diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1878f561b1..5c663df622 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.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 diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 14ee147276..9ed2deeacb 100644 --- a/.github/workflows/swift.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 7d2c65a0c7..dd4801cf4f 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,5 @@ fastlane/Preview.html fastlane/screenshots fastlane/test_output Carthage -Charts.framework.zip -ChartsRealm.framework.zip +DGCharts.framework.zip .swiftpm/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b66f22f8f..6172134b12 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj index 69cdc7f398..4f4bd31bf6 100644 --- a/Charts.xcodeproj/project.pbxproj +++ b/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 = ""; }; 0619A877C69A95ECCC440A44 /* LineChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartView.swift; path = Source/Charts/Charts/LineChartView.swift; sourceTree = ""; }; 064989451F5C99C7006E8BB3 /* Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = ""; }; + 067934542A324A9D004BFBA9 /* Indexed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Indexed.swift; path = Source/Charts/Utils/Indexed.swift; sourceTree = ""; }; + 067934552A324A9D004BFBA9 /* Partition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Partition.swift; path = Source/Charts/Utils/Partition.swift; sourceTree = ""; }; 06AB297E20FA726500BAD505 /* Highlighter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Highlighter.swift; path = Source/Charts/Highlight/Highlighter.swift; sourceTree = ""; }; 0BD9DF16AF59680A3BB49452 /* AxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AxisValueFormatter.swift; path = Source/Charts/Formatters/AxisValueFormatter.swift; sourceTree = ""; }; 0DABDBBCCE6B3620C967F04A /* LineChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartRenderer.swift; path = Source/Charts/Renderers/LineChartRenderer.swift; sourceTree = ""; }; @@ -194,7 +197,7 @@ 18462BFDD9DEE76D51D40503 /* ScatterChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartView.swift; path = Source/Charts/Charts/ScatterChartView.swift; sourceTree = ""; }; 18BFB0A14A5C47A302A597D9 /* CandleChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/CandleChartDataSetProtocol.swift; sourceTree = ""; }; 1C02C3AF5C92FCFC18224C35 /* XAxisRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxisRenderer.swift; path = Source/Charts/Renderers/XAxisRenderer.swift; sourceTree = ""; }; - 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 = ""; }; 2194AA554712E6BA2677F114 /* BubbleChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartRenderer.swift; path = Source/Charts/Renderers/BubbleChartRenderer.swift; sourceTree = ""; }; 219BC9CEA037F897E92E45D1 /* ScatterChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ScatterChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/ScatterChartDataSetProtocol.swift; sourceTree = ""; }; @@ -233,7 +236,7 @@ 4EAA8AA30C377D54D22A577A /* ValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ValueFormatter.swift; path = Source/Charts/Formatters/ValueFormatter.swift; sourceTree = ""; }; 4EED352A98860E031F13AFB7 /* BubbleChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BubbleChartView.swift; path = Source/Charts/Charts/BubbleChartView.swift; sourceTree = ""; }; 4F7E6A99D82E6AE3804D5A39 /* LineRadarChartDataSetProtocol.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineRadarChartDataSetProtocol.swift; path = Source/Charts/Data/Interfaces/LineRadarChartDataSetProtocol.swift; sourceTree = ""; }; - 4F9922F0641F7955DC6CD324 /* Charts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = Charts.h; path = "Source/Supporting Files/Charts.h"; sourceTree = ""; }; + 4F9922F0641F7955DC6CD324 /* DGCharts.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = DGCharts.h; path = "Source/Supporting Files/DGCharts.h"; sourceTree = ""; }; 5225ABC3C0C2F65FC094EEBB /* XAxis.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = XAxis.swift; path = Source/Charts/Components/XAxis.swift; sourceTree = ""; }; 52265C1B343CCC41AF2300E3 /* CombinedChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CombinedChartRenderer.swift; path = Source/Charts/Renderers/CombinedChartRenderer.swift; sourceTree = ""; }; 539382766378B702660FDFB2 /* HorizontalBarChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartRenderer.swift; path = Source/Charts/Renderers/HorizontalBarChartRenderer.swift; sourceTree = ""; }; @@ -246,7 +249,7 @@ 5C3F5E1A69EC06E86505F7B1 /* BarChartTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BarChartTests.swift; sourceTree = ""; }; 6021C9E424C36116AEA78CC9 /* HorizontalBarChartView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HorizontalBarChartView.swift; path = Source/Charts/Charts/HorizontalBarChartView.swift; sourceTree = ""; }; 62B73FCEDD3841E7B958F6A9 /* ChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataProvider.swift; path = Source/Charts/Interfaces/ChartDataProvider.swift; sourceTree = ""; }; - 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 = ""; }; 6A4770E0F75EFFC30707A7C8 /* DefaultAxisValueFormatter.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DefaultAxisValueFormatter.swift; path = Source/Charts/Formatters/DefaultAxisValueFormatter.swift; sourceTree = ""; }; 6CEC0C69C89CE9B99F3B4409 /* ChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/ChartDataSet.swift; sourceTree = ""; }; @@ -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 = ""; @@ -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 = ""; @@ -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" */; diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/DGCharts.xcscheme similarity index 81% rename from Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme rename to Charts.xcodeproj/xcshareddata/xcschemes/DGCharts.xcscheme index 283b847aa0..002c19ed9f 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/DGCharts.xcscheme @@ -1,6 +1,6 @@ @@ -33,8 +33,8 @@ @@ -50,22 +50,6 @@ debugDocumentVersioning = "YES" debugServiceExtension = "internal" allowLocationSimulation = "YES"> - - - - - - - - + + + + diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/DGChartsTests.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/DGChartsTests.xcscheme new file mode 100644 index 0000000000..322e8c7f2b --- /dev/null +++ b/Charts.xcodeproj/xcshareddata/xcschemes/DGChartsTests.xcscheme @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Charts.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Charts.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000000..54782e32fd --- /dev/null +++ b/Charts.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + + + diff --git a/Charts.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Charts.xcworkspace/xcshareddata/swiftpm/Package.resolved index 92070a1c75..f58d68807c 100644 --- a/Charts.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/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" } } ], diff --git a/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj index e10db2415b..69441f58f5 100644 --- a/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj +++ b/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 = ""; @@ -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"; diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS-Swift.xcscheme similarity index 58% rename from Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme rename to ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS-Swift.xcscheme index 68bd2fcbda..d93d21bd31 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme +++ b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS-Swift.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "225B361C1F6EB9A50005B3D5" + BuildableName = "ChartsDemo-iOS-Swift.app" + BlueprintName = "ChartsDemo-iOS-Swift" + ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj"> @@ -26,19 +26,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES" - codeCoverageEnabled = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES"> - - - - - + + BlueprintIdentifier = "225B361C1F6EB9A50005B3D5" + BuildableName = "ChartsDemo-iOS-Swift.app" + BlueprintName = "ChartsDemo-iOS-Swift" + ReferencedContainer = "container:ChartsDemo-iOS.xcodeproj"> - - - - - + + + + + diff --git a/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS.xcscheme b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS.xcscheme new file mode 100644 index 0000000000..beb2cdf231 --- /dev/null +++ b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-iOS.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift index b36c3fe0b1..8ec8c004e7 100644 --- a/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift +++ b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift @@ -10,7 +10,7 @@ // import Foundation -import Charts +import DGCharts #if canImport(UIKit) import UIKit #endif diff --git a/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift index c0d62a3d19..503131d065 100644 --- a/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift +++ b/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift @@ -10,7 +10,7 @@ // import Foundation -import Charts +import DGCharts #if canImport(UIKit) import UIKit #endif diff --git a/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift index 4d2654d485..7e20a254be 100644 --- a/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift +++ b/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift @@ -5,7 +5,7 @@ // import Foundation -import Charts +import DGCharts #if canImport(UIKit) import UIKit #endif diff --git a/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h index cc5374f6ca..1a96452d5d 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface AnotherBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h index 05b7c8c96c..c48260a38d 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface BarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h index e09eef7962..c77cf58175 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface BubbleChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h index fc3d2f66b2..baf23f0325 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface CandleStickChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h index c79e3cf314..d33fcdbb6c 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface ColoredLineChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h index c6de2899e8..2df1d91a87 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface CombinedChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h index 658570aaab..784ff73553 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface CubicLineChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h index 5f3ab1b1a4..cbd6ca8125 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface HalfPieChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h index 4db77ab945..8c8d7e80ac 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface HorizontalBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h index 3519fd4054..9c6fe474dc 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface LineChart1ViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h index 0c8e6d3712..cd950a4b9d 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface LineChart2ViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h index d62d9443ed..1c60e46afa 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface LineChartFilledViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h index 6edfb1ff85..456612b129 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface LineChartTimeViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h index 63b820c5ef..4fbd558a4e 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface MultipleBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h index f2cc35ab9d..1d49b3dfad 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface MultipleLinesChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h index 610c3ecdad..2f7c9a2328 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface NegativeStackedBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h index 098d12b733..3a475e2280 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface PieChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h index a566badb86..9d7411bba6 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface PositiveNegativeBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h index b9e13507e2..45263157f0 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface RadarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m index e4f5cbcf35..231d70ecbd 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m @@ -16,9 +16,6 @@ @interface RadarChartViewController () *activities; -@property (nonatomic, strong) UIColor *originalBarBgColor; -@property (nonatomic, strong) UIColor *originalBarTintColor; -@property (nonatomic) UIBarStyle originalBarStyle; @end @@ -90,34 +87,6 @@ - (void)viewDidLoad [_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]; diff --git a/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h index 2989d22d8f..9d7a23506e 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface ScatterChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h index aa94a9fd64..fc7848792b 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface SinusBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h index 5ef6f2797b..762781bf03 100644 --- a/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h +++ b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h @@ -11,7 +11,7 @@ #import #import "DemoBaseViewController.h" -#import +#import @interface StackedBarChartViewController : DemoBaseViewController diff --git a/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift index 1f37660ed3..a608ff2c5a 100644 --- a/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift +++ b/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift @@ -5,7 +5,7 @@ // import Foundation -import Charts +import DGCharts open class LargeValueFormatter: NSObject, ValueFormatter, AxisValueFormatter { diff --git a/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift index 8f7f09f3ab..fa6848698f 100644 --- a/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift +++ b/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift @@ -10,7 +10,7 @@ // import Foundation -import Charts +import DGCharts #if canImport(UIKit) import UIKit #endif diff --git a/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift b/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift index 4958e10f5c..be53cfe1ce 100644 --- a/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift +++ b/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift @@ -7,7 +7,7 @@ // import Foundation -import Charts +import DGCharts #if canImport(UIKit) import UIKit #endif diff --git a/ChartsDemo-iOS/Swift/DemoBaseViewController.swift b/ChartsDemo-iOS/Swift/DemoBaseViewController.swift index 6445f11cab..da2afe2d4e 100644 --- a/ChartsDemo-iOS/Swift/DemoBaseViewController.swift +++ b/ChartsDemo-iOS/Swift/DemoBaseViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts enum Option { case toggleValues diff --git a/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift index 568c3c9949..115ede1159 100644 --- a/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class AnotherBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift index 7f66cda378..16b3837601 100644 --- a/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift +++ b/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 diff --git a/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift index b6db99cfb8..93e6e17f8a 100644 --- a/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class BubbleChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift index 33cb7edc1d..0f75fc0f40 100644 --- a/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class CandleStickChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift index 0586923f79..76745abe93 100644 --- a/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift +++ b/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]! diff --git a/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift index c6d2619c32..3d502862c7 100644 --- a/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift +++ b/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 diff --git a/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift index 022ea71cd3..66cbd2608f 100644 --- a/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift +++ b/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 { diff --git a/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift index c02c5cafae..c559b8cb1b 100644 --- a/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class HalfPieChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift index ef77b9cab2..d0c4a39dca 100644 --- a/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class HorizontalBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift index e676cd9e1a..df91e64c85 100644 --- a/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift @@ -7,7 +7,7 @@ // import UIKit -import Charts +import DGCharts class LineChart1ViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift index 9ae9688f9c..57e732f04c 100644 --- a/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class LineChart2ViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift index ad99136a7b..5e78a602b3 100644 --- a/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class LineChartFilledViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift index 303c636139..a31dad6fd8 100644 --- a/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift +++ b/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! diff --git a/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift index 871e2ebe7b..d22847f760 100644 --- a/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class MultipleBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift index 098bf07b27..bec02d5f9e 100644 --- a/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class MultipleLinesChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift index 01a656f94b..5d250932d2 100644 --- a/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class NegativeStackedBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift index dc8523d08b..8eefe0ca1f 100644 --- a/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class PieChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift index 42021249ce..1986ac1a27 100644 --- a/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift @@ -7,7 +7,7 @@ // import UIKit -import Charts +import DGCharts class PiePolylineChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift index 2f1a65e65c..9526751457 100644 --- a/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class PositiveNegativeBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift index a9842f89ef..0daaef02d2 100644 --- a/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift +++ b/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 diff --git a/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift index bcc691c906..10c4cc41fe 100644 --- a/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class ScatterChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift index 0a966c4cce..765c0205ab 100644 --- a/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class SinusBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift index e48d882433..fd704b596a 100644 --- a/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift +++ b/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift @@ -9,7 +9,7 @@ #if canImport(UIKit) import UIKit #endif -import Charts +import DGCharts class StackedBarChartViewController: DemoBaseViewController { diff --git a/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift index aa39e3d444..c5472337e9 100644 --- a/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift +++ b/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() diff --git a/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift index f403daa06a..5f0a2db92d 100644 --- a/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift +++ b/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? diff --git a/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift index 00157055ec..8b8ba380bd 100644 --- a/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift +++ b/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 { diff --git a/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift index 8cf679d2b5..443219ecb9 100644 --- a/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift +++ b/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift @@ -5,7 +5,7 @@ // import Foundation -import Charts +import DGCharts private let MAX_LENGTH = 5 diff --git a/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib index 571312c92c..8a8be08684 100644 --- a/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib @@ -1,20 +1,14 @@ - - - - + + - + + - - - HelveticaNeue-Light - - - + @@ -40,7 +34,7 @@ - + @@ -57,7 +51,7 @@ - + @@ -66,7 +60,7 @@ - + @@ -75,6 +69,7 @@ + @@ -94,7 +89,6 @@ - diff --git a/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib index 85dbdc8371..bee68c9967 100644 --- a/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib index 03af886339..23f7158b34 100644 --- a/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib index 460c052371..7f2bbed282 100644 --- a/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib index ef099b9fd9..fc4a9b6e39 100644 --- a/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib @@ -23,19 +23,19 @@ - + - + - + - + diff --git a/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib index 82fe07e540..ff072051f2 100644 --- a/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib @@ -36,7 +36,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib index 007e470e21..fcea9c9b14 100644 --- a/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib index cdcf1ffe65..e76b95f2ab 100644 --- a/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib @@ -36,7 +36,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib index 7ea8e71202..202c23cb03 100644 --- a/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib index 9902b5b27d..96187f0070 100644 --- a/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib index c1c730e97b..91c637be56 100644 --- a/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib index 62bf7015e6..ea1934023e 100644 --- a/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib @@ -29,7 +29,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib index d13233af3f..37db98cd71 100644 --- a/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib @@ -38,7 +38,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib index 9ee6745abc..b002c6cf89 100644 --- a/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib index c9595f1dc4..4ed16af085 100644 --- a/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib index ac24e0d3c9..86ebcf0a1e 100644 --- a/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib @@ -36,7 +36,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib index 39cce57ef3..0ea5db7695 100644 --- a/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib @@ -70,7 +70,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib index c0bc4dbb86..5b7aefe143 100644 --- a/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib @@ -70,7 +70,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib index 365f7f6337..c738413cf1 100644 --- a/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib @@ -36,7 +36,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib index 3e45cbe67d..79cdddbf1f 100644 --- a/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib @@ -44,7 +44,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib index 926e15c0df..648176530e 100644 --- a/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib index e2c84ecf6f..30b4244607 100644 --- a/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib @@ -53,7 +53,7 @@ - + diff --git a/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib index cb9e5c20e2..0725db31fc 100644 --- a/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib +++ b/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib @@ -40,7 +40,7 @@ - + diff --git a/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj index 10e89b3554..9ebdaeb65c 100644 --- a/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj +++ b/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 = ""; }; + 06FF5D7629BD10FA0002256E /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; 5B9A0C381C83AB0600ED8ED8 /* Demos */ = { isa = PBXGroup; children = ( @@ -109,6 +116,7 @@ 65B3F63F1C73B4F5000983D0 /* Products */, 03780C7E1EA29C87005C11C8 /* PlaygroundChart.playground */, 0630AE691D812840008859B0 /* Charts.xcodeproj */, + 06FF5D7629BD10FA0002256E /* Frameworks */, ); sourceTree = ""; }; @@ -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 */ diff --git a/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-macOS.xcscheme b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-macOS.xcscheme new file mode 100644 index 0000000000..0a28b2978d --- /dev/null +++ b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/xcshareddata/xcschemes/ChartsDemo-macOS.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard index e1bbcb34b1..6944a28714 100644 --- a/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard +++ b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -642,7 +643,7 @@ - + @@ -651,7 +652,7 @@ - + @@ -701,16 +702,16 @@ - + - - + +