From b40aa1bcb4a5d34ffa9f9e7ff72c768f9db7c2e2 Mon Sep 17 00:00:00 2001 From: jjatie Date: Fri, 30 Mar 2018 10:04:03 -0300 Subject: [PATCH] Swift 4.1 (#3370) * Fixed misuse of "!" operator * Updated projects for Xcode 9.3 and Swift 4.1 added a workspace to include all demos with the project to make it easier to test changes * Fixes for Xcode 9.3 --- .travis.yml | 8 +-- Charts.xcodeproj/project.pbxproj | 8 ++- .../xcshareddata/xcschemes/Charts.xcscheme | 62 +++++++++-------- .../xcschemes/ChartsTests.xcscheme | 63 ++++++++++-------- Charts.xcworkspace/contents.xcworkspacedata | 13 ++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ .../ChartsDemo-iOS.xcodeproj}/project.pbxproj | 48 +++++++------ .../Objective-C/AppDelegate.h | 0 .../Objective-C/AppDelegate.m | 0 .../Components/BalloonMarker.swift | 0 .../Components/RadarMarkerView.swift | 0 .../Objective-C/Components/XYMarkerView.swift | 0 .../Objective-C/DemoBaseViewController.h | 2 +- .../Objective-C/DemoBaseViewController.m | 0 .../Objective-C/DemoListViewController.h | 0 .../Objective-C/DemoListViewController.m | 0 .../Demos/AnotherBarChartViewController.h | 0 .../Demos/AnotherBarChartViewController.m | 2 +- .../Demos/BarChartViewController.h | 0 .../Demos/BarChartViewController.m | 2 +- .../Demos/BubbleChartViewController.h | 0 .../Demos/BubbleChartViewController.m | 2 +- .../Demos/CandleStickChartViewController.h | 0 .../Demos/CandleStickChartViewController.m | 2 +- .../Demos/ColoredLineChartViewController.h | 0 .../Demos/ColoredLineChartViewController.m | 2 +- .../Demos/CombinedChartViewController.h | 0 .../Demos/CombinedChartViewController.m | 2 +- .../Demos/CubicLineChartViewController.h | 0 .../Demos/CubicLineChartViewController.m | 2 +- .../Demos/HalfPieChartViewController.h | 0 .../Demos/HalfPieChartViewController.m | 2 +- .../Demos/HorizontalBarChartViewController.h | 0 .../Demos/HorizontalBarChartViewController.m | 2 +- .../Demos/LineChart1ViewController.h | 0 .../Demos/LineChart1ViewController.m | 2 +- .../Demos/LineChart2ViewController.h | 0 .../Demos/LineChart2ViewController.m | 2 +- .../Demos/LineChartFilledViewController.h | 0 .../Demos/LineChartFilledViewController.m | 6 +- .../Demos/LineChartTimeViewController.h | 0 .../Demos/LineChartTimeViewController.m | 2 +- .../Demos/MultipleBarChartViewController.h | 0 .../Demos/MultipleBarChartViewController.m | 2 +- .../Demos/MultipleLinesChartViewController.h | 0 .../Demos/MultipleLinesChartViewController.m | 2 +- .../NegativeStackedBarChartViewController.h | 0 .../NegativeStackedBarChartViewController.m | 2 +- .../Demos/PieChartViewController.h | 0 .../Demos/PieChartViewController.m | 2 +- .../Demos/PiePolylineChartViewController.h | 0 .../Demos/PiePolylineChartViewController.m | 2 +- .../PositiveNegativeBarChartViewController.h | 0 .../PositiveNegativeBarChartViewController.m | 2 +- .../Demos/RadarChartViewController.h | 0 .../Demos/RadarChartViewController.m | 28 ++++---- .../Demos/ScatterChartViewController.h | 0 .../Demos/ScatterChartViewController.m | 2 +- .../Demos/SinusBarChartViewController.h | 0 .../Demos/SinusBarChartViewController.m | 2 +- .../Demos/StackedBarChartViewController.h | 0 .../Demos/StackedBarChartViewController.m | 2 +- .../Formatters/DateValueFormatter.h | 2 +- .../Formatters/DateValueFormatter.m | 0 .../Formatters/DayAxisValueFormatter.h | 2 +- .../Formatters/DayAxisValueFormatter.m | 0 .../Formatters/IntAxisValueFormatter.h | 2 +- .../Formatters/IntAxisValueFormatter.m | 0 .../Formatters/LargeValueFormatter.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/Icon-29@2x.png | Bin .../AppIcon.appiconset/Icon-29@3x.png | Bin .../AppIcon.appiconset/Icon-40@2x.png | Bin .../AppIcon.appiconset/Icon-40@3x.png | Bin .../AppIcon.appiconset/Icon-60@2x.png | Bin .../AppIcon.appiconset/Icon-60@3x.png | Bin .../AppIcon.appiconset/iTunesArtwork@2x.png | Bin .../Resources/Images.xcassets/Contents.json | 0 .../icon.imageset/Contents.json | 0 .../Images.xcassets/icon.imageset/star-1.png | Bin .../Images.xcassets/icon.imageset/star-2.png | Bin .../Images.xcassets/icon.imageset/star.png | Bin .../Resources/Launch Screen.storyboard | 0 .../Resources/markers/radar_marker@3x.png | Bin .../ChartsDemo-Bridging-Header.h | 0 .../Supporting Files/Info.plist | 0 .../Supporting Files/main.m | 0 .../Swift/AppDelegate.swift | 0 .../Swift/Components/BalloonMarker.swift | 0 .../Swift/Components/RadarMarkerView.swift | 0 .../Swift/Components/XYMarkerView.swift | 0 .../Swift/DemoBaseViewController.swift | 0 .../Swift/DemoListViewController.swift | 0 .../Demos/AnotherBarChartViewController.swift | 0 .../Swift/Demos/BarChartViewController.swift | 0 .../Demos/BubbleChartViewController.swift | 0 .../CandleStickChartViewController.swift | 0 .../ColoredLineChartViewController.swift | 0 .../Demos/CombinedChartViewController.swift | 0 .../Demos/CubicLineChartViewController.swift | 0 .../Demos/HalfPieChartViewController.swift | 0 .../HorizontalBarChartViewController.swift | 0 .../Demos/LineChart1ViewController.swift | 0 .../Demos/LineChart2ViewController.swift | 0 .../Demos/LineChartFilledViewController.swift | 0 .../Demos/LineChartTimeViewController.swift | 0 .../MultipleBarChartViewController.swift | 0 .../MultipleLinesChartViewController.swift | 0 ...egativeStackedBarChartViewController.swift | 0 .../Swift/Demos/PieChartViewController.swift | 0 .../PiePolylineChartViewController.swift | 0 ...sitiveNegativeBarChartViewController.swift | 0 .../Demos/RadarChartViewController.swift | 0 .../Demos/ScatterChartViewController.swift | 0 .../Demos/SinusBarChartViewController.swift | 0 .../Demos/StackedBarChartViewController.swift | 0 .../Swift/Formatters/DateValueFormatter.swift | 0 .../Formatters/DayAxisValueFormatter.swift | 0 .../Formatters/IntAxisValueFormatter.swift | 0 .../Formatters/LargeValueFormatter.swift | 0 .../XIBs/DemoListViewController.xib | 0 .../Demos/AnotherBarChartViewController.xib | 0 .../XIBs/Demos/BarChartViewController.xib | 0 .../XIBs/Demos/BubbleChartViewController.xib | 0 .../Demos/CandleStickChartViewController.xib | 0 .../Demos/ColoredLineChartViewController.xib | 0 .../Demos/CombinedChartViewController.xib | 0 .../Demos/CubicLineChartViewController.xib | 0 .../XIBs/Demos/HalfPieChartViewController.xib | 0 .../HorizontalBarChartViewController.xib | 0 .../XIBs/Demos/LineChart1ViewController.xib | 0 .../XIBs/Demos/LineChart2ViewController.xib | 0 .../Demos/LineChartFilledViewController.xib | 0 .../Demos/LineChartTimeViewController.xib | 0 .../Demos/MultipleBarChartViewController.xib | 0 .../MultipleLinesChartViewController.xib | 0 .../NegativeStackedBarChartViewController.xib | 0 .../XIBs/Demos/PieChartViewController.xib | 0 .../Demos/PiePolylineChartViewController.xib | 0 ...PositiveNegativeBarChartViewController.xib | 0 .../XIBs/Demos/RadarChartViewController.xib | 0 .../XIBs/Demos/RealmDemosViewController.xib | 0 .../XIBs/Demos/ScatterChartViewController.xib | 0 .../Demos/SinusBarChartViewController.xib | 0 .../Demos/StackedBarChartViewController.xib | 0 .../XIBs/RadarMarkerView.xib | 0 .../project.pbxproj | 38 ++++++----- .../ChartsDemo-macOS}/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Base.lproj/Main.storyboard | 28 +++++--- .../Demos/BarDemoViewController.swift | 0 .../Demos/LineDemoViewController.swift | 0 .../Demos/PieDemoViewController.swift | 0 .../Demos/RadarDemoViewController.swift | 0 .../ChartsDemo-macOS}/Info.plist | 0 .../BarChart.xcplaygroundpage/Contents.swift | 0 .../Contents.swift | 0 .../Contents.swift | 0 .../Contents.swift | 0 .../Contents.swift | 0 .../LineChart.xcplaygroundpage/Contents.swift | 0 .../Menu.xcplaygroundpage/Contents.swift | 0 .../Resources/feature_graphic.png | Bin .../PieChart.xcplaygroundpage/Contents.swift | 0 .../Contents.swift | 0 .../Contents.swift | 0 .../Contents.swift | 0 .../contents.xcplayground | 0 Rakefile | 16 ++--- .../Charts/Charts/BarLineChartViewBase.swift | 4 +- Source/Charts/Charts/CombinedChartView.swift | 16 ++--- Source/Charts/Components/Legend.swift | 6 +- .../Charts/Filters/DataApproximator+N.swift | 2 +- Source/Charts/Renderers/LegendRenderer.swift | 2 +- 174 files changed, 233 insertions(+), 173 deletions(-) create mode 100644 Charts.xcworkspace/contents.xcworkspacedata create mode 100644 Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename {ChartsDemo/ChartsDemo.xcodeproj => ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj}/project.pbxproj (98%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/AppDelegate.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/AppDelegate.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Components/BalloonMarker.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Components/RadarMarkerView.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Components/XYMarkerView.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/DemoBaseViewController.h (96%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/DemoBaseViewController.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/DemoListViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/DemoListViewController.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/AnotherBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/AnotherBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/BarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/BarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/BubbleChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/BubbleChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CandleStickChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CandleStickChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/ColoredLineChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/ColoredLineChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CombinedChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CombinedChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CubicLineChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/CubicLineChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/HalfPieChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/HalfPieChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/HorizontalBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/HorizontalBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChart1ViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChart1ViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChart2ViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChart2ViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChartFilledViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChartFilledViewController.m (97%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChartTimeViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/LineChartTimeViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/MultipleBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/MultipleBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/MultipleLinesChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/MultipleLinesChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/NegativeStackedBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/NegativeStackedBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PieChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PieChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PiePolylineChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PiePolylineChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PositiveNegativeBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/PositiveNegativeBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/RadarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/RadarChartViewController.m (91%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/ScatterChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/ScatterChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/SinusBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/SinusBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/StackedBarChartViewController.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Demos/StackedBarChartViewController.m (99%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/DateValueFormatter.h (90%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/DateValueFormatter.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/DayAxisValueFormatter.h (88%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/DayAxisValueFormatter.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/IntAxisValueFormatter.h (85%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/IntAxisValueFormatter.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Objective-C/Formatters/LargeValueFormatter.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/Contents.json (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/icon.imageset/Contents.json (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/icon.imageset/star-1.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/icon.imageset/star-2.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Images.xcassets/icon.imageset/star.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/Launch Screen.storyboard (100%) rename {ChartsDemo => ChartsDemo-iOS}/Resources/markers/radar_marker@3x.png (100%) rename {ChartsDemo => ChartsDemo-iOS}/Supporting Files/ChartsDemo-Bridging-Header.h (100%) rename {ChartsDemo => ChartsDemo-iOS}/Supporting Files/Info.plist (100%) rename {ChartsDemo => ChartsDemo-iOS}/Supporting Files/main.m (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/AppDelegate.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Components/BalloonMarker.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Components/RadarMarkerView.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Components/XYMarkerView.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/DemoBaseViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/DemoListViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/AnotherBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/BarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/BubbleChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/CandleStickChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/ColoredLineChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/CombinedChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/CubicLineChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/HalfPieChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/HorizontalBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/LineChart1ViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/LineChart2ViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/LineChartFilledViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/LineChartTimeViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/MultipleBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/MultipleLinesChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/NegativeStackedBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/PieChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/PiePolylineChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/PositiveNegativeBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/RadarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/ScatterChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/SinusBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Demos/StackedBarChartViewController.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Formatters/DateValueFormatter.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Formatters/DayAxisValueFormatter.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Formatters/IntAxisValueFormatter.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/Swift/Formatters/LargeValueFormatter.swift (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/DemoListViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/AnotherBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/BarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/BubbleChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/CandleStickChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/ColoredLineChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/CombinedChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/CubicLineChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/HalfPieChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/HorizontalBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/LineChart1ViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/LineChart2ViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/LineChartFilledViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/LineChartTimeViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/MultipleBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/MultipleLinesChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/NegativeStackedBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/PieChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/PiePolylineChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/PositiveNegativeBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/RadarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/RealmDemosViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/ScatterChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/SinusBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/Demos/StackedBarChartViewController.xib (100%) rename {ChartsDemo => ChartsDemo-iOS}/XIBs/RadarMarkerView.xib (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj => ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj}/project.pbxproj (92%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/AppDelegate.swift (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Base.lproj/Main.storyboard (98%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Demos/BarDemoViewController.swift (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Demos/LineDemoViewController.swift (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Demos/PieDemoViewController.swift (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Demos/RadarDemoViewController.swift (100%) rename {ChartsDemo-OSX/ChartsDemo-OSX => ChartsDemo-macOS/ChartsDemo-macOS}/Info.plist (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift (100%) rename {ChartsDemo-OSX => ChartsDemo-macOS}/PlaygroundChart.playground/contents.xcplayground (100%) diff --git a/.travis.yml b/.travis.yml index 6d6fe4d549..0740950980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: objective-c -osx_image: xcode9 +osx_image: xcode9.3beta matrix: include: - - osx_image: xcode9 + - osx_image: xcode9.3beta env: PLATFORM="iOS" - - osx_image: xcode9 + - osx_image: xcode9.3beta env: PLATFORM="tvOS" - - osx_image: xcode9 + - osx_image: xcode9.3beta env: PLATFORM="macOS" env: global: diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj index b672d31b54..d5ed7687e8 100644 --- a/Charts.xcodeproj/project.pbxproj +++ b/Charts.xcodeproj/project.pbxproj @@ -731,7 +731,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0930; TargetAttributes = { A58A4ED274A941CA248EA921 = { LastSwiftMigration = 0900; @@ -1055,6 +1055,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1062,6 +1063,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1084,6 +1086,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; VALIDATE_PRODUCT = YES; }; @@ -1103,6 +1106,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -1110,6 +1114,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1140,6 +1145,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2,3,4"; }; name = Debug; diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme index 6386c46eef..6029c01d57 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme @@ -1,49 +1,49 @@ + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "A58A4ED274A941CA248EA921" + BuildableName = "Charts.framework" + BlueprintName = "Charts" + ReferencedContainer = "container:Charts.xcodeproj"> - - + shouldUseLaunchSchemeArgsEnv = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2" + BuildableName = "ChartsTests.xctest" + BlueprintName = "ChartsTests" + ReferencedContainer = "container:Charts.xcodeproj"> + + - - + + + + + key = "FB_REFERENCE_IMAGE_DIR" + value = "$(SOURCE_ROOT)/Tests/ReferenceImages" + isEnabled = "YES"> + + + debugDocumentVersioning = "YES"> diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme index bd0766f00d..4b03f98058 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme @@ -1,49 +1,50 @@ + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2" + BuildableName = "ChartsTests.xctest" + BlueprintName = "ChartsTests" + ReferencedContainer = "container:Charts.xcodeproj"> - - + codeCoverageEnabled = "YES" + shouldUseLaunchSchemeArgsEnv = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2" + BuildableName = "ChartsTests.xctest" + BlueprintName = "ChartsTests" + ReferencedContainer = "container:Charts.xcodeproj"> + + - - + + + + + key = "FB_REFERENCE_IMAGE_DIR" + value = "$(SOURCE_ROOT)/Tests/ReferenceImages" + isEnabled = "YES"> + + + debugDocumentVersioning = "YES"> diff --git a/Charts.xcworkspace/contents.xcworkspacedata b/Charts.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..088d4b7329 --- /dev/null +++ b/Charts.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/Charts.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj similarity index 98% rename from ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj rename to ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj index 28674b1c25..68a01cd7e2 100644 --- a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj +++ b/ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ 0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PiePolylineChartViewController.m; sourceTree = ""; }; 0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PiePolylineChartViewController.xib; sourceTree = ""; }; 0630AE391D8126C0008859B0 /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts.xcodeproj; sourceTree = ""; }; - 225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoBaseViewController.swift; sourceTree = ""; }; 225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoListViewController.swift; sourceTree = ""; }; @@ -240,7 +240,7 @@ 5B0CC7831ABB875400665592 /* PieChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PieChartViewController.m; sourceTree = ""; }; 5B0CC7841ABB875400665592 /* PieChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PieChartViewController.xib; sourceTree = ""; }; 5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RealmDemosViewController.xib; path = XIBs/Demos/RealmDemosViewController.xib; sourceTree = SOURCE_ROOT; }; - 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChartsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 5B57BBB31A9B26AA0036A6CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5B57BBB41A9B26AA0036A6CC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 5B57BBB61A9B26AA0036A6CC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -477,8 +477,8 @@ 5B57BBB01A9B26AA0036A6CC /* Products */ = { isa = PBXGroup; children = ( - 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */, - 225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */, + 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */, + 225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */, ); name = Products; sourceTree = ""; @@ -607,9 +607,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 225B361C1F6EB9A50005B3D5 /* ChartsDemo-Swift */ = { + 225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */ = { isa = PBXNativeTarget; - buildConfigurationList = 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-Swift" */; + buildConfigurationList = 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */; buildPhases = ( 225B36191F6EB9A50005B3D5 /* Sources */, 225B361A1F6EB9A50005B3D5 /* Frameworks */, @@ -621,14 +621,14 @@ dependencies = ( 225B368F1F6EBBB00005B3D5 /* PBXTargetDependency */, ); - name = "ChartsDemo-Swift"; + name = "ChartsDemo-iOS-Swift"; productName = "ChartsDemo-Swift"; - productReference = 225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */; + productReference = 225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */; productType = "com.apple.product-type.application"; }; - 5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */ = { + 5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */; + buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */; buildPhases = ( 5B57BBAB1A9B26AA0036A6CC /* Sources */, 5B57BBAC1A9B26AA0036A6CC /* Frameworks */, @@ -640,9 +640,9 @@ dependencies = ( 0630AE541D81271B008859B0 /* PBXTargetDependency */, ); - name = ChartsDemo; + name = "ChartsDemo-iOS"; productName = chartstest; - productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */; + productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -653,7 +653,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = dcg; TargetAttributes = { 225B361C1F6EB9A50005B3D5 = { @@ -666,7 +666,7 @@ }; }; }; - buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */; + buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -685,8 +685,8 @@ ); projectRoot = ""; targets = ( - 5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */, - 225B361C1F6EB9A50005B3D5 /* ChartsDemo-Swift */, + 5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */, + 225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */, ); }; /* End PBXProject section */ @@ -952,12 +952,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -987,6 +989,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -1002,12 +1005,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -1030,6 +1035,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -1045,7 +1051,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = ChartsDemo; + PRODUCT_NAME = "ChartsDemo-iOS"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; @@ -1065,7 +1071,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = ChartsDemo; + PRODUCT_NAME = "ChartsDemo-iOS"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos"; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; @@ -1076,7 +1082,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-Swift" */ = { + 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */ = { isa = XCConfigurationList; buildConfigurations = ( 225B362D1F6EB9A50005B3D5 /* Debug */, @@ -1085,7 +1091,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */ = { + 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 5B57BBD01A9B26AA0036A6CC /* Debug */, @@ -1094,7 +1100,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */ = { + 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 5B57BBD31A9B26AA0036A6CC /* Debug */, diff --git a/ChartsDemo/Objective-C/AppDelegate.h b/ChartsDemo-iOS/Objective-C/AppDelegate.h similarity index 100% rename from ChartsDemo/Objective-C/AppDelegate.h rename to ChartsDemo-iOS/Objective-C/AppDelegate.h diff --git a/ChartsDemo/Objective-C/AppDelegate.m b/ChartsDemo-iOS/Objective-C/AppDelegate.m similarity index 100% rename from ChartsDemo/Objective-C/AppDelegate.m rename to ChartsDemo-iOS/Objective-C/AppDelegate.m diff --git a/ChartsDemo/Objective-C/Components/BalloonMarker.swift b/ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift similarity index 100% rename from ChartsDemo/Objective-C/Components/BalloonMarker.swift rename to ChartsDemo-iOS/Objective-C/Components/BalloonMarker.swift diff --git a/ChartsDemo/Objective-C/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift similarity index 100% rename from ChartsDemo/Objective-C/Components/RadarMarkerView.swift rename to ChartsDemo-iOS/Objective-C/Components/RadarMarkerView.swift diff --git a/ChartsDemo/Objective-C/Components/XYMarkerView.swift b/ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift similarity index 100% rename from ChartsDemo/Objective-C/Components/XYMarkerView.swift rename to ChartsDemo-iOS/Objective-C/Components/XYMarkerView.swift diff --git a/ChartsDemo/Objective-C/DemoBaseViewController.h b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.h similarity index 96% rename from ChartsDemo/Objective-C/DemoBaseViewController.h rename to ChartsDemo-iOS/Objective-C/DemoBaseViewController.h index 3fe7ed2230..fd31bfd7da 100644 --- a/ChartsDemo/Objective-C/DemoBaseViewController.h +++ b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.h @@ -10,7 +10,7 @@ // #import -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface DemoBaseViewController : UIViewController { diff --git a/ChartsDemo/Objective-C/DemoBaseViewController.m b/ChartsDemo-iOS/Objective-C/DemoBaseViewController.m similarity index 100% rename from ChartsDemo/Objective-C/DemoBaseViewController.m rename to ChartsDemo-iOS/Objective-C/DemoBaseViewController.m diff --git a/ChartsDemo/Objective-C/DemoListViewController.h b/ChartsDemo-iOS/Objective-C/DemoListViewController.h similarity index 100% rename from ChartsDemo/Objective-C/DemoListViewController.h rename to ChartsDemo-iOS/Objective-C/DemoListViewController.h diff --git a/ChartsDemo/Objective-C/DemoListViewController.m b/ChartsDemo-iOS/Objective-C/DemoListViewController.m similarity index 100% rename from ChartsDemo/Objective-C/DemoListViewController.m rename to ChartsDemo-iOS/Objective-C/DemoListViewController.m diff --git a/ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m index 91168fee79..f6b1adaa8b 100644 --- a/ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m @@ -10,7 +10,7 @@ // #import "AnotherBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface AnotherBarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/BarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/BarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/BarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/BarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m index d134a03dcd..52db459e9b 100644 --- a/ChartsDemo/Objective-C/Demos/BarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m @@ -10,7 +10,7 @@ // #import "BarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" #import "DayAxisValueFormatter.h" @interface BarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/BubbleChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/BubbleChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/BubbleChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/BubbleChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m index 56d7b24ce0..765639acfe 100644 --- a/ChartsDemo/Objective-C/Demos/BubbleChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m @@ -10,7 +10,7 @@ // #import "BubbleChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface BubbleChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/CandleStickChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/CandleStickChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/CandleStickChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/CandleStickChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m index 2fe219de28..689b578c23 100644 --- a/ChartsDemo/Objective-C/Demos/CandleStickChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m @@ -10,7 +10,7 @@ // #import "CandleStickChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface CandleStickChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m index ee4fed4768..a639f6911d 100644 --- a/ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m @@ -10,7 +10,7 @@ // #import "ColoredLineChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface ColoredLineChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/CombinedChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/CombinedChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/CombinedChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/CombinedChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m index c0eb2fa2a4..17b661712f 100644 --- a/ChartsDemo/Objective-C/Demos/CombinedChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m @@ -10,7 +10,7 @@ // #import "CombinedChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" #define ITEM_COUNT 12 diff --git a/ChartsDemo/Objective-C/Demos/CubicLineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/CubicLineChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/CubicLineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/CubicLineChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m index d434898479..e28c5cd642 100644 --- a/ChartsDemo/Objective-C/Demos/CubicLineChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m @@ -10,7 +10,7 @@ // #import "CubicLineChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface CubicLineSampleFillFormatter : NSObject { diff --git a/ChartsDemo/Objective-C/Demos/HalfPieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/HalfPieChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/HalfPieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/HalfPieChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m index 80be2872a1..3e34b7fd32 100644 --- a/ChartsDemo/Objective-C/Demos/HalfPieChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m @@ -10,7 +10,7 @@ // #import "HalfPieChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface HalfPieChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m index dac6e26e07..fea156a249 100644 --- a/ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m @@ -10,7 +10,7 @@ // #import "HorizontalBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface HorizontalBarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/LineChart1ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/LineChart1ViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h diff --git a/ChartsDemo/Objective-C/Demos/LineChart1ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/LineChart1ViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m index 8cf348c759..669eb3fdd7 100644 --- a/ChartsDemo/Objective-C/Demos/LineChart1ViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m @@ -10,7 +10,7 @@ // #import "LineChart1ViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface LineChart1ViewController () diff --git a/ChartsDemo/Objective-C/Demos/LineChart2ViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/LineChart2ViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h diff --git a/ChartsDemo/Objective-C/Demos/LineChart2ViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/LineChart2ViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m index 990ba151c5..99e7d1ba1b 100644 --- a/ChartsDemo/Objective-C/Demos/LineChart2ViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m @@ -10,7 +10,7 @@ // #import "LineChart2ViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface LineChart2ViewController () diff --git a/ChartsDemo/Objective-C/Demos/LineChartFilledViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/LineChartFilledViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h diff --git a/ChartsDemo/Objective-C/Demos/LineChartFilledViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m similarity index 97% rename from ChartsDemo/Objective-C/Demos/LineChartFilledViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m index c78a043b30..6caf4ebf45 100644 --- a/ChartsDemo/Objective-C/Demos/LineChartFilledViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m @@ -10,7 +10,7 @@ // #import "LineChartFilledViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface LineChartFilledViewController () @@ -124,7 +124,7 @@ - (void)setDataCount:(int)count range:(double)range set1.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0]; set1.drawCircleHoleEnabled = NO; set1.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id _Nonnull dataSet, id _Nonnull dataProvider) { - return _chartView.leftAxis.axisMinimum; + return self.chartView.leftAxis.axisMinimum; }]; set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"]; @@ -139,7 +139,7 @@ - (void)setDataCount:(int)count range:(double)range set2.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0]; set2.drawCircleHoleEnabled = NO; set2.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id _Nonnull dataSet, id _Nonnull dataProvider) { - return _chartView.leftAxis.axisMaximum; + return self.chartView.leftAxis.axisMaximum; }]; NSMutableArray *dataSets = [[NSMutableArray alloc] init]; diff --git a/ChartsDemo/Objective-C/Demos/LineChartTimeViewController.h b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/LineChartTimeViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h diff --git a/ChartsDemo/Objective-C/Demos/LineChartTimeViewController.m b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/LineChartTimeViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m index 07bf61c50d..f279248f99 100644 --- a/ChartsDemo/Objective-C/Demos/LineChartTimeViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m @@ -10,7 +10,7 @@ // #import "LineChartTimeViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" #import "DateValueFormatter.h" @interface LineChartTimeViewController () diff --git a/ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m index b4157afb86..1a17776a2c 100644 --- a/ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m @@ -10,7 +10,7 @@ // #import "MultipleBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" #import "IntAxisValueFormatter.h" @interface MultipleBarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m index 01f284f014..c49f762c63 100644 --- a/ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m @@ -10,7 +10,7 @@ // #import "MultipleLinesChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface MultipleLinesChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m index da934ad7b7..0e2703a83d 100644 --- a/ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m @@ -10,7 +10,7 @@ // #import "NegativeStackedBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface NegativeStackedBarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/PieChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/PieChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/PieChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/PieChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m index dd9b0228bd..009800615d 100644 --- a/ChartsDemo/Objective-C/Demos/PieChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m @@ -10,7 +10,7 @@ // #import "PieChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface PieChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m index f68658f296..fbf3c366bb 100644 --- a/ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m @@ -7,7 +7,7 @@ // #import "PiePolylineChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface PiePolylineChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m index 4a048dab65..e0a86f4300 100644 --- a/ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m @@ -10,7 +10,7 @@ // #import "PositiveNegativeBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface PositiveNegativeBarChartViewController () { diff --git a/ChartsDemo/Objective-C/Demos/RadarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/RadarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/RadarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m similarity index 91% rename from ChartsDemo/Objective-C/Demos/RadarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m index 7bc11569d1..4446035f9d 100644 --- a/ChartsDemo/Objective-C/Demos/RadarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m @@ -10,17 +10,15 @@ // #import "RadarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface RadarChartViewController () -{ - NSArray *activities; - UIColor *originalBarBgColor; - UIColor *originalBarTintColor; - UIBarStyle originalBarStyle; -} @property (nonatomic, strong) IBOutlet RadarChartView *chartView; +@property (nonatomic, strong) NSArray *activities; +@property (nonatomic, strong) UIColor *originalBarBgColor; +@property (nonatomic, strong) UIColor *originalBarTintColor; +@property (nonatomic) UIBarStyle originalBarStyle; @end @@ -30,7 +28,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ]; + self.activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ]; self.title = @"Radar Bar Chart"; @@ -98,9 +96,9 @@ - (void)viewWillAppear:(BOOL)animated [UIView animateWithDuration:0.15 animations:^{ UINavigationBar *navigationBar = self.navigationController.navigationBar; - originalBarBgColor = self.navigationController.navigationBar.barTintColor; - originalBarTintColor = self.navigationController.navigationBar.tintColor; - originalBarStyle = self.navigationController.navigationBar.barStyle; + self.originalBarBgColor = navigationBar.barTintColor; + self.originalBarTintColor = navigationBar.tintColor; + self.originalBarStyle = navigationBar.barStyle; navigationBar.barTintColor = self.view.backgroundColor; navigationBar.tintColor = UIColor.whiteColor; @@ -114,9 +112,9 @@ - (void)viewWillDisappear:(BOOL)animated [UIView animateWithDuration:0.15 animations:^{ UINavigationBar *navigationBar = self.navigationController.navigationBar; - navigationBar.barTintColor = originalBarBgColor; - navigationBar.tintColor = originalBarTintColor; - navigationBar.barStyle = originalBarStyle; + navigationBar.barTintColor = self.originalBarBgColor; + navigationBar.tintColor = self.originalBarTintColor; + navigationBar.barStyle = self.originalBarStyle; }]; } @@ -270,7 +268,7 @@ - (void)chartValueNothingSelected:(ChartViewBase * __nonnull)chartView - (NSString *)stringForValue:(double)value axis:(ChartAxisBase *)axis { - return activities[(int) value % activities.count]; + return self.activities[(int) value % self.activities.count]; } @end diff --git a/ChartsDemo/Objective-C/Demos/ScatterChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/ScatterChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/ScatterChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/ScatterChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m index 177ba28fb7..5c5d6a9d16 100644 --- a/ChartsDemo/Objective-C/Demos/ScatterChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m @@ -10,7 +10,7 @@ // #import "ScatterChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface ScatterChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/SinusBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/SinusBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/SinusBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/SinusBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m index 708aa727ad..c945986a36 100644 --- a/ChartsDemo/Objective-C/Demos/SinusBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m @@ -10,7 +10,7 @@ // #import "SinusBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface SinusBarChartViewController () diff --git a/ChartsDemo/Objective-C/Demos/StackedBarChartViewController.h b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h similarity index 100% rename from ChartsDemo/Objective-C/Demos/StackedBarChartViewController.h rename to ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h diff --git a/ChartsDemo/Objective-C/Demos/StackedBarChartViewController.m b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m similarity index 99% rename from ChartsDemo/Objective-C/Demos/StackedBarChartViewController.m rename to ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m index 2f3e728132..0a572b4cf8 100644 --- a/ChartsDemo/Objective-C/Demos/StackedBarChartViewController.m +++ b/ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m @@ -10,7 +10,7 @@ // #import "StackedBarChartViewController.h" -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface StackedBarChartViewController () diff --git a/ChartsDemo/Objective-C/Formatters/DateValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h similarity index 90% rename from ChartsDemo/Objective-C/Formatters/DateValueFormatter.h rename to ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h index 71ba11d021..2e94536aa7 100644 --- a/ChartsDemo/Objective-C/Formatters/DateValueFormatter.h +++ b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h @@ -10,7 +10,7 @@ // #import -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface DateValueFormatter : NSObject diff --git a/ChartsDemo/Objective-C/Formatters/DateValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m similarity index 100% rename from ChartsDemo/Objective-C/Formatters/DateValueFormatter.m rename to ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m diff --git a/ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h similarity index 88% rename from ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.h rename to ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h index 117e8c8de1..4de193d0c5 100644 --- a/ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.h +++ b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h @@ -5,7 +5,7 @@ // #import -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface DayAxisValueFormatter : NSObject diff --git a/ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m similarity index 100% rename from ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.m rename to ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m diff --git a/ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.h b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h similarity index 85% rename from ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.h rename to ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h index 746cc21565..6401ed07d4 100644 --- a/ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.h +++ b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h @@ -5,7 +5,7 @@ // #import -#import "ChartsDemo-Swift.h" +#import "ChartsDemo_iOS-Swift.h" @interface IntAxisValueFormatter : NSObject diff --git a/ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.m b/ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m similarity index 100% rename from ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.m rename to ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m diff --git a/ChartsDemo/Objective-C/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift similarity index 100% rename from ChartsDemo/Objective-C/Formatters/LargeValueFormatter.swift rename to ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Contents.json rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png rename to ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png diff --git a/ChartsDemo/Resources/Images.xcassets/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/Contents.json similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/Contents.json rename to ChartsDemo-iOS/Resources/Images.xcassets/Contents.json diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/Contents.json b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/Contents.json rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star-1.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star-1.png rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star-2.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star-2.png rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png diff --git a/ChartsDemo/Resources/Images.xcassets/icon.imageset/star.png b/ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png similarity index 100% rename from ChartsDemo/Resources/Images.xcassets/icon.imageset/star.png rename to ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png diff --git a/ChartsDemo/Resources/Launch Screen.storyboard b/ChartsDemo-iOS/Resources/Launch Screen.storyboard similarity index 100% rename from ChartsDemo/Resources/Launch Screen.storyboard rename to ChartsDemo-iOS/Resources/Launch Screen.storyboard diff --git a/ChartsDemo/Resources/markers/radar_marker@3x.png b/ChartsDemo-iOS/Resources/markers/radar_marker@3x.png similarity index 100% rename from ChartsDemo/Resources/markers/radar_marker@3x.png rename to ChartsDemo-iOS/Resources/markers/radar_marker@3x.png diff --git a/ChartsDemo/Supporting Files/ChartsDemo-Bridging-Header.h b/ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h similarity index 100% rename from ChartsDemo/Supporting Files/ChartsDemo-Bridging-Header.h rename to ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h diff --git a/ChartsDemo/Supporting Files/Info.plist b/ChartsDemo-iOS/Supporting Files/Info.plist similarity index 100% rename from ChartsDemo/Supporting Files/Info.plist rename to ChartsDemo-iOS/Supporting Files/Info.plist diff --git a/ChartsDemo/Supporting Files/main.m b/ChartsDemo-iOS/Supporting Files/main.m similarity index 100% rename from ChartsDemo/Supporting Files/main.m rename to ChartsDemo-iOS/Supporting Files/main.m diff --git a/ChartsDemo/Swift/AppDelegate.swift b/ChartsDemo-iOS/Swift/AppDelegate.swift similarity index 100% rename from ChartsDemo/Swift/AppDelegate.swift rename to ChartsDemo-iOS/Swift/AppDelegate.swift diff --git a/ChartsDemo/Swift/Components/BalloonMarker.swift b/ChartsDemo-iOS/Swift/Components/BalloonMarker.swift similarity index 100% rename from ChartsDemo/Swift/Components/BalloonMarker.swift rename to ChartsDemo-iOS/Swift/Components/BalloonMarker.swift diff --git a/ChartsDemo/Swift/Components/RadarMarkerView.swift b/ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift similarity index 100% rename from ChartsDemo/Swift/Components/RadarMarkerView.swift rename to ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift diff --git a/ChartsDemo/Swift/Components/XYMarkerView.swift b/ChartsDemo-iOS/Swift/Components/XYMarkerView.swift similarity index 100% rename from ChartsDemo/Swift/Components/XYMarkerView.swift rename to ChartsDemo-iOS/Swift/Components/XYMarkerView.swift diff --git a/ChartsDemo/Swift/DemoBaseViewController.swift b/ChartsDemo-iOS/Swift/DemoBaseViewController.swift similarity index 100% rename from ChartsDemo/Swift/DemoBaseViewController.swift rename to ChartsDemo-iOS/Swift/DemoBaseViewController.swift diff --git a/ChartsDemo/Swift/DemoListViewController.swift b/ChartsDemo-iOS/Swift/DemoListViewController.swift similarity index 100% rename from ChartsDemo/Swift/DemoListViewController.swift rename to ChartsDemo-iOS/Swift/DemoListViewController.swift diff --git a/ChartsDemo/Swift/Demos/AnotherBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/AnotherBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/BarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/BarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/BubbleChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/BubbleChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/CandleStickChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/CandleStickChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/ColoredLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/ColoredLineChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/CombinedChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/CombinedChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/CubicLineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/CubicLineChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/HalfPieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/HalfPieChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/HorizontalBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/HorizontalBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/LineChart1ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/LineChart1ViewController.swift rename to ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift diff --git a/ChartsDemo/Swift/Demos/LineChart2ViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/LineChart2ViewController.swift rename to ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift diff --git a/ChartsDemo/Swift/Demos/LineChartFilledViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/LineChartFilledViewController.swift rename to ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift diff --git a/ChartsDemo/Swift/Demos/LineChartTimeViewController.swift b/ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/LineChartTimeViewController.swift rename to ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift diff --git a/ChartsDemo/Swift/Demos/MultipleBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/MultipleBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/MultipleLinesChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/MultipleLinesChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/NegativeStackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/NegativeStackedBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/PieChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/PieChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/PiePolylineChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/PiePolylineChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/PositiveNegativeBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/PositiveNegativeBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/RadarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/RadarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/ScatterChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/ScatterChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/SinusBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/SinusBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift diff --git a/ChartsDemo/Swift/Demos/StackedBarChartViewController.swift b/ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift similarity index 100% rename from ChartsDemo/Swift/Demos/StackedBarChartViewController.swift rename to ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift diff --git a/ChartsDemo/Swift/Formatters/DateValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift similarity index 100% rename from ChartsDemo/Swift/Formatters/DateValueFormatter.swift rename to ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift diff --git a/ChartsDemo/Swift/Formatters/DayAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift similarity index 100% rename from ChartsDemo/Swift/Formatters/DayAxisValueFormatter.swift rename to ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift diff --git a/ChartsDemo/Swift/Formatters/IntAxisValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift similarity index 100% rename from ChartsDemo/Swift/Formatters/IntAxisValueFormatter.swift rename to ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift diff --git a/ChartsDemo/Swift/Formatters/LargeValueFormatter.swift b/ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift similarity index 100% rename from ChartsDemo/Swift/Formatters/LargeValueFormatter.swift rename to ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift diff --git a/ChartsDemo/XIBs/DemoListViewController.xib b/ChartsDemo-iOS/XIBs/DemoListViewController.xib similarity index 100% rename from ChartsDemo/XIBs/DemoListViewController.xib rename to ChartsDemo-iOS/XIBs/DemoListViewController.xib diff --git a/ChartsDemo/XIBs/Demos/AnotherBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/AnotherBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/BarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/BarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/BubbleChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/BubbleChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/CandleStickChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/CandleStickChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/ColoredLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/ColoredLineChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/CombinedChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/CombinedChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/CubicLineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/CubicLineChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/HalfPieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/HalfPieChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/HorizontalBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/HorizontalBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/LineChart1ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/LineChart1ViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib diff --git a/ChartsDemo/XIBs/Demos/LineChart2ViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/LineChart2ViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib diff --git a/ChartsDemo/XIBs/Demos/LineChartFilledViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/LineChartFilledViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib diff --git a/ChartsDemo/XIBs/Demos/LineChartTimeViewController.xib b/ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/LineChartTimeViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib diff --git a/ChartsDemo/XIBs/Demos/MultipleBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/MultipleBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/MultipleLinesChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/MultipleLinesChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/NegativeStackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/NegativeStackedBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/PieChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/PieChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/PiePolylineChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/PiePolylineChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/PositiveNegativeBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/PositiveNegativeBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/RadarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/RadarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/RealmDemosViewController.xib b/ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/RealmDemosViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib diff --git a/ChartsDemo/XIBs/Demos/ScatterChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/ScatterChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/SinusBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/SinusBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib diff --git a/ChartsDemo/XIBs/Demos/StackedBarChartViewController.xib b/ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib similarity index 100% rename from ChartsDemo/XIBs/Demos/StackedBarChartViewController.xib rename to ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib diff --git a/ChartsDemo/XIBs/RadarMarkerView.xib b/ChartsDemo-iOS/XIBs/RadarMarkerView.xib similarity index 100% rename from ChartsDemo/XIBs/RadarMarkerView.xib rename to ChartsDemo-iOS/XIBs/RadarMarkerView.xib diff --git a/ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj similarity index 92% rename from ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj rename to ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj index 07dd0f1abb..922588b12b 100644 --- a/ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj/project.pbxproj +++ b/ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj @@ -63,7 +63,7 @@ 5B9A0C3B1C83AB2100ED8ED8 /* LineDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineDemoViewController.swift; sourceTree = ""; }; 5B9A0C3D1C83AB2B00ED8ED8 /* RadarDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarDemoViewController.swift; sourceTree = ""; }; 5B9A0C3F1C83AB3400ED8ED8 /* PieDemoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PieDemoViewController.swift; sourceTree = ""; }; - 65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 65B3F6411C73B4F5000983D0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 65B3F6451C73B4F5000983D0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 65B3F6481C73B4F5000983D0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -105,7 +105,7 @@ 65B3F6351C73B4F5000983D0 = { isa = PBXGroup; children = ( - 65B3F6401C73B4F5000983D0 /* ChartsDemo-OSX */, + 65B3F6401C73B4F5000983D0 /* ChartsDemo-macOS */, 65B3F63F1C73B4F5000983D0 /* Products */, 03780C7E1EA29C87005C11C8 /* PlaygroundChart.playground */, 0630AE691D812840008859B0 /* Charts.xcodeproj */, @@ -115,12 +115,12 @@ 65B3F63F1C73B4F5000983D0 /* Products */ = { isa = PBXGroup; children = ( - 65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */, + 65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */, ); name = Products; sourceTree = ""; }; - 65B3F6401C73B4F5000983D0 /* ChartsDemo-OSX */ = { + 65B3F6401C73B4F5000983D0 /* ChartsDemo-macOS */ = { isa = PBXGroup; children = ( 5B9A0C381C83AB0600ED8ED8 /* Demos */, @@ -129,15 +129,15 @@ 65B3F6471C73B4F5000983D0 /* Main.storyboard */, 65B3F64A1C73B4F5000983D0 /* Info.plist */, ); - path = "ChartsDemo-OSX"; + path = "ChartsDemo-macOS"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 65B3F63D1C73B4F5000983D0 /* ChartsDemo-OSX */ = { + 65B3F63D1C73B4F5000983D0 /* ChartsDemo-macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-OSX" */; + buildConfigurationList = 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-macOS" */; buildPhases = ( 65B3F63A1C73B4F5000983D0 /* Sources */, 65B3F63B1C73B4F5000983D0 /* Frameworks */, @@ -149,9 +149,9 @@ dependencies = ( 0630AE8F1D8128A5008859B0 /* PBXTargetDependency */, ); - name = "ChartsDemo-OSX"; + name = "ChartsDemo-macOS"; productName = "ChartsDemo-OSX"; - productReference = 65B3F63E1C73B4F5000983D0 /* ChartsDemo-OSX.app */; + productReference = 65B3F63E1C73B4F5000983D0 /* ChartsDemo-macOS.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -161,7 +161,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = dcg; TargetAttributes = { 65B3F63D1C73B4F5000983D0 = { @@ -171,7 +171,7 @@ }; }; }; - buildConfigurationList = 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-OSX" */; + buildConfigurationList = 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-macOS" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -190,7 +190,7 @@ ); projectRoot = ""; targets = ( - 65B3F63D1C73B4F5000983D0 /* ChartsDemo-OSX */, + 65B3F63D1C73B4F5000983D0 /* ChartsDemo-macOS */, ); }; /* End PBXProject section */ @@ -271,12 +271,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -308,6 +310,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -323,12 +326,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -353,6 +358,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -365,7 +371,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -383,7 +389,7 @@ CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = "ChartsDemo-OSX/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/ChartsDemo-macOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.ChartsDemo-OSX"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -395,7 +401,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-OSX" */ = { + 65B3F6391C73B4F5000983D0 /* Build configuration list for PBXProject "ChartsDemo-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 65B3F64B1C73B4F5000983D0 /* Debug */, @@ -404,7 +410,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-OSX" */ = { + 65B3F64D1C73B4F5000983D0 /* Build configuration list for PBXNativeTarget "ChartsDemo-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 65B3F64E1C73B4F5000983D0 /* Debug */, diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/AppDelegate.swift b/ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/AppDelegate.swift rename to ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json b/ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Assets.xcassets/AppIcon.appiconset/Contents.json rename to ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard similarity index 98% rename from ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard rename to ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard index d03155d871..e1bbcb34b1 100644 --- a/ChartsDemo-OSX/ChartsDemo-OSX/Base.lproj/Main.storyboard +++ b/ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - - + + - - + + @@ -11,11 +11,11 @@ - + - + - + @@ -29,7 +29,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -628,7 +628,7 @@ - + @@ -656,6 +656,9 @@ + + + @@ -679,9 +682,12 @@ - + + + + diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/BarDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/BarDemoViewController.swift rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/LineDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/LineDemoViewController.swift rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/PieDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/PieDemoViewController.swift rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Demos/RadarDemoViewController.swift b/ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Demos/RadarDemoViewController.swift rename to ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift diff --git a/ChartsDemo-OSX/ChartsDemo-OSX/Info.plist b/ChartsDemo-macOS/ChartsDemo-macOS/Info.plist similarity index 100% rename from ChartsDemo-OSX/ChartsDemo-OSX/Info.plist rename to ChartsDemo-macOS/ChartsDemo-macOS/Info.plist diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift b/ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift rename to ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift diff --git a/ChartsDemo-OSX/PlaygroundChart.playground/contents.xcplayground b/ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground similarity index 100% rename from ChartsDemo-OSX/PlaygroundChart.playground/contents.xcplayground rename to ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground diff --git a/Rakefile b/Rakefile index 516b385a96..016faddc9f 100644 --- a/Rakefile +++ b/Rakefile @@ -3,11 +3,11 @@ def type end def project_name - 'ChartsDemo/ChartsDemo.xcodeproj' + 'ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj' end def macos_project_name - 'ChartsDemo-OSX/ChartsDemo-OSX.xcodeproj' + 'ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj' end def configuration @@ -35,14 +35,14 @@ end def build_demo_schemes %i[ - ChartsDemo - ChartsDemo-Swift + ChartsDemo-iOS + ChartsDemo-iOS-Swift ] end def build_macos_demo_schemes [ - 'ChartsDemo-OSX' + 'ChartsDemo-macOS' ] end @@ -66,8 +66,8 @@ def devices }, tvOS: { sdk: 'appletvsimulator', - device: "name='Apple TV 1080p'", - name: 'Apple TV 1080p' + device: "name='Apple TV'", + name: 'Apple TV' } } end @@ -179,4 +179,4 @@ end desc 'generate changelog' task :generate_changelog do sh 'github_changelog_generator' -end +end \ No newline at end of file diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift index 65b2be586c..43b28c3bc4 100644 --- a/Source/Charts/Charts/BarLineChartViewBase.swift +++ b/Source/Charts/Charts/BarLineChartViewBase.swift @@ -1691,12 +1691,12 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD } /// - returns: The DataSet object displayed at the touched position of the chart - @objc open func getDataSetByTouchPoint(point pt: CGPoint) -> IBarLineScatterCandleBubbleChartDataSet! + @objc open func getDataSetByTouchPoint(point pt: CGPoint) -> IBarLineScatterCandleBubbleChartDataSet? { let h = getHighlightByTouchPoint(pt) if h !== nil { - return _data?.getDataSetByIndex(h!.dataSetIndex) as! IBarLineScatterCandleBubbleChartDataSet! + return _data?.getDataSetByIndex(h!.dataSetIndex) as? IBarLineScatterCandleBubbleChartDataSet } return nil } diff --git a/Source/Charts/Charts/CombinedChartView.swift b/Source/Charts/Charts/CombinedChartView.swift index ead6c3d130..e1b13b495e 100644 --- a/Source/Charts/Charts/CombinedChartView.swift +++ b/Source/Charts/Charts/CombinedChartView.swift @@ -165,22 +165,22 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider /// if set to true, all values are drawn above their bars, instead of below their top @objc open var drawValueAboveBarEnabled: Bool { - get { return (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled } - set { (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled = newValue } + get { return (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled } + set { (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled = newValue } } /// if set to true, a grey area is drawn behind each bar that indicates the maximum value @objc open var drawBarShadowEnabled: Bool { - get { return (renderer as! CombinedChartRenderer!).drawBarShadowEnabled } - set { (renderer as! CombinedChartRenderer!).drawBarShadowEnabled = newValue } + get { return (renderer as! CombinedChartRenderer).drawBarShadowEnabled } + set { (renderer as! CombinedChartRenderer).drawBarShadowEnabled = newValue } } /// - returns: `true` if drawing values above bars is enabled, `false` ifnot - open var isDrawValueAboveBarEnabled: Bool { return (renderer as! CombinedChartRenderer!).drawValueAboveBarEnabled } + open var isDrawValueAboveBarEnabled: Bool { return (renderer as! CombinedChartRenderer).drawValueAboveBarEnabled } /// - returns: `true` if drawing shadows (maxvalue) for each bar is enabled, `false` ifnot - open var isDrawBarShadowEnabled: Bool { return (renderer as! CombinedChartRenderer!).drawBarShadowEnabled } + open var isDrawBarShadowEnabled: Bool { return (renderer as! CombinedChartRenderer).drawBarShadowEnabled } /// the order in which the provided data objects should be drawn. /// The earlier you place them in the provided array, the further they will be in the background. @@ -189,11 +189,11 @@ open class CombinedChartView: BarLineChartViewBase, CombinedChartDataProvider { get { - return (renderer as! CombinedChartRenderer!).drawOrder.map { $0.rawValue } + return (renderer as! CombinedChartRenderer).drawOrder.map { $0.rawValue } } set { - (renderer as! CombinedChartRenderer!).drawOrder = newValue.map { DrawOrder(rawValue: $0)! } + (renderer as! CombinedChartRenderer).drawOrder = newValue.map { DrawOrder(rawValue: $0)! } } } diff --git a/Source/Charts/Components/Legend.swift b/Source/Charts/Components/Legend.swift index e684b7b6fe..53177d04f5 100644 --- a/Source/Charts/Components/Legend.swift +++ b/Source/Charts/Components/Legend.swift @@ -167,7 +167,7 @@ open class Legend: ComponentBase guard let label = entry.label else { continue } - let size = (label as NSString!).size(withAttributes: [NSAttributedStringKey.font: font]) + let size = (label as NSString).size(withAttributes: [.font: font]) if size.width > maxW { @@ -256,7 +256,7 @@ open class Legend: ComponentBase if label != nil { - let size = (label as NSString!).size(withAttributes: [NSAttributedStringKey.font: labelFont]) + let size = (label! as NSString).size(withAttributes: [.font: labelFont]) if drawingForm && !wasStacked { @@ -343,7 +343,7 @@ open class Legend: ComponentBase // grouped forms have null labels if label != nil { - calculatedLabelSizes[i] = (label as NSString!).size(withAttributes: labelAttrs) + calculatedLabelSizes[i] = (label! as NSString).size(withAttributes: labelAttrs) requiredWidth += drawingForm ? formToTextSpace + formSize : 0.0 requiredWidth += calculatedLabelSizes[i].width } diff --git a/Source/Charts/Filters/DataApproximator+N.swift b/Source/Charts/Filters/DataApproximator+N.swift index 1b31dbc870..32a7784664 100644 --- a/Source/Charts/Filters/DataApproximator+N.swift +++ b/Source/Charts/Filters/DataApproximator+N.swift @@ -112,7 +112,7 @@ extension DataApproximator { } while !queue.isEmpty // create a new array with series, only take the kept ones - let reducedEntries = points.enumerated().flatMap { (index: Int, point: CGPoint) -> CGPoint? in + let reducedEntries = points.enumerated().compactMap { (index: Int, point: CGPoint) -> CGPoint? in return keep[index] ? point : nil } diff --git a/Source/Charts/Renderers/LegendRenderer.swift b/Source/Charts/Renderers/LegendRenderer.swift index 38c3648537..08100e32f7 100755 --- a/Source/Charts/Renderers/LegendRenderer.swift +++ b/Source/Charts/Renderers/LegendRenderer.swift @@ -462,7 +462,7 @@ open class LegendRenderer: Renderer if direction == .rightToLeft { - posX -= (e.label as NSString!).size(withAttributes: [NSAttributedStringKey.font: labelFont]).width + posX -= (e.label! as NSString).size(withAttributes: [.font: labelFont]).width } if !wasStacked