From 99f70298e123943a4c70de41daf5830bb06f1a86 Mon Sep 17 00:00:00 2001 From: Doyoung Gwak Date: Sun, 14 Jan 2018 09:01:54 +0900 Subject: [PATCH 1/3] fixed duplicated assignment compared with obj-c code. --- .../xcshareddata/xcschemes/Charts.xcscheme | 62 +++++++++++-------- .../Demos/LineChart1ViewController.swift | 2 +- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme index 6386c46eef..ac9cf336e1 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme @@ -7,68 +7,78 @@ buildImplicitDependencies = "YES"> + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + BuildableIdentifier = "primary" + BlueprintIdentifier = "A58A4ED274A941CA248EA921" + BuildableName = "Charts.framework" + BlueprintName = "Charts" + ReferencedContainer = "container:Charts.xcodeproj"> - - + language = "" + 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/ChartsDemo/Swift/Demos/LineChart1ViewController.swift b/ChartsDemo/Swift/Demos/LineChart1ViewController.swift index bf5eb7f67d..6f34b8b763 100644 --- a/ChartsDemo/Swift/Demos/LineChart1ViewController.swift +++ b/ChartsDemo/Swift/Demos/LineChart1ViewController.swift @@ -126,7 +126,7 @@ class LineChart1ViewController: DemoBaseViewController { set1.valueFont = .systemFont(ofSize: 9) set1.formLineDashLengths = [5, 2.5] set1.formLineWidth = 1 - set1.formLineWidth = 15 + set1.formSize = 15 let gradientColors = [ChartColorTemplates.colorFromString("#00ff0000").cgColor, ChartColorTemplates.colorFromString("#ffff0000").cgColor] From c16d10a56f71c039045d824b9d89886249656272 Mon Sep 17 00:00:00 2001 From: canapio Date: Tue, 16 Jan 2018 13:29:52 +0900 Subject: [PATCH 2/3] Update Charts.xcscheme --- .../xcshareddata/xcschemes/Charts.xcscheme | 70 +++++-------------- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme index ac9cf336e1..9a14cc7e4b 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme @@ -1,84 +1,52 @@ - - - - - - - - + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug" + codeCoverageEnabled = "NO"> + + + BuildableIdentifier = 'primary' + BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2' + BlueprintName = 'ChartsTests' + ReferencedContainer = 'container:Charts.xcodeproj' + BuildableName = 'ChartsTests.xctest'> - - - - - - + + + key = 'FB_REFERENCE_IMAGE_DIR' + value = '$(SOURCE_ROOT)/Tests/ReferenceImages' + isEnabled = 'YES'> - - + debugDocumentVersioning = "YES" + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES"> From ef0ac253279450755084401af1ee4ca27eff3d20 Mon Sep 17 00:00:00 2001 From: canapio Date: Tue, 16 Jan 2018 13:32:30 +0900 Subject: [PATCH 3/3] Update Charts.xcscheme --- .../xcshareddata/xcschemes/Charts.xcscheme | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme index 9a14cc7e4b..6386c46eef 100644 --- a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme +++ b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme @@ -1,3 +1,25 @@ + + + + + + + +