-
-
Notifications
You must be signed in to change notification settings - Fork 6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Resolve conflict for 4.0 branch and master #4456
Commits on Dec 24, 2017
-
Merge pull request #3130 from danielgindi/master
Updating 4.0.0 with latest changes in master
Configuration menu - View commit details
-
Copy full SHA for df62114 - Browse repository at this point
Copy the full SHA df62114View commit details
Commits on Dec 26, 2017
-
Remove java interface convention (#2997)
* Renamed `IMarker` to `Marker` following Swift API guidelines. * Renamed `IAxisValueFormatter` to `AxisValueFormatter` * Renamed `IFillFormatter` to `FillFormatter` * Renamed `IValueFormatter` to `ValueFormatter` * Renamed `IHighlighter` to `Highlighter` * Renamed `I*DataSet` to `*DataSetProtocol` to follow Swift API guidelines * Fixed naming of `LineRadarChartDataSetProtocol` and `RadarChartDataSetProtocol` from previous commit * Renamed "Interfaces" to "DataProviders" for clarity * Updated Demos to for new type naming
Configuration menu - View commit details
-
Copy full SHA for 1d245b7 - Browse repository at this point
Copy the full SHA 1d245b7View commit details -
* Renderer is now a protocol Renamed Renderers, and organized the Renderer folder. * DataRenderer is now a protocol * AxisRenderer is now a protocol
Configuration menu - View commit details
-
Copy full SHA for e126844 - Browse repository at this point
Copy the full SHA e126844View commit details
Commits on Jan 6, 2018
-
Chartviewbase redundant ivar (#3045)
* Fixed using wrong axis (Issue #2257) * fix #1830. credit from #2049 (#2874) * fix #1830. credit from #2049 * add combined chart unit tests for iOS, tvOS (macOS only have build process) * use iterater rather than index * Removed redundant ivars in BarLineChartViewBase (#3043) * Removed redundant ivars in favour of proper access control * Moved initialization of axes to their declaration to keep the same optionality exposed. * Update 4.0.0 with master (#3135) * Replaced relevant `ChartUtils` methods with `Double` extensions (#2994) * Replaced relevant `ChartUtils` methods with `Double` extensions Improves readability. `nextUp` is built in and provides the same functionality. * Updated `ChartUtilsTests` to match changes * add option to build demo projects unit tests on iOS (#3121) * add option to build demo projects unit tests on iOS * add ChartsDemo-OSX build test. * Update ViewPortHandler.swift (#3143) fix a small bug * Refactored ChartUtils method into CGPoint extension (#3087) * Refactored ChartUtils method into CGPoint extension * Replaced ChartUtils.defaultValueFormatter() * Codestyle fixes * ChartViewBase cleanup For the most part, condensing logic and using `guard` where appropriate Removed optionality of many internal variables as they were only optional to allow for deferred initialization. This is now replaced with lazy vars. Removed empty initializer overrides. `fileprivate` is now `private` * Removed redundant ivars In favour of proper access control * Fixes after merge * Renamed `animator` to `chartAnimator` on `ChartViewBase` to no conflict with `NSView`'s `animator()` method. * pulled latest master * Code style fix * Removed AxisRendererBase.swift * Fixed demos
Configuration menu - View commit details
-
Copy full SHA for 85573ee - Browse repository at this point
Copy the full SHA 85573eeView commit details -
BarChartRenderer Logic cleanup (#3008)
* Logic cleanup Mostly using guard where appropriate Few very minor performance improvements * Made use of `==` where appropriate to simplify logic * Returned fatalError message * Replaced `Buffer` class with simple typealias. There was only one instance where reference semantics might have be helpful, but was easily reimplemented with value semantics.
Configuration menu - View commit details
-
Copy full SHA for 11ff349 - Browse repository at this point
Copy the full SHA 11ff349View commit details
Commits on Jan 7, 2018
-
Syncing 4.0.0 with master (#3160)
* Fixed using wrong axis (Issue #2257) * fix #1830. credit from #2049 (#2874) * fix #1830. credit from #2049 * add combined chart unit tests for iOS, tvOS (macOS only have build process) * use iterater rather than index * Removed redundant ivars in BarLineChartViewBase (#3043) * Removed redundant ivars in favour of proper access control * Moved initialization of axes to their declaration to keep the same optionality exposed. * Update 4.0.0 with master (#3135) * Replaced relevant `ChartUtils` methods with `Double` extensions (#2994) * Replaced relevant `ChartUtils` methods with `Double` extensions Improves readability. `nextUp` is built in and provides the same functionality. * Updated `ChartUtilsTests` to match changes * add option to build demo projects unit tests on iOS (#3121) * add option to build demo projects unit tests on iOS * add ChartsDemo-OSX build test. * Update ViewPortHandler.swift (#3143) fix a small bug * Refactored ChartUtils method into CGPoint extension (#3087) * Refactored ChartUtils method into CGPoint extension * Replaced ChartUtils.defaultValueFormatter() * Codestyle fixes * Minor cleanup to Highlighter types (#3003) * Minor cleanup to Highlighter types * Fixes for PR * Pulled master and updated code style * added DataApproximator+N extension (#2848) * added DataApproximator+N extension * fixed PR notes * Readded in missing files
Configuration menu - View commit details
-
Copy full SHA for d9dba58 - Browse repository at this point
Copy the full SHA d9dba58View commit details
Commits on Jan 8, 2018
-
Moved ChartUtils drawing methods into CGContext extension (#3086)
* Fixed using wrong axis (Issue #2257) * fix #1830. credit from #2049 (#2874) * fix #1830. credit from #2049 * add combined chart unit tests for iOS, tvOS (macOS only have build process) * use iterater rather than index * Removed redundant ivars in BarLineChartViewBase (#3043) * Removed redundant ivars in favour of proper access control * Moved initialization of axes to their declaration to keep the same optionality exposed. * Update 4.0.0 with master (#3135) * Replaced relevant `ChartUtils` methods with `Double` extensions (#2994) * Replaced relevant `ChartUtils` methods with `Double` extensions Improves readability. `nextUp` is built in and provides the same functionality. * Updated `ChartUtilsTests` to match changes * add option to build demo projects unit tests on iOS (#3121) * add option to build demo projects unit tests on iOS * add ChartsDemo-OSX build test. * Update ViewPortHandler.swift (#3143) fix a small bug * Refactored ChartUtils method into CGPoint extension (#3087) * Refactored ChartUtils method into CGPoint extension * Replaced ChartUtils.defaultValueFormatter() * Codestyle fixes * Minor cleanup to Highlighter types (#3003) * Minor cleanup to Highlighter types * Fixes for PR * Pulled master and updated code style * added DataApproximator+N extension (#2848) * added DataApproximator+N extension * fixed PR notes * Moved drawing methods into CGContext extension Much nicer call sites. Renamed some parameter names. Removed `NSAttributedStringKey` where type inference was sufficient. Minor tidy of drawText calls in AxisRenderers * Pulled latest master * Pulled master * Fixed code style
Configuration menu - View commit details
-
Copy full SHA for 9d8b76d - Browse repository at this point
Copy the full SHA 9d8b76dView commit details
Commits on Jan 9, 2018
-
* Cleanup Replaced unnecessary getters with proper access control Replaced unnecessary convenience inits with default parameters Minor refactoring * Pulled latest master * Pulled latest master * Pulled latest master * Fix after pulling master * Fixed using wrong axis (Issue #2257) * fix #1830. credit from #2049 (#2874) * fix #1830. credit from #2049 * add combined chart unit tests for iOS, tvOS (macOS only have build process) * use iterater rather than index * Removed redundant ivars in BarLineChartViewBase (#3043) * Removed redundant ivars in favour of proper access control * Moved initialization of axes to their declaration to keep the same optionality exposed. * Update 4.0.0 with master (#3135) * Replaced relevant `ChartUtils` methods with `Double` extensions (#2994) * Replaced relevant `ChartUtils` methods with `Double` extensions Improves readability. `nextUp` is built in and provides the same functionality. * Updated `ChartUtilsTests` to match changes * add option to build demo projects unit tests on iOS (#3121) * add option to build demo projects unit tests on iOS * add ChartsDemo-OSX build test. * Update ViewPortHandler.swift (#3143) fix a small bug * Refactored ChartUtils method into CGPoint extension (#3087) * Refactored ChartUtils method into CGPoint extension * Replaced ChartUtils.defaultValueFormatter() * Codestyle fixes * Finished cleanup * Pulled master
Configuration menu - View commit details
-
Copy full SHA for 28ed948 - Browse repository at this point
Copy the full SHA 28ed948View commit details
Commits on Jan 16, 2018
-
Chartdata collection conformance (#3023)
* Added Collection conformances MutableCollection RandomAccessCollection RangeReplaceableCollection * Fixed required initializers * ChartData adopts ExressibleByArrayLiteral * Updates for PR Also added remove subrange. * PR review fixes * Removed unnecessary `get` from subscripts. * Disabled `remove(at:)` for CombinedChartView * Relocated `appendEntry(_:todataSet:)` * Removed methods from CombinedChartData
Configuration menu - View commit details
-
Copy full SHA for 4285bbc - Browse repository at this point
Copy the full SHA 4285bbcView commit details
Commits on Jan 21, 2018
-
* weak -> unowned `ViewPortJob`s are owned by the Charts that make them. They are guaranteed to only exist while the chart exists. The `Transformer` and `ViewPortHandler` are supplied by the chart, so they will also only exist while the chart exists. Therefor none of them need to be `weak`, but can be `unowned` instead. It's a minor change in the code base (removing some guard statements), but it makes it much easier to discern how the framework is architected. * pulled latest master
Configuration menu - View commit details
-
Copy full SHA for f9120d2 - Browse repository at this point
Copy the full SHA f9120d2View commit details
Commits on Jan 23, 2018
-
Removed optionality from valueFormatter where appropriate (#3106)
* Removed optionality from valueFormatter where appropriate In ChartBaseDataSet, `valueFormatter` never returned nil, and escaped early if trying to set it to nil. It appears this was made optional solely to provide lazy initialization. We now use a lazy var instead. In AxisBase, the backing var `_axisValueFormatter` would never be treated as nil, and appears to be made optional solely to provide lazy initialization. We now use a lazy var instead. In `valueFormatter` we can remove the `nil` check, but leave it optional to keep the same functionality. * Pulled 4.0.0 * Pulled latest 4.0.0 * Fixed pro file
Configuration menu - View commit details
-
Copy full SHA for 34d2940 - Browse repository at this point
Copy the full SHA 34d2940View commit details
Commits on Jan 26, 2018
-
Chartdata collection refactor (#3024)
* Added Collection conformances MutableCollection RandomAccessCollection RangeReplaceableCollection * [#3018] Refactored use of `ChartData` to use new `Collection` conformances * Fixed required initializers * ChartData adopts ExressibleByArrayLiteral * Modified demos to take advantage of collection conformance. * Removed unnecessary `get` from subscripts. * Removed redundant methods * Relocated `appendEntry(_:todataSet:)` * Removed methods from CombinedChartData
Configuration menu - View commit details
-
Copy full SHA for 3ebee41 - Browse repository at this point
Copy the full SHA 3ebee41View commit details -
Moved the default value formatter (#3088)
* Moved the default value formatter It is now simply `DefaultValueFomatter()` Removed unnecessary backing ivars in `DefaultValuetFormatter` in favour of property observers Deprecated static func constructor in favour of initializer
Configuration menu - View commit details
-
Copy full SHA for fe16641 - Browse repository at this point
Copy the full SHA fe16641View commit details
Commits on Feb 21, 2018
-
Add option to rotate value text for line charts
ctran committedFeb 21, 2018 Configuration menu - View commit details
-
Copy full SHA for ef21083 - Browse repository at this point
Copy the full SHA ef21083View commit details -
Add value text rotation for bar charts
Chinh Tran committedFeb 21, 2018 Configuration menu - View commit details
-
Copy full SHA for 5a1a46e - Browse repository at this point
Copy the full SHA 5a1a46eView commit details -
Add value text rotation for other charts
Chinh Tran committedFeb 21, 2018 Configuration menu - View commit details
-
Copy full SHA for 31f7ad5 - Browse repository at this point
Copy the full SHA 31f7ad5View commit details
Commits on Mar 10, 2018
-
Configuration menu - View commit details
-
Copy full SHA for fa1c567 - Browse repository at this point
Copy the full SHA fa1c567View commit details -
Updated projects for Xcode 9.3 and Swift 4.1
added a workspace to include all demos with the project to make it easier to test changes
Configuration menu - View commit details
-
Copy full SHA for ab79255 - Browse repository at this point
Copy the full SHA ab79255View commit details -
Merge branch 'swift-4.1' of https://github.com/jjatie/Charts into 4.0.0
# Conflicts: # Charts.xcodeproj/project.pbxproj # ChartsDemo/ChartsDemo-iOS.xcodeproj/project.pbxproj # ChartsDemo/Objective-C/Demos/LineChartFilledViewController.m # ChartsDemo/Objective-C/Demos/RadarChartViewController.m # Source/Charts/Charts/BarLineChartViewBase.swift # Source/Charts/Charts/ChartViewBase.swift # Source/Charts/Charts/HorizontalBarChartView.swift # Source/Charts/Components/Legend.swift # Source/Charts/Renderers/LegendRenderer.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift # Source/Charts/Utils/ChartUtils.swift # Source/Charts/Utils/ViewPortHandler.swift
Configuration menu - View commit details
-
Copy full SHA for 39f1550 - Browse repository at this point
Copy the full SHA 39f1550View commit details
Commits on Mar 12, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 1bc15ce - Browse repository at this point
Copy the full SHA 1bc15ceView commit details
Commits on Mar 13, 2018
-
Configuration menu - View commit details
-
Copy full SHA for d957f4e - Browse repository at this point
Copy the full SHA d957f4eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 99341af - Browse repository at this point
Copy the full SHA 99341afView commit details
Commits on Mar 14, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 2a6931f - Browse repository at this point
Copy the full SHA 2a6931fView commit details -
Configuration menu - View commit details
-
Copy full SHA for bb92e1f - Browse repository at this point
Copy the full SHA bb92e1fView commit details
Commits on Mar 15, 2018
-
Rename valueRotationAngle -> valueLabelAngle
Chinh Tran committedMar 15, 2018 Configuration menu - View commit details
-
Copy full SHA for ea87d1f - Browse repository at this point
Copy the full SHA ea87d1fView commit details -
Make function private & remove line break
Chinh Tran committedMar 15, 2018 Configuration menu - View commit details
-
Copy full SHA for 66cd435 - Browse repository at this point
Copy the full SHA 66cd435View commit details
Commits on Mar 30, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 32ef09e - Browse repository at this point
Copy the full SHA 32ef09eView commit details
Commits on Apr 8, 2018
-
* Added Collection conformances MutableCollection RandomAccessCollection RangeReplaceableCollection * [#3018] Refactored use of `ChartData` to use new `Collection` conformances * Fixed required initializers * ChartData adopts ExressibleByArrayLiteral * Modified demos to take advantage of collection conformance. * Updates for PR Also added remove subrange. * Refactored ChartData Removed redundancy from min/max logic. Lots of naming changes. Cleaner implementations. * PR review fixes * Removed unnecessary `get` from subscripts. * Disabled `remove(at:)` for CombinedChartView * Removed redundant methods * Relocated `appendEntry(_:todataSet:)` * pulled latest 4.0.0 * Disabled Collection support for CombinedChartData * Removed methods from CombinedChartData * Pulled latest 4.0 * Fixes after merge * Removed used of dataSet(forIndex:) * Fixed merge conflicts * Fixed merge conflicts * updated demos * Pulled latest 4.0.0 * Fixed demos * Fixed objective c demos * Moved travis to Xcode 9.3 beta temporarily * Fixed macOS demo info.plist and tv demo device name * PR Fixes * Fixed objective-c naming * PR Fixes * fix comment
Configuration menu - View commit details
-
Copy full SHA for d74ce61 - Browse repository at this point
Copy the full SHA d74ce61View commit details
Commits on Apr 29, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 7141265 - Browse repository at this point
Copy the full SHA 7141265View commit details
Commits on May 2, 2018
-
* Cleaned up `ChartDataSet` logic Added TODOs for areas where simple changes can help improve Swift consistency. * Tidied up logic for `ChartDataSet` subclasses Minor changes to take advantage of Swift features and help improve readability. * Added Collection conformances MutableCollection RandomAccessCollection RangeReplaceableCollection * [#3018] Refactored use of `ChartData` to use new `Collection` conformances * Fixed required initializers * ChartData adopts ExressibleByArrayLiteral * Modified demos to take advantage of collection conformance. * Pulled latest master * Pulled latest master * Updates for PR Also added remove subrange. * Refactored ChartData Removed redundancy from min/max logic. Lots of naming changes. Cleaner implementations. * PR review fixes * Removed unnecessary `get` from subscripts. * Disabled `remove(at:)` for CombinedChartView * Removed redundant methods * Relocated `appendEntry(_:todataSet:)` * pulled latest 4.0.0 * Disabled Collection support for CombinedChartData * Removed methods from CombinedChartData * Pulled latest 4.0 * Fixes after merge * Removed used of dataSet(forIndex:) * Fixed merge conflicts * Fixed merge conflicts * updated demos * Pulled latest 4.0.0 * Fixed demos * Fixed objective c demos * Moved travis to Xcode 9.3 beta temporarily * Fixed macOS demo info.plist and tv demo device name * PR Fixes * Fixed objective-c naming * PR Fixes * PR Fixes
Configuration menu - View commit details
-
Copy full SHA for 08bd20c - Browse repository at this point
Copy the full SHA 08bd20cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3db09d9 - Browse repository at this point
Copy the full SHA 3db09d9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8981f32 - Browse repository at this point
Copy the full SHA 8981f32View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c65999 - Browse repository at this point
Copy the full SHA 1c65999View commit details -
Configuration menu - View commit details
-
Copy full SHA for 25eb164 - Browse repository at this point
Copy the full SHA 25eb164View commit details -
Configuration menu - View commit details
-
Copy full SHA for a13978f - Browse repository at this point
Copy the full SHA a13978fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 470328a - Browse repository at this point
Copy the full SHA 470328aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bd7bbd - Browse repository at this point
Copy the full SHA 6bd7bbdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9f20679 - Browse repository at this point
Copy the full SHA 9f20679View commit details -
Configuration menu - View commit details
-
Copy full SHA for 342e088 - Browse repository at this point
Copy the full SHA 342e088View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50b29b4 - Browse repository at this point
Copy the full SHA 50b29b4View commit details -
Remove unnecessary function for generating gradient line
- additional code optimizations
Configuration menu - View commit details
-
Copy full SHA for d7814af - Browse repository at this point
Copy the full SHA d7814afView commit details -
Configuration menu - View commit details
-
Copy full SHA for aee20f0 - Browse repository at this point
Copy the full SHA aee20f0View commit details
Commits on May 7, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 4d2e335 - Browse repository at this point
Copy the full SHA 4d2e335View commit details
Commits on Jun 10, 2018
-
Merge pull request #3415 from larryonoff/draw-gradient-line
Added gradient line drawing to LineChartRenderer. based on PR #3142
Configuration menu - View commit details
-
Copy full SHA for 1b387d8 - Browse repository at this point
Copy the full SHA 1b387d8View commit details -
Merge pull request #3445 from nagykatalin/customizable-legend
Make legendRenderer property public in order to be externally customizable
Configuration menu - View commit details
-
Copy full SHA for 52c06d6 - Browse repository at this point
Copy the full SHA 52c06d6View commit details -
Merge branch 'master' into 4.0.0
# Conflicts: # ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift # Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift # Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift # Source/Charts/Data/Implementations/Standard/LineRadarChartDataSet.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift
Configuration menu - View commit details
-
Copy full SHA for c523949 - Browse repository at this point
Copy the full SHA c523949View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a7b712 - Browse repository at this point
Copy the full SHA 0a7b712View commit details -
Configuration menu - View commit details
-
Copy full SHA for 96345f6 - Browse repository at this point
Copy the full SHA 96345f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 75c4fa5 - Browse repository at this point
Copy the full SHA 75c4fa5View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba6bbc1 - Browse repository at this point
Copy the full SHA ba6bbc1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 89706c0 - Browse repository at this point
Copy the full SHA 89706c0View commit details
Commits on Jun 11, 2018
-
Merge pull request #3500 from danielgindi/pr/3218
Fix merge conflicts in #3218
Configuration menu - View commit details
-
Copy full SHA for ea3cedd - Browse repository at this point
Copy the full SHA ea3ceddView commit details
Commits on Jul 14, 2018
-
Merge branch 'master' into 4.0.0
# Conflicts: # Charts.xcodeproj/project.pbxproj # Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift # Source/Charts/Renderers/BarChartRenderer.swift # Source/Charts/Renderers/BubbleChartRenderer.swift # Source/Charts/Renderers/CandleStickChartRenderer.swift # Source/Charts/Renderers/ChartDataRendererBase.swift # Source/Charts/Renderers/LineChartRenderer.swift # Source/Charts/Renderers/PieChartRenderer.swift # Source/Charts/Renderers/RadarChartRenderer.swift # Source/Charts/Renderers/ScatterChartRenderer.swift
Configuration menu - View commit details
-
Copy full SHA for 73183d5 - Browse repository at this point
Copy the full SHA 73183d5View commit details -
Configuration menu - View commit details
-
Copy full SHA for aadc3a8 - Browse repository at this point
Copy the full SHA aadc3a8View commit details -
Merge pull request #2200 from chinh-tran/master
Added value text rotation
Configuration menu - View commit details
-
Copy full SHA for 1d44ab3 - Browse repository at this point
Copy the full SHA 1d44ab3View commit details
Commits on Jul 20, 2018
-
Add label colors to legend entries (#3558)
* add label colors to legend entries * Change interface of LegendEntry
Configuration menu - View commit details
-
Copy full SHA for 7a5239a - Browse repository at this point
Copy the full SHA 7a5239aView commit details
Commits on Jul 29, 2018
-
Merge branch 'master' into 4.0.0
# Conflicts: # Source/Charts/Renderers/BarChartRenderer.swift
Configuration menu - View commit details
-
Copy full SHA for 68d5459 - Browse repository at this point
Copy the full SHA 68d5459View commit details
Commits on Aug 21, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 707d627 - Browse repository at this point
Copy the full SHA 707d627View commit details
Commits on Sep 6, 2018
-
Merge pull request #3608 from larryonoff/4.0.0
Add Swift version 4.1 to podspec
Configuration menu - View commit details
-
Copy full SHA for 97587d0 - Browse repository at this point
Copy the full SHA 97587d0View commit details
Commits on Oct 8, 2018
-
Merge branch 'master' into 4.0.0
# Conflicts: # Source/Charts/Charts/ChartViewBase.swift # Source/Charts/Charts/PieChartView.swift # Source/Charts/Components/Legend.swift # Source/Charts/Components/YAxis.swift # Source/Charts/Formatters/ValueFormatter.swift # Source/Charts/Renderers/BarChartRenderer.swift # Source/Charts/Renderers/BubbleChartRenderer.swift # Source/Charts/Renderers/CandleStickChartRenderer.swift # Source/Charts/Renderers/DataRenderer.swift # Source/Charts/Renderers/HorizontalBarChartRenderer.swift # Source/Charts/Renderers/LegendRenderer.swift # Source/Charts/Renderers/LineChartRenderer.swift # Source/Charts/Renderers/PieChartRenderer.swift # Source/Charts/Renderers/RadarChartRenderer.swift # Source/Charts/Renderers/Renderer.swift # Source/Charts/Renderers/ScatterChartRenderer.swift # Source/Charts/Renderers/XAxisRenderer.swift # Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/XAxisRendererRadarChart.swift # Source/Charts/Renderers/YAxisRenderer.swift # Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift # Source/Charts/Utils/ChartUtils.swift
Configuration menu - View commit details
-
Copy full SHA for 9a7b922 - Browse repository at this point
Copy the full SHA 9a7b922View commit details
Commits on Dec 25, 2018
-
Configuration menu - View commit details
-
Copy full SHA for be8b386 - Browse repository at this point
Copy the full SHA be8b386View commit details -
Added TODOs for areas where simple changes can help improve Swift consistency.
Configuration menu - View commit details
-
Copy full SHA for aa7e20a - Browse repository at this point
Copy the full SHA aa7e20aView commit details -
MutableCollection RandomAccessCollection RangeReplaceableCollection
Configuration menu - View commit details
-
Copy full SHA for 438dae7 - Browse repository at this point
Copy the full SHA 438dae7View commit details -
Refactored use of `ChartData` to use new `Collection` conformances
Configuration menu - View commit details
-
Copy full SHA for 8aba022 - Browse repository at this point
Copy the full SHA 8aba022View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ced54f - Browse repository at this point
Copy the full SHA 2ced54fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7dfb59e - Browse repository at this point
Copy the full SHA 7dfb59eView commit details -
Configuration menu - View commit details
-
Copy full SHA for b554fb0 - Browse repository at this point
Copy the full SHA b554fb0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 51501a1 - Browse repository at this point
Copy the full SHA 51501a1View commit details -
Replaced custom algorithms with built-in ones Made axis renderer implementations feel "Swift-ier"
Configuration menu - View commit details
-
Copy full SHA for 78fb682 - Browse repository at this point
Copy the full SHA 78fb682View commit details -
Configuration menu - View commit details
-
Copy full SHA for bdf6f6d - Browse repository at this point
Copy the full SHA bdf6f6dView commit details -
Removed redundancy from min/max logic. Lots of naming changes. Cleaner implementations.
Configuration menu - View commit details
-
Copy full SHA for da2ff2d - Browse repository at this point
Copy the full SHA da2ff2dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9aaee13 - Browse repository at this point
Copy the full SHA 9aaee13View commit details -
Configuration menu - View commit details
-
Copy full SHA for f399bca - Browse repository at this point
Copy the full SHA f399bcaView commit details -
Configuration menu - View commit details
-
Copy full SHA for bd1bc8f - Browse repository at this point
Copy the full SHA bd1bc8fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 74f28b1 - Browse repository at this point
Copy the full SHA 74f28b1View commit details -
Configuration menu - View commit details
-
Copy full SHA for aec150e - Browse repository at this point
Copy the full SHA aec150eView commit details -
Configuration menu - View commit details
-
Copy full SHA for f606175 - Browse repository at this point
Copy the full SHA f606175View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6db01d2 - Browse repository at this point
Copy the full SHA 6db01d2View commit details -
Configuration menu - View commit details
-
Copy full SHA for b8aa08e - Browse repository at this point
Copy the full SHA b8aa08eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6d8471d - Browse repository at this point
Copy the full SHA 6d8471dView commit details
Commits on Jan 3, 2019
-
Jacob Christie committed
Jan 3, 2019 Configuration menu - View commit details
-
Copy full SHA for 52480db - Browse repository at this point
Copy the full SHA 52480dbView commit details
Commits on Jan 4, 2019
-
Merge pull request #3164 from jjatie/4.0/axis-renderer-cleanup
Axis Renderers Cleanup
Configuration menu - View commit details
-
Copy full SHA for 5689a1c - Browse repository at this point
Copy the full SHA 5689a1cView commit details
Commits on Apr 16, 2020
-
close #3140 * Fill is now a protocol Different fill logic is broken up into separate classes. This has a few benefits: 1. It makes the `Fill` types more readable (logic is grouped together) 2. No optionals 3. Most importantly it allows consumers to create new Fill types without looking into the framework. * Added super.init() for objc * Updated Fill access No need to subclass existing fills now that the system is more flexible. If functionality is needed from another fill, user can call it within their own `fillPath(context: CGContext, rect: CGRect)` implementation. * Updated Fill Names * Update Fill.swift update code style Co-authored-by: Jacob Christie <[email protected]> Co-authored-by: Xuan <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 4b23327 - Browse repository at this point
Copy the full SHA 4b23327View commit details
Commits on Jul 27, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 9275d37 - Browse repository at this point
Copy the full SHA 9275d37View commit details
Commits on Aug 27, 2020
-
Merge branch '4.0.0' into ResolveConflict
# Conflicts: # Charts.xcodeproj/project.pbxproj # Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme # Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme # ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift # ChartsDemo-macOS/PlaygroundChart.playground/Contents.o # Source/Charts/Charts/BarLineChartViewBase.swift # Source/Charts/Charts/ChartViewBase.swift # Source/Charts/Charts/PieChartView.swift # Source/Charts/Charts/RadarChartView.swift # Source/Charts/Components/AxisBase.swift # Source/Charts/Components/LegendEntry.swift # Source/Charts/Components/Marker.swift # Source/Charts/Data/Implementations/ChartBaseDataSet.swift # Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift # Source/Charts/Data/Implementations/Standard/CandleChartDataSet.swift # Source/Charts/Data/Implementations/Standard/ChartData.swift # Source/Charts/Data/Implementations/Standard/ChartDataSet.swift # Source/Charts/Data/Implementations/Standard/CombinedChartData.swift # Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift # Source/Charts/Data/Implementations/Standard/PieChartData.swift # Source/Charts/Data/Implementations/Standard/PieChartDataSet.swift # Source/Charts/Data/Implementations/Standard/RadarChartDataSet.swift # Source/Charts/Data/Implementations/Standard/ScatterChartData.swift # Source/Charts/Data/Interfaces/ChartDataSetProtocol.swift # Source/Charts/Data/Interfaces/ScatterChartDataSetProtocol.swift # Source/Charts/Formatters/FillFormatter.swift # Source/Charts/Renderers/AxisRendererBase.swift # Source/Charts/Renderers/BarChartRenderer.swift # Source/Charts/Renderers/BarLineScatterCandleBubbleRenderer.swift # Source/Charts/Renderers/CandleStickChartRenderer.swift # Source/Charts/Renderers/CombinedChartRenderer.swift # Source/Charts/Renderers/DataRenderer.swift # Source/Charts/Renderers/HorizontalBarChartRenderer.swift # Source/Charts/Renderers/LegendRenderer.swift # Source/Charts/Renderers/LineChartRenderer.swift # Source/Charts/Renderers/PieChartRenderer.swift # Source/Charts/Renderers/RadarChartRenderer.swift # Source/Charts/Renderers/ScatterChartRenderer.swift # Source/Charts/Renderers/XAxisRenderer.swift # Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/XAxisRendererRadarChart.swift # Source/Charts/Renderers/YAxisRenderer.swift # Source/Charts/Renderers/YAxisRendererHorizontalBarChart.swift # Source/Charts/Renderers/YAxisRendererRadarChart.swift # Source/Charts/Utils/ChartUtils.swift # Source/Charts/Utils/Platform+Accessibility.swift # Source/Charts/Utils/Platform.swift # Source/Charts/Utils/ViewPortHandler.swift
Configuration menu - View commit details
-
Copy full SHA for 84b501f - Browse repository at this point
Copy the full SHA 84b501fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3f84f87 - Browse repository at this point
Copy the full SHA 3f84f87View commit details
Commits on Aug 28, 2020
-
revert back to convenience init for BarChartDataSet
fix ChartDataTests compile errors: use new API dataSet(forLabel:, ignorecase: )
Configuration menu - View commit details
-
Copy full SHA for 58ab2e0 - Browse repository at this point
Copy the full SHA 58ab2e0View commit details -
actually, I compared the old master and find this is a mistake while …
…merging to make init(label:) in BarChartDataSet. It should be in ChartDataSet.
Configuration menu - View commit details
-
Copy full SHA for 4229997 - Browse repository at this point
Copy the full SHA 4229997View commit details -
fix -0.0 issue in 4.0 merge. fix func calculateLegendOffsets in BarLi…
…neChartViewBase due to mistaking added back offsetBottom += xAxis.labelRotatedHeight. see #4277 for details now bar & horizontal bar chart tests should pass.
Configuration menu - View commit details
-
Copy full SHA for 0705a42 - Browse repository at this point
Copy the full SHA 0705a42View commit details -
fix pie chart UT failures. didSet will no be called in init(), so we…
… call it manually also fix set.valueFormatter in data setter
Configuration menu - View commit details
-
Copy full SHA for bcbb0aa - Browse repository at this point
Copy the full SHA bcbb0aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c3891e - Browse repository at this point
Copy the full SHA 1c3891eView commit details
Commits on Aug 30, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 2e60d0c - Browse repository at this point
Copy the full SHA 2e60d0cView commit details
Commits on Sep 23, 2020
-
Configuration menu - View commit details
-
Copy full SHA for f7dab2f - Browse repository at this point
Copy the full SHA f7dab2fView commit details
Commits on Sep 25, 2020
-
Remove misuse of
count
(#4461)* Remove misuse of `count` * Fix protocol method name * Update ChartColorTemplates.swift use fallbackColor for `colorFromString()` * Revert "Update ChartColorTemplates.swift" This reverts commit b4111fd. Co-authored-by: Xuan <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 2864cac - Browse repository at this point
Copy the full SHA 2864cacView commit details
Commits on Oct 9, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 771978c - Browse repository at this point
Copy the full SHA 771978cView commit details -
fix Carthage error after changing to source compile. Carthage/Carthag…
…e#3019 there is a workaround mentioned [here](Carthage/Carthage#3019 (comment)) making travis to build from carthage.sh until the root issue is fixed.
Configuration menu - View commit details
-
Copy full SHA for 60bfc33 - Browse repository at this point
Copy the full SHA 60bfc33View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9fc9f46 - Browse repository at this point
Copy the full SHA 9fc9f46View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9d73463 - Browse repository at this point
Copy the full SHA 9d73463View commit details
Commits on Oct 19, 2020
-
Merge pull request #4476 from danielgindi/bump-travis-ci-to-use-xcode-12
Bump travis ci to use xcode 12
Configuration menu - View commit details
-
Copy full SHA for 96ac08d - Browse repository at this point
Copy the full SHA 96ac08dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 32cc06e - Browse repository at this point
Copy the full SHA 32cc06eView commit details
Commits on Oct 28, 2020
-
Remove internal use of datasets (#4459)
* Remove internal use of ChartData.dataSets * Rebased onto ResolveConflicts * Remove duplicated line
Configuration menu - View commit details
-
Copy full SHA for 201146d - Browse repository at this point
Copy the full SHA 201146dView commit details -
Merge branch 'master' into ResolveConflict
# Conflicts: # Charts.podspec # Charts.xcodeproj/project.pbxproj
Configuration menu - View commit details
-
Copy full SHA for 05a59f7 - Browse repository at this point
Copy the full SHA 05a59f7View commit details