Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Resolve conflict for 4.0 branch and master #4456

Merged
merged 102 commits into from
Oct 30, 2020
Merged

Resolve conflict for 4.0 branch and master #4456

merged 102 commits into from
Oct 30, 2020

Commits on Dec 24, 2017

  1. Merge pull request #3130 from danielgindi/master 

    Updating 4.0.0 with latest changes in master
    @jjatie
    jjatie authored Dec 24, 2017
    Configuration menu
    Copy the full SHA
    df62114 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2017

  1. 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
    @jjatie
    jjatie authored Dec 26, 2017
    Configuration menu
    Copy the full SHA
    1d245b7 View commit details
    Browse the repository at this point in the history

  2. Renderer protocols (#3136) 

    * Renderer is now a protocol

Renamed Renderers, and organized the Renderer folder.

* DataRenderer is now a protocol

* AxisRenderer is now a protocol
    @jjatie
    jjatie authored Dec 26, 2017
    Configuration menu
    Copy the full SHA
    e126844 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    85573ee View commit details
    Browse the repository at this point in the history

  2. 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.
    @jjatie
    jjatie authored Jan 6, 2018
    Configuration menu
    Copy the full SHA
    11ff349 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2018

  1. 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
    @jjatie
    jjatie authored Jan 7, 2018
    Configuration menu
    Copy the full SHA
    d9dba58 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2018

  1. 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    9d8b76d View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Utils Cleanup (#3054) 

    * 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    28ed948 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    4285bbc View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. weak -> unowned (#3039) 

    * 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    f9120d2 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. 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
    @jjatie
    jjatie authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    34d2940 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. 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
    @jjatie
    jjatie authored Jan 26, 2018
    Configuration menu
    Copy the full SHA
    3ebee41 View commit details
    Browse the repository at this point in the history

  2. 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
    @jjatie
    jjatie authored Jan 26, 2018
    Configuration menu
    Copy the full SHA
    fe16641 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Add option to rotate value text for line charts

    ctran committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    ef21083 View commit details
    Browse the repository at this point in the history

  2. Add value text rotation for bar charts

    Chinh Tran committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    5a1a46e View commit details
    Browse the repository at this point in the history

  3. Add value text rotation for other charts

    Chinh Tran committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    31f7ad5 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2018

  1. Fixed misuse/deprecation of "!" operator

    @jjatie
    jjatie committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    fa1c567 View commit details
    Browse the repository at this point in the history

  2. 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
    @jjatie
    jjatie committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    ab79255 View commit details
    Browse the repository at this point in the history

  3. 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
    @jjatie
    jjatie committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    39f1550 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. pulled master

    @jjatie
    jjatie committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    1bc15ce View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. Pulled master

    @jjatie
    jjatie committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    d957f4e View commit details
    Browse the repository at this point in the history

  2. Moved travis to Xcode 9.3beta temporarily

    @jjatie
    jjatie committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    99341af View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Updated Rakefile for new project names

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    2a6931f View commit details
    Browse the repository at this point in the history

  2. Updated demo imports

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    bb92e1f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. Rename valueRotationAngle -> valueLabelAngle

    Chinh Tran committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    ea87d1f View commit details
    Browse the repository at this point in the history

  2. Make function private & remove line break

    Chinh Tran committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    66cd435 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2018

  1. pulled master

    @jjatie
    jjatie committed Mar 30, 2018
    Configuration menu
    Copy the full SHA
    32ef09e View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2018

  1. Refactored ChartData (#3169) 

    * 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    d74ce61 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2018

  1. Remove unnecessary file (#3432)

    @larryonoff @jjatie
    larryonoff authored and jjatie committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    7141265 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2018

  1. Dataset logic cleanup (#3001) 

    * 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
    @jjatie @liuxuan30
    jjatie authored and liuxuan30 committed May 2, 2018
    Configuration menu
    Copy the full SHA
    08bd20c View commit details
    Browse the repository at this point in the history

  2. Added gradient line drawing to LineChartRenderer

    @larryonoff
    Jacob Christie authored and larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    3db09d9 View commit details
    Browse the repository at this point in the history

  3. Stabilize and clean the code

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    8981f32 View commit details
    Browse the repository at this point in the history

  4. Extract line drawing into function

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    1c65999 View commit details
    Browse the repository at this point in the history

  5. Fix macOS build

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    25eb164 View commit details
    Browse the repository at this point in the history

  6. Move drawGradientLine out of drawLine method

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    a13978f View commit details
    Browse the repository at this point in the history

  7. Remove unused parameters from drawLine function

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    470328a View commit details
    Browse the repository at this point in the history

  8. Fix gradient location calculation

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    6bd7bbd View commit details
    Browse the repository at this point in the history

  9. Add toggle gradient line into demo options

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    9f20679 View commit details
    Browse the repository at this point in the history

  10. Improvements after code review

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    342e088 View commit details
    Browse the repository at this point in the history

  11. Code cleanup

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    50b29b4 View commit details
    Browse the repository at this point in the history

  12. Remove unnecessary function for generating gradient line 

    - additional code optimizations
    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    d7814af View commit details
    Browse the repository at this point in the history

  13. Fix: gradient lines peaks are truncated when line width > 1

    @larryonoff
    larryonoff committed May 2, 2018
    Configuration menu
    Copy the full SHA
    aee20f0 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. Make legendRenderer property public in order to be externally customi… 

    …zable
    @nagykatalin
    nagykatalin committed May 7, 2018
    Configuration menu
    Copy the full SHA
    4d2e335 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2018

  1. Merge pull request #3415 from larryonoff/draw-gradient-line 

    Added gradient line drawing to LineChartRenderer. based on PR #3142
    @pmairoldi
    pmairoldi authored Jun 10, 2018
    Configuration menu
    Copy the full SHA
    1b387d8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3445 from nagykatalin/customizable-legend 

    Make legendRenderer property public in order to be externally customizable
    @pmairoldi
    pmairoldi authored Jun 10, 2018
    Configuration menu
    Copy the full SHA
    52c06d6 View commit details
    Browse the repository at this point in the history

  3. 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
    @pmairoldi
    pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    c523949 View commit details
    Browse the repository at this point in the history

  4. fix build issue in objc demo

    @pmairoldi
    pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    0a7b712 View commit details
    Browse the repository at this point in the history

  5. Add minimum slice angle for value labels to PieChartView

    @mgod @pmairoldi
    mgod authored and pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    96345f6 View commit details
    Browse the repository at this point in the history

  6. Rename drawSliceTextMinimumAngle to sliceTextDrawingThreshold

    @mgod @pmairoldi
    mgod authored and pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    75c4fa5 View commit details
    Browse the repository at this point in the history

  7. Fix sliceTextDrawingThreshold renaming in demo

    @mgod @pmairoldi
    mgod authored and pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    ba6bbc1 View commit details
    Browse the repository at this point in the history

  8. fix build of demos

    @pmairoldi
    pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    89706c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. Merge pull request #3500 from danielgindi/pr/3218 

    Fix merge conflicts in #3218
    @pmairoldi
    pmairoldi authored Jun 11, 2018
    Configuration menu
    Copy the full SHA
    ea3cedd View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2018

  1. 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
    @pmairoldi
    pmairoldi committed Jul 14, 2018
    Configuration menu
    Copy the full SHA
    73183d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch '4.0.0' into master

    @pmairoldi
    pmairoldi authored Jul 14, 2018
    Configuration menu
    Copy the full SHA
    aadc3a8 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2200 from chinh-tran/master 

    Added value text rotation
    @pmairoldi
    pmairoldi authored Jul 14, 2018
    Configuration menu
    Copy the full SHA
    1d44ab3 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. Add label colors to legend entries (#3558) 

    * add label colors to legend entries

* Change interface of LegendEntry
    @pmairoldi @jjatie
    pmairoldi authored and jjatie committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    7a5239a View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2018

  1. Merge branch 'master' into 4.0.0 

    # Conflicts:
#	Source/Charts/Renderers/BarChartRenderer.swift
    @pmairoldi
    pmairoldi committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    68d5459 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2018

  1. Add Swift version 4.1 to podspec

    @larryonoff
    larryonoff committed Aug 21, 2018
    Configuration menu
    Copy the full SHA
    707d627 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Merge pull request #3608 from larryonoff/4.0.0 

    Add Swift version 4.1 to podspec
    @liuxuan30
    liuxuan30 authored Sep 6, 2018
    Configuration menu
    Copy the full SHA
    97587d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2018

  1. 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
    @pmairoldi
    pmairoldi committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    9a7b922 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2018

  1. Turned gradient components and locations into constants (#3775)

    @jjatie
    jjatie authored Dec 25, 2018
    Configuration menu
    Copy the full SHA
    be8b386 View commit details
    Browse the repository at this point in the history

  2. Cleaned up ChartDataSet logic 

    Added TODOs for areas where simple changes can help improve Swift consistency.
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    aa7e20a View commit details
    Browse the repository at this point in the history

  3. Added Collection conformances 

    MutableCollection
RandomAccessCollection
RangeReplaceableCollection
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    438dae7 View commit details
    Browse the repository at this point in the history

  4. [#3018] 

    Refactored use of `ChartData` to use new `Collection` conformances
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    8aba022 View commit details
    Browse the repository at this point in the history

  5. Fixed required initializers

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    2ced54f View commit details
    Browse the repository at this point in the history

  6. ChartData adopts ExressibleByArrayLiteral

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    7dfb59e View commit details
    Browse the repository at this point in the history

  7. Modified demos 

    to take advantage of collection conformance.
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    b554fb0 View commit details
    Browse the repository at this point in the history

  8. Pulled latest master

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    51501a1 View commit details
    Browse the repository at this point in the history

  9. Unified Style 

    Replaced custom algorithms with built-in ones
Made axis renderer implementations feel "Swift-ier"
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    78fb682 View commit details
    Browse the repository at this point in the history

  10. Updates for PR 

    Also added remove subrange.
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    bdf6f6d View commit details
    Browse the repository at this point in the history

  11. Refactored ChartData 

    Removed redundancy from min/max logic.
Lots of naming changes.
Cleaner implementations.
    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    da2ff2d View commit details
    Browse the repository at this point in the history

  12. Fixed horizontal barchart bug,

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    9aaee13 View commit details
    Browse the repository at this point in the history

  13. Removed unnecessary get from subscripts.

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    f399bca View commit details
    Browse the repository at this point in the history

  14. Disabled remove(at:) for CombinedChartView

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    bd1bc8f View commit details
    Browse the repository at this point in the history

  15. Relocated appendEntry(_:todataSet:)

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    74f28b1 View commit details
    Browse the repository at this point in the history

  16. Disabled Collection support for CombinedChartData

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    aec150e View commit details
    Browse the repository at this point in the history

  17. Removed used of dataSet(forIndex:)

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    f606175 View commit details
    Browse the repository at this point in the history

  18. Fixed merge conflicts

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    6db01d2 View commit details
    Browse the repository at this point in the history

  19. updated demos

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    b8aa08e View commit details
    Browse the repository at this point in the history

  20. PR Fixes

    @jjatie
    jjatie committed Dec 25, 2018
    Configuration menu
    Copy the full SHA
    6d8471d View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. Fixed axisLabels calculation

    Jacob Christie committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    52480db View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. Merge pull request #3164 from jjatie/4.0/axis-renderer-cleanup 

    Axis Renderers Cleanup
    @liuxuan30
    liuxuan30 authored Jan 4, 2019
    Configuration menu
    Copy the full SHA
    5689a1c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Fill rewrite (#3084) 

    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 <jchristie@christie.teamspace.ad>
Co-authored-by: Xuan <liuxuan30@gmail.com>
    @jjatie @liuxuan30
    3 people authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    4b23327 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. update to Swift 5, Xcode 13.5.1, and fix warnings

    @liuxuan30
    liuxuan30 committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    9275d37 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2020

  1. 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
    @liuxuan30
    liuxuan30 committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    84b501f View commit details
    Browse the repository at this point in the history

  2. fix all compile errors and wrong symbols either by git or me.

    @liuxuan30
    liuxuan30 committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    3f84f87 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. revert back to convenience init for BarChartDataSet 

    fix ChartDataTests compile errors: use new API dataSet(forLabel:, ignorecase: )
    @liuxuan30
    liuxuan30 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    58ab2e0 View commit details
    Browse the repository at this point in the history

  2. 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.
    @liuxuan30
    liuxuan30 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    4229997 View commit details
    Browse the repository at this point in the history

  3. 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.
    @liuxuan30
    liuxuan30 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    0705a42 View commit details
    Browse the repository at this point in the history

  4. fix pie chart UT failures. didSet will no be called in init(), so we… 

    … call it manually

also fix set.valueFormatter in data setter
    @liuxuan30
    liuxuan30 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    bcbb0aa View commit details
    Browse the repository at this point in the history

  5. fix line chart UT failures

    @liuxuan30
    liuxuan30 committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    1c3891e View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Remove isIndirectValuesCall

    @jjatie
    jjatie committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    2e60d0c View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. Bump Travis to Xcode 12

    @jjatie
    jjatie committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    f7dab2f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. 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 <liuxuan30@gmail.com>
    @jjatie @liuxuan30
    jjatie and liuxuan30 authored Sep 25, 2020
    Configuration menu
    Copy the full SHA
    2864cac View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. switch to source compiling swift code

    @liuxuan30
    liuxuan30 committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    771978c View commit details
    Browse the repository at this point in the history

  2. 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.
    @liuxuan30
    liuxuan30 committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    60bfc33 View commit details
    Browse the repository at this point in the history

  3. update project settings

    @liuxuan30
    liuxuan30 committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    9fc9f46 View commit details
    Browse the repository at this point in the history

  4. recreate iOS+tvOS images due to iOS14 SDK uncertain changes.

    @liuxuan30
    liuxuan30 committed Oct 9, 2020
    Configuration menu
    Copy the full SHA
    9d73463 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2020

  1. Merge pull request #4476 from danielgindi/bump-travis-ci-to-use-xcode-12 

    Bump travis ci to use xcode 12
    @liuxuan30
    liuxuan30 authored Oct 19, 2020
    Configuration menu
    Copy the full SHA
    96ac08d View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary ternary in boolean expression (#4435)

    @SixFiveSoftware
    SixFiveSoftware authored Oct 19, 2020
    Configuration menu
    Copy the full SHA
    32cc06e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2020

  1. Remove internal use of datasets (#4459) 

    * Remove internal use of ChartData.dataSets

* Rebased onto ResolveConflicts

* Remove duplicated line
    @jjatie
    jjatie authored Oct 28, 2020
    Configuration menu
    Copy the full SHA
    201146d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ResolveConflict 

    # Conflicts:
#	Charts.podspec
#	Charts.xcodeproj/project.pbxproj
    @liuxuan30
    liuxuan30 committed Oct 28, 2020
    Configuration menu
    Copy the full SHA
    05a59f7 View commit details
    Browse the repository at this point in the history