Merge pull request #5028 from danielgindi/release/5.0.0

[WIP] Release/5.0.0

.github/ISSUE_TEMPLATE.md

@@ -20,12 +20,12 @@
 
 ℹ Please replace this with of what happened instead.  
 
-## Charts Environment
+## DGCharts Environment
 
-**Charts version/Branch/Commit Number:**
+**DGCharts version/Branch/Commit Number:**
 **Xcode version:**
 **Swift version:**
-**Platform(s) running Charts:**
+**Platform(s) running DGCharts:**
 **macOS version running Xcode:**
 
 ## Demo Project

.github/workflows/swift.yml

@@ -1,65 +1,81 @@
 name: Swift
 
 on:
+  workflow_dispatch:
   push:
     branches:
-      - master
+      - "*"
   pull_request:
     branches:
       - "*"
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  iOS:
+  buildFramework:
+    name: Build framework
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=16.0,name=iPhone 14 Pro"] #, "OS=14.4,name=iPhone 12 Pro", "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
+        target:
+          - destination: "OS=16.2,name=iPhone 14 Pro"
+            actions: "build test"
+          - destination: "OS=16.1,name=Apple TV 4K (3rd generation)"
+            actions: "build test"
+          - destination: "platform=macOS"
+            actions: "build"
     steps:
       - uses: actions/checkout@v3
-      - name: iOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "Charts" -destination "${{ matrix.destination }}" clean test | xcpretty
+      - name: Build framework - ${{ matrix.target.destination }}
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "DGCharts" -destination "${{ matrix.target.destination }}" clean ${{ matrix.target.actions }} | xcpretty
 
-  tvOS:
+  buildDemo:
+    name: Build demo
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     strategy:
       matrix:
-        destination: ["OS=16.0,name=Apple TV 4K (2nd generation)"]
+        target:
+          - scheme: "ChartsDemo-iOS"
+            destination: "OS=16.2,name=iPhone 14 Pro"
+          - scheme: "ChartsDemo-macOS"
+            destination: "platform=macOS"
     steps:
       - uses: actions/checkout@v3
-      - name: tvOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "Charts" -destination "${{ matrix.destination }}" clean test | xcpretty
+      - name: Build demo - ${{ matrix.target.destination }}
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "${{ matrix.target.scheme }}" -destination "${{ matrix.target.destination }}" clean build | xcpretty
 
-  macOS_demo:
+  spm:
+    name: Test with SPM
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
       - uses: actions/checkout@v3
-      - name: macOS
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "ChartsDemo-macOS" -destination "platform=macOS" clean build | xcpretty
+      - name: SPM Test
+        run: swift build
 
-  iOS_demo:
+  carthage:
+    name: Test with carthage
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
-    strategy:
-      matrix:
-        destination: ["OS=16.0,name=iPhone 14 Pro"] #, "OS=14.4,name=iPhone 12 Pro", "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X", "OS=10.3.1,name=iPhone SE"]
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
       - uses: actions/checkout@v3
-      - name: iOS - ${{ matrix.destination }}
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Charts.xcworkspace" -scheme "ChartsDemo-iOS" -destination "${{ matrix.destination }}" clean build | xcpretty
+      - name: Carthage Test
+        run: carthage build --use-xcframeworks --no-skip-current
 
-  spm:
-    name: Test with SPM
+  cocoapods:
+    name: Test with cocoapods
     runs-on: macos-12
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.0.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
     steps:
       - uses: actions/checkout@v3
-      - name: SPM Test
-        run: swift build -c debug
+      - name: Carthage Test
+        run: pod lib lint

.gitignore

@@ -71,6 +71,5 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 Carthage
-Charts.framework.zip
-ChartsRealm.framework.zip
+DGCharts.framework.zip
 .swiftpm/

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to contribute
 
-Bug-fixes and features often come from users of the Charts framework, and improving it greatly. We want to keep it as easy as possible to contribute changes that improve the experience for users all around the world. There are a few guidelines that we
+Bug-fixes and features often come from users of the DGCharts framework, and improving it greatly. We want to keep it as easy as possible to contribute changes that improve the experience for users all around the world. There are a few guidelines that we
 need contributors to follow so that we can have a chance of keeping on
 top of things.
 
@@ -8,38 +8,38 @@ top of things.
 
 If you are reporting a bug which can be observed visually, please add to your issue either:
 
-* Screenshots, if the bug is easily explainable
-* A working sample project that we can compile, run, and immediately observe the issue
+- Screenshots, if the bug is easily explainable
+- A working sample project that we can compile, run, and immediately observe the issue
 
 ## Getting Started with Contributions
 
-* Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a ticket for your issue, assuming one does not already exist.
-  * Clearly describe the issue including steps to reproduce when it is a bug.
-  * Make sure you fill in the earliest version (or commit number) that you know has the issue.
-* Fork the repository on GitHub
+- Make sure you have a [GitHub account](https://github.com/signup/free)
+- Submit a ticket for your issue, assuming one does not already exist.
+  - Clearly describe the issue including steps to reproduce when it is a bug.
+  - Make sure you fill in the earliest version (or commit number) that you know has the issue.
+- Fork the repository on GitHub
 
 ## Making Changes
 
-* Create a topic branch from where you want to base your work. This is usually the master branch.
-* Make commits of logical units.
-* Make sure your code conforms to the code style around it. It's easy, just look around!
-* If you have made changes back and forth, or have made merges, your commit history might look messy and hard to understand. A single issue or change should still be in one commit. So please squash those commits together and rebase them however you need to - to make our lives easier when reading it later.
-* Check for unnecessary whitespace with `git diff --check` before committing.
-* Make sure your commit messages are in the proper format.
+- Create a topic branch from where you want to base your work. This is usually the master branch.
+- Make commits of logical units.
+- Make sure your code conforms to the code style around it. It's easy, just look around!
+- If you have made changes back and forth, or have made merges, your commit history might look messy and hard to understand. A single issue or change should still be in one commit. So please squash those commits together and rebase them however you need to - to make our lives easier when reading it later.
+- Check for unnecessary whitespace with `git diff --check` before committing.
+- Make sure your commit messages are in the proper format.
 
-````
+```
     First line must be up to 50 chars (Fixes #1234)
 
     The first line should be a short statement as to what have changed, and should also include an issue number, prefixed with a hash.
     The body of the message comes after an empty new line, and describes the changes
     more thoroughly, especially if there was a special case handled there,
     or maybe some trickery that only code wizards can understand.
-````
+```
 
-* Make sure you have tested your changes well.
-* If your changes could theoretically affect some other component or case, which you do not necessarily use, you still have to test it.
-* Create a Pull Request from your topic branch to the relevant branch in the main repo. If you go to the main repo of the framework, you'll see a big green button which pretty much prepares the PR for you. You just have to hit it.
+- Make sure you have tested your changes well.
+- If your changes could theoretically affect some other component or case, which you do not necessarily use, you still have to test it.
+- Create a Pull Request from your topic branch to the relevant branch in the main repo. If you go to the main repo of the framework, you'll see a big green button which pretty much prepares the PR for you. You just have to hit it.
 
 ## Making Trivial Changes
 

Charts.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 53;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -15,6 +15,8 @@
 		0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 823F7DB281C6C6F069A69605 /* CrossShapeRenderer.swift */; };
 		0577C2B38BCE4C871F262714 /* AnimatedZoomViewJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2EA58CB336967198D30D20 /* AnimatedZoomViewJob.swift */; };
 		064989461F5C99C7006E8BB3 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 064989451F5C99C7006E8BB3 /* Utilities.swift */; };
+		067934562A324A9D004BFBA9 /* Indexed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 067934542A324A9D004BFBA9 /* Indexed.swift */; };
+		067934572A324A9D004BFBA9 /* Partition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 067934552A324A9D004BFBA9 /* Partition.swift */; };
 		06AB297F20FA726600BAD505 /* Highlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06AB297E20FA726500BAD505 /* Highlighter.swift */; };
 		0A772AEC08246FEC480673E5 /* PieRadarChartViewBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A6C9631C69B2D772BBD9232 /* PieRadarChartViewBase.swift */; };
 		0C52C70C6E6EA09BD7426386 /* RadarChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB57D6FA41029B08F26D7B /* RadarChartData.swift */; };
@@ -29,7 +31,6 @@
 		221CA2922588FCBC00C2DD1E /* Sequence+KeyPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 221CA2912588FCBC00C2DD1E /* Sequence+KeyPath.swift */; };
 		2243BBFD1FF156EC00B49D0B /* EquatableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2243BBFB1FF156D000B49D0B /* EquatableTests.swift */; };
 		22786E8525CD96620051335B /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 22786E8325CD96620051335B /* Media.xcassets */; };
-		228D56232554F27A00BEE75E /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 228D56222554F27A00BEE75E /* Algorithms */; };
 		22BBDA0825CC4C2F00435670 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 22BBDA0725CC4C2F00435670 /* SnapshotTesting */; };
 		23649EFC635A76022F07FFA6 /* PieChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */; };
 		23FA50B2730D8C7ACA091C4F /* BarChartRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F279974FE650E57A061B09 /* BarChartRenderer.swift */; };
@@ -119,7 +120,7 @@
 		B6C9F450D937B87224D29D5C /* FillFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818AC6B12505B7C0A53D62F9 /* FillFormatter.swift */; };
 		B6DCC229615EFE706F64A37D /* LineScatterCandleRadarRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 923206233CA89FD03565FF87 /* LineScatterCandleRadarRenderer.swift */; };
 		B85DEB06B4C1AFFC8A0E3295 /* CircleShapeRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECE1B1623D3AF69CECAE8562 /* CircleShapeRenderer.swift */; };
-		BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F9922F0641F7955DC6CD324 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		BEFD9518F3A74ACF8FA33308 /* DGCharts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F9922F0641F7955DC6CD324 /* DGCharts.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C03E6D8123DAAB2600083010 /* ChartDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C03E6D8023DAAB2600083010 /* ChartDataTests.swift */; };
 		C04D269AD4A373FD2B621C43 /* LineChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C978F31F23C7D21197DC2A1 /* LineChartData.swift */; };
 		C09E91F67A4AC43C277E7D82 /* BubbleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */; };
@@ -127,7 +128,7 @@
 		C2EFB4EC8C97FA9987F1B50D /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */; };
 		C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */; };
 		C3F0DDB7F0A922F0BB7EDB8A /* BarChartDataSetProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A53A9E42FC07FFDACA937C1 /* BarChartDataSetProtocol.swift */; };
-		C7B150D740255670DEB9F455 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AD9E95D9ED4DC0BD73A743 /* Charts.framework */; };
+		C7B150D740255670DEB9F455 /* DGCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65AD9E95D9ED4DC0BD73A743 /* DGCharts.framework */; };
 		C9AA360A2355F01F00C97D93 /* Platform+Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9AA36092355F01F00C97D93 /* Platform+Color.swift */; };
 		C9F3DC262355F791000C3215 /* Platform+Graphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F3DC242355F791000C3215 /* Platform+Graphics.swift */; };
 		C9F3DC272355F791000C3215 /* Platform+Gestures.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9F3DC252355F791000C3215 /* Platform+Gestures.swift */; };
@@ -180,6 +181,8 @@
 		04F7B9DF1F2D66E7279771D4 /* PieRadarHighlighter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieRadarHighlighter.swift; path = Source/Charts/Highlight/PieRadarHighlighter.swift; sourceTree = "<group>"; };
 		0619A877C69A95ECCC440A44 /* LineChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartView.swift; path = Source/Charts/Charts/LineChartView.swift; sourceTree = "<group>"; };
 		064989451F5C99C7006E8BB3 /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; };
+		067934542A324A9D004BFBA9 /* Indexed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Indexed.swift; path = Source/Charts/Utils/Indexed.swift; sourceTree = "<group>"; };
+		067934552A324A9D004BFBA9 /* Partition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Partition.swift; path = Source/Charts/Utils/Partition.swift; sourceTree = "<group>"; };
 		06AB297E20FA726500BAD505 /* Highlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Highlighter.swift; path = Source/Charts/Highlight/Highlighter.swift; sourceTree = "<group>"; };
 		0BD9DF16AF59680A3BB49452 /* AxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AxisValueFormatter.swift; path = Source/Charts/Formatters/AxisValueFormatter.swift; sourceTree = "<group>"; };
 		0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartRenderer.swift; path = Source/Charts/Renderers/LineChartRenderer.swift; sourceTree = "<group>"; };
@@ -194,7 +197,7 @@
 		18462BFDD9DEE76D51D40503 /* ScatterChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartView.swift; path = Source/Charts/Charts/ScatterChartView.swift; sourceTree = "<group>"; };
 		18BFB0A14A5C47A302A597D9 /* CandleChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/CandleChartDataSetProtocol.swift; sourceTree = "<group>"; };
 		1C02C3AF5C92FCFC18224C35 /* XAxisRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRenderer.swift; path = Source/Charts/Renderers/XAxisRenderer.swift; sourceTree = "<group>"; };
-		1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChartsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		1CBBC58C6CE1EBEE9852CE41 /* DGChartsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DGChartsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		1F3D55A7E6176D52DC957D27 /* XAxisRendererHorizontalBarChart.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRendererHorizontalBarChart.swift; path = Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift; sourceTree = "<group>"; };
 		2194AA554712E6BA2677F114 /* BubbleChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartRenderer.swift; path = Source/Charts/Renderers/BubbleChartRenderer.swift; sourceTree = "<group>"; };
 		219BC9CEA037F897E92E45D1 /* ScatterChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/ScatterChartDataSetProtocol.swift; sourceTree = "<group>"; };
@@ -233,7 +236,7 @@
 		4EAA8AA30C377D54D22A577A /* ValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueFormatter.swift; path = Source/Charts/Formatters/ValueFormatter.swift; sourceTree = "<group>"; };
 		4EED352A98860E031F13AFB7 /* BubbleChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartView.swift; path = Source/Charts/Charts/BubbleChartView.swift; sourceTree = "<group>"; };
 		4F7E6A99D82E6AE3804D5A39 /* LineRadarChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineRadarChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/LineRadarChartDataSetProtocol.swift; sourceTree = "<group>"; };
-		4F9922F0641F7955DC6CD324 /* Charts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Charts.h; path = "Source/Supporting Files/Charts.h"; sourceTree = "<group>"; };
+		4F9922F0641F7955DC6CD324 /* DGCharts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DGCharts.h; path = "Source/Supporting Files/DGCharts.h"; sourceTree = "<group>"; };
 		5225ABC3C0C2F65FC094EEBB /* XAxis.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxis.swift; path = Source/Charts/Components/XAxis.swift; sourceTree = "<group>"; };
 		52265C1B343CCC41AF2300E3 /* CombinedChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartRenderer.swift; path = Source/Charts/Renderers/CombinedChartRenderer.swift; sourceTree = "<group>"; };
 		539382766378B702660FDFB2 /* HorizontalBarChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartRenderer.swift; path = Source/Charts/Renderers/HorizontalBarChartRenderer.swift; sourceTree = "<group>"; };
@@ -246,7 +249,7 @@
 		5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BarChartTests.swift; sourceTree = "<group>"; };
 		6021C9E424C36116AEA78CC9 /* HorizontalBarChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartView.swift; path = Source/Charts/Charts/HorizontalBarChartView.swift; sourceTree = "<group>"; };
 		62B73FCEDD3841E7B958F6A9 /* ChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataProvider.swift; path = Source/Charts/Interfaces/ChartDataProvider.swift; sourceTree = "<group>"; };
-		65AD9E95D9ED4DC0BD73A743 /* Charts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Charts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		65AD9E95D9ED4DC0BD73A743 /* DGCharts.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DGCharts.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		688B80F1AA88AE54152BE768 /* YAxisRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = YAxisRenderer.swift; path = Source/Charts/Renderers/YAxisRenderer.swift; sourceTree = "<group>"; };
 		6A4770E0F75EFFC30707A7C8 /* DefaultAxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultAxisValueFormatter.swift; path = Source/Charts/Formatters/DefaultAxisValueFormatter.swift; sourceTree = "<group>"; };
 		6CEC0C69C89CE9B99F3B4409 /* ChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/ChartDataSet.swift; sourceTree = "<group>"; };
@@ -338,7 +341,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C7B150D740255670DEB9F455 /* Charts.framework in Frameworks */,
+				C7B150D740255670DEB9F455 /* DGCharts.framework in Frameworks */,
 				22BBDA0825CC4C2F00435670 /* SnapshotTesting in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -347,7 +350,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				228D56232554F27A00BEE75E /* Algorithms in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -624,8 +626,8 @@
 		AB2D554102718F209377399E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				65AD9E95D9ED4DC0BD73A743 /* Charts.framework */,
-				1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */,
+				65AD9E95D9ED4DC0BD73A743 /* DGCharts.framework */,
+				1CBBC58C6CE1EBEE9852CE41 /* DGChartsTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -646,6 +648,8 @@
 		D047819AB7170595896D6FE8 /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				067934542A324A9D004BFBA9 /* Indexed.swift */,
+				067934552A324A9D004BFBA9 /* Partition.swift */,
 				F6227A646166E248F90F86AD /* ChartColorTemplates.swift */,
 				3FDA09EF973925A110506799 /* ChartUtils.swift */,
 				5A4CFFFB65819121595F06F1 /* Fill.swift */,
@@ -705,7 +709,7 @@
 			isa = PBXGroup;
 			children = (
 				910DBFE1DA1B2CA237A736DF /* Info.plist */,
-				4F9922F0641F7955DC6CD324 /* Charts.h */,
+				4F9922F0641F7955DC6CD324 /* DGCharts.h */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -732,16 +736,16 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */,
+				BEFD9518F3A74ACF8FA33308 /* DGCharts.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		A58A4ED274A941CA248EA921 /* Charts */ = {
+		A58A4ED274A941CA248EA921 /* DGCharts */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "Charts" */;
+			buildConfigurationList = F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "DGCharts" */;
 			buildPhases = (
 				B2B2DD73E237562739EE1F83 /* Headers */,
 				B5996DB2D9B6F0DB0E9D3F3E /* Sources */,
@@ -752,17 +756,16 @@
 			);
 			dependencies = (
 			);
-			name = Charts;
+			name = DGCharts;
 			packageProductDependencies = (
-				228D56222554F27A00BEE75E /* Algorithms */,
 			);
 			productName = Charts;
-			productReference = 65AD9E95D9ED4DC0BD73A743 /* Charts.framework */;
+			productReference = 65AD9E95D9ED4DC0BD73A743 /* DGCharts.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		F2749BD5443C1CB5FE2080C2 /* ChartsTests */ = {
+		F2749BD5443C1CB5FE2080C2 /* DGChartsTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "ChartsTests" */;
+			buildConfigurationList = E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "DGChartsTests" */;
 			buildPhases = (
 				E356A2384A2368AB3D2C7912 /* Sources */,
 				5B102E31AA8399941CC6248D /* Resources */,
@@ -773,12 +776,12 @@
 			dependencies = (
 				8676F8A013D87F9961E92465 /* PBXTargetDependency */,
 			);
-			name = ChartsTests;
+			name = DGChartsTests;
 			packageProductDependencies = (
 				22BBDA0725CC4C2F00435670 /* SnapshotTesting */,
 			);
 			productName = ChartsTests;
-			productReference = 1CBBC58C6CE1EBEE9852CE41 /* ChartsTests.xctest */;
+			productReference = 1CBBC58C6CE1EBEE9852CE41 /* DGChartsTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
@@ -787,8 +790,9 @@
 		193FC8DF32D250560C5F5D77 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1430;
 				TargetAttributes = {
 					A58A4ED274A941CA248EA921 = {
 						LastSwiftMigration = 1150;
@@ -808,15 +812,14 @@
 			);
 			mainGroup = 865A1CF149F52850CAB7F177;
 			packageReferences = (
-				228D56212554F27A00BEE75E /* XCRemoteSwiftPackageReference "swift-algorithms" */,
 				22BBDA0625CC4C2F00435670 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
 			);
 			productRefGroup = AB2D554102718F209377399E /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				A58A4ED274A941CA248EA921 /* Charts */,
-				F2749BD5443C1CB5FE2080C2 /* ChartsTests */,
+				A58A4ED274A941CA248EA921 /* DGCharts */,
+				F2749BD5443C1CB5FE2080C2 /* DGChartsTests */,
 			);
 		};
 /* End PBXProject section */
@@ -864,6 +867,7 @@
 				DBC9DB402CC9BB84B76968C4 /* Description.swift in Sources */,
 				03960E8148C6AEDACE4B77CC /* Marker.swift in Sources */,
 				ECE7EAE7179A7F57CE9BBD8F /* Legend.swift in Sources */,
+				067934572A324A9D004BFBA9 /* Partition.swift in Sources */,
 				C9F3DC272355F791000C3215 /* Platform+Gestures.swift in Sources */,
 				C20A62D8CB9120523D5FB650 /* LegendEntry.swift in Sources */,
 				369DEB23452CB436A3A1A644 /* MarkerImage.swift in Sources */,
@@ -913,6 +917,7 @@
 				FAAD9FF6565DED2652188584 /* PieChartDataSetProtocol.swift in Sources */,
 				83BBAF3EDC31FD452F8BF1DB /* RadarChartDataSetProtocol.swift in Sources */,
 				50476F8E6662CAFC1EFE0723 /* ScatterChartDataSetProtocol.swift in Sources */,
+				067934562A324A9D004BFBA9 /* Indexed.swift in Sources */,
 				97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */,
 				779B46E9F13A087BFA47D539 /* DefaultAxisValueFormatter.swift in Sources */,
 				F744C510DA9B85C228BBB335 /* DefaultFillFormatter.swift in Sources */,
@@ -1010,7 +1015,7 @@
 		8676F8A013D87F9961E92465 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = Charts;
-			target = A58A4ED274A941CA248EA921 /* Charts */;
+			target = A58A4ED274A941CA248EA921 /* DGCharts */;
 			targetProxy = C2005F425A98942473657ED2 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
@@ -1020,6 +1025,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
@@ -1028,6 +1034,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1039,8 +1046,10 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 4.1.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MARKETING_VERSION = 5.0.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1209,6 +1218,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APPLICATION_EXTENSION_API_ONLY = YES;
+				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = YES;
@@ -1217,6 +1227,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_VERSION = A;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1228,8 +1239,10 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 4.1.0;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
+				MARKETING_VERSION = 5.0.0;
+				MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
+				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.dcg.Charts;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1289,7 +1302,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "ChartsTests" */ = {
+		E61E9728E2BF9CC4048B13D5 /* Build configuration list for PBXNativeTarget "DGChartsTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				FA978B0A385680C0086D4D49 /* Release */,
@@ -1298,7 +1311,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "Charts" */ = {
+		F1D4AA9E26EA32041FC0E3B6 /* Build configuration list for PBXNativeTarget "DGCharts" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				D9365FBCFFEE9FCFC79EC4C7 /* Release */,
@@ -1310,14 +1323,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		228D56212554F27A00BEE75E /* XCRemoteSwiftPackageReference "swift-algorithms" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/apple/swift-algorithms";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
-			};
-		};
 		22BBDA0625CC4C2F00435670 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
@@ -1329,11 +1334,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		228D56222554F27A00BEE75E /* Algorithms */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 228D56212554F27A00BEE75E /* XCRemoteSwiftPackageReference "swift-algorithms" */;
-			productName = Algorithms;
-		};
 		22BBDA0725CC4C2F00435670 /* SnapshotTesting */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 22BBDA0625CC4C2F00435670 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;

Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme → Charts.xcodeproj/xcshareddata/xcschemes/DGCharts.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A58A4ED274A941CA248EA921"
-               BuildableName = "Charts.framework"
-               BlueprintName = "Charts"
+               BuildableName = "DGCharts.framework"
+               BlueprintName = "DGCharts"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
+               BuildableName = "DGChartsTests.xctest"
+               BlueprintName = "DGChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -50,22 +50,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A58A4ED274A941CA248EA921"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,6 +57,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A58A4ED274A941CA248EA921"
+            BuildableName = "DGCharts.framework"
+            BlueprintName = "DGCharts"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Charts.xcodeproj/xcshareddata/xcschemes/DGChartsTests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "DGChartsTests.xctest"
+               BlueprintName = "DGChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Charts.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<true/>
+</dict>
+</plist>

Charts.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,30 +1,12 @@
 {
   "pins" : [
-    {
-      "identity" : "swift-algorithms",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-algorithms",
-      "state" : {
-        "revision" : "b14b7f4c528c942f121c8b860b9410b2bf57825e",
-        "version" : "1.0.0"
-      }
-    },
-    {
-      "identity" : "swift-numerics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-numerics",
-      "state" : {
-        "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
-        "version" : "1.0.2"
-      }
-    },
     {
       "identity" : "swift-snapshot-testing",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "f8a9c997c3c1dab4e216a8ec9014e23144cbab37",
-        "version" : "1.9.0"
+        "revision" : "cef5b3f6f11781dd4591bdd1dd0a3d22bd609334",
+        "version" : "1.11.0"
       }
     }
   ],

ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj

@@ -9,11 +9,10 @@
 /* Begin PBXBuildFile section */
 		0439A3541C9FF95F00496F83 /* PiePolylineChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */; };
 		0471CBFC1CA1090A00E52DBC /* PiePolylineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */; };
-		0630AE511D81271B008859B0 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; };
-		0630AE521D81271B008859B0 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		068A9B191FBBF351003CF1AD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
 		068A9B1A1FBBF355003CF1AD /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B64D06EA1FB199130067418D /* Launch Screen.storyboard */; };
 		068A9B1B1FBBF366003CF1AD /* radar_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */; };
+		06FF5D7529BD10650002256E /* DGCharts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 06FF5D7229BD10650002256E /* DGCharts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		225B36201F6EB9A50005B3D5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */; };
 		225B36311F6EB9EE0005B3D5 /* DemoBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */; };
 		225B36321F6EB9EE0005B3D5 /* DemoListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */; };
@@ -72,8 +71,6 @@
 		225B36891F6EBA640005B3D5 /* ScatterChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED171ABBFB340013F194 /* ScatterChartViewController.xib */; };
 		225B368A1F6EBA640005B3D5 /* SinusBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */; };
 		225B368B1F6EBA640005B3D5 /* StackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED1A1ABBFB340013F194 /* StackedBarChartViewController.xib */; };
-		225B368C1F6EBBB00005B3D5 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; };
-		225B368D1F6EBBB00005B3D5 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE411D8126C0008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		55E356501ADC638F00A57971 /* BubbleChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55E3564D1ADC638F00A57971 /* BubbleChartViewController.xib */; };
 		55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55E3564F1ADC638F00A57971 /* BubbleChartViewController.m */; };
 		5B0CC7851ABB875400665592 /* PieChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B0CC7831ABB875400665592 /* PieChartViewController.m */; };
@@ -139,26 +136,26 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		0630AE401D8126C0008859B0 /* PBXContainerItemProxy */ = {
+		0630AE531D81271B008859B0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE391D8126C0008859B0 /* Charts.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 06165F241D8110E600722320;
+			proxyType = 1;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
 			remoteInfo = Charts;
 		};
-		0630AE421D8126C0008859B0 /* PBXContainerItemProxy */ = {
+		06FF5D7129BD10650002256E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE391D8126C0008859B0 /* Charts.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 06165F2E1D8110E600722320;
-			remoteInfo = ChartsTests;
+			remoteGlobalIDString = 65AD9E95D9ED4DC0BD73A743;
+			remoteInfo = DGCharts;
 		};
-		0630AE531D81271B008859B0 /* PBXContainerItemProxy */ = {
+		06FF5D7329BD10650002256E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE391D8126C0008859B0 /* Charts.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = A58A4ED274A941CA248EA921;
-			remoteInfo = Charts;
+			proxyType = 2;
+			remoteGlobalIDString = 1CBBC58C6CE1EBEE9852CE41;
+			remoteInfo = DGChartsTests;
 		};
 		225B368E1F6EBBB00005B3D5 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -176,7 +173,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				225B368D1F6EBBB00005B3D5 /* Charts.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -187,7 +183,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				0630AE521D81271B008859B0 /* Charts.framework in Embed Frameworks */,
+				06FF5D7529BD10650002256E /* DGCharts.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -331,7 +327,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				225B368C1F6EBBB00005B3D5 /* Charts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -339,7 +334,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0630AE511D81271B008859B0 /* Charts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -349,8 +343,8 @@
 		0630AE3A1D8126C0008859B0 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0630AE411D8126C0008859B0 /* Charts.framework */,
-				0630AE431D8126C0008859B0 /* ChartsTests.xctest */,
+				06FF5D7229BD10650002256E /* DGCharts.framework */,
+				06FF5D7429BD10650002256E /* DGChartsTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -691,18 +685,18 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		0630AE411D8126C0008859B0 /* Charts.framework */ = {
+		06FF5D7229BD10650002256E /* DGCharts.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = Charts.framework;
-			remoteRef = 0630AE401D8126C0008859B0 /* PBXContainerItemProxy */;
+			path = DGCharts.framework;
+			remoteRef = 06FF5D7129BD10650002256E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		0630AE431D8126C0008859B0 /* ChartsTests.xctest */ = {
+		06FF5D7429BD10650002256E /* DGChartsTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = ChartsTests.xctest;
-			remoteRef = 0630AE421D8126C0008859B0 /* PBXContainerItemProxy */;
+			path = DGChartsTests.xctest;
+			remoteRef = 06FF5D7329BD10650002256E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -1055,7 +1049,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ChartsDemo-iOS";
@@ -1078,7 +1072,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ChartsDemo-iOS";

Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme → ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS-Swift.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
+               BlueprintIdentifier = "225B361C1F6EB9A50005B3D5"
+               BuildableName = "ChartsDemo-iOS-Swift.app"
+               BlueprintName = "ChartsDemo-iOS-Swift"
+               ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,19 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -51,22 +40,16 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
-            BuildableName = "ChartsTests.xctest"
-            BlueprintName = "ChartsTests"
-            ReferencedContainer = "container:Charts.xcodeproj">
+            BlueprintIdentifier = "225B361C1F6EB9A50005B3D5"
+            BuildableName = "ChartsDemo-iOS-Swift.app"
+            BlueprintName = "ChartsDemo-iOS-Swift"
+            ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -74,6 +57,16 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "225B361C1F6EB9A50005B3D5"
+            BuildableName = "ChartsDemo-iOS-Swift.app"
+            BlueprintName = "ChartsDemo-iOS-Swift"
+            ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "5B57BBAE1A9B26AA0036A6CC"
+               BuildableName = "ChartsDemo-iOS.app"
+               BlueprintName = "ChartsDemo-iOS"
+               ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5B57BBAE1A9B26AA0036A6CC"
+            BuildableName = "ChartsDemo-iOS.app"
+            BlueprintName = "ChartsDemo-iOS"
+            ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5B57BBAE1A9B26AA0036A6CC"
+            BuildableName = "ChartsDemo-iOS.app"
+            BlueprintName = "ChartsDemo-iOS"
+            ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift

@@ -10,7 +10,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift

@@ -10,7 +10,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift

@@ -5,7 +5,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface AnotherBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface BarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface BubbleChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface CandleStickChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface ColoredLineChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface CombinedChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface CubicLineChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface HalfPieChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface HorizontalBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface LineChart1ViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface LineChart2ViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface LineChartFilledViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface LineChartTimeViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface MultipleBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface MultipleLinesChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface NegativeStackedBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface PieChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface PositiveNegativeBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface RadarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m

@@ -16,9 +16,6 @@
 
 @property (nonatomic, strong) IBOutlet RadarChartView *chartView;
 @property (nonatomic, strong) NSArray<NSString *> *activities;
-@property (nonatomic, strong) UIColor *originalBarBgColor;
-@property (nonatomic, strong) UIColor *originalBarTintColor;
-@property (nonatomic) UIBarStyle originalBarStyle;
 
 @end
 
@@ -90,34 +87,6 @@
     [_chartView animateWithXAxisDuration:1.4 yAxisDuration:1.4 easingOption:ChartEasingOptionEaseOutBack];
 }
 
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    [UIView animateWithDuration:0.15 animations:^{
-        UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        self.originalBarBgColor = navigationBar.barTintColor;
-        self.originalBarTintColor = navigationBar.tintColor;
-        self.originalBarStyle = navigationBar.barStyle;
-        
-        navigationBar.barTintColor = self.view.backgroundColor;
-        navigationBar.tintColor = UIColor.whiteColor;
-        navigationBar.barStyle = UIBarStyleBlack;
-    }];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-    
-    [UIView animateWithDuration:0.15 animations:^{
-        UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        navigationBar.barTintColor = self.originalBarBgColor;
-        navigationBar.tintColor = self.originalBarTintColor;
-        navigationBar.barStyle = self.originalBarStyle;
-    }];
-}
-
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];

ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface ScatterChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface SinusBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h

@@ -11,7 +11,7 @@
 
 #import <UIKit/UIKit.h>
 #import "DemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <DGCharts/DGCharts.h>
 
 @interface StackedBarChartViewController : DemoBaseViewController
 

ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift

@@ -5,7 +5,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 
 open class LargeValueFormatter: NSObject, ValueFormatter, AxisValueFormatter
 {

ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift

@@ -10,7 +10,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Swift/Components/XYMarkerView.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Swift/DemoBaseViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 enum Option {
     case toggleValues

ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class AnotherBarChartViewController: DemoBaseViewController {
     

ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class BubbleChartViewController: DemoBaseViewController {
     

ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class CandleStickChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class ColoredLineChartViewController: DemoBaseViewController {
     @IBOutlet var chartViews: [LineChartView]!

ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 #if canImport(UIKit)
     import UIKit
 #endif

ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 private class CubicLineSampleFillFormatter: FillFormatter {
     func getFillLinePosition(dataSet: LineChartDataSetProtocol, dataProvider: LineChartDataProvider) -> CGFloat {

ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class HalfPieChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class HorizontalBarChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Charts
+import DGCharts
 
 class LineChart1ViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class LineChart2ViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class LineChartFilledViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class LineChartTimeViewController: DemoBaseViewController {
     @IBOutlet var chartView: LineChartView!

ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class MultipleBarChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class MultipleLinesChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class NegativeStackedBarChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class PieChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Charts
+import DGCharts
 
 class PiePolylineChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class PositiveNegativeBarChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift

@@ -9,16 +9,13 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class RadarChartViewController: DemoBaseViewController {
 
     @IBOutlet var chartView: RadarChartView!
     
     let activities = ["Burger", "Steak", "Salad", "Pasta", "Pizza"]
-    var originalBarBgColor: UIColor!
-    var originalBarTintColor: UIColor!
-    var originalBarStyle: UIBarStyle!
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -82,32 +79,6 @@ class RadarChartViewController: DemoBaseViewController {
         chartView.animate(xAxisDuration: 1.4, yAxisDuration: 1.4, easingOption: .easeOutBack)
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        UIView.animate(withDuration: 0.15) {
-            let navBar = self.navigationController!.navigationBar
-            self.originalBarBgColor = navBar.barTintColor
-            self.originalBarTintColor = navBar.tintColor
-            self.originalBarStyle = navBar.barStyle
-
-            navBar.barTintColor = self.view.backgroundColor
-            navBar.tintColor = .white
-            navBar.barStyle = .black
-        }
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        UIView.animate(withDuration: 0.15) {
-            let navBar = self.navigationController!.navigationBar
-            navBar.barTintColor = self.originalBarBgColor
-            navBar.tintColor = self.originalBarTintColor
-            navBar.barStyle = self.originalBarStyle
-        }
-    }
-    
     override func updateChartData() {
         if self.shouldHideData {
             chartView.data = nil

ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class ScatterChartViewController: DemoBaseViewController {
     

ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class SinusBarChartViewController: DemoBaseViewController {
     

ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift

@@ -9,7 +9,7 @@
 #if canImport(UIKit)
     import UIKit
 #endif
-import Charts
+import DGCharts
 
 class StackedBarChartViewController: DemoBaseViewController {
 

ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 
 public class DateValueFormatter: NSObject, AxisValueFormatter {
     private let dateFormatter = DateFormatter()

ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 
 public class DayAxisValueFormatter: NSObject, AxisValueFormatter {
     weak var chart: BarLineChartViewBase?

ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 
 public class IntAxisValueFormatter: NSObject, AxisValueFormatter {
     public func stringForValue(_ value: Double, axis: AxisBase?) -> String {

ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift

@@ -5,7 +5,7 @@
 //
 
 import Foundation
-import Charts
+import DGCharts
 
 private let MAX_LENGTH = 5
 

ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib

@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
-    <customFonts key="customFonts">
-        <array key="HelveticaNeueLights.ttc">
-            <string>HelveticaNeue-Light</string>
-        </array>
-    </customFonts>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AnotherBarChartViewController" customModule="ChartsDemo" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AnotherBarChartViewController" customModule="ChartsDemo_iOS" customModuleProvider="target">
             <connections>
                 <outlet property="chartView" destination="Oqd-Ej-1xl" id="tSA-aU-J9W"/>
                 <outlet property="sliderTextX" destination="It4-Tc-0qK" id="esc-84-jQT"/>
@@ -40,7 +34,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
@@ -57,7 +51,7 @@
                     </connections>
                 </slider>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vDG-Fm-61Z">
-                    <rect key="frame" x="297" y="611.5" width="70" height="30"/>
+                    <rect key="frame" x="297" y="611" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="EAG-hU-sTu"/>
                         <constraint firstAttribute="height" constant="30" id="GB4-g0-PGO"/>
@@ -66,7 +60,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="500" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="It4-Tc-0qK">
-                    <rect key="frame" x="297" y="573.5" width="70" height="30"/>
+                    <rect key="frame" x="297" y="573" width="70" height="30"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="70" id="SsZ-2p-GDE"/>
                         <constraint firstAttribute="height" constant="30" id="Yzk-h7-HPb"/>
@@ -75,6 +69,7 @@
                     <textInputTraits key="textInputTraits"/>
                 </textField>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vfX-GJ-eSe"/>
             <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Oqd-Ej-1xl" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="47" id="3NA-if-rAO"/>
@@ -94,7 +89,6 @@
                 <constraint firstItem="Xhn-cI-Tqm" firstAttribute="top" secondItem="Oqd-Ej-1xl" secondAttribute="bottom" constant="25" id="r0S-JG-wnp"/>
                 <constraint firstItem="vDG-Fm-61Z" firstAttribute="leading" secondItem="IuK-nU-ZPT" secondAttribute="trailing" constant="8" id="zz3-mA-tmf"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vfX-GJ-eSe"/>
             <point key="canvasLocation" x="157.5" y="222.5"/>
         </view>
     </objects>

ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BubbleChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BubbleChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CandleStickChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CandleStickChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib

@@ -23,19 +23,19 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="167"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="njk-0O-Wam" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="njk-0O-Wam" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="167" width="375" height="166.5"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Lp-os-3Vt" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Lp-os-3Vt" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="333.5" width="375" height="167"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nGo-AX-wvC" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nGo-AX-wvC" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="500.5" width="375" height="166.5"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib

@@ -36,7 +36,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CombinedChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="CombinedChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib

@@ -36,7 +36,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="561"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib

@@ -29,7 +29,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="548"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib

@@ -38,7 +38,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="539"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="LineChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib

@@ -36,7 +36,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="HorizontalBarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib

@@ -70,7 +70,7 @@
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="15"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="PieChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib

@@ -70,7 +70,7 @@
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="15"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="anE-ka-ll7" customClass="PieChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="anE-ka-ll7" customClass="PieChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>

ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib

@@ -36,7 +36,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="620"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib

@@ -44,7 +44,7 @@
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="RadarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="RadarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="133.5" width="375" height="533.5"/>
                     <color key="backgroundColor" red="0.23529411764705882" green="0.25490196078431371" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="ScatterChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="ScatterChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib

@@ -53,7 +53,7 @@
                     <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="15"/>
                     <textInputTraits key="textInputTraits"/>
                 </textField>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="539"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib

@@ -40,7 +40,7 @@
                         <action selector="optionsButtonTapped:" destination="-1" eventType="touchUpInside" id="ig5-8o-JhO"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="Charts">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqd-Ej-1xl" customClass="BarChartView" customModule="DGCharts">
                     <rect key="frame" x="0.0" y="47" width="375" height="501"/>
                     <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>

ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj

@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0630AE8C1D8128A5008859B0 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE711D812840008859B0 /* Charts.framework */; };
-		0630AE8D1D8128A5008859B0 /* Charts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0630AE711D812840008859B0 /* Charts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		06FF5D7C29BD10FA0002256E /* DGCharts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06FF5D7929BD10FA0002256E /* DGCharts.framework */; };
+		06FF5D7D29BD10FA0002256E /* DGCharts.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 06FF5D7929BD10FA0002256E /* DGCharts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5B9A0C3A1C83AB1800ED8ED8 /* BarDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B9A0C391C83AB1800ED8ED8 /* BarDemoViewController.swift */; };
 		5B9A0C3C1C83AB2100ED8ED8 /* LineDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B9A0C3B1C83AB2100ED8ED8 /* LineDemoViewController.swift */; };
 		5B9A0C3E1C83AB2B00ED8ED8 /* RadarDemoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B9A0C3D1C83AB2B00ED8ED8 /* RadarDemoViewController.swift */; };
@@ -19,26 +19,26 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		0630AE701D812840008859B0 /* PBXContainerItemProxy */ = {
+		0630AE8E1D8128A5008859B0 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 06165F241D8110E600722320;
+			proxyType = 1;
+			remoteGlobalIDString = A58A4ED274A941CA248EA921;
 			remoteInfo = Charts;
 		};
-		0630AE721D812840008859B0 /* PBXContainerItemProxy */ = {
+		06FF5D7829BD10FA0002256E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
 			proxyType = 2;
-			remoteGlobalIDString = 06165F2E1D8110E600722320;
-			remoteInfo = ChartsTests;
+			remoteGlobalIDString = 65AD9E95D9ED4DC0BD73A743;
+			remoteInfo = DGCharts;
 		};
-		0630AE8E1D8128A5008859B0 /* PBXContainerItemProxy */ = {
+		06FF5D7A29BD10FA0002256E /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0630AE691D812840008859B0 /* Charts.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = A58A4ED274A941CA248EA921;
-			remoteInfo = Charts;
+			proxyType = 2;
+			remoteGlobalIDString = 1CBBC58C6CE1EBEE9852CE41;
+			remoteInfo = DGChartsTests;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -49,7 +49,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				0630AE8D1D8128A5008859B0 /* Charts.framework in Embed Frameworks */,
+				06FF5D7D29BD10FA0002256E /* DGCharts.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -75,7 +75,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0630AE8C1D8128A5008859B0 /* Charts.framework in Frameworks */,
+				06FF5D7C29BD10FA0002256E /* DGCharts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,12 +85,19 @@
 		0630AE6A1D812840008859B0 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0630AE711D812840008859B0 /* Charts.framework */,
-				0630AE731D812840008859B0 /* ChartsTests.xctest */,
+				06FF5D7929BD10FA0002256E /* DGCharts.framework */,
+				06FF5D7B29BD10FA0002256E /* DGChartsTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		06FF5D7629BD10FA0002256E /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		5B9A0C381C83AB0600ED8ED8 /* Demos */ = {
 			isa = PBXGroup;
 			children = (
@@ -109,6 +116,7 @@
 				65B3F63F1C73B4F5000983D0 /* Products */,
 				03780C7E1EA29C87005C11C8 /* PlaygroundChart.playground */,
 				0630AE691D812840008859B0 /* Charts.xcodeproj */,
+				06FF5D7629BD10FA0002256E /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -196,18 +204,18 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		0630AE711D812840008859B0 /* Charts.framework */ = {
+		06FF5D7929BD10FA0002256E /* DGCharts.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
-			path = Charts.framework;
-			remoteRef = 0630AE701D812840008859B0 /* PBXContainerItemProxy */;
+			path = DGCharts.framework;
+			remoteRef = 06FF5D7829BD10FA0002256E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		0630AE731D812840008859B0 /* ChartsTests.xctest */ = {
+		06FF5D7B29BD10FA0002256E /* DGChartsTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = ChartsTests.xctest;
-			remoteRef = 0630AE721D812840008859B0 /* PBXContainerItemProxy */;
+			path = DGChartsTests.xctest;
+			remoteRef = 06FF5D7A29BD10FA0002256E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */

ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-macOS.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "65B3F63D1C73B4F5000983D0"
+               BuildableName = "ChartsDemo-macOS.app"
+               BlueprintName = "ChartsDemo-macOS"
+               ReferencedContainer = "container:ChartsDemo-macOS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65B3F63D1C73B4F5000983D0"
+            BuildableName = "ChartsDemo-macOS.app"
+            BlueprintName = "ChartsDemo-macOS"
+            ReferencedContainer = "container:ChartsDemo-macOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65B3F63D1C73B4F5000983D0"
+            BuildableName = "ChartsDemo-macOS.app"
+            BlueprintName = "ChartsDemo-macOS"
+            ReferencedContainer = "container:ChartsDemo-macOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14105" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14105"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -642,7 +643,7 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="ChartsDemo_OSX" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="ChartsDemo_macOS" customModuleProvider="target"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="75" y="0.0"/>
@@ -651,7 +652,7 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>
@@ -701,16 +702,16 @@
         <!--Bar Demo View Controller-->
         <scene sceneID="A6I-3s-knM">
             <objects>
-                <viewController title="Bar Demo View Controller" id="4fu-uG-om0" customClass="BarDemoViewController" customModule="ChartsDemo_OSX" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Bar Demo View Controller" id="4fu-uG-om0" customClass="BarDemoViewController" customModule="ChartsDemo_macOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="U2J-4p-9ti">
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="ElM-1T-Mza" customClass="BarChartView" customModule="Charts">
-                                <rect key="frame" x="5" y="31" width="440" height="264"/>
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="ElM-1T-Mza" customClass="BarChartView" customModule="DGCharts">
+                                <rect key="frame" x="5" y="30" width="440" height="265"/>
                             </customView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zeP-Mj-hKG">
-                                <rect key="frame" x="-1" y="-2" width="118" height="32"/>
+                                <rect key="frame" x="-2" y="-2" width="112" height="32"/>
                                 <buttonCell key="cell" type="push" title="Save as PNG" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="4id-uC-82a">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -724,6 +725,7 @@
                             <constraint firstItem="ElM-1T-Mza" firstAttribute="leading" secondItem="U2J-4p-9ti" secondAttribute="leading" constant="5" id="KwD-j8-5I4"/>
                             <constraint firstItem="zeP-Mj-hKG" firstAttribute="top" secondItem="ElM-1T-Mza" secondAttribute="bottom" constant="5" id="LX8-qy-0Z5"/>
                             <constraint firstAttribute="trailing" secondItem="ElM-1T-Mza" secondAttribute="trailing" constant="5" id="Z91-lG-orc"/>
+                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zeP-Mj-hKG" secondAttribute="trailing" constant="5" id="ege-aR-Oqe"/>
                             <constraint firstItem="zeP-Mj-hKG" firstAttribute="leading" secondItem="U2J-4p-9ti" secondAttribute="leading" constant="5" id="hww-5P-BKM"/>
                             <constraint firstItem="ElM-1T-Mza" firstAttribute="top" secondItem="U2J-4p-9ti" secondAttribute="top" constant="5" id="sRD-ZS-Eoa"/>
                             <constraint firstAttribute="bottom" secondItem="zeP-Mj-hKG" secondAttribute="bottom" constant="5" id="x9Q-cI-FVn"/>
@@ -740,12 +742,12 @@
         <!--Line-->
         <scene sceneID="IGh-XR-taX">
             <objects>
-                <viewController title="Line" id="vkP-1b-D8k" customClass="LineDemoViewController" customModule="ChartsDemo_OSX" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Line" id="vkP-1b-D8k" customClass="LineDemoViewController" customModule="ChartsDemo_macOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="bwI-de-txf">
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="UZ4-Tp-UjR" customClass="LineChartView" customModule="Charts">
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="UZ4-Tp-UjR" customClass="LineChartView" customModule="DGCharts">
                                 <rect key="frame" x="5" y="5" width="440" height="290"/>
                             </customView>
                         </subviews>
@@ -767,12 +769,12 @@
         <!--Radar-->
         <scene sceneID="jjT-Es-ofe">
             <objects>
-                <viewController title="Radar" id="CQR-9h-gXY" customClass="RadarDemoViewController" customModule="ChartsDemo_OSX" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Radar" id="CQR-9h-gXY" customClass="RadarDemoViewController" customModule="ChartsDemo_macOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="fep-JV-rhs">
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="2xv-mz-JjT" customClass="RadarChartView" customModule="Charts">
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="2xv-mz-JjT" customClass="RadarChartView" customModule="DGCharts">
                                 <rect key="frame" x="5" y="5" width="440" height="290"/>
                             </customView>
                         </subviews>
@@ -794,12 +796,12 @@
         <!--Pie-->
         <scene sceneID="zCq-mS-JMX">
             <objects>
-                <viewController title="Pie" id="KI5-K5-PrY" customClass="PieDemoViewController" customModule="ChartsDemo_OSX" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Pie" id="KI5-K5-PrY" customClass="PieDemoViewController" customModule="ChartsDemo_macOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" id="6Bd-GB-Gqp">
                         <rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="HL0-pV-46O" customClass="PieChartView" customModule="Charts">
+                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="HL0-pV-46O" customClass="PieChartView" customModule="DGCharts">
                                 <rect key="frame" x="5" y="5" width="440" height="290"/>
                             </customView>
                         </subviews>

ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Cocoa
-import Charts
+import DGCharts
 
 open class BarDemoViewController: NSViewController
 {

ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Cocoa
-import Charts
+import DGCharts
 
 open class LineDemoViewController: NSViewController
 {

ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Cocoa
-import Charts
+import DGCharts
 
 open class PieDemoViewController: NSViewController
 {

ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift

@@ -10,7 +10,7 @@
 
 import Foundation
 import Cocoa
-import Charts
+import DGCharts
 
 open class RadarDemoViewController: NSViewController
 {

ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift

@@ -19,7 +19,7 @@
 //: # Bar Chart
 //#-hidden-code
 import Cocoa
-import Charts
+import DGCharts
 import PlaygroundSupport
 //#-end-hidden-code