From f230d700ef1c7f81b19b68b9cfd934685de2f9d2 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Sun, 20 Oct 2019 00:21:13 -0400 Subject: [PATCH 01/12] Update Xcode 11 --- FSLineChart.xcodeproj/project.pbxproj | 28 +++++++++++++++---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ 2 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/FSLineChart.xcodeproj/project.pbxproj b/FSLineChart.xcodeproj/project.pbxproj index 1fe4b73..26bab9c 100644 --- a/FSLineChart.xcodeproj/project.pbxproj +++ b/FSLineChart.xcodeproj/project.pbxproj @@ -186,12 +186,12 @@ 8EA19ADE19DB55E9005F4BD1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = "Arthur GUIBERT"; TargetAttributes = { 8EA19AE519DB55E9005F4BD1 = { CreatedOnToolsVersion = 6.0.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1110; }; 8EA19AFE19DB55E9005F4BD1 = { CreatedOnToolsVersion = 6.0.1; @@ -201,7 +201,7 @@ }; buildConfigurationList = 8EA19AE119DB55E9005F4BD1 /* Build configuration list for PBXProject "FSLineChart" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -294,18 +294,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; 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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -339,18 +348,27 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; 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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -386,7 +404,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "FSLineChart/FSLineChart-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -402,7 +420,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.slipcorp.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "FSLineChart/FSLineChart-Bridging-Header.h"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 9b174d9da8e8d6ea9aec062e45f2d7f5ac422f20 Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Tue, 19 Nov 2019 22:09:45 +0200 Subject: [PATCH 02/12] Update .gitignore --- .gitignore | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a3cd143..d0e8564 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +# OS X +.DS_Store + # Xcode -# build/ *.pbxuser !default.pbxuser @@ -11,16 +13,31 @@ build/ !default.perspectivev3 xcuserdata *.xccheckout +profile *.moved-aside DerivedData *.hmap *.ipa -*.xcuserstate -# CocoaPods -# +# Bundler +.bundle + # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control +# +# Note: if you ignore the Pods directory, make sure to uncomment +# `pod install` in .travis.yml # # Pods/ + +# Carthage +Carthage/Build + +FDWaveformView.framework.zip + +# Swift build artifacts +.build/ + +# Swift project manager +.swiftpm From 37f0481869262e42a118129ed8c3db8a94e28fda Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Mon, 25 Nov 2019 17:34:38 +0200 Subject: [PATCH 03/12] Rewrite code --- FSLineChart.podspec | 11 +- FSLineChart.xcodeproj/project.pbxproj | 499 -------------- ...0253AE25-533E-4348-B0B5-CFFA60E20AAE.plist | 22 - .../Info.plist | 40 -- FSLineChart/AppDelegate.h | 17 - FSLineChart/AppDelegate.m | 45 -- FSLineChart/FSLineChart/FSLineChart.h | 100 --- FSLineChart/FSLineChart/FSLineChart.m | 638 ------------------ FSLineChart/FSLineChart/UIColor+FSPalette.h | 25 - FSLineChart/FSLineChart/UIColor+FSPalette.m | 63 -- FSLineChart/ViewController.h | 15 - FSLineChart/ViewController.m | 59 -- FSLineChart/main.m | 16 - FSLineChartTests/FSLineChartTests.m | 81 --- FSLineChartTests/Info.plist | 24 - Package.swift | 25 + Sources/FSLineChart/BoundsCalculator.swift | 118 ++++ Sources/FSLineChart/FSLineChart.swift | 121 ++++ Sources/FSLineChart/GridRenderer.swift | 87 +++ Sources/FSLineChart/LayoutManager.swift | 514 ++++++++++++++ Sources/FSLineChart/LegacySupport.swift | 17 + Sources/FSLineChart/UIColor+FS.swift | 51 ++ Tests/FSLineChartTests/FSLineChartTests.swift | 51 ++ .../iOS Example.xcodeproj/project.pbxproj | 373 ++++++++++ .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + iOS Example/iOS Example/AppDelegate.swift | 37 + .../AppIcon.appiconset/Contents.json | 98 +++ .../iOS Example/Assets.xcassets/Contents.json | 6 + .../iOS Example}/Base.lproj/LaunchScreen.xib | 0 .../iOS Example}/Base.lproj/Main.storyboard | 21 +- .../iOS Example}/ExampleChart.swift | 8 +- .../AppIcon.appiconset/Contents.json | 0 .../iOS Example}/Info.plist | 32 +- iOS Example/iOS Example/SceneDelegate.swift | 53 ++ iOS Example/iOS Example/ViewController.swift | 50 ++ .../iOS Example/iOS Example-Bridging-Header.h | 1 - 39 files changed, 1668 insertions(+), 1670 deletions(-) delete mode 100644 FSLineChart.xcodeproj/project.pbxproj delete mode 100644 FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/0253AE25-533E-4348-B0B5-CFFA60E20AAE.plist delete mode 100644 FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/Info.plist delete mode 100644 FSLineChart/AppDelegate.h delete mode 100644 FSLineChart/AppDelegate.m delete mode 100644 FSLineChart/FSLineChart/FSLineChart.h delete mode 100644 FSLineChart/FSLineChart/FSLineChart.m delete mode 100644 FSLineChart/FSLineChart/UIColor+FSPalette.h delete mode 100644 FSLineChart/FSLineChart/UIColor+FSPalette.m delete mode 100644 FSLineChart/ViewController.h delete mode 100644 FSLineChart/ViewController.m delete mode 100644 FSLineChart/main.m delete mode 100644 FSLineChartTests/FSLineChartTests.m delete mode 100644 FSLineChartTests/Info.plist create mode 100644 Package.swift create mode 100644 Sources/FSLineChart/BoundsCalculator.swift create mode 100644 Sources/FSLineChart/FSLineChart.swift create mode 100644 Sources/FSLineChart/GridRenderer.swift create mode 100644 Sources/FSLineChart/LayoutManager.swift create mode 100644 Sources/FSLineChart/LegacySupport.swift create mode 100644 Sources/FSLineChart/UIColor+FS.swift create mode 100644 Tests/FSLineChartTests/FSLineChartTests.swift create mode 100644 iOS Example/iOS Example.xcodeproj/project.pbxproj rename {FSLineChart.xcodeproj => iOS Example/iOS Example.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (69%) rename {FSLineChart.xcodeproj => iOS Example/iOS Example.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) create mode 100644 iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata create mode 100644 iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 iOS Example/iOS Example/AppDelegate.swift create mode 100644 iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 iOS Example/iOS Example/Assets.xcassets/Contents.json rename {FSLineChart => iOS Example/iOS Example}/Base.lproj/LaunchScreen.xib (100%) rename {FSLineChart => iOS Example/iOS Example}/Base.lproj/Main.storyboard (82%) rename {FSLineChart => iOS Example/iOS Example}/ExampleChart.swift (80%) rename {FSLineChart => iOS Example/iOS Example}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {FSLineChart => iOS Example/iOS Example}/Info.plist (55%) create mode 100644 iOS Example/iOS Example/SceneDelegate.swift create mode 100644 iOS Example/iOS Example/ViewController.swift rename FSLineChart/FSLineChart-Bridging-Header.h => iOS Example/iOS Example/iOS Example-Bridging-Header.h (81%) diff --git a/FSLineChart.podspec b/FSLineChart.podspec index 9d2a89d..f239827 100644 --- a/FSLineChart.podspec +++ b/FSLineChart.podspec @@ -5,12 +5,13 @@ Pod::Spec.new do |s| s.description = <<-DESC FSLineChart is a simple chart library for iOS. You can change whatever you want: size, color, units,... DESC - s.homepage = "https://github.com/ArthurGuibert/FSLineChart" - s.screenshots = "https://github.com/ArthurGuibert/FSLineChart/raw/master/Screenshots/fslinechart.png" - s.author = { "Arthur Guibert" => "birslip@gmail.com" } + s.homepage = "https://github.com/fulldecent/FSLineChart" + s.screenshots = "https://github.com/fulldecent/FSLineChart/raw/master/Screenshots/fslinechart.png" + s.author = { "William Entriken" => "github.com@phor.net" } s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.platform = :ios, '7.0' + s.platform = :ios, '8.0' s.source = { :git => "https://github.com/ArthurGuibert/FSLineChart.git",:tag => "#{s.version}" } - s.source_files = 'Classes', 'FSLineChart/FSLineChart/*.{h,m}' + s.source_files = 'Sources/FSLineChart/**/*.swift' s.requires_arc = true + s.swift_version = '5.0' end diff --git a/FSLineChart.xcodeproj/project.pbxproj b/FSLineChart.xcodeproj/project.pbxproj deleted file mode 100644 index 26bab9c..0000000 --- a/FSLineChart.xcodeproj/project.pbxproj +++ /dev/null @@ -1,499 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 8E67717B1DC89E3F00EA02FA /* ExampleChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E67717A1DC89E3F00EA02FA /* ExampleChart.swift */; }; - 8EA19AEC19DB55E9005F4BD1 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19AEB19DB55E9005F4BD1 /* main.m */; }; - 8EA19AEF19DB55E9005F4BD1 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19AEE19DB55E9005F4BD1 /* AppDelegate.m */; }; - 8EA19AF219DB55E9005F4BD1 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19AF119DB55E9005F4BD1 /* ViewController.m */; }; - 8EA19AF519DB55E9005F4BD1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8EA19AF319DB55E9005F4BD1 /* Main.storyboard */; }; - 8EA19AF719DB55E9005F4BD1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8EA19AF619DB55E9005F4BD1 /* Images.xcassets */; }; - 8EA19AFA19DB55E9005F4BD1 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8EA19AF819DB55E9005F4BD1 /* LaunchScreen.xib */; }; - 8EA19B0619DB55E9005F4BD1 /* FSLineChartTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19B0519DB55E9005F4BD1 /* FSLineChartTests.m */; }; - 8EA19B1119DB5696005F4BD1 /* FSLineChart.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19B1019DB5696005F4BD1 /* FSLineChart.m */; }; - 8EA19B1519DB56E8005F4BD1 /* UIColor+FSPalette.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EA19B1419DB56E8005F4BD1 /* UIColor+FSPalette.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 8EA19B0019DB55E9005F4BD1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8EA19ADE19DB55E9005F4BD1 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8EA19AE519DB55E9005F4BD1; - remoteInfo = FSLineChart; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 8E6771791DC89E3F00EA02FA /* FSLineChart-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FSLineChart-Bridging-Header.h"; sourceTree = ""; }; - 8E67717A1DC89E3F00EA02FA /* ExampleChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleChart.swift; sourceTree = ""; }; - 8EA19AE619DB55E9005F4BD1 /* FSLineChart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FSLineChart.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8EA19AEA19DB55E9005F4BD1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8EA19AEB19DB55E9005F4BD1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 8EA19AED19DB55E9005F4BD1 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 8EA19AEE19DB55E9005F4BD1 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 8EA19AF019DB55E9005F4BD1 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 8EA19AF119DB55E9005F4BD1 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 8EA19AF419DB55E9005F4BD1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 8EA19AF619DB55E9005F4BD1 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - 8EA19AF919DB55E9005F4BD1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 8EA19AFF19DB55E9005F4BD1 /* FSLineChartTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FSLineChartTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 8EA19B0419DB55E9005F4BD1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8EA19B0519DB55E9005F4BD1 /* FSLineChartTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FSLineChartTests.m; sourceTree = ""; }; - 8EA19B0F19DB5696005F4BD1 /* FSLineChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FSLineChart.h; path = FSLineChart/FSLineChart.h; sourceTree = ""; }; - 8EA19B1019DB5696005F4BD1 /* FSLineChart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FSLineChart.m; path = FSLineChart/FSLineChart.m; sourceTree = ""; }; - 8EA19B1319DB56E8005F4BD1 /* UIColor+FSPalette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIColor+FSPalette.h"; path = "FSLineChart/UIColor+FSPalette.h"; sourceTree = ""; }; - 8EA19B1419DB56E8005F4BD1 /* UIColor+FSPalette.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIColor+FSPalette.m"; path = "FSLineChart/UIColor+FSPalette.m"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8EA19AE319DB55E9005F4BD1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8EA19AFC19DB55E9005F4BD1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 8EA19ADD19DB55E9005F4BD1 = { - isa = PBXGroup; - children = ( - 8EA19AE819DB55E9005F4BD1 /* FSLineChart */, - 8EA19B0219DB55E9005F4BD1 /* FSLineChartTests */, - 8EA19AE719DB55E9005F4BD1 /* Products */, - ); - sourceTree = ""; - }; - 8EA19AE719DB55E9005F4BD1 /* Products */ = { - isa = PBXGroup; - children = ( - 8EA19AE619DB55E9005F4BD1 /* FSLineChart.app */, - 8EA19AFF19DB55E9005F4BD1 /* FSLineChartTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 8EA19AE819DB55E9005F4BD1 /* FSLineChart */ = { - isa = PBXGroup; - children = ( - 8EA19B1219DB569A005F4BD1 /* FSLineChart */, - 8EA19AED19DB55E9005F4BD1 /* AppDelegate.h */, - 8EA19AEE19DB55E9005F4BD1 /* AppDelegate.m */, - 8EA19AF019DB55E9005F4BD1 /* ViewController.h */, - 8EA19AF119DB55E9005F4BD1 /* ViewController.m */, - 8E67717A1DC89E3F00EA02FA /* ExampleChart.swift */, - 8E6771791DC89E3F00EA02FA /* FSLineChart-Bridging-Header.h */, - 8EA19AF319DB55E9005F4BD1 /* Main.storyboard */, - 8EA19AF619DB55E9005F4BD1 /* Images.xcassets */, - 8EA19AF819DB55E9005F4BD1 /* LaunchScreen.xib */, - 8EA19AE919DB55E9005F4BD1 /* Supporting Files */, - ); - path = FSLineChart; - sourceTree = ""; - }; - 8EA19AE919DB55E9005F4BD1 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8EA19AEA19DB55E9005F4BD1 /* Info.plist */, - 8EA19AEB19DB55E9005F4BD1 /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 8EA19B0219DB55E9005F4BD1 /* FSLineChartTests */ = { - isa = PBXGroup; - children = ( - 8EA19B0519DB55E9005F4BD1 /* FSLineChartTests.m */, - 8EA19B0319DB55E9005F4BD1 /* Supporting Files */, - ); - path = FSLineChartTests; - sourceTree = ""; - }; - 8EA19B0319DB55E9005F4BD1 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 8EA19B0419DB55E9005F4BD1 /* Info.plist */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - 8EA19B1219DB569A005F4BD1 /* FSLineChart */ = { - isa = PBXGroup; - children = ( - 8EA19B1319DB56E8005F4BD1 /* UIColor+FSPalette.h */, - 8EA19B1419DB56E8005F4BD1 /* UIColor+FSPalette.m */, - 8EA19B0F19DB5696005F4BD1 /* FSLineChart.h */, - 8EA19B1019DB5696005F4BD1 /* FSLineChart.m */, - ); - name = FSLineChart; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8EA19AE519DB55E9005F4BD1 /* FSLineChart */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8EA19B0919DB55E9005F4BD1 /* Build configuration list for PBXNativeTarget "FSLineChart" */; - buildPhases = ( - 8EA19AE219DB55E9005F4BD1 /* Sources */, - 8EA19AE319DB55E9005F4BD1 /* Frameworks */, - 8EA19AE419DB55E9005F4BD1 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = FSLineChart; - productName = FSLineChart; - productReference = 8EA19AE619DB55E9005F4BD1 /* FSLineChart.app */; - productType = "com.apple.product-type.application"; - }; - 8EA19AFE19DB55E9005F4BD1 /* FSLineChartTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8EA19B0C19DB55E9005F4BD1 /* Build configuration list for PBXNativeTarget "FSLineChartTests" */; - buildPhases = ( - 8EA19AFB19DB55E9005F4BD1 /* Sources */, - 8EA19AFC19DB55E9005F4BD1 /* Frameworks */, - 8EA19AFD19DB55E9005F4BD1 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 8EA19B0119DB55E9005F4BD1 /* PBXTargetDependency */, - ); - name = FSLineChartTests; - productName = FSLineChartTests; - productReference = 8EA19AFF19DB55E9005F4BD1 /* FSLineChartTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 8EA19ADE19DB55E9005F4BD1 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1110; - ORGANIZATIONNAME = "Arthur GUIBERT"; - TargetAttributes = { - 8EA19AE519DB55E9005F4BD1 = { - CreatedOnToolsVersion = 6.0.1; - LastSwiftMigration = 1110; - }; - 8EA19AFE19DB55E9005F4BD1 = { - CreatedOnToolsVersion = 6.0.1; - TestTargetID = 8EA19AE519DB55E9005F4BD1; - }; - }; - }; - buildConfigurationList = 8EA19AE119DB55E9005F4BD1 /* Build configuration list for PBXProject "FSLineChart" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 8EA19ADD19DB55E9005F4BD1; - productRefGroup = 8EA19AE719DB55E9005F4BD1 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8EA19AE519DB55E9005F4BD1 /* FSLineChart */, - 8EA19AFE19DB55E9005F4BD1 /* FSLineChartTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8EA19AE419DB55E9005F4BD1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8EA19AF519DB55E9005F4BD1 /* Main.storyboard in Resources */, - 8EA19AFA19DB55E9005F4BD1 /* LaunchScreen.xib in Resources */, - 8EA19AF719DB55E9005F4BD1 /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8EA19AFD19DB55E9005F4BD1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8EA19AE219DB55E9005F4BD1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8EA19AF219DB55E9005F4BD1 /* ViewController.m in Sources */, - 8E67717B1DC89E3F00EA02FA /* ExampleChart.swift in Sources */, - 8EA19AEF19DB55E9005F4BD1 /* AppDelegate.m in Sources */, - 8EA19AEC19DB55E9005F4BD1 /* main.m in Sources */, - 8EA19B1119DB5696005F4BD1 /* FSLineChart.m in Sources */, - 8EA19B1519DB56E8005F4BD1 /* UIColor+FSPalette.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8EA19AFB19DB55E9005F4BD1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8EA19B0619DB55E9005F4BD1 /* FSLineChartTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 8EA19B0119DB55E9005F4BD1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8EA19AE519DB55E9005F4BD1 /* FSLineChart */; - targetProxy = 8EA19B0019DB55E9005F4BD1 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 8EA19AF319DB55E9005F4BD1 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 8EA19AF419DB55E9005F4BD1 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 8EA19AF819DB55E9005F4BD1 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - 8EA19AF919DB55E9005F4BD1 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 8EA19B0719DB55E9005F4BD1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - 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; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - 8EA19B0819DB55E9005F4BD1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - 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; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 8EA19B0A19DB55E9005F4BD1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = NO; - INFOPLIST_FILE = FSLineChart/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.slipcorp.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "FSLineChart/FSLineChart-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 8EA19B0B19DB55E9005F4BD1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - DEFINES_MODULE = NO; - INFOPLIST_FILE = FSLineChart/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.slipcorp.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "FSLineChart/FSLineChart-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 8EA19B0D19DB55E9005F4BD1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = FSLineChartTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.slipcorp.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FSLineChart.app/FSLineChart"; - }; - name = Debug; - }; - 8EA19B0E19DB55E9005F4BD1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = FSLineChartTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.slipcorp.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FSLineChart.app/FSLineChart"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 8EA19AE119DB55E9005F4BD1 /* Build configuration list for PBXProject "FSLineChart" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8EA19B0719DB55E9005F4BD1 /* Debug */, - 8EA19B0819DB55E9005F4BD1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8EA19B0919DB55E9005F4BD1 /* Build configuration list for PBXNativeTarget "FSLineChart" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8EA19B0A19DB55E9005F4BD1 /* Debug */, - 8EA19B0B19DB55E9005F4BD1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8EA19B0C19DB55E9005F4BD1 /* Build configuration list for PBXNativeTarget "FSLineChartTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8EA19B0D19DB55E9005F4BD1 /* Debug */, - 8EA19B0E19DB55E9005F4BD1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 8EA19ADE19DB55E9005F4BD1 /* Project object */; -} diff --git a/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/0253AE25-533E-4348-B0B5-CFFA60E20AAE.plist b/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/0253AE25-533E-4348-B0B5-CFFA60E20AAE.plist deleted file mode 100644 index d17a092..0000000 --- a/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/0253AE25-533E-4348-B0B5-CFFA60E20AAE.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - classNames - - FSLineChartTests - - testPerformanceExample - - com.apple.XCTPerformanceMetric_WallClockTime - - baselineAverage - 0.015 - baselineIntegrationDisplayName - Local Baseline - - - - - - diff --git a/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/Info.plist b/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/Info.plist deleted file mode 100644 index 41b5b18..0000000 --- a/FSLineChart.xcodeproj/xcshareddata/xcbaselines/8EA19AFE19DB55E9005F4BD1.xcbaseline/Info.plist +++ /dev/null @@ -1,40 +0,0 @@ - - - - - runDestinationsByUUID - - 0253AE25-533E-4348-B0B5-CFFA60E20AAE - - localComputer - - busSpeedInMHz - 100 - cpuCount - 1 - cpuKind - Intel Core i5 - cpuSpeedInMHz - 2600 - logicalCPUCoresPerPackage - 4 - modelCode - MacBookPro11,1 - physicalCPUCoresPerPackage - 2 - platformIdentifier - com.apple.platform.macosx - - targetArchitecture - i386 - targetDevice - - modelCode - iPhone5,1 - platformIdentifier - com.apple.platform.iphonesimulator - - - - - diff --git a/FSLineChart/AppDelegate.h b/FSLineChart/AppDelegate.h deleted file mode 100644 index cdb6f7e..0000000 --- a/FSLineChart/AppDelegate.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// AppDelegate.h -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - - -@end - diff --git a/FSLineChart/AppDelegate.m b/FSLineChart/AppDelegate.m deleted file mode 100644 index 1d9a091..0000000 --- a/FSLineChart/AppDelegate.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// AppDelegate.m -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/FSLineChart/FSLineChart/FSLineChart.h b/FSLineChart/FSLineChart/FSLineChart.h deleted file mode 100644 index 0b0989e..0000000 --- a/FSLineChart/FSLineChart/FSLineChart.h +++ /dev/null @@ -1,100 +0,0 @@ -// -// FSLineChart.h -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#import - -@interface FSLineChart : UIView - -// Block definition for getting a label for a set index (use case: date, units,...) -typedef NSString *(^FSLabelForIndexGetter)(NSUInteger index); - -// Same as above, but for the value (for adding a currency, or a unit symbol for example) -typedef NSString *(^FSLabelForValueGetter)(CGFloat value); - -typedef NS_ENUM(NSInteger, ValueLabelPositionType) { - ValueLabelLeft, - ValueLabelRight, - ValueLabelLeftMirrored -}; - -// Index label properties -@property (copy) FSLabelForIndexGetter labelForIndex; -@property (nonatomic, strong) UIFont* indexLabelFont; -@property (nonatomic) UIColor* indexLabelTextColor; -@property (nonatomic) UIColor* indexLabelBackgroundColor; - -// Value label properties -@property (copy) FSLabelForValueGetter labelForValue; -@property (nonatomic, strong) UIFont* valueLabelFont; -@property (nonatomic) UIColor* valueLabelTextColor; -@property (nonatomic) UIColor* valueLabelBackgroundColor; -@property (nonatomic) ValueLabelPositionType valueLabelPosition; - -// Number of visible step in the chart -@property (nonatomic) int gridStep; -@property (nonatomic) int verticalGridStep; -@property (nonatomic) int horizontalGridStep; - -// Margin of the chart -@property (nonatomic) CGFloat margin; - -@property (nonatomic) CGFloat axisWidth; -@property (nonatomic) CGFloat axisHeight; - -// Decoration parameters, let you pick the color of the line as well as the color of the axis -@property (nonatomic, strong) UIColor* axisColor; -@property (nonatomic) CGFloat axisLineWidth; - -// Chart parameters -@property (nonatomic, strong) UIColor* color; -@property (nonatomic, strong) UIColor* fillColor; -@property (nonatomic) CGFloat lineWidth; - -// Data points -@property (nonatomic) BOOL displayDataPoint; -@property (nonatomic, strong) UIColor* dataPointColor; -@property (nonatomic, strong) UIColor* dataPointBackgroundColor; -@property (nonatomic) CGFloat dataPointRadius; - -// Grid parameters -@property (nonatomic) BOOL drawInnerGrid; -@property (nonatomic, strong) UIColor* innerGridColor; -@property (nonatomic) CGFloat innerGridLineWidth; - -// Smoothing -@property (nonatomic) BOOL bezierSmoothing; -@property (nonatomic) CGFloat bezierSmoothingTension; - -// Animations -@property (nonatomic) CGFloat animationDuration; - -// Set the actual data for the chart, and then render it to the view. -- (void)setChartData:(NSArray *)chartData; - -// Clear all rendered data from the view. -- (void)clearChartData; - -// Get the bounds of the chart -- (CGFloat)minVerticalBound; -- (CGFloat)maxVerticalBound; - - -@end diff --git a/FSLineChart/FSLineChart/FSLineChart.m b/FSLineChart/FSLineChart/FSLineChart.m deleted file mode 100644 index a3a2fb6..0000000 --- a/FSLineChart/FSLineChart/FSLineChart.m +++ /dev/null @@ -1,638 +0,0 @@ -// -// FSLineChart.m -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#import -#import "FSLineChart.h" -#import "UIColor+FSPalette.h" - -@interface FSLineChart () - -@property (nonatomic, strong) NSMutableArray* data; -@property (nonatomic, strong) NSMutableArray* layers; - -@property (nonatomic) CGFloat min; -@property (nonatomic) CGFloat max; -@property (nonatomic) CGMutablePathRef initialPath; -@property (nonatomic) CGMutablePathRef newPath; - -@end - -@implementation FSLineChart - -#pragma mark - Initialisation - -- (id)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - [self commonInit]; - } - return self; -} - -- (id)initWithCoder:(NSCoder *)aDecoder -{ - self = [super initWithCoder:aDecoder]; - if (self) { - [self commonInit]; - } - return self; -} - -- (void)awakeFromNib -{ - [super awakeFromNib]; - [self commonInit]; -} - -- (void)commonInit -{ - _layers = [NSMutableArray array]; - self.backgroundColor = [UIColor whiteColor]; - [self setDefaultParameters]; -} - -- (void)setDefaultParameters -{ - _color = [UIColor fsLightBlue]; - _fillColor = [_color colorWithAlphaComponent:0.25]; - _verticalGridStep = 3; - _horizontalGridStep = 3; - _margin = 5.0f; - _axisWidth = self.frame.size.width - 2 * _margin; - _axisHeight = self.frame.size.height - 2 * _margin; - _axisColor = [UIColor colorWithWhite:0.7 alpha:1.0]; - _innerGridColor = [UIColor colorWithWhite:0.9 alpha:1.0]; - _drawInnerGrid = YES; - _bezierSmoothing = YES; - _bezierSmoothingTension = 0.2; - _lineWidth = 1; - _innerGridLineWidth = 0.5; - _axisLineWidth = 1; - _animationDuration = 0.5; - _displayDataPoint = NO; - _dataPointRadius = 1; - _dataPointColor = _color; - _dataPointBackgroundColor = _color; - - // Labels attributes - _indexLabelBackgroundColor = [UIColor clearColor]; - _indexLabelTextColor = [UIColor grayColor]; - _indexLabelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:10]; - - _valueLabelBackgroundColor = [UIColor colorWithWhite:1 alpha:0.75]; - _valueLabelTextColor = [UIColor grayColor]; - _valueLabelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:11]; - _valueLabelPosition = ValueLabelRight; -} - -- (void)layoutSubviews -{ - _axisWidth = self.frame.size.width - 2 * _margin; - _axisHeight = self.frame.size.height - 2 * _margin; - - // Removing the old label views as well as the chart layers. - [self.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [obj removeFromSuperview]; - }]; - - [self.layers enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - CALayer* layer = (CALayer*)obj; - [layer removeFromSuperlayer]; - }]; - - [self layoutChart]; - [super layoutSubviews]; -} - -- (void)layoutChart -{ - if(_data == nil) { - return; - } - - [self computeBounds]; - - // No data - if(isnan(_max)) { - _max = 1; - } - - [self strokeChart]; - - if(_displayDataPoint) { - [self strokeDataPoints]; - } - - if(_labelForValue) { - for(int i=0;i<_verticalGridStep;i++) { - UILabel* label = [self createLabelForValue:i]; - - if(label) { - [self addSubview:label]; - } - } - } - - if(_labelForIndex) { - for(int i=0;i<_horizontalGridStep + 1;i++) { - UILabel* label = [self createLabelForIndex:i]; - - if(label) { - [self addSubview:label]; - } - } - } - - [self setNeedsDisplay]; -} - -- (void)setChartData:(NSArray *)chartData -{ - if (chartData == nil || chartData.count == 0) { - return; - } - - _data = [NSMutableArray arrayWithArray:chartData]; - [self layoutChart]; -} - -#pragma mark - Labels creation - -- (UILabel*)createLabelForValue: (NSUInteger)index -{ - CGFloat minBound = [self minVerticalBound]; - CGFloat maxBound = [self maxVerticalBound]; - - CGPoint p = CGPointMake(_margin + (_valueLabelPosition == ValueLabelRight ? _axisWidth : 0), _axisHeight + _margin - (index + 1) * _axisHeight / _verticalGridStep); - - NSString* text = _labelForValue(minBound + (maxBound - minBound) / _verticalGridStep * (index + 1)); - - if(!text) - { - return nil; - } - - CGRect rect = CGRectMake(_margin, p.y + 2, self.frame.size.width - _margin * 2 - 4.0f, 14); - - float width = [text boundingRectWithSize:rect.size - options:NSStringDrawingUsesLineFragmentOrigin - attributes:@{ NSFontAttributeName:_valueLabelFont } - context:nil].size.width; - - CGFloat xPadding = 6; - CGFloat xOffset = width + xPadding; - - if (_valueLabelPosition == ValueLabelLeftMirrored) { - xOffset = -xPadding; - } - - UILabel* label = [[UILabel alloc] initWithFrame:CGRectMake(p.x - xOffset, p.y + 2, width + 2, 14)]; - label.text = text; - label.font = _valueLabelFont; - label.textColor = _valueLabelTextColor; - label.textAlignment = NSTextAlignmentCenter; - label.backgroundColor = _valueLabelBackgroundColor; - - return label; -} - -- (UILabel*)createLabelForIndex: (NSUInteger)index -{ - CGFloat scale = [self horizontalScale]; - NSInteger q = (int)_data.count / _horizontalGridStep; - NSInteger itemIndex = q * index; - - if(itemIndex >= _data.count) - { - itemIndex = _data.count - 1; - } - - NSString* text = _labelForIndex(itemIndex); - - if(!text) - { - return nil; - } - - CGPoint p = CGPointMake(_margin + index * (_axisWidth / _horizontalGridStep) * scale, _axisHeight + _margin); - - CGRect rect = CGRectMake(_margin, p.y + 2, self.frame.size.width - _margin * 2 - 4.0f, 14); - - float width = [text boundingRectWithSize:rect.size - options:NSStringDrawingUsesLineFragmentOrigin - attributes:@{ NSFontAttributeName:_indexLabelFont } - context:nil].size.width; - - UILabel* label = [[UILabel alloc] initWithFrame:CGRectMake(p.x - 4.0f, p.y + 2, width + 2, 14)]; - label.text = text; - label.font = _indexLabelFont; - label.textColor = _indexLabelTextColor; - label.backgroundColor = _indexLabelBackgroundColor; - - return label; -} - -#pragma mark - Drawing - -- (void)drawRect:(CGRect)rect -{ - if (_data.count > 0) { - [self drawGrid]; - } -} - -- (void)drawGrid -{ - CGContextRef ctx = UIGraphicsGetCurrentContext(); - UIGraphicsPushContext(ctx); - CGContextSetLineWidth(ctx, _axisLineWidth); - CGContextSetStrokeColorWithColor(ctx, [_axisColor CGColor]); - - // draw coordinate axis - CGContextMoveToPoint(ctx, _margin, _margin); - CGContextAddLineToPoint(ctx, _margin, _axisHeight + _margin + 3); - CGContextStrokePath(ctx); - - CGFloat scale = [self horizontalScale]; - CGFloat minBound = [self minVerticalBound]; - CGFloat maxBound = [self maxVerticalBound]; - - // draw grid - if(_drawInnerGrid) { - for(int i=0;i<_horizontalGridStep;i++) { - CGContextSetStrokeColorWithColor(ctx, [_innerGridColor CGColor]); - CGContextSetLineWidth(ctx, _innerGridLineWidth); - - CGPoint point = CGPointMake((1 + i) * _axisWidth / _horizontalGridStep * scale + _margin, _margin); - - CGContextMoveToPoint(ctx, point.x, point.y); - CGContextAddLineToPoint(ctx, point.x, _axisHeight + _margin); - CGContextStrokePath(ctx); - - CGContextSetStrokeColorWithColor(ctx, [_axisColor CGColor]); - CGContextSetLineWidth(ctx, _axisLineWidth); - CGContextMoveToPoint(ctx, point.x - 0.5f, _axisHeight + _margin); - CGContextAddLineToPoint(ctx, point.x - 0.5f, _axisHeight + _margin + 3); - CGContextStrokePath(ctx); - } - - for(int i=0;i<_verticalGridStep + 1;i++) { - // If the value is zero then we display the horizontal axis - CGFloat v = maxBound - (maxBound - minBound) / _verticalGridStep * i; - - if(v == 0) { - CGContextSetLineWidth(ctx, _axisLineWidth); - CGContextSetStrokeColorWithColor(ctx, [_axisColor CGColor]); - } else { - CGContextSetStrokeColorWithColor(ctx, [_innerGridColor CGColor]); - CGContextSetLineWidth(ctx, _innerGridLineWidth); - } - - CGPoint point = CGPointMake(_margin, (i) * _axisHeight / _verticalGridStep + _margin); - - CGContextMoveToPoint(ctx, point.x, point.y); - CGContextAddLineToPoint(ctx, _axisWidth + _margin, point.y); - CGContextStrokePath(ctx); - } - } - - UIGraphicsPopContext(); -} - -- (void)clearChartData -{ - for (CAShapeLayer *layer in self.layers) { - [layer removeFromSuperlayer]; - } - [self.layers removeAllObjects]; -} - -- (void)strokeChart -{ - CGFloat minBound = [self minVerticalBound]; - CGFloat scale = [self verticalScale]; - - UIBezierPath *noPath = [self getLinePath:0 withSmoothing:_bezierSmoothing close:NO]; - UIBezierPath *path = [self getLinePath:scale withSmoothing:_bezierSmoothing close:NO]; - - UIBezierPath *noFill = [self getLinePath:0 withSmoothing:_bezierSmoothing close:YES]; - UIBezierPath *fill = [self getLinePath:scale withSmoothing:_bezierSmoothing close:YES]; - - if(_fillColor) { - CAShapeLayer* fillLayer = [CAShapeLayer layer]; - fillLayer.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y + minBound * scale, self.bounds.size.width, self.bounds.size.height); - fillLayer.bounds = self.bounds; - fillLayer.path = fill.CGPath; - fillLayer.strokeColor = nil; - fillLayer.fillColor = _fillColor.CGColor; - fillLayer.lineWidth = 0; - fillLayer.lineJoin = kCALineJoinRound; - - [self.layer addSublayer:fillLayer]; - [self.layers addObject:fillLayer]; - - CABasicAnimation *fillAnimation = [CABasicAnimation animationWithKeyPath:@"path"]; - fillAnimation.duration = _animationDuration; - fillAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - fillAnimation.fillMode = kCAFillModeForwards; - fillAnimation.fromValue = (id)noFill.CGPath; - fillAnimation.toValue = (id)fill.CGPath; - [fillLayer addAnimation:fillAnimation forKey:@"path"]; - } - - CAShapeLayer *pathLayer = [CAShapeLayer layer]; - pathLayer.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y + minBound * scale, self.bounds.size.width, self.bounds.size.height); - pathLayer.bounds = self.bounds; - pathLayer.path = path.CGPath; - pathLayer.strokeColor = [_color CGColor]; - pathLayer.fillColor = nil; - pathLayer.lineWidth = _lineWidth; - pathLayer.lineJoin = kCALineJoinRound; - - [self.layer addSublayer:pathLayer]; - [self.layers addObject:pathLayer]; - - if(_fillColor) { - CABasicAnimation *pathAnimation = [CABasicAnimation animationWithKeyPath:@"path"]; - pathAnimation.duration = _animationDuration; - pathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - pathAnimation.fromValue = (__bridge id)(noPath.CGPath); - pathAnimation.toValue = (__bridge id)(path.CGPath); - [pathLayer addAnimation:pathAnimation forKey:@"path"]; - } else { - CABasicAnimation *pathAnimation = [CABasicAnimation animationWithKeyPath:@"strokeEnd"]; - pathAnimation.duration = _animationDuration; - pathAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]; - pathAnimation.fromValue = [NSNumber numberWithFloat:0.0f]; - pathAnimation.toValue = [NSNumber numberWithFloat:1.0f]; - [pathLayer addAnimation:pathAnimation forKey:@"path"]; - } - -} - -- (void)strokeDataPoints -{ - CGFloat minBound = [self minVerticalBound]; - CGFloat scale = [self verticalScale]; - - for(int i=0;i<_data.count;i++) { - CGPoint p = [self getPointForIndex:i withScale:scale]; - p.y += minBound * scale; - - UIBezierPath* circle = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(p.x - _dataPointRadius, p.y - _dataPointRadius, _dataPointRadius * 2, _dataPointRadius * 2)]; - - CAShapeLayer *fillLayer = [CAShapeLayer layer]; - fillLayer.frame = CGRectMake(p.x, p.y, _dataPointRadius, _dataPointRadius); - fillLayer.bounds = CGRectMake(p.x, p.y, _dataPointRadius, _dataPointRadius); - fillLayer.path = circle.CGPath; - fillLayer.strokeColor = _dataPointColor.CGColor; - fillLayer.fillColor = _dataPointBackgroundColor.CGColor; - fillLayer.lineWidth = 1; - fillLayer.lineJoin = kCALineJoinRound; - - [self.layer addSublayer:fillLayer]; - [self.layers addObject:fillLayer]; - } -} - -#pragma mark - Chart scale & boundaries - -- (CGFloat)horizontalScale -{ - CGFloat scale = 1.0f; - NSInteger q = (int)_data.count / _horizontalGridStep; - - if(_data.count > 1) { - scale = (CGFloat)(q * _horizontalGridStep) / (CGFloat)(_data.count - 1); - } - - return scale; -} - -- (CGFloat)verticalScale -{ - CGFloat minBound = [self minVerticalBound]; - CGFloat maxBound = [self maxVerticalBound]; - CGFloat spread = maxBound - minBound; - CGFloat scale = 0; - - if (spread != 0) { - scale = _axisHeight / spread; - } - - return scale; -} - -- (CGFloat)minVerticalBound -{ - return MIN(_min, 0); -} - -- (CGFloat)maxVerticalBound -{ - return MAX(_max, 0); -} - -- (void)computeBounds -{ - _min = MAXFLOAT; - _max = -MAXFLOAT; - - for(int i=0;i<_data.count;i++) { - NSNumber* number = _data[i]; - if([number floatValue] < _min) - _min = [number floatValue]; - - if([number floatValue] > _max) - _max = [number floatValue]; - } - - // The idea is to adjust the minimun and the maximum value to display the whole chart in the view, and if possible with nice "round" steps. - _max = [self getUpperRoundNumber:_max forGridStep:_verticalGridStep]; - - if(_min < 0) { - // If the minimum is negative then we want to have one of the step to be zero so that the chart is displayed nicely and more comprehensively - float step; - - if(_verticalGridStep > 3) { - step = fabs(_max - _min) / (float)(_verticalGridStep - 1); - } else { - step = MAX(fabs(_max - _min) / 2, MAX(fabs(_min), fabs(_max))); - } - - step = [self getUpperRoundNumber:step forGridStep:_verticalGridStep]; - - float newMin,newMax; - - if(fabs(_min) > fabs(_max)) { - int m = ceilf(fabs(_min) / step); - - newMin = step * m * (_min > 0 ? 1 : -1); - newMax = step * (_verticalGridStep - m) * (_max > 0 ? 1 : -1); - - } else { - int m = ceilf(fabs(_max) / step); - - newMax = step * m * (_max > 0 ? 1 : -1); - newMin = step * (_verticalGridStep - m) * (_min > 0 ? 1 : -1); - } - - if(_min < newMin) { - newMin -= step; - newMax -= step; - } - - if(_max > newMax + step) { - newMin += step; - newMax += step; - } - - _min = newMin; - _max = newMax; - - if(_max < _min) { - float tmp = _max; - _max = _min; - _min = tmp; - } - - } -} - -#pragma mark - Chart utils - -- (CGFloat)getUpperRoundNumber:(CGFloat)value forGridStep:(int)gridStep -{ - if(value <= 0) - return 0; - - // We consider a round number the following by 0.5 step instead of true round number (with step of 1) - CGFloat logValue = log10f(value); - CGFloat scale = powf(10, floorf(logValue)); - CGFloat n = ceilf(value / scale * 4); - - int tmp = (int)(n) % gridStep; - - if(tmp != 0) { - n += gridStep - tmp; - } - - return n * scale / 4.0f; -} - -- (void)setGridStep:(int)gridStep -{ - _verticalGridStep = gridStep; - _horizontalGridStep = gridStep; -} - -- (CGPoint)getPointForIndex:(NSUInteger)idx withScale:(CGFloat)scale -{ - if(idx >= _data.count) { - return CGPointZero; - } - - // Compute the point position in the view from the data with a set scale value - NSNumber* number = _data[idx]; - - if(_data.count < 2) { - return CGPointMake(_margin, _axisHeight + _margin - [number floatValue] * scale); - } else { - return CGPointMake(_margin + idx * (_axisWidth / (_data.count - 1)), _axisHeight + _margin - [number floatValue] * scale); - } -} - -- (UIBezierPath*)getLinePath:(float)scale withSmoothing:(BOOL)smoothed close:(BOOL)closed -{ - UIBezierPath* path = [UIBezierPath bezierPath]; - - if(smoothed) { - for(int i=0;i<_data.count - 1;i++) { - CGPoint controlPoint[2]; - CGPoint p = [self getPointForIndex:i withScale:scale]; - - // Start the path drawing - if(i == 0) - [path moveToPoint:p]; - - CGPoint nextPoint, previousPoint, m; - - // First control point - nextPoint = [self getPointForIndex:i + 1 withScale:scale]; - previousPoint = [self getPointForIndex:i - 1 withScale:scale]; - m = CGPointZero; - - if(i > 0) { - m.x = (nextPoint.x - previousPoint.x) / 2; - m.y = (nextPoint.y - previousPoint.y) / 2; - } else { - m.x = (nextPoint.x - p.x) / 2; - m.y = (nextPoint.y - p.y) / 2; - } - - controlPoint[0].x = p.x + m.x * _bezierSmoothingTension; - controlPoint[0].y = p.y + m.y * _bezierSmoothingTension; - - // Second control point - nextPoint = [self getPointForIndex:i + 2 withScale:scale]; - previousPoint = [self getPointForIndex:i withScale:scale]; - p = [self getPointForIndex:i + 1 withScale:scale]; - m = CGPointZero; - - if(i < _data.count - 2) { - m.x = (nextPoint.x - previousPoint.x) / 2; - m.y = (nextPoint.y - previousPoint.y) / 2; - } else { - m.x = (p.x - previousPoint.x) / 2; - m.y = (p.y - previousPoint.y) / 2; - } - - controlPoint[1].x = p.x - m.x * _bezierSmoothingTension; - controlPoint[1].y = p.y - m.y * _bezierSmoothingTension; - - [path addCurveToPoint:p controlPoint1:controlPoint[0] controlPoint2:controlPoint[1]]; - } - - } else { - for(int i=0;i<_data.count;i++) { - if(i > 0) { - [path addLineToPoint:[self getPointForIndex:i withScale:scale]]; - } else { - [path moveToPoint:[self getPointForIndex:i withScale:scale]]; - } - } - } - - if(closed) { - // Closing the path for the fill drawing - [path addLineToPoint:[self getPointForIndex:_data.count - 1 withScale:scale]]; - [path addLineToPoint:[self getPointForIndex:_data.count - 1 withScale:0]]; - [path addLineToPoint:[self getPointForIndex:0 withScale:0]]; - [path addLineToPoint:[self getPointForIndex:0 withScale:scale]]; - } - - return path; -} - - - -@end diff --git a/FSLineChart/FSLineChart/UIColor+FSPalette.h b/FSLineChart/FSLineChart/UIColor+FSPalette.h deleted file mode 100644 index 333dc7c..0000000 --- a/FSLineChart/FSLineChart/UIColor+FSPalette.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// UIColor+FSPalette.h -// FlurrySummary -// -// Created by Arthur GUIBERT on 16/07/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import - -@interface UIColor (FSPalette) - -+ (instancetype)fsRed; -+ (instancetype)fsOrange; -+ (instancetype)fsYellow; -+ (instancetype)fsGreen; -+ (instancetype)fsLightBlue; -+ (instancetype)fsDarkBlue; -+ (instancetype)fsPurple; -+ (instancetype)fsPink; -+ (instancetype)fsDarkGray; -+ (instancetype)fsLightGray; - - -@end diff --git a/FSLineChart/FSLineChart/UIColor+FSPalette.m b/FSLineChart/FSLineChart/UIColor+FSPalette.m deleted file mode 100644 index 1ee1348..0000000 --- a/FSLineChart/FSLineChart/UIColor+FSPalette.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// UIColor+FSPalette.m -// FlurrySummary -// -// Created by Arthur GUIBERT on 16/07/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import "UIColor+FSPalette.h" - -@implementation UIColor (FSPalette) - -+ (instancetype)fsRed -{ - return [UIColor colorWithRed:1.0f green:0.22f blue:0.22f alpha:1.0f]; -} - -+ (instancetype)fsOrange -{ - return [UIColor colorWithRed:1.0f green:0.58f blue:0.21f alpha:1.0f]; -} - -+ (instancetype)fsYellow -{ - return [UIColor colorWithRed:1.0f green:0.79f blue:0.28f alpha:1.0f]; -} - -+ (instancetype)fsGreen -{ - return [UIColor colorWithRed:0.27f green:0.85f blue:0.46f alpha:1.0f]; -} - -+ (instancetype)fsLightBlue -{ - return [UIColor colorWithRed:0.18f green:0.67f blue:0.84f alpha:1.0f]; -} - -+ (instancetype)fsDarkBlue -{ - return [UIColor colorWithRed:0.0f green:0.49f blue:0.96f alpha:1.0f]; -} - -+ (instancetype)fsPurple -{ - return [UIColor colorWithRed:0.35f green:0.35f blue:0.81f alpha:1.0f]; -} - -+ (instancetype)fsPink -{ - return [UIColor colorWithRed:1.0f green:0.17f blue:0.34f alpha:1.0f]; -} - -+ (instancetype)fsDarkGray -{ - return [UIColor colorWithRed:0.56f green:0.56f blue:0.58f alpha:1.0f]; -} - -+ (instancetype)fsLightGray -{ - return [UIColor colorWithRed:0.78f green:0.78f blue:0.8f alpha:1.0f]; -} - -@end diff --git a/FSLineChart/ViewController.h b/FSLineChart/ViewController.h deleted file mode 100644 index 427b30a..0000000 --- a/FSLineChart/ViewController.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// ViewController.h -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/FSLineChart/ViewController.m b/FSLineChart/ViewController.m deleted file mode 100644 index 873111c..0000000 --- a/FSLineChart/ViewController.m +++ /dev/null @@ -1,59 +0,0 @@ -// -// ViewController.m -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import "ViewController.h" -#import "FSLineChart.h" -#import "UIColor+FSPalette.h" - -@interface ViewController () - -@property (nonatomic, strong) IBOutlet FSLineChart *chartWithDates; - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - [self loadChartWithDates]; -} - -#pragma mark - Setting up the chart - -- (void)loadChartWithDates { - // Generating some dummy data - NSMutableArray* chartData = [NSMutableArray arrayWithCapacity:7]; - for(int i=0;i<7;i++) { - chartData[i] = [NSNumber numberWithFloat: (float)i / 30.0f + (float)(rand() % 100) / 500.0f]; - } - - NSArray* months = @[@"January", @"February", @"March", @"April", @"May", @"June", @"July"]; - - // Setting up the line chart - _chartWithDates.verticalGridStep = 6; - _chartWithDates.horizontalGridStep = 3; - _chartWithDates.fillColor = nil; - _chartWithDates.displayDataPoint = YES; - _chartWithDates.dataPointColor = [UIColor fsOrange]; - _chartWithDates.dataPointBackgroundColor = [UIColor fsOrange]; - _chartWithDates.dataPointRadius = 2; - _chartWithDates.color = [_chartWithDates.dataPointColor colorWithAlphaComponent:0.3]; - _chartWithDates.valueLabelPosition = ValueLabelLeftMirrored; - - _chartWithDates.labelForIndex = ^(NSUInteger item) { - return months[item]; - }; - - _chartWithDates.labelForValue = ^(CGFloat value) { - return [NSString stringWithFormat:@"%.02f €", value]; - }; - - [_chartWithDates setChartData:chartData]; -} - -@end diff --git a/FSLineChart/main.m b/FSLineChart/main.m deleted file mode 100644 index 13fc67d..0000000 --- a/FSLineChart/main.m +++ /dev/null @@ -1,16 +0,0 @@ -// -// main.m -// FSLineChart -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/FSLineChartTests/FSLineChartTests.m b/FSLineChartTests/FSLineChartTests.m deleted file mode 100644 index 62ddfbb..0000000 --- a/FSLineChartTests/FSLineChartTests.m +++ /dev/null @@ -1,81 +0,0 @@ -// -// FSLineChartTests.m -// FSLineChartTests -// -// Created by Arthur GUIBERT on 30/09/2014. -// Copyright (c) 2014 Arthur GUIBERT. All rights reserved. -// - -#import -#import -#import "FSLineChart.h" - -@interface FSLineChartTests : XCTestCase - -@end - -@implementation FSLineChartTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testInitialisation { - FSLineChart* chart = [[FSLineChart alloc] init]; - XCTAssertNotNil(chart); -} - -- (void)testBoundsNilChart { - FSLineChart* chart = [[FSLineChart alloc] init]; - [chart setChartData:nil]; - - XCTAssertEqual([chart minVerticalBound], 0); - XCTAssertEqual([chart maxVerticalBound], 0); -} - -- (void)testBoundsEmptyChart { - FSLineChart* chart = [[FSLineChart alloc] init]; - [chart setChartData:@[]]; - - XCTAssertEqual([chart minVerticalBound], 0); - XCTAssertEqual([chart maxVerticalBound], 0); -} - -- (void)testBoundsAllValuesToZero { - FSLineChart* chart = [[FSLineChart alloc] init]; - [chart setChartData:@[@0,@0,@0]]; - - XCTAssertEqual([chart minVerticalBound], 0); - XCTAssertEqual([chart maxVerticalBound], 0); -} - -- (void)testBounds { - FSLineChart* chart = [[FSLineChart alloc] init]; - [chart setChartData:@[@0, @1, @-1]]; - - XCTAssertGreaterThan([chart maxVerticalBound], 1); - XCTAssertLessThan([chart minVerticalBound], -1); -} - -- (void)testPerformanceExample { - FSLineChart* chart = [[FSLineChart alloc] init]; - NSMutableArray* array = [[NSMutableArray alloc] init]; - - for(int i=0;i<1000;i++) { - [array addObject:[NSNumber numberWithInt:rand()]]; - } - - // Testing whether a 1000 values are processed between two frames (1/60th of a second) - [self measureBlock:^{ - // Put the code you want to measure the time of here. - [chart setChartData:array]; - }]; -} - -@end diff --git a/FSLineChartTests/Info.plist b/FSLineChartTests/Info.plist deleted file mode 100644 index ba72822..0000000 --- a/FSLineChartTests/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - BNDL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..8feba55 --- /dev/null +++ b/Package.swift @@ -0,0 +1,25 @@ +// swift-tools-version:5.1 + +import PackageDescription + +let package = Package( + name: "FSLineChart", + platforms: [.iOS(.v8)], + products: [ + .library( + name: "FSLineChart", + targets: ["FSLineChart"] + ) + ], + dependencies: [], + targets: [ + .target( + name: "FSLineChart", + dependencies: [] + ), + .testTarget( + name: "FSLineChartTests", + dependencies: ["FSLineChart"] + ) + ] +) diff --git a/Sources/FSLineChart/BoundsCalculator.swift b/Sources/FSLineChart/BoundsCalculator.swift new file mode 100644 index 0000000..9930e6a --- /dev/null +++ b/Sources/FSLineChart/BoundsCalculator.swift @@ -0,0 +1,118 @@ +// +// BoundsCalculator.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import CoreGraphics +import Foundation + +class BoundsCalculator { + private(set) var min: Float = MAXFLOAT + private(set) var max: Float = -MAXFLOAT + + func computeBounds(data: [Float], verticalGridStep: Int) { + min = MAXFLOAT + max = -MAXFLOAT + + for number in data { + if number < min { + min = number + } + + if number > max { + max = number + } + } + + // The idea is to adjust the minimun and the maximum value to display the whole chart in the view, and if possible with nice "round" steps. + max = getUpperRoundNumber(max, forGridStep: verticalGridStep) + + if min < 0 { + // If the minimum is negative then we want to have one of the step to be zero so that the chart is displayed nicely and more comprehensively + var step: Float + + if verticalGridStep > 3 { + step = abs(max - min) / Float(verticalGridStep - 1) + } else { + step = Swift.max(abs(max - min) / 2, Swift.max(abs(min), abs(max))) + } + + step = getUpperRoundNumber(step, forGridStep: verticalGridStep) + + var newMin: Float + var newMax: Float + + if abs(min) > abs(max) { + let m = ceilf(abs(min) / step) + + newMin = step * Float(m) * (min > 0 ? 1 : -1) + newMax = step * (Float(verticalGridStep) - m) * (max > 0 ? 1 : -1) + } else { + let m = ceilf(abs(max) / step) + + newMax = step * Float(m) * (max > 0 ? 1 : -1) + newMin = step * (Float(verticalGridStep) - m) * (min > 0 ? 1 : -1) + } + + if min < newMin { + newMin -= step + newMax -= step + } + + if max > newMax + step { + newMin += step + newMax += step + } + + min = newMin + max = newMax + + if max < min { + // TODO: use swap + let tmp = max + max = min + min = tmp + } + } + + // No data + if max.isNaN { + max = 1 + } + } + + func getUpperRoundNumber( + _ value: Float, + forGridStep gridStep: Int + ) -> Float { + guard value > 0 else { + return 0 + } + + // We consider a round number the following by 0.5 step instead of true round number (with step of 1) + let logValue = log10f(value); + let scale = powf(10, floorf(logValue)); + var n = ceilf(value / scale * 4); + + let tmp = Int(n) % gridStep; + + if tmp != 0 { + n += Float(gridStep - tmp) + } + + return n * scale / 4.0 + } +} + +extension BoundsCalculator { + var minVerticalBound: CGFloat { + return CGFloat(Swift.min(min, 0)) + } + + var maxVerticalBound: CGFloat { + return CGFloat(Swift.max(max, 0)) + } +} diff --git a/Sources/FSLineChart/FSLineChart.swift b/Sources/FSLineChart/FSLineChart.swift new file mode 100644 index 0000000..bb5300d --- /dev/null +++ b/Sources/FSLineChart/FSLineChart.swift @@ -0,0 +1,121 @@ +// +// LegacySupport.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import UIKit +import QuartzCore + +open class FSLineChart: UIView { + internal var data: [Float] = [] + + private let renderer = GridRenderer() + private let layoutManager = LineChartLayoutManager() + + // Block definition for getting a label for a set index (use case: date, units,...) + public typealias LabelForIndexGetter = (Int) -> String + // Same as above, but for the value (for adding a currency, or a unit symbol for example) + public typealias LabelForValueGetter = (CGFloat) -> String + + public enum ValueLabelPosition { + case left + case right + case mirrored + } + + // Index label properties + public var labelForIndex: LabelForIndexGetter? + + public var indexLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 10)! + public var indexLabelTextColor: UIColor = .gray + public var indexLabelBackgroundColor: UIColor = .clear + + // Value label properties + public var labelForValue: LabelForValueGetter? + public var valueLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 11)! + public var valueLabelTextColor: UIColor = .gray + public var valueLabelBackgroundColor: UIColor = UIColor(white: 1, alpha:0.75) + public var valueLabelPosition: ValueLabelPosition = .right + + // Number of visible step in the chart + public var verticalGridStep: Int = 3 + public var horizontalGridStep: Int = 3 + public func setGridStep(_ value: Int) { + verticalGridStep = value + horizontalGridStep = value + } + + // Margin of the chart + public var margin: CGFloat = 0.5 + + // Decoration parameters, let you pick the color of the line as well as the color of the axis + public var axisColor: UIColor = UIColor(white: 0.7, alpha: 1.0) + public var axisLineWidth: CGFloat = 1 + + // Chart parameters + public var color: UIColor = .fsLightBlue + public var fillColor: UIColor? = UIColor.fsLightBlue.withAlphaComponent(0.25) + public var lineWidth: CGFloat = 1.0 + + // Data points + public var displayDataPoint: Bool = false + public var dataPointColor: UIColor = .fsLightBlue + public var dataPointBackgroundColor: UIColor = .fsLightBlue + public var dataPointRadius: CGFloat = 1 + + // Grid parameters + public var drawInnerGrid: Bool = true + public var innerGridColor: UIColor = UIColor(white: 0.9, alpha: 1.0) + public var innerGridLineWidth: CGFloat = 0.5 + + // Smoothing + public var bezierSmoothing: Bool = true + public var bezierSmoothingTension: CGFloat = 0.2 + + // Animations + public var animationDuration: TimeInterval = 0.5 + + public override init(frame: CGRect) { + super.init(frame: frame) + layoutManager.recalculateAxisSize(from: frame, margin: margin) + self.commonInit() + } + + public required init?(coder: NSCoder) { + super.init(coder: coder) + layoutManager.recalculateAxisSize(from: frame, margin: margin) + self.commonInit() + } + + private func commonInit() { + self.backgroundColor = .white + } + + public override func layoutSubviews() { + layoutManager.recalculateAxisSize(from: frame, margin: margin) + layoutManager.layoutChart(self) + super.layoutSubviews() + } + + public override func draw(_ rect: CGRect) { + renderer.render(chart: self, layoutManager: layoutManager) + } + + public func setChartData(_ chartData: [Float]) { + data = chartData + layoutManager.layoutChart(self) + } +} + +public extension FSLineChart { + var minVerticalBound: CGFloat { + return layoutManager.minVerticalBound + } + + var maxVerticalBound: CGFloat { + return layoutManager.maxVerticalBound + } +} diff --git a/Sources/FSLineChart/GridRenderer.swift b/Sources/FSLineChart/GridRenderer.swift new file mode 100644 index 0000000..064cd99 --- /dev/null +++ b/Sources/FSLineChart/GridRenderer.swift @@ -0,0 +1,87 @@ +// +// GridRenderer.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import Foundation +import CoreGraphics +import UIKit + +class GridRenderer { + // We pass FSLineChart now for temporarily refactoring reasons. Its better to use some struct. + func render( + chart options: FSLineChart, + layoutManager: LineChartLayoutManager + ) { + guard options.data.count > 0 else { + return + } + + let ctx = UIGraphicsGetCurrentContext()! + UIGraphicsPushContext(ctx); + ctx.setLineWidth(options.axisLineWidth); + ctx.setStrokeColor(options.axisColor.cgColor) + + // draw coordinate axis + ctx.move(to: CGPointMake(options.margin, options.margin)) + ctx.addLine(to: CGPointMake(options.margin, layoutManager.axisHeight + options.margin + 3)) + ctx.strokePath() + + let scale = layoutManager.calculateHorizontalScale( + data: options.data, + horizontalGridStep: options.horizontalGridStep + ) + let minBound = layoutManager.minVerticalBound + let maxBound = layoutManager.maxVerticalBound + + // draw grid + if(options.drawInnerGrid) { + for i in 0.. 0 else { + return + } + + boundsCalculator.computeBounds( + data: data, + verticalGridStep: verticalGridStep + ) + + strokeChart() + + if displayDataPoint { + strokeDataPoints() + } + + if labelForValue != nil { + for i in 0.. CGPoint { + guard idx >= 0 && idx < data.count else { + return .zero + } + + // Compute the point position in the view from the data with a set scale value + let number = CGFloat(data[idx]) + + if(data.count < 2) { + return CGPointMake(margin, axisHeight + margin - number * scale); + } else { + return CGPointMake( + margin + CGFloat(idx) * (axisWidth / CGFloat(data.count - 1)), + axisHeight + margin - number * scale + ) + } + } + + func getLinePath( + scale: CGFloat, + withSmoothing smoothed: Bool, + close closed: Bool + ) -> UIBezierPath { + let path = UIBezierPath() + + if(smoothed) { + for i in 0.. 0) { + m.x = (nextPoint.x - previousPoint.x) / 2; + m.y = (nextPoint.y - previousPoint.y) / 2; + } else { + m.x = (nextPoint.x - p.x) / 2; + m.y = (nextPoint.y - p.y) / 2; + } + + controlPoint[0].x = p.x + m.x * bezierSmoothingTension; + controlPoint[0].y = p.y + m.y * bezierSmoothingTension; + + // Second control point + nextPoint = getPointForIndex(i + 2, withScale:scale) + previousPoint = getPointForIndex(i, withScale:scale) + p = getPointForIndex(i + 1, withScale:scale) + m = CGPoint.zero; + + if(i < data.count - 2) { + m.x = (nextPoint.x - previousPoint.x) / 2; + m.y = (nextPoint.y - previousPoint.y) / 2; + } else { + m.x = (p.x - previousPoint.x) / 2; + m.y = (p.y - previousPoint.y) / 2; + } + + controlPoint[1].x = p.x - m.x * bezierSmoothingTension; + controlPoint[1].y = p.y - m.y * bezierSmoothingTension; + + path.addCurve( + to: p, + controlPoint1: controlPoint[0], + controlPoint2: controlPoint[1] + ) + } + + } else { + for i in 0.. 0) { + path.addLine(to: getPointForIndex(i, withScale: scale)) + } else { + path.move(to: getPointForIndex(i, withScale: scale)) + } + } + } + + if closed { + // Closing the path for the fill drawing + path.addLine(to: getPointForIndex(data.count - 1, withScale:scale)) + path.addLine(to: getPointForIndex(data.count - 1, withScale:0)) + path.addLine(to: getPointForIndex(0, withScale:0)) + path.addLine(to: getPointForIndex(0, withScale:scale)) + } + + return path + } +} + +extension LineChartLayoutManager { + func calculateHorizontalScale( + data: [Float], + horizontalGridStep: Int + ) -> CGFloat { + var scale: CGFloat = 1.0 + let q = data.count / horizontalGridStep + + if data.count > 1 { + scale = CGFloat(q * horizontalGridStep) / CGFloat(data.count - 1) + } + + return scale + } + + private var horizontalScale: CGFloat { + return calculateHorizontalScale( + data: data, + horizontalGridStep: horizontalGridStep + ) + } + + private var verticalScale: CGFloat { + let minBound = self.minVerticalBound + let maxBound = self.maxVerticalBound + + let spread = maxBound - minBound; + var scale: CGFloat = 0 + + if (spread != 0) { + scale = axisHeight / spread + } + + return scale + } +} + +fileprivate extension LineChartLayoutManager { + private func createLabelForValue(_ index: Int) -> UILabel? { + let minBound = self.minVerticalBound + let maxBound = self.maxVerticalBound + + let p = CGPoint( + x: margin + (valueLabelPosition == .right ? axisWidth : 0), + y: axisHeight + margin - CGFloat(index + 1) * axisHeight / CGFloat(verticalGridStep) + ) + + let value = minBound + (maxBound - minBound) / CGFloat(verticalGridStep * (index + 1)) + guard let text = labelForValue?(value) else { + return nil + } + + let rect = CGRect( + x: margin, + y: p.y + 2, + width: self.frame.size.width - margin * 2 - 4.0, + height: 14 + ) + + let width = (text as NSString).boundingRect( + with: rect.size, + options: [.usesLineFragmentOrigin], + attributes: [.font: valueLabelFont], + context: nil + ).size.width + + + let xPadding: CGFloat = 6 + var xOffset: CGFloat = width + xPadding; + + if valueLabelPosition == .mirrored { + xOffset = -xPadding; + } + + let label = UILabel( + frame: CGRect( + x: p.x - xOffset, + y: p.y + 2, + width: width + 2, + height: 14 + ) + ) + label.text = text; + label.font = valueLabelFont; + label.textColor = valueLabelTextColor; + label.textAlignment = .center; + label.backgroundColor = valueLabelBackgroundColor; + + return label + } + + private func createLabelForIndex(_ index: Int) -> UILabel? { + let scale = self.horizontalScale + let q = data.count / horizontalGridStep; + var itemIndex = q * index; + + if itemIndex >= data.count { + itemIndex = data.count - 1 + } + + guard let text = labelForIndex?(itemIndex) else { + return nil + } + + let p = CGPointMake( + margin + CGFloat(index) * (axisWidth / CGFloat(horizontalGridStep)) * scale, + axisHeight + margin + ) + + + let rect = CGRect( + x: margin, + y: p.y + 2, + width: self.frame.size.width - margin * 2 - 4.0, + height: 14 + ); + + let width = (text as NSString).boundingRect( + with: rect.size, + options: [.usesLineFragmentOrigin], + attributes: [.font: indexLabelFont], + context: nil + ).size.width + + let label = UILabel( + frame: CGRect( + x: p.x - 4.0, + y: p.y + 2, + width: width + 2, + height: 14 + ) + ) + label.text = text; + label.font = indexLabelFont; + label.textColor = indexLabelTextColor; + label.backgroundColor = indexLabelBackgroundColor; + + return label + } +} + +// It's done for refactoring purposes +extension LineChartLayoutManager { + var data: [Float] { + return chart.data + } + + var dataPointBackgroundColor: UIColor { + return chart.dataPointBackgroundColor + } + + var verticalGridStep: Int { + return chart.verticalGridStep + } + + var bezierSmoothingTension: CGFloat { + return chart.bezierSmoothingTension + } + + var displayDataPoint: Bool { + return chart.displayDataPoint + } + + var labelForValue: FSLineChart.LabelForValueGetter? { + return chart.labelForValue + } + + var labelForIndex: FSLineChart.LabelForIndexGetter? { + return chart.labelForIndex + } + + var horizontalGridStep: Int { + return chart.horizontalGridStep + } + + var valueLabelPosition: FSLineChart.ValueLabelPosition { + return chart.valueLabelPosition + } + + var minVerticalBound: CGFloat { + return boundsCalculator.minVerticalBound + } + + var maxVerticalBound: CGFloat { + return boundsCalculator.maxVerticalBound + } + + var margin: CGFloat { + return chart.margin + } + + var color: UIColor { + return chart.color + } + + var lineWidth: CGFloat { + return chart.lineWidth + } + + var frame: CGRect { + return chart.frame + } + + var bounds: CGRect { + return chart.bounds + } + + var fillColor: UIColor? { + return chart.fillColor + } + + var valueLabelFont: UIFont { + return chart.valueLabelFont + } + + var valueLabelTextColor: UIColor { + return chart.valueLabelTextColor + } + + var valueLabelBackgroundColor: UIColor { + return chart.valueLabelBackgroundColor + } + + var indexLabelFont: UIFont { + return chart.indexLabelFont + } + + var dataPointRadius: CGFloat { + return chart.dataPointRadius + } + + var indexLabelTextColor: UIColor { + return chart.indexLabelTextColor + } + + var dataPointColor: UIColor { + return chart.dataPointColor + } + + var bezierSmoothing: Bool { + return chart.bezierSmoothing + } + + var indexLabelBackgroundColor: UIColor { + return chart.indexLabelBackgroundColor + } + + var animationDuration: TimeInterval { + return chart.animationDuration + } +} diff --git a/Sources/FSLineChart/LegacySupport.swift b/Sources/FSLineChart/LegacySupport.swift new file mode 100644 index 0000000..bc076a8 --- /dev/null +++ b/Sources/FSLineChart/LegacySupport.swift @@ -0,0 +1,17 @@ +// +// LegacySupport.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import CoreGraphics + +func CGRectMake(_ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) -> CGRect { + return CGRect(x: x, y: y, width: width, height: height) +} + +func CGPointMake(_ x: CGFloat, _ y: CGFloat) -> CGPoint { + return CGPoint(x: x, y: y) +} diff --git a/Sources/FSLineChart/UIColor+FS.swift b/Sources/FSLineChart/UIColor+FS.swift new file mode 100644 index 0000000..a91f62d --- /dev/null +++ b/Sources/FSLineChart/UIColor+FS.swift @@ -0,0 +1,51 @@ +// +// UIColor+FS.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import UIKit + +public extension UIColor { + static var fsRed: UIColor { + return UIColor(red: 1.0, green: 0.22, blue: 0.22, alpha: 1.0) + } + + static var fsOrange: UIColor { + return UIColor(red: 1.0, green: 0.58, blue: 0.21, alpha: 1.0) + } + + static var fsYellow: UIColor { + return UIColor(red: 1.0, green: 0.79, blue: 0.28, alpha: 1.0) + } + + static var fsGreen: UIColor { + return UIColor(red: 0.27, green: 0.85, blue: 0.46, alpha: 1.0) + } + + static var fsLightBlue: UIColor { + return UIColor(red: 0.18, green: 0.67, blue: 0.84, alpha: 1.0) + } + + static var fsDarkBlue: UIColor { + return UIColor(red: 0.0, green: 0.49, blue: 0.96, alpha: 1.0) + } + + static var fsPurple: UIColor { + return UIColor(red: 0.35, green: 0.35, blue: 0.81, alpha: 1.0) + } + + static var fsPink: UIColor { + return UIColor(red: 1.0, green: 0.17, blue: 0.34, alpha: 1.0) + } + + static var fsDarkGray: UIColor { + return UIColor(red: 0.56, green: 0.56, blue: 0.58, alpha: 1.0) + } + + static var fsLightGray: UIColor { + return UIColor(red: 0.78, green: 0.78, blue: 0.8, alpha: 1.0) + } +} diff --git a/Tests/FSLineChartTests/FSLineChartTests.swift b/Tests/FSLineChartTests/FSLineChartTests.swift new file mode 100644 index 0000000..67e6e85 --- /dev/null +++ b/Tests/FSLineChartTests/FSLineChartTests.swift @@ -0,0 +1,51 @@ +// +// FSLineChartTests.swift +// FSLineChart +// +// Created by Yaroslav Zhurakovskiy on 25.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import XCTest +@testable import FSLineChart + +class FSLineChartTests: XCTestCase { + func testInitialisation() { + let chart = FSLineChart() + XCTAssertNotNil(chart); + } + + func testBoundsEmptyChart() { + let chart = FSLineChart() + chart.setChartData([]) + + XCTAssertEqual(chart.minVerticalBound, 0) + XCTAssertEqual(chart.maxVerticalBound, 0) + } + + func testBoundsAllValuesToZero() { + let chart = FSLineChart() + chart.setChartData([0, 0, 0]) + + XCTAssertEqual(chart.minVerticalBound, 0) + XCTAssertEqual(chart.maxVerticalBound, 0) + } + + func testBounds() { + let chart = FSLineChart() + chart.setChartData([0, 1, -1]) + + XCTAssertEqual(chart.minVerticalBound, -3) + XCTAssertEqual(chart.maxVerticalBound, 1.5) + } + + func testPerformanceExample() { + let chart = FSLineChart() + let testData = (0..<1000).map { Float($0) } + + // Testing whether a 1000 values are processed between two frames (1/60th of a second) + measure { + chart.setChartData(testData); + } + } +} diff --git a/iOS Example/iOS Example.xcodeproj/project.pbxproj b/iOS Example/iOS Example.xcodeproj/project.pbxproj new file mode 100644 index 0000000..44ead82 --- /dev/null +++ b/iOS Example/iOS Example.xcodeproj/project.pbxproj @@ -0,0 +1,373 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 52; + objects = { + +/* Begin PBXBuildFile section */ + C438D83F238C2B0D00D5B4B0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */; }; + C4BAEC6823855FE600B52987 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6723855FE600B52987 /* AppDelegate.swift */; }; + C4BAEC6A23855FE600B52987 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6923855FE600B52987 /* SceneDelegate.swift */; }; + C4BAEC6C23855FE600B52987 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6B23855FE600B52987 /* ViewController.swift */; }; + C4BAEC6F23855FE600B52987 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C4BAEC6D23855FE600B52987 /* Main.storyboard */; }; + C4BAEC7123855FE700B52987 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C4BAEC7023855FE700B52987 /* Assets.xcassets */; }; + C4BAEC7D2385602E00B52987 /* FSLineChart in Frameworks */ = {isa = PBXBuildFile; productRef = C4BAEC7C2385602E00B52987 /* FSLineChart */; }; + C4BAEC822385607400B52987 /* ExampleChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC802385607400B52987 /* ExampleChart.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + C438D83E238C2B0D00D5B4B0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; + C4BAEC6423855FE600B52987 /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + C4BAEC6723855FE600B52987 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + C4BAEC6923855FE600B52987 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + C4BAEC6B23855FE600B52987 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + C4BAEC6E23855FE600B52987 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + C4BAEC7023855FE700B52987 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + C4BAEC7523855FE700B52987 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C4BAEC7E2385607300B52987 /* iOS Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iOS Example-Bridging-Header.h"; sourceTree = ""; }; + C4BAEC802385607400B52987 /* ExampleChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleChart.swift; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + C4BAEC6123855FE600B52987 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + C4BAEC7D2385602E00B52987 /* FSLineChart in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + C4BAEC5B23855FE600B52987 = { + isa = PBXGroup; + children = ( + C4BAEC6623855FE600B52987 /* iOS Example */, + C4BAEC6523855FE600B52987 /* Products */, + C4BAEC7B2385602E00B52987 /* Frameworks */, + ); + sourceTree = ""; + }; + C4BAEC6523855FE600B52987 /* Products */ = { + isa = PBXGroup; + children = ( + C4BAEC6423855FE600B52987 /* iOS Example.app */, + ); + name = Products; + sourceTree = ""; + }; + C4BAEC6623855FE600B52987 /* iOS Example */ = { + isa = PBXGroup; + children = ( + C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */, + C4BAEC802385607400B52987 /* ExampleChart.swift */, + C4BAEC6723855FE600B52987 /* AppDelegate.swift */, + C4BAEC6923855FE600B52987 /* SceneDelegate.swift */, + C4BAEC6B23855FE600B52987 /* ViewController.swift */, + C4BAEC6D23855FE600B52987 /* Main.storyboard */, + C4BAEC7023855FE700B52987 /* Assets.xcassets */, + C4BAEC7523855FE700B52987 /* Info.plist */, + C4BAEC7E2385607300B52987 /* iOS Example-Bridging-Header.h */, + ); + path = "iOS Example"; + sourceTree = ""; + }; + C4BAEC7B2385602E00B52987 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + C4BAEC6323855FE600B52987 /* iOS Example */ = { + isa = PBXNativeTarget; + buildConfigurationList = C4BAEC7823855FE700B52987 /* Build configuration list for PBXNativeTarget "iOS Example" */; + buildPhases = ( + C4BAEC6023855FE600B52987 /* Sources */, + C4BAEC6123855FE600B52987 /* Frameworks */, + C4BAEC6223855FE600B52987 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "iOS Example"; + packageProductDependencies = ( + C4BAEC7C2385602E00B52987 /* FSLineChart */, + ); + productName = "iOS Example"; + productReference = C4BAEC6423855FE600B52987 /* iOS Example.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + C4BAEC5C23855FE600B52987 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1120; + LastUpgradeCheck = 1120; + ORGANIZATIONNAME = "William Entriken"; + TargetAttributes = { + C4BAEC6323855FE600B52987 = { + CreatedOnToolsVersion = 11.2.1; + LastSwiftMigration = 1120; + }; + }; + }; + buildConfigurationList = C4BAEC5F23855FE600B52987 /* Build configuration list for PBXProject "iOS Example" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = C4BAEC5B23855FE600B52987; + productRefGroup = C4BAEC6523855FE600B52987 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + C4BAEC6323855FE600B52987 /* iOS Example */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + C4BAEC6223855FE600B52987 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C4BAEC7123855FE700B52987 /* Assets.xcassets in Resources */, + C438D83F238C2B0D00D5B4B0 /* LaunchScreen.xib in Resources */, + C4BAEC6F23855FE600B52987 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + C4BAEC6023855FE600B52987 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C4BAEC6C23855FE600B52987 /* ViewController.swift in Sources */, + C4BAEC6823855FE600B52987 /* AppDelegate.swift in Sources */, + C4BAEC6A23855FE600B52987 /* SceneDelegate.swift in Sources */, + C4BAEC822385607400B52987 /* ExampleChart.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */ = { + isa = PBXVariantGroup; + children = ( + C438D83E238C2B0D00D5B4B0 /* Base */, + ); + name = LaunchScreen.xib; + sourceTree = ""; + }; + C4BAEC6D23855FE600B52987 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + C4BAEC6E23855FE600B52987 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + C4BAEC7623855FE700B52987 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + 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_DOCUMENTATION_COMMENTS = YES; + 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; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + C4BAEC7723855FE700B52987 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + 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_DOCUMENTATION_COMMENTS = YES; + 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; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.2; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + C4BAEC7923855FE700B52987 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = "iOS Example/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "net.phor.iOS-Example"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "iOS Example/iOS Example-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + C4BAEC7A23855FE700B52987 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = "iOS Example/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "net.phor.iOS-Example"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "iOS Example/iOS Example-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + C4BAEC5F23855FE600B52987 /* Build configuration list for PBXProject "iOS Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C4BAEC7623855FE700B52987 /* Debug */, + C4BAEC7723855FE700B52987 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C4BAEC7823855FE700B52987 /* Build configuration list for PBXNativeTarget "iOS Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C4BAEC7923855FE700B52987 /* Debug */, + C4BAEC7A23855FE700B52987 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCSwiftPackageProductDependency section */ + C4BAEC7C2385602E00B52987 /* FSLineChart */ = { + isa = XCSwiftPackageProductDependency; + productName = FSLineChart; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = C4BAEC5C23855FE600B52987 /* Project object */; +} diff --git a/FSLineChart.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 69% rename from FSLineChart.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata index f03d496..bfe77a2 100644 --- a/FSLineChart.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:iOS Example.xcodeproj"> diff --git a/FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from FSLineChart.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata b/iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..b59d032 --- /dev/null +++ b/iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/iOS Example/iOS Example/AppDelegate.swift b/iOS Example/iOS Example/AppDelegate.swift new file mode 100644 index 0000000..7da9044 --- /dev/null +++ b/iOS Example/iOS Example/AppDelegate.swift @@ -0,0 +1,37 @@ +// +// AppDelegate.swift +// iOS Example +// +// Created by Yaroslav Zhurakovskiy on 20.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d8db8d6 --- /dev/null +++ b/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "76x76", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/iOS Example/iOS Example/Assets.xcassets/Contents.json b/iOS Example/iOS Example/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/iOS Example/iOS Example/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/FSLineChart/Base.lproj/LaunchScreen.xib b/iOS Example/iOS Example/Base.lproj/LaunchScreen.xib similarity index 100% rename from FSLineChart/Base.lproj/LaunchScreen.xib rename to iOS Example/iOS Example/Base.lproj/LaunchScreen.xib diff --git a/FSLineChart/Base.lproj/Main.storyboard b/iOS Example/iOS Example/Base.lproj/Main.storyboard similarity index 82% rename from FSLineChart/Base.lproj/Main.storyboard rename to iOS Example/iOS Example/Base.lproj/Main.storyboard index 6beb148..07919f7 100644 --- a/FSLineChart/Base.lproj/Main.storyboard +++ b/iOS Example/iOS Example/Base.lproj/Main.storyboard @@ -1,31 +1,32 @@ - - + + + - - - + - + - + - + + - + + @@ -49,7 +50,7 @@ - + diff --git a/FSLineChart/ExampleChart.swift b/iOS Example/iOS Example/ExampleChart.swift similarity index 80% rename from FSLineChart/ExampleChart.swift rename to iOS Example/iOS Example/ExampleChart.swift index 2cb8855..bb8d46b 100644 --- a/FSLineChart/ExampleChart.swift +++ b/iOS Example/iOS Example/ExampleChart.swift @@ -7,6 +7,7 @@ // import UIKit +import FSLineChart class ExampleChart: FSLineChart { override func awakeFromNib() { @@ -14,12 +15,9 @@ class ExampleChart: FSLineChart { } public func load() { - var data: [Int] = [] - // Generate some dummy data - for _ in 0...10 { - data.append(Int(20 + (arc4random() % 100))) - } + let data = (0...10).map { _ in Float(20 + (arc4random() % 100)) } + verticalGridStep = 5 horizontalGridStep = 9 diff --git a/FSLineChart/Images.xcassets/AppIcon.appiconset/Contents.json b/iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from FSLineChart/Images.xcassets/AppIcon.appiconset/Contents.json rename to iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/FSLineChart/Info.plist b/iOS Example/iOS Example/Info.plist similarity index 55% rename from FSLineChart/Info.plist rename to iOS Example/iOS Example/Info.plist index 6905cc6..2a3483c 100644 --- a/FSLineChart/Info.plist +++ b/iOS Example/iOS Example/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,15 +13,32 @@ CFBundleName $(PRODUCT_NAME) CFBundlePackageType - APPL + $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 - CFBundleSignature - ???? CFBundleVersion 1 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -36,5 +53,12 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + diff --git a/iOS Example/iOS Example/SceneDelegate.swift b/iOS Example/iOS Example/SceneDelegate.swift new file mode 100644 index 0000000..c6bda9a --- /dev/null +++ b/iOS Example/iOS Example/SceneDelegate.swift @@ -0,0 +1,53 @@ +// +// SceneDelegate.swift +// iOS Example +// +// Created by Yaroslav Zhurakovskiy on 20.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift new file mode 100644 index 0000000..02d9581 --- /dev/null +++ b/iOS Example/iOS Example/ViewController.swift @@ -0,0 +1,50 @@ +// +// ViewController.swift +// iOS Example +// +// Created by Yaroslav Zhurakovskiy on 20.11.2019. +// Copyright © 2019 William Entriken. All rights reserved. +// + +import UIKit +import FSLineChart + +class ViewController: UIViewController { + @IBOutlet weak var chartWithDates: FSLineChart! + + override func viewDidLoad() { + super.viewDidLoad() + + loadChartWithDates() + } + + func loadChartWithDates() { + // Generating some dummy data +// let chartData = (0..<7).map { Float($0) / 30.0 + Float(Int.random(in: 0...100)) / 500 } + + let chartData = (0..<7).map { Float($0) + Float(Int.random(in: 10...25)) } + + let months: [String] = ["January", "February", "March", "April", "May", "June", "July"] + + // Setting up the line chart + chartWithDates.verticalGridStep = 6; + chartWithDates.horizontalGridStep = 3; + chartWithDates.fillColor = nil; + chartWithDates.displayDataPoint = true + chartWithDates.dataPointColor = .fsOrange + chartWithDates.dataPointBackgroundColor = UIColor.fsOrange + chartWithDates.dataPointRadius = 2 + chartWithDates.color = chartWithDates.dataPointColor.withAlphaComponent(0.3) + chartWithDates.valueLabelPosition = .mirrored; + + chartWithDates.labelForIndex = { months[$0] }; + + chartWithDates.labelForValue = { value in + print(value) + return String(format: "%.02f €", value) + } + + chartWithDates.setChartData(chartData) + } +} + diff --git a/FSLineChart/FSLineChart-Bridging-Header.h b/iOS Example/iOS Example/iOS Example-Bridging-Header.h similarity index 81% rename from FSLineChart/FSLineChart-Bridging-Header.h rename to iOS Example/iOS Example/iOS Example-Bridging-Header.h index bdcb1d8..1b2cb5d 100644 --- a/FSLineChart/FSLineChart-Bridging-Header.h +++ b/iOS Example/iOS Example/iOS Example-Bridging-Header.h @@ -2,4 +2,3 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // -#import "FSLineChart.h" From de168d8ccc59c66411e3e9ffd687015fbda7cd4f Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Tue, 26 Nov 2019 00:07:09 +0200 Subject: [PATCH 04/12] Add travis ci --- .travis.yml | 14 ++++++++++++++ Scripts/travis-ci.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 .travis.yml create mode 100755 Scripts/travis-ci.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3e932ab --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: objective-c +osx_image: xcode11.2 +env: + global: + - LC_CTYPE=en_US.UTF-8 + - LANG=en_US.UTF-8 + - RUN_TESTS="YES" + - BUILD_EXAMPLE="YES" + - POD_LINT="NO" + - POD_QUALITY_CHECK="NO" + matrix: + - DESTINATION="OS=13.2.2,name=iPhone 8 Plus" +script: + - Scripts/travis-ci.sh \ No newline at end of file diff --git a/Scripts/travis-ci.sh b/Scripts/travis-ci.sh new file mode 100755 index 0000000..dfb525e --- /dev/null +++ b/Scripts/travis-ci.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +EXAMPLE_SCHEME="iOS Example" +EXAMPLE_WORKSPACE="iOS Example/iOS Example.xcworkspace" +IOS_FRAMEWORK_SCHEME="FSLineChart" + +set -o pipefail + +if [ $RUN_TESTS == "YES" ]; then + xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; +else + xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty; +fi + +# Build Framework in Release and Run Tests if specified +if [ $RUN_TESTS == "YES" ]; then + xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; +else + xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES build | xcpretty; +fi + +if [ $BUILD_EXAMPLE == "YES" ]; then + xcodebuild -workspace "$EXAMPLE_WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty; +fi + +# Run `pod lib lint` if specified +if [ $POD_LINT == "YES" ]; then + pod lib lint +fi + +if [ $POD_QUALITY_CHECK == "YES" ]; then + ruby Tests/CheckCocoaPodsQualityIndexes.rb FDTake +fi \ No newline at end of file From 0429945d6dc09aabc8ed1f976014b5d919bcedbe Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Tue, 26 Nov 2019 00:12:22 +0200 Subject: [PATCH 05/12] Update dummy data in the example --- iOS Example/iOS Example/ExampleChart.swift | 3 +-- iOS Example/iOS Example/ViewController.swift | 18 ++++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/iOS Example/iOS Example/ExampleChart.swift b/iOS Example/iOS Example/ExampleChart.swift index bb8d46b..b936371 100644 --- a/iOS Example/iOS Example/ExampleChart.swift +++ b/iOS Example/iOS Example/ExampleChart.swift @@ -18,11 +18,10 @@ class ExampleChart: FSLineChart { // Generate some dummy data let data = (0...10).map { _ in Float(20 + (arc4random() % 100)) } - verticalGridStep = 5 horizontalGridStep = 9 labelForIndex = { "\($0)" } - labelForValue = { "$\($0)" } + labelForValue = { String(format: "$%.02f", $0) } setChartData(data) } diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift index 02d9581..bae5f7c 100644 --- a/iOS Example/iOS Example/ViewController.swift +++ b/iOS Example/iOS Example/ViewController.swift @@ -20,29 +20,23 @@ class ViewController: UIViewController { func loadChartWithDates() { // Generating some dummy data -// let chartData = (0..<7).map { Float($0) / 30.0 + Float(Int.random(in: 0...100)) / 500 } + let chartData = (0..<7).map { Float($0) / 30.0 + Float(Int.random(in: 0...100)) / 500 } - let chartData = (0..<7).map { Float($0) + Float(Int.random(in: 10...25)) } - let months: [String] = ["January", "February", "March", "April", "May", "June", "July"] // Setting up the line chart - chartWithDates.verticalGridStep = 6; - chartWithDates.horizontalGridStep = 3; + chartWithDates.verticalGridStep = 6 + chartWithDates.horizontalGridStep = 3 chartWithDates.fillColor = nil; chartWithDates.displayDataPoint = true chartWithDates.dataPointColor = .fsOrange chartWithDates.dataPointBackgroundColor = UIColor.fsOrange chartWithDates.dataPointRadius = 2 chartWithDates.color = chartWithDates.dataPointColor.withAlphaComponent(0.3) - chartWithDates.valueLabelPosition = .mirrored; - - chartWithDates.labelForIndex = { months[$0] }; + chartWithDates.valueLabelPosition = .mirrored - chartWithDates.labelForValue = { value in - print(value) - return String(format: "%.02f €", value) - } + chartWithDates.labelForIndex = { months[$0] } + chartWithDates.labelForValue = { String(format: "%.02f €", $0) } chartWithDates.setChartData(chartData) } From 03c43545bbcdf307cfd2c9c69131b8572b849f34 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Mon, 25 Nov 2019 19:53:12 -0500 Subject: [PATCH 06/12] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index dd8a38c..3648743 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,8 @@ Screenshots Installing FSLineChart --- -Add the contents of the FSLineChart project to your directory or simply add the following line to your Podfile: - pod "FSLineChart" +Add this to your project using Swift Package Manager. In Xcode that is simply: File > Swift Packages > Add Package Dependency... and you're done. Alternative installations options are available for legacy projects. How to use --- From 7a48ace9eedb24c937d62f6e7793cc37d722b99a Mon Sep 17 00:00:00 2001 From: William Entriken Date: Mon, 25 Nov 2019 20:17:13 -0500 Subject: [PATCH 07/12] Update readme for Swift examples --- README.md | 80 +++++++++++++++++++------------------------------------ 1 file changed, 28 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index dd8a38c..1ee1fa3 100644 --- a/README.md +++ b/README.md @@ -33,77 +33,53 @@ labelForValue = { "$\($0)" } setChartData(data) ``` -Or in objective-c - -```objc -NSArray* months = @[@"January", @"February", @"March", @"April", @"May", @"June", @"July"]; - -FSLineChart* lineChart = [[FSLineChart alloc] initWithFrame:frame]; - -lineChart.labelForIndex = ^(NSUInteger item) { - return months[item]; -}; - -lineChart.labelForValue = ^(CGFloat value) { - return [NSString stringWithFormat:@"%.02f €", powf(10,value)]; -}; - -[lineChart setChartData:chartData]; -``` - You can also set several parameters. Some of the parameters including `color` and `fillColor` must be set before calling the `setChartData` method. All those properties are available: -```objc +```swift // Index label properties -@property (copy) FSLabelForIndexGetter labelForIndex; -@property (nonatomic, strong) UIFont* indexLabelFont; -@property (nonatomic) UIColor* indexLabelTextColor; -@property (nonatomic) UIColor* indexLabelBackgroundColor; +public var labelForIndex: LabelForIndexGetter? + +public var indexLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 10)! +public var indexLabelTextColor: UIColor = .gray +public var indexLabelBackgroundColor: UIColor = .clear // Value label properties -@property (copy) FSLabelForValueGetter labelForValue; -@property (nonatomic, strong) UIFont* valueLabelFont; -@property (nonatomic) UIColor* valueLabelTextColor; -@property (nonatomic) UIColor* valueLabelBackgroundColor; -@property (nonatomic) ValueLabelPositionType valueLabelPosition; +public var labelForValue: LabelForValueGetter? +public var valueLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 11)! +public var valueLabelTextColor: UIColor = .gray +public var valueLabelBackgroundColor: UIColor = UIColor(white: 1, alpha:0.75) +public var valueLabelPosition: ValueLabelPosition = .right // Number of visible step in the chart -@property (nonatomic) int gridStep; -@property (nonatomic) int verticalGridStep; -@property (nonatomic) int horizontalGridStep; +public var verticalGridStep: Int = 3 +public var horizontalGridStep: Int = 3 // Margin of the chart -@property (nonatomic) CGFloat margin; - -@property (nonatomic) CGFloat axisWidth; -@property (nonatomic) CGFloat axisHeight; +public var margin: CGFloat = 0.5 // Decoration parameters, let you pick the color of the line as well as the color of the axis -@property (nonatomic, strong) UIColor* axisColor; -@property (nonatomic) CGFloat axisLineWidth; +public var axisColor: UIColor = UIColor(white: 0.7, alpha: 1.0) +public var axisLineWidth: CGFloat = 1 // Chart parameters -@property (nonatomic, strong) UIColor* color; -@property (nonatomic, strong) UIColor* fillColor; -@property (nonatomic) CGFloat lineWidth; +public var color: UIColor = .fsLightBlue +public var fillColor: UIColor? = UIColor.fsLightBlue.withAlphaComponent(0.25) +public var lineWidth: CGFloat = 1.0 // Data points -@property (nonatomic) BOOL displayDataPoint; -@property (nonatomic, strong) UIColor* dataPointColor; -@property (nonatomic, strong) UIColor* dataPointBackgroundColor; -@property (nonatomic) CGFloat dataPointRadius; +public var displayDataPoint: Bool = false +public var dataPointColor: UIColor = .fsLightBlue +public var dataPointBackgroundColor: UIColor = .fsLightBlue +public var dataPointRadius: CGFloat = 1 // Grid parameters -@property (nonatomic) BOOL drawInnerGrid; -@property (nonatomic, strong) UIColor* innerGridColor; -@property (nonatomic) CGFloat innerGridLineWidth; +public var drawInnerGrid: Bool = true +public var innerGridColor: UIColor = UIColor(white: 0.9, alpha: 1.0) +public var innerGridLineWidth: CGFloat = 0.5 // Smoothing -@property (nonatomic) BOOL bezierSmoothing; -@property (nonatomic) CGFloat bezierSmoothingTension; - -// Animations -@property (nonatomic) CGFloat animationDuration; +public var bezierSmoothing: Bool = true +public var bezierSmoothingTension: CGFloat = 0.2 ``` From 8e5bbaca11a948f9e79560fbff403a347580f417 Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Mon, 2 Dec 2019 12:30:36 +0200 Subject: [PATCH 08/12] Add tests for the case when all data points are equal to zero --- Tests/FSLineChartTests/FSLineChartTests.swift | 23 ++++++++++ .../iOS Example/Base.lproj/Main.storyboard | 11 +++++ iOS Example/iOS Example/ExampleChart.swift | 2 +- iOS Example/iOS Example/ViewController.swift | 43 ++++++++++++++----- 4 files changed, 68 insertions(+), 11 deletions(-) diff --git a/Tests/FSLineChartTests/FSLineChartTests.swift b/Tests/FSLineChartTests/FSLineChartTests.swift index 67e6e85..e618198 100644 --- a/Tests/FSLineChartTests/FSLineChartTests.swift +++ b/Tests/FSLineChartTests/FSLineChartTests.swift @@ -48,4 +48,27 @@ class FSLineChartTests: XCTestCase { chart.setChartData(testData); } } + + func testDataWithAllZeroesShouldNotCrash() { + let chart = FSLineChart( + frame: CGRect( + x: 0, + y: 0, + width: 320, + height: 176 + ) + ) + chart.verticalGridStep = 5 + chart.horizontalGridStep = 9 + chart.labelForIndex = { "\($0)" } + chart.labelForValue = { String(format: "%.f", $0) } + chart.setChartData((1...10).map { _ in Float(0) }) + + UIGraphicsBeginImageContext(chart.bounds.size) + chart.layer.render(in: UIGraphicsGetCurrentContext()!) + let image = UIGraphicsGetImageFromCurrentImageContext() + UIGraphicsEndImageContext() + + XCTAssertNotNil(image) + } } diff --git a/iOS Example/iOS Example/Base.lproj/Main.storyboard b/iOS Example/iOS Example/Base.lproj/Main.storyboard index 07919f7..7c0b5e4 100644 --- a/iOS Example/iOS Example/Base.lproj/Main.storyboard +++ b/iOS Example/iOS Example/Base.lproj/Main.storyboard @@ -32,15 +32,25 @@ + + + + + + + + + + @@ -51,6 +61,7 @@ + diff --git a/iOS Example/iOS Example/ExampleChart.swift b/iOS Example/iOS Example/ExampleChart.swift index b936371..7d73c61 100644 --- a/iOS Example/iOS Example/ExampleChart.swift +++ b/iOS Example/iOS Example/ExampleChart.swift @@ -16,7 +16,7 @@ class ExampleChart: FSLineChart { public func load() { // Generate some dummy data - let data = (0...10).map { _ in Float(20 + (arc4random() % 100)) } + let data = (0...10).map { _ in Float(Int.random(in: 20...120)) } verticalGridStep = 5 horizontalGridStep = 9 diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift index bae5f7c..9fd586b 100644 --- a/iOS Example/iOS Example/ViewController.swift +++ b/iOS Example/iOS Example/ViewController.swift @@ -11,23 +11,33 @@ import FSLineChart class ViewController: UIViewController { @IBOutlet weak var chartWithDates: FSLineChart! + @IBOutlet weak var chartWithZeroes: FSLineChart! override func viewDidLoad() { super.viewDidLoad() + setupChartWithDates() + setupChartWithZeroes() + loadChartWithDates() + loadChartWithZeroes() } - func loadChartWithDates() { - // Generating some dummy data + private func loadChartWithDates() { let chartData = (0..<7).map { Float($0) / 30.0 + Float(Int.random(in: 0...100)) / 500 } - - let months: [String] = ["January", "February", "March", "April", "May", "June", "July"] - - // Setting up the line chart + + chartWithDates.setChartData(chartData) + } + + private func loadChartWithZeroes() { + let chartData = (0..<10).map { _ in Float(0) } + chartWithZeroes.setChartData(chartData) + } + + private func setupChartWithDates() { chartWithDates.verticalGridStep = 6 chartWithDates.horizontalGridStep = 3 - chartWithDates.fillColor = nil; + chartWithDates.fillColor = nil chartWithDates.displayDataPoint = true chartWithDates.dataPointColor = .fsOrange chartWithDates.dataPointBackgroundColor = UIColor.fsOrange @@ -35,10 +45,23 @@ class ViewController: UIViewController { chartWithDates.color = chartWithDates.dataPointColor.withAlphaComponent(0.3) chartWithDates.valueLabelPosition = .mirrored + let months = [ + "January", + "February", + "March", + "April", + "May", + "June", + "July" + ] chartWithDates.labelForIndex = { months[$0] } chartWithDates.labelForValue = { String(format: "%.02f €", $0) } - - chartWithDates.setChartData(chartData) + } + + private func setupChartWithZeroes() { + chartWithZeroes.verticalGridStep = 5 + chartWithZeroes.horizontalGridStep = 9 + chartWithZeroes.labelForIndex = { "\($0)" } + chartWithZeroes.labelForValue = { String(format: "%.f", $0) } } } - From 3dbe0629906c42a1dd94a50431c77f1cbc3cfdbc Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Mon, 2 Dec 2019 12:36:13 +0200 Subject: [PATCH 09/12] Make data type Double instead of Float --- Sources/FSLineChart/BoundsCalculator.swift | 42 +++++++++---------- Sources/FSLineChart/FSLineChart.swift | 4 +- Sources/FSLineChart/LayoutManager.swift | 4 +- Tests/FSLineChartTests/FSLineChartTests.swift | 4 +- iOS Example/iOS Example/ExampleChart.swift | 2 +- iOS Example/iOS Example/ViewController.swift | 4 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Sources/FSLineChart/BoundsCalculator.swift b/Sources/FSLineChart/BoundsCalculator.swift index 9930e6a..64e39e7 100644 --- a/Sources/FSLineChart/BoundsCalculator.swift +++ b/Sources/FSLineChart/BoundsCalculator.swift @@ -10,12 +10,12 @@ import CoreGraphics import Foundation class BoundsCalculator { - private(set) var min: Float = MAXFLOAT - private(set) var max: Float = -MAXFLOAT + private(set) var min: Double = Double.greatestFiniteMagnitude + private(set) var max: Double = -Double.greatestFiniteMagnitude - func computeBounds(data: [Float], verticalGridStep: Int) { - min = MAXFLOAT - max = -MAXFLOAT + func computeBounds(data: [Double], verticalGridStep: Int) { + min = Double.greatestFiniteMagnitude + max = -Double.greatestFiniteMagnitude for number in data { if number < min { @@ -32,29 +32,29 @@ class BoundsCalculator { if min < 0 { // If the minimum is negative then we want to have one of the step to be zero so that the chart is displayed nicely and more comprehensively - var step: Float + var step: Double if verticalGridStep > 3 { - step = abs(max - min) / Float(verticalGridStep - 1) + step = abs(max - min) / Double(verticalGridStep - 1) } else { step = Swift.max(abs(max - min) / 2, Swift.max(abs(min), abs(max))) } step = getUpperRoundNumber(step, forGridStep: verticalGridStep) - var newMin: Float - var newMax: Float + var newMin: Double + var newMax: Double if abs(min) > abs(max) { - let m = ceilf(abs(min) / step) + let m = ceil(abs(min) / step) - newMin = step * Float(m) * (min > 0 ? 1 : -1) - newMax = step * (Float(verticalGridStep) - m) * (max > 0 ? 1 : -1) + newMin = step * Double(m) * (min > 0 ? 1 : -1) + newMax = step * (Double(verticalGridStep) - m) * (max > 0 ? 1 : -1) } else { - let m = ceilf(abs(max) / step) + let m = ceil(abs(max) / step) - newMax = step * Float(m) * (max > 0 ? 1 : -1) - newMin = step * (Float(verticalGridStep) - m) * (min > 0 ? 1 : -1) + newMax = step * Double(m) * (max > 0 ? 1 : -1) + newMin = step * (Double(verticalGridStep) - m) * (min > 0 ? 1 : -1) } if min < newMin { @@ -85,22 +85,22 @@ class BoundsCalculator { } func getUpperRoundNumber( - _ value: Float, + _ value: Double, forGridStep gridStep: Int - ) -> Float { + ) -> Double { guard value > 0 else { return 0 } // We consider a round number the following by 0.5 step instead of true round number (with step of 1) - let logValue = log10f(value); - let scale = powf(10, floorf(logValue)); - var n = ceilf(value / scale * 4); + let logValue = log10(value); + let scale = pow(10, floor(logValue)); + var n = ceil(value / scale * 4); let tmp = Int(n) % gridStep; if tmp != 0 { - n += Float(gridStep - tmp) + n += Double(gridStep - tmp) } return n * scale / 4.0 diff --git a/Sources/FSLineChart/FSLineChart.swift b/Sources/FSLineChart/FSLineChart.swift index bb5300d..72c6812 100644 --- a/Sources/FSLineChart/FSLineChart.swift +++ b/Sources/FSLineChart/FSLineChart.swift @@ -10,7 +10,7 @@ import UIKit import QuartzCore open class FSLineChart: UIView { - internal var data: [Float] = [] + internal var data: [Double] = [] private let renderer = GridRenderer() private let layoutManager = LineChartLayoutManager() @@ -104,7 +104,7 @@ open class FSLineChart: UIView { renderer.render(chart: self, layoutManager: layoutManager) } - public func setChartData(_ chartData: [Float]) { + public func setChartData(_ chartData: [Double]) { data = chartData layoutManager.layoutChart(self) } diff --git a/Sources/FSLineChart/LayoutManager.swift b/Sources/FSLineChart/LayoutManager.swift index 5ea732f..2038517 100644 --- a/Sources/FSLineChart/LayoutManager.swift +++ b/Sources/FSLineChart/LayoutManager.swift @@ -263,7 +263,7 @@ fileprivate extension LineChartLayoutManager { extension LineChartLayoutManager { func calculateHorizontalScale( - data: [Float], + data: [Double], horizontalGridStep: Int ) -> CGFloat { var scale: CGFloat = 1.0 @@ -404,7 +404,7 @@ fileprivate extension LineChartLayoutManager { // It's done for refactoring purposes extension LineChartLayoutManager { - var data: [Float] { + var data: [Double] { return chart.data } diff --git a/Tests/FSLineChartTests/FSLineChartTests.swift b/Tests/FSLineChartTests/FSLineChartTests.swift index e618198..6de5c9d 100644 --- a/Tests/FSLineChartTests/FSLineChartTests.swift +++ b/Tests/FSLineChartTests/FSLineChartTests.swift @@ -41,7 +41,7 @@ class FSLineChartTests: XCTestCase { func testPerformanceExample() { let chart = FSLineChart() - let testData = (0..<1000).map { Float($0) } + let testData = (0..<1000).map { Double($0) } // Testing whether a 1000 values are processed between two frames (1/60th of a second) measure { @@ -62,7 +62,7 @@ class FSLineChartTests: XCTestCase { chart.horizontalGridStep = 9 chart.labelForIndex = { "\($0)" } chart.labelForValue = { String(format: "%.f", $0) } - chart.setChartData((1...10).map { _ in Float(0) }) + chart.setChartData((1...10).map { _ in Double(0) }) UIGraphicsBeginImageContext(chart.bounds.size) chart.layer.render(in: UIGraphicsGetCurrentContext()!) diff --git a/iOS Example/iOS Example/ExampleChart.swift b/iOS Example/iOS Example/ExampleChart.swift index 7d73c61..291ae18 100644 --- a/iOS Example/iOS Example/ExampleChart.swift +++ b/iOS Example/iOS Example/ExampleChart.swift @@ -16,7 +16,7 @@ class ExampleChart: FSLineChart { public func load() { // Generate some dummy data - let data = (0...10).map { _ in Float(Int.random(in: 20...120)) } + let data = (0...10).map { _ in Double(Int.random(in: 20...120)) } verticalGridStep = 5 horizontalGridStep = 9 diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift index 9fd586b..4de9fd4 100644 --- a/iOS Example/iOS Example/ViewController.swift +++ b/iOS Example/iOS Example/ViewController.swift @@ -24,13 +24,13 @@ class ViewController: UIViewController { } private func loadChartWithDates() { - let chartData = (0..<7).map { Float($0) / 30.0 + Float(Int.random(in: 0...100)) / 500 } + let chartData = (0..<7).map { Double($0) / 30.0 + Double(Int.random(in: 0...100)) / 500 } chartWithDates.setChartData(chartData) } private func loadChartWithZeroes() { - let chartData = (0..<10).map { _ in Float(0) } + let chartData = (0..<10).map { _ in Double(0) } chartWithZeroes.setChartData(chartData) } From cd01066f745cb47a9df1b21f0e8e0b875a7fa1a4 Mon Sep 17 00:00:00 2001 From: Yaroslav Zhurakovskiy Date: Mon, 2 Dec 2019 12:49:07 +0200 Subject: [PATCH 10/12] Rework LayoutManager --- Sources/FSLineChart/FSLineChart.swift | 10 +++++----- Sources/FSLineChart/GridRenderer.swift | 2 +- Sources/FSLineChart/LayoutManager.swift | 21 +++++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Sources/FSLineChart/FSLineChart.swift b/Sources/FSLineChart/FSLineChart.swift index 72c6812..2abb6ed 100644 --- a/Sources/FSLineChart/FSLineChart.swift +++ b/Sources/FSLineChart/FSLineChart.swift @@ -13,7 +13,7 @@ open class FSLineChart: UIView { internal var data: [Double] = [] private let renderer = GridRenderer() - private let layoutManager = LineChartLayoutManager() + private let layoutManager = LayoutManager() // Block definition for getting a label for a set index (use case: date, units,...) public typealias LabelForIndexGetter = (Int) -> String @@ -80,23 +80,23 @@ open class FSLineChart: UIView { public override init(frame: CGRect) { super.init(frame: frame) - layoutManager.recalculateAxisSize(from: frame, margin: margin) self.commonInit() } public required init?(coder: NSCoder) { super.init(coder: coder) - layoutManager.recalculateAxisSize(from: frame, margin: margin) self.commonInit() } private func commonInit() { self.backgroundColor = .white + layoutManager.chart = self + layoutManager.recalculateAxisSize(from: frame, margin: margin) } public override func layoutSubviews() { layoutManager.recalculateAxisSize(from: frame, margin: margin) - layoutManager.layoutChart(self) + layoutManager.layoutChart() super.layoutSubviews() } @@ -106,7 +106,7 @@ open class FSLineChart: UIView { public func setChartData(_ chartData: [Double]) { data = chartData - layoutManager.layoutChart(self) + layoutManager.layoutChart() } } diff --git a/Sources/FSLineChart/GridRenderer.swift b/Sources/FSLineChart/GridRenderer.swift index 064cd99..3487a66 100644 --- a/Sources/FSLineChart/GridRenderer.swift +++ b/Sources/FSLineChart/GridRenderer.swift @@ -14,7 +14,7 @@ class GridRenderer { // We pass FSLineChart now for temporarily refactoring reasons. Its better to use some struct. func render( chart options: FSLineChart, - layoutManager: LineChartLayoutManager + layoutManager: LayoutManager ) { guard options.data.count > 0 else { return diff --git a/Sources/FSLineChart/LayoutManager.swift b/Sources/FSLineChart/LayoutManager.swift index 2038517..f4b6f5b 100644 --- a/Sources/FSLineChart/LayoutManager.swift +++ b/Sources/FSLineChart/LayoutManager.swift @@ -9,17 +9,18 @@ import CoreGraphics import UIKit -class LineChartLayoutManager { - private unowned var chart: FSLineChart! +class LayoutManager { + // It is done for refactoring reasons. + // 'chart' should be set before using any methods. + unowned var chart: FSLineChart! + private var layers: [CALayer] = [] private let boundsCalculator = BoundsCalculator() public private(set) var axisWidth: CGFloat = 0 public private(set) var axisHeight: CGFloat = 0 - func layoutChart(_ chart: FSLineChart) { - self.chart = chart - + func layoutChart() { // Removing the old label views as well as the chart layers. chart.subviews.forEach { $0.removeFromSuperview() } layers.forEach { $0.removeFromSuperlayer() } @@ -64,7 +65,7 @@ class LineChartLayoutManager { } } -fileprivate extension LineChartLayoutManager { +fileprivate extension LayoutManager { func strokeChart() { let minBound = self.minVerticalBound let scale = self.verticalScale @@ -163,7 +164,7 @@ fileprivate extension LineChartLayoutManager { } } -fileprivate extension LineChartLayoutManager { +fileprivate extension LayoutManager { func getPointForIndex(_ idx: Int, withScale scale: CGFloat) -> CGPoint { guard idx >= 0 && idx < data.count else { return .zero @@ -261,7 +262,7 @@ fileprivate extension LineChartLayoutManager { } } -extension LineChartLayoutManager { +extension LayoutManager { func calculateHorizontalScale( data: [Double], horizontalGridStep: Int @@ -298,7 +299,7 @@ extension LineChartLayoutManager { } } -fileprivate extension LineChartLayoutManager { +fileprivate extension LayoutManager { private func createLabelForValue(_ index: Int) -> UILabel? { let minBound = self.minVerticalBound let maxBound = self.maxVerticalBound @@ -403,7 +404,7 @@ fileprivate extension LineChartLayoutManager { } // It's done for refactoring purposes -extension LineChartLayoutManager { +extension LayoutManager { var data: [Double] { return chart.data } From 6e14df3758099a9c29e2cc014f62593c9a06aeb5 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Sat, 31 May 2025 11:27:32 -0400 Subject: [PATCH 11/12] Implement new swift6-module-template and refactor --- .github/workflows/ci.yml | 374 ++++++++++ .gitignore | 77 +- .../contents.xcworkspacedata | 2 +- .travis.yml | 14 - CHANGELOG.md | 10 + CONTRIBUTING.md | 19 + Example/Example.xcodeproj/project.pbxproj | 578 +++++++++++++++ .../contents.xcworkspacedata | 5 +- Example/ExampleTests/ExampleTests.swift | 10 + Example/ExampleUITests/ExampleUITests.swift | 34 + .../ExampleUITestsLaunchTests.swift | 26 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 35 + Example/Sources/Assets.xcassets/Contents.json | 6 + Example/Sources/ExampleApp.swift | 302 ++++++++ FSLineChart.podspec | 17 - LICENSE | 222 +----- Package.swift | 17 +- README.md | 168 +++-- Screenshots/fslinechart.png | Bin 55010 -> 0 bytes Screenshots/fslinechart2.png | Bin 36065 -> 0 bytes Screenshots/screenshot-1.webp | Bin 0 -> 22600 bytes Screenshots/screenshot-2.webp | Bin 0 -> 20740 bytes Scripts/travis-ci.sh | 33 - Sources/FSLineChart/BoundsCalculator.swift | 179 ++--- Sources/FSLineChart/ChartUtilities.swift | 216 ++++++ Sources/FSLineChart/FSLineChart.swift | 285 +++++--- Sources/FSLineChart/GridRenderer.swift | 143 ++-- Sources/FSLineChart/LayoutManager.swift | 671 +++++++----------- Sources/FSLineChart/LegacySupport.swift | 17 - Sources/FSLineChart/UIColor+FS.swift | 27 +- .../iOS Example.xcodeproj/project.pbxproj | 373 ---------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - iOS Example/iOS Example/AppDelegate.swift | 37 - .../AppIcon.appiconset/Contents.json | 98 --- .../iOS Example/Assets.xcassets/Contents.json | 6 - .../iOS Example/Base.lproj/LaunchScreen.xib | 41 -- .../iOS Example/Base.lproj/Main.storyboard | 72 -- iOS Example/iOS Example/ExampleChart.swift | 28 - .../AppIcon.appiconset/Contents.json | 38 - iOS Example/iOS Example/Info.plist | 64 -- iOS Example/iOS Example/SceneDelegate.swift | 53 -- iOS Example/iOS Example/ViewController.swift | 67 -- .../iOS Example/iOS Example-Bridging-Header.h | 4 - 45 files changed, 2405 insertions(+), 1990 deletions(-) create mode 100644 .github/workflows/ci.yml rename {iOS Example/iOS Example.xcodeproj/project.xcworkspace => .swiftpm/xcode/package.xcworkspace}/contents.xcworkspacedata (69%) delete mode 100644 .travis.yml create mode 100644 CHANGELOG.md create mode 100644 CONTRIBUTING.md create mode 100644 Example/Example.xcodeproj/project.pbxproj rename {iOS Example/iOS Example.xcworkspace => Example/Example.xcodeproj/project.xcworkspace}/contents.xcworkspacedata (50%) create mode 100644 Example/ExampleTests/ExampleTests.swift create mode 100644 Example/ExampleUITests/ExampleUITests.swift create mode 100644 Example/ExampleUITests/ExampleUITestsLaunchTests.swift create mode 100644 Example/Sources/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 Example/Sources/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Example/Sources/Assets.xcassets/Contents.json create mode 100644 Example/Sources/ExampleApp.swift delete mode 100644 FSLineChart.podspec delete mode 100644 Screenshots/fslinechart.png delete mode 100644 Screenshots/fslinechart2.png create mode 100644 Screenshots/screenshot-1.webp create mode 100644 Screenshots/screenshot-2.webp delete mode 100755 Scripts/travis-ci.sh create mode 100644 Sources/FSLineChart/ChartUtilities.swift delete mode 100644 Sources/FSLineChart/LegacySupport.swift delete mode 100644 iOS Example/iOS Example.xcodeproj/project.pbxproj delete mode 100644 iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 iOS Example/iOS Example/AppDelegate.swift delete mode 100644 iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 iOS Example/iOS Example/Assets.xcassets/Contents.json delete mode 100644 iOS Example/iOS Example/Base.lproj/LaunchScreen.xib delete mode 100644 iOS Example/iOS Example/Base.lproj/Main.storyboard delete mode 100644 iOS Example/iOS Example/ExampleChart.swift delete mode 100644 iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 iOS Example/iOS Example/Info.plist delete mode 100644 iOS Example/iOS Example/SceneDelegate.swift delete mode 100644 iOS Example/iOS Example/ViewController.swift delete mode 100644 iOS Example/iOS Example/iOS Example-Bridging-Header.h diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1816aa0 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,374 @@ +name: "FSLineChart CI" + +on: + push: + branches: + - main + paths: + - 'Sources/**' + - 'Tests/**' + - '.github/workflows/**' + - 'Package.swift' + pull_request: + paths: + - 'Sources/**' + - 'Tests/**' + - '.github/workflows/**' + - 'Package.swift' + +concurrency: + group: ${{ github.ref_name }} + cancel-in-progress: true + +# Keep this up to date with https://github.com/FSLineChart/FSLineChart/blob/main/.github/workflows/ci.yml +# And also https://github.com/Alamofire/Alamofire/blob/master/.github/workflows/ci.yml +jobs: + macOS: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - xcode: "Xcode_15.4" + runsOn: firebreak + name: "macOS 14, Xcode 15.4, Swift 5.10" + testPlan: "macOS" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.2" + runsOn: firebreak + name: "macOS 13, Xcode 15.2, Swift 5.9.2" + testPlan: "macOS" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.1" + runsOn: macOS-14 + name: "macOS 14, Xcode 15.1, Swift 5.9.1" + testPlan: "macOS" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.0.1" + runsOn: macOS-14 + name: "macOS 14, Xcode 15.0.1, Swift 5.9.0" + testPlan: "macOS" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_14.3.1" + runsOn: macOS-13 + name: "macOS 13, Xcode 14.3.1, Swift 5.8.0" + testPlan: "macOS" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_14.2" + runsOn: macOS-12 + name: "macOS 12, Xcode 14.2, Swift 5.7.2" + testPlan: "macOS" + outputFilter: xcpretty + - xcode: "Xcode_14.1" + runsOn: macOS-12 + name: "macOS 12, Xcode 14.1, Swift 5.7.1" + testPlan: "macOS" + outputFilter: xcpretty + steps: + - uses: actions/checkout@v4 + - name: ${{ matrix.name }} + run: |- + set -o pipefail + brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk + firewalk & + env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire macOS" -destination "platform=macOS" -testPlan "${{ matrix.testPlan }}" clean test | ${{ matrix.outputFilter }} + Catalyst: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - xcode: "Xcode_15.4" + name: "Catalyst 15.4" + runsOn: firebreak + - xcode: "Xcode_15.2" + name: "Catalyst 15.2" + runsOn: firebreak + - xcode: "Xcode_15.1" + name: "Catalyst 15.1" + runsOn: macOS-14 + - xcode: "Xcode_15.0.1" + name: "Catalyst 15.0" + runsOn: macOS-14 + - xcode: "Xcode_14.3.1" + name: "Catalyst 14.3.1" + runsOn: macOS-13 + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & + - name: Catalyst + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire iOS" -destination "platform=macOS" clean test 2>&1 | xcbeautify --renderer github-actions + iOS: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - destination: "OS=17.5,name=iPhone 15 Pro" + name: "iOS 17.5" + testPlan: "iOS" + xcode: "Xcode_15.4" + runsOn: firebreak + - destination: "OS=17.2,name=iPhone 15 Pro" + name: "iOS 17.2" + testPlan: "iOS" + xcode: "Xcode_15.2" + runsOn: firebreak + - destination: "OS=17.0,name=iPhone 15 Pro" + name: "iOS 17.0" + testPlan: "iOS" + xcode: "Xcode_15.0.1" + runsOn: macOS-14 + - destination: "OS=16.4,name=iPhone 14 Pro" + name: "iOS 16.4" + testPlan: "iOS" + xcode: "Xcode_14.3.1" + runsOn: macOS-13 + - destination: "OS=15.5,name=iPhone 13 Pro" + name: "iOS 15.5" + testPlan: "iOS-NoTS" + xcode: "Xcode_14.3.1" + runsOn: firebreak + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & + - name: ${{ matrix.name }} + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire iOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + tvOS: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - destination: "OS=17.5,name=Apple TV" + name: "tvOS 17.5" + testPlan: "tvOS" + xcode: "Xcode_15.4" + runsOn: firebreak + - destination: "OS=17.2,name=Apple TV" + name: "tvOS 17.2" + testPlan: "tvOS" + xcode: "Xcode_15.2" + runsOn: firebreak + - destination: "OS=17.0,name=Apple TV" + name: "tvOS 17.0" + testPlan: "tvOS" + xcode: "Xcode_15.0.1" + runsOn: macOS-14 + - destination: "OS=16.4,name=Apple TV" + name: "tvOS 16.4" + testPlan: "tvOS" + xcode: "Xcode_14.3.1" + runsOn: macOS-13 + - destination: "OS=15.4,name=Apple TV" + name: "tvOS 15.4" + testPlan: "tvOS-NoTS" + xcode: "Xcode_14.3.1" + runsOn: firebreak + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & + - name: ${{ matrix.name }} + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire tvOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + visionOS: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer" + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - destination: "OS=1.0,name=Apple Vision Pro" + name: "visionOS 1.0" + testPlan: "visionOS" + scheme: "Alamofire visionOS" + runsOn: firebreak + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & + - name: ${{ matrix.name }} + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + watchOS: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - destination: "OS=10.5,name=Apple Watch Series 9 (45mm)" + name: "watchOS 10.5" + testPlan: "watchOS" + xcode: "Xcode_15.4" + runsOn: firebreak + - destination: "OS=10.2,name=Apple Watch Series 9 (45mm)" + name: "watchOS 10.2" + testPlan: "watchOS" + xcode: "Xcode_15.2" + runsOn: firebreak + - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)" + name: "watchOS 10.0" + testPlan: "watchOS" + xcode: "Xcode_15.0.1" + runsOn: macOS-14 + - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)" + name: "watchOS 9.4" + testPlan: "watchOS" + xcode: "Xcode_14.3.1" + runsOn: macOS-13 + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew update && brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & + - name: ${{ matrix.name }} + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire watchOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + SPM: + name: ${{ matrix.name }} + runs-on: ${{ matrix.runsOn }} + env: + DEVELOPER_DIR: "/Applications/${{ matrix.xcode }}.app/Contents/Developer" + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - xcode: "Xcode_15.4" + runsOn: firebreak + name: "macOS 14, SPM 5.10 Test" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.2" + runsOn: firebreak + name: "macOS 13, SPM 5.9.2 Test" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.1" + runsOn: macOS-14 + name: "macOS 14, SPM 5.9.1 Test" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_15.0.1" + runsOn: macOS-14 + name: "macOS 14, SPM 5.9.0 Test" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_14.3.1" + runsOn: macOS-13 + name: "macOS 13, SPM 5.8.0 Test" + outputFilter: xcbeautify --renderer github-actions + - xcode: "Xcode_14.2" + runsOn: macOS-12 + name: "macOS 12, SPM 5.7.2 Test" + outputFilter: xcpretty + - xcode: "Xcode_14.1" + runsOn: macOS-12 + name: "macOS 12, SPM 5.7.1 Test" + outputFilter: xcpretty + steps: + - uses: actions/checkout@v4 + - name: Install Firewalk + run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk xcbeautify && firewalk & + - name: Test SPM + run: swift test -c debug | ${{ matrix.outputFilter }} + Linux: + name: Linux + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - image: swift:5.8-focal + - image: swift:5.8-jammy + - image: swift:5.8-centos7 + - image: swift:5.8-amazonlinux2 + - image: swift:5.8-rhel-ubi9 + - image: swift:5.9-focal + - image: swift:5.9-jammy + - image: swift:5.9-centos7 + - image: swift:5.9-amazonlinux2 + - image: swift:5.9-rhel-ubi9 + - image: swiftlang/swift:nightly-focal + - image: swiftlang/swift:nightly-jammy + - image: swiftlang/swift:nightly-amazonlinux2 + container: + image: ${{ matrix.image }} + timeout-minutes: 10 + steps: + - uses: actions/checkout@v4 + - name: ${{ matrix.image }} + run: swift build --build-tests -c debug + Android: + name: Android + uses: hggz/swift-android-sdk/.github/workflows/sdks.yml@ci + strategy: + fail-fast: false + with: + target-repo: ${{ github.repository }} + checkout-hash: ${{ github.sha }} + Windows: + name: ${{ matrix.name }} + runs-on: windows-latest + timeout-minutes: 10 + strategy: + fail-fast: false + matrix: + include: + - branch: swift-5.8-release + tag: 5.8-RELEASE + name: Windows Swift 5.8 + - branch: swift-5.9-release + tag: 5.9-RELEASE + name: Windows Swift 5.9 + - branch: swift-5.10-release + tag: 5.10-RELEASE + name: Windows Swift 5.10 + steps: + - name: Setup + uses: compnerd/gha-setup-swift@main + with: + branch: ${{ matrix.branch }} + tag: ${{ matrix.tag }} + - name: Clone + uses: actions/checkout@v4 + - name: SPM ${{ matrix.name }} + run: | + swift build --build-tests -c debug -Xlinker /INCREMENTAL:NO -v + CodeQL: + name: Analyze with CodeQL + runs-on: macOS-13 + env: + DEVELOPER_DIR: "/Applications/Xcode_14.3.1.app/Contents/Developer" + timeout-minutes: 10 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: swift + - name: Build macOS + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire macOS" -destination "platform=macOS" clean build | xcpretty + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:swift" diff --git a/.gitignore b/.gitignore index d0e8564..52fe2f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,43 +1,62 @@ -# OS X -.DS_Store - # Xcode -build/ -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata -*.xccheckout -profile -*.moved-aside -DerivedData +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## Obj-C/Swift specific *.hmap + +## App packaging *.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace -# Bundler -.bundle +# Swift Package Manager +# +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm +.build/ + +# CocoaPods +# # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: -# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -# Note: if you ignore the Pods directory, make sure to uncomment -# `pod install` in .travis.yml +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # # Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace # Carthage -Carthage/Build +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts -FDWaveformView.framework.zip +Carthage/Build/ -# Swift build artifacts -.build/ +# fastlane +# +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control -# Swift project manager -.swiftpm +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output diff --git a/iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata similarity index 69% rename from iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata index bfe77a2..919434a 100644 --- a/iOS Example/iOS Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3e932ab..0000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: objective-c -osx_image: xcode11.2 -env: - global: - - LC_CTYPE=en_US.UTF-8 - - LANG=en_US.UTF-8 - - RUN_TESTS="YES" - - BUILD_EXAMPLE="YES" - - POD_LINT="NO" - - POD_QUALITY_CHECK="NO" - matrix: - - DESTINATION="OS=13.2.2,name=iPhone 8 Plus" -script: - - Scripts/travis-ci.sh \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..71f77b5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# Change Log +All notable changes to this project will be documented in this file. +FSLineChart adheres to [Semantic Versioning](http://semver.org/). + +## [Main](https://github.com/fulldecent/FSLineChart) +### Added + +### Changed + +### Removed diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..047279a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,19 @@ +# Contributing + +All contributors are welcome. Please use issues and pull requests to contribute to the project. And update [CHANGELOG.md](CHANGELOG.md) when committing. + +## Making a change + +When you commit a change, please add a note to [CHANGELOG.md](CHANGELOG.md). + +## Release process + +1. Confirm the build is [passing in GitHub Actions](https://github.com/fulldecent/FSLineChart/actions) +2. Push a release commit + 1. Create a new Main section at the top + 2. Rename the old Main section like: + ## [1.0.5](https://github.com/fulldecent/FSLineChart/releases/tag/1.0.5) + Released on 2019-10-15. +3. Create a GitHub release + 1. Tag the release (like `1.0.5`) + 2. Paste notes from [CHANGELOG.md](CHANGELOG.md) \ No newline at end of file diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj new file mode 100644 index 0000000..2e572d5 --- /dev/null +++ b/Example/Example.xcodeproj/project.pbxproj @@ -0,0 +1,578 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 77; + objects = { + +/* Begin PBXBuildFile section */ + D93672892DA620E500F3D5DC /* FSLineChart in Frameworks */ = {isa = PBXBuildFile; productRef = D93672882DA620E500F3D5DC /* FSLineChart */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + D936726B2DA61EF300F3D5DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D93672552DA61EF200F3D5DC /* Project object */; + proxyType = 1; + remoteGlobalIDString = D936725C2DA61EF200F3D5DC; + remoteInfo = Example; + }; + D93672752DA61EF300F3D5DC /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D93672552DA61EF200F3D5DC /* Project object */; + proxyType = 1; + remoteGlobalIDString = D936725C2DA61EF200F3D5DC; + remoteInfo = Example; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + D936725D2DA61EF200F3D5DC /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; }; + D936726A2DA61EF300F3D5DC /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + D93672742DA61EF300F3D5DC /* ExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + D936725F2DA61EF200F3D5DC /* Sources */ = { + isa = PBXFileSystemSynchronizedRootGroup; + path = Sources; + sourceTree = ""; + }; + D936726D2DA61EF300F3D5DC /* ExampleTests */ = { + isa = PBXFileSystemSynchronizedRootGroup; + path = ExampleTests; + sourceTree = ""; + }; + D93672772DA61EF300F3D5DC /* ExampleUITests */ = { + isa = PBXFileSystemSynchronizedRootGroup; + path = ExampleUITests; + sourceTree = ""; + }; +/* End PBXFileSystemSynchronizedRootGroup section */ + +/* Begin PBXFrameworksBuildPhase section */ + D936725A2DA61EF200F3D5DC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D93672892DA620E500F3D5DC /* FSLineChart in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672672DA61EF300F3D5DC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672712DA61EF300F3D5DC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + D93672542DA61EF200F3D5DC = { + isa = PBXGroup; + children = ( + D936725F2DA61EF200F3D5DC /* Sources */, + D936726D2DA61EF300F3D5DC /* ExampleTests */, + D93672772DA61EF300F3D5DC /* ExampleUITests */, + D936725E2DA61EF200F3D5DC /* Products */, + ); + sourceTree = ""; + }; + D936725E2DA61EF200F3D5DC /* Products */ = { + isa = PBXGroup; + children = ( + D936725D2DA61EF200F3D5DC /* Example.app */, + D936726A2DA61EF300F3D5DC /* ExampleTests.xctest */, + D93672742DA61EF300F3D5DC /* ExampleUITests.xctest */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + D936725C2DA61EF200F3D5DC /* Example */ = { + isa = PBXNativeTarget; + buildConfigurationList = D936727E2DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "Example" */; + buildPhases = ( + D93672592DA61EF200F3D5DC /* Sources */, + D936725A2DA61EF200F3D5DC /* Frameworks */, + D936725B2DA61EF200F3D5DC /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + fileSystemSynchronizedGroups = ( + D936725F2DA61EF200F3D5DC /* Sources */, + ); + name = Example; + packageProductDependencies = ( + D93672882DA620E500F3D5DC /* FSLineChart */, + ); + productName = Example; + productReference = D936725D2DA61EF200F3D5DC /* Example.app */; + productType = "com.apple.product-type.application"; + }; + D93672692DA61EF300F3D5DC /* ExampleTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = D93672812DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "ExampleTests" */; + buildPhases = ( + D93672662DA61EF300F3D5DC /* Sources */, + D93672672DA61EF300F3D5DC /* Frameworks */, + D93672682DA61EF300F3D5DC /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + D936726C2DA61EF300F3D5DC /* PBXTargetDependency */, + ); + fileSystemSynchronizedGroups = ( + D936726D2DA61EF300F3D5DC /* ExampleTests */, + ); + name = ExampleTests; + packageProductDependencies = ( + ); + productName = ExampleTests; + productReference = D936726A2DA61EF300F3D5DC /* ExampleTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + D93672732DA61EF300F3D5DC /* ExampleUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = D93672842DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "ExampleUITests" */; + buildPhases = ( + D93672702DA61EF300F3D5DC /* Sources */, + D93672712DA61EF300F3D5DC /* Frameworks */, + D93672722DA61EF300F3D5DC /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + D93672762DA61EF300F3D5DC /* PBXTargetDependency */, + ); + fileSystemSynchronizedGroups = ( + D93672772DA61EF300F3D5DC /* ExampleUITests */, + ); + name = ExampleUITests; + packageProductDependencies = ( + ); + productName = ExampleUITests; + productReference = D93672742DA61EF300F3D5DC /* ExampleUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + D93672552DA61EF200F3D5DC /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1630; + LastUpgradeCheck = 1630; + TargetAttributes = { + D936725C2DA61EF200F3D5DC = { + CreatedOnToolsVersion = 16.3; + }; + D93672692DA61EF300F3D5DC = { + CreatedOnToolsVersion = 16.3; + TestTargetID = D936725C2DA61EF200F3D5DC; + }; + D93672732DA61EF300F3D5DC = { + CreatedOnToolsVersion = 16.3; + TestTargetID = D936725C2DA61EF200F3D5DC; + }; + }; + }; + buildConfigurationList = D93672582DA61EF200F3D5DC /* Build configuration list for PBXProject "Example" */; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = D93672542DA61EF200F3D5DC; + minimizedProjectReferenceProxies = 1; + packageReferences = ( + D93672872DA620E500F3D5DC /* XCLocalSwiftPackageReference "../../FSLineChart" */, + ); + preferredProjectObjectVersion = 77; + productRefGroup = D936725E2DA61EF200F3D5DC /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + D936725C2DA61EF200F3D5DC /* Example */, + D93672692DA61EF300F3D5DC /* ExampleTests */, + D93672732DA61EF300F3D5DC /* ExampleUITests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + D936725B2DA61EF200F3D5DC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672682DA61EF300F3D5DC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672722DA61EF300F3D5DC /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + D93672592DA61EF200F3D5DC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672662DA61EF300F3D5DC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D93672702DA61EF300F3D5DC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + D936726C2DA61EF300F3D5DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D936725C2DA61EF200F3D5DC /* Example */; + targetProxy = D936726B2DA61EF300F3D5DC /* PBXContainerItemProxy */; + }; + D93672762DA61EF300F3D5DC /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D936725C2DA61EF200F3D5DC /* Example */; + targetProxy = D93672752DA61EF300F3D5DC /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + D936727C2DA61EF300F3D5DC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + 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_DOCUMENTATION_COMMENTS = YES; + 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + D936727D2DA61EF300F3D5DC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + 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_DOCUMENTATION_COMMENTS = YES; + 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_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + D936727F2DA61EF300F3D5DC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.Example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + D93672802DA61EF300F3D5DC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.Example; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + D93672822DA61EF300F3D5DC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.ExampleTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example"; + }; + name = Debug; + }; + D93672832DA61EF300F3D5DC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.ExampleTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Example"; + }; + name = Release; + }; + D93672852DA61EF300F3D5DC /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.ExampleUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = Example; + }; + name = Debug; + }; + D93672862DA61EF300F3D5DC /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = net.phor.ExampleUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = Example; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + D93672582DA61EF200F3D5DC /* Build configuration list for PBXProject "Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D936727C2DA61EF300F3D5DC /* Debug */, + D936727D2DA61EF300F3D5DC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D936727E2DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "Example" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D936727F2DA61EF300F3D5DC /* Debug */, + D93672802DA61EF300F3D5DC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D93672812DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "ExampleTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D93672822DA61EF300F3D5DC /* Debug */, + D93672832DA61EF300F3D5DC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D93672842DA61EF300F3D5DC /* Build configuration list for PBXNativeTarget "ExampleUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D93672852DA61EF300F3D5DC /* Debug */, + D93672862DA61EF300F3D5DC /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + D93672872DA620E500F3D5DC /* XCLocalSwiftPackageReference "../../FSLineChart" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../FSLineChart; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + D93672882DA620E500F3D5DC /* FSLineChart */ = { + isa = XCSwiftPackageProductDependency; + productName = FSLineChart; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = D93672552DA61EF200F3D5DC /* Project object */; +} diff --git a/iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata b/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 50% rename from iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata rename to Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata index b59d032..919434a 100644 --- a/iOS Example/iOS Example.xcworkspace/contents.xcworkspacedata +++ b/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,9 +2,6 @@ - - + location = "self:"> diff --git a/Example/ExampleTests/ExampleTests.swift b/Example/ExampleTests/ExampleTests.swift new file mode 100644 index 0000000..9498955 --- /dev/null +++ b/Example/ExampleTests/ExampleTests.swift @@ -0,0 +1,10 @@ +import Testing +@testable import Example + +struct ExampleTests { + + @Test func example() async throws { + // Write your test here and use APIs like `#expect(...)` to check expected conditions. + } + +} diff --git a/Example/ExampleUITests/ExampleUITests.swift b/Example/ExampleUITests/ExampleUITests.swift new file mode 100644 index 0000000..75fbf7f --- /dev/null +++ b/Example/ExampleUITests/ExampleUITests.swift @@ -0,0 +1,34 @@ +import XCTest + +final class ExampleUITests: XCTestCase { + + override func setUpWithError() throws { + // Put setup code here. This method is called before the invocation of each test method in the class. + + // In UI tests it is usually best to stop immediately when a failure occurs. + continueAfterFailure = false + + // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. + } + + override func tearDownWithError() throws { + // Put teardown code here. This method is called after the invocation of each test method in the class. + } + + @MainActor + func testExample() throws { + // UI tests must launch the application that they test. + let app = XCUIApplication() + app.launch() + + // Use XCTAssert and related functions to verify your tests produce the correct results. + } + + @MainActor + func testLaunchPerformance() throws { + // This measures how long it takes to launch your application. + measure(metrics: [XCTApplicationLaunchMetric()]) { + XCUIApplication().launch() + } + } +} diff --git a/Example/ExampleUITests/ExampleUITestsLaunchTests.swift b/Example/ExampleUITests/ExampleUITestsLaunchTests.swift new file mode 100644 index 0000000..2910808 --- /dev/null +++ b/Example/ExampleUITests/ExampleUITestsLaunchTests.swift @@ -0,0 +1,26 @@ +import XCTest + +final class ExampleUITestsLaunchTests: XCTestCase { + + override class var runsForEachTargetApplicationUIConfiguration: Bool { + true + } + + override func setUpWithError() throws { + continueAfterFailure = false + } + + @MainActor + func testLaunch() throws { + let app = XCUIApplication() + app.launch() + + // Insert steps here to perform after app launch but before taking a screenshot, + // such as logging into a test account or navigating somewhere in the app + + let attachment = XCTAttachment(screenshot: app.screenshot()) + attachment.name = "Launch Screen" + attachment.lifetime = .keepAlways + add(attachment) + } +} diff --git a/Example/Sources/Assets.xcassets/AccentColor.colorset/Contents.json b/Example/Sources/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/Example/Sources/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/Sources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Sources/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2305880 --- /dev/null +++ b/Example/Sources/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/Sources/Assets.xcassets/Contents.json b/Example/Sources/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Example/Sources/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Example/Sources/ExampleApp.swift b/Example/Sources/ExampleApp.swift new file mode 100644 index 0000000..c18ed9d --- /dev/null +++ b/Example/Sources/ExampleApp.swift @@ -0,0 +1,302 @@ +import SwiftUI +import FSLineChart + +/// A chart view demonstrating various FSLineChart configurations. +class ExampleChart: FSLineChart { + struct Configuration { + let data: [Double] + let labels: ChartLabels? + let style: ChartStyle + let title: String + } + + /// Configures the chart with the provided settings. + /// - Parameter configuration: The chart configuration. + func load(configuration: Configuration) { + try? setChartData(configuration.data) + setLabels(configuration.labels) + applyStyle(configuration.style) + } +} + +/// SwiftUI wrapper for ExampleChart. +struct SwiftUIExampleChart: UIViewRepresentable { + let configuration: ExampleChart.Configuration + + func makeUIView(context: Context) -> ExampleChart { + let chart = ExampleChart() + chart.load(configuration: configuration) + return chart + } + + func updateUIView(_ uiView: ExampleChart, context: Context) { + uiView.load(configuration: configuration) + } +} + +/// The main content view displaying multiple chart configurations. +struct ContentView: View { + private let configurations: [ExampleChart.Configuration] = [ + ExampleChart.Configuration( + data: (0..<10).map { _ in Double(Int.random(in: 20...120)) }, + labels: ChartLabels( + indexLabel: { "\($0)" }, + valueLabel: { String(format: "$%.0f", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsOrange, + fillColor: UIColor.fsOrange.withAlphaComponent(0.25), + lineWidth: 1, + displayDataPoints: true, + dataPointColor: .fsOrange, + dataPointBackgroundColor: .fsOrange, + dataPointRadius: 3, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 5, horizontal: 9), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "basic chart with random data" + ), + ExampleChart.Configuration( + data: (0..<7).map { Double($0) / 30.0 + Double(Int.random(in: 0...100)) / 500 }, + labels: ChartLabels( + indexLabel: { ["January", "February", "March", "April", "May", "June", "July"][$0] }, + valueLabel: { String(format: "%.02f €", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsGreen, + fillColor: nil, + lineWidth: 1, + displayDataPoints: true, + dataPointColor: .fsGreen, + dataPointBackgroundColor: .fsGreen, + dataPointRadius: 2, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 6, horizontal: 3), + margin: 20, + bezierSmoothing: false, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "monthly chart without smoothing" + ), + ExampleChart.Configuration( + data: (0..<20).map { _ in Double(Int.random(in: 50...200)) }, + labels: ChartLabels( + indexLabel: { "Day \($0 + 1)" }, + valueLabel: { String(format: "%.0f units", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsDarkBlue, + fillColor: UIColor.fsDarkBlue.withAlphaComponent(0.3), + lineWidth: 1, + displayDataPoints: false, + dataPointColor: .fsDarkBlue, + dataPointBackgroundColor: .fsDarkBlue, + dataPointRadius: 0, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 8, horizontal: 5), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "dense data with blue theme" + ), + ExampleChart.Configuration( + data: (0..<5).map { _ in Double(Int.random(in: 10...50)) }, + labels: ChartLabels( + indexLabel: { "\($0)" }, + valueLabel: { String(format: "%.0f", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsRed, + fillColor: nil, + lineWidth: 1, + displayDataPoints: true, + dataPointColor: .fsRed, + dataPointBackgroundColor: .fsRed, + dataPointRadius: 4, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 4, horizontal: 4), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "minimal chart with red theme" + ) + ] + + var body: some View { + ScrollView { + VStack(alignment: .leading, spacing: 20) { + Text("FSLineChart examples") + .font(.title) + .padding(.horizontal) + + ForEach(configurations, id: \.title) { config in + VStack(alignment: .leading) { + Text(config.title) + .font(.headline) + .padding(.horizontal) + + SwiftUIExampleChart(configuration: config) + .frame(height: 250) + .padding(.horizontal) + .background(Color.white) + .cornerRadius(10) + .shadow(radius: 5) + } + } + + Spacer() + } + .padding(.vertical) + } + .background(Color(UIColor.systemGray6)) + } +} + +#Preview("Basic Chart") { + ContentView() + .previewDisplayName("Basic Chart") +} + +#Preview("Monthly Chart") { + SwiftUIExampleChart(configuration: ExampleChart.Configuration( + data: (0..<7).map { Double($0) / 30.0 + Double(Int.random(in: 0...100)) / 500 }, + labels: ChartLabels( + indexLabel: { ["January", "February", "March", "April", "May", "June", "July"][$0] }, + valueLabel: { String(format: "%.02f €", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsGreen, + fillColor: nil, + lineWidth: 1, + displayDataPoints: true, + dataPointColor: .fsGreen, + dataPointBackgroundColor: .fsGreen, + dataPointRadius: 2, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 6, horizontal: 3), + margin: 20, + bezierSmoothing: false, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "monthly chart without smoothing" + )) + .frame(height: 250) + .padding() + .background(Color.white) + .previewDisplayName("Monthly Chart") +} + +#Preview("Dense Data") { + SwiftUIExampleChart(configuration: ExampleChart.Configuration( + data: (0..<20).map { _ in Double(Int.random(in: 50...200)) }, + labels: ChartLabels( + indexLabel: { "Day \($0 + 1)" }, + valueLabel: { String(format: "%.0f units", $0) } + ), + style: ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsDarkBlue, + fillColor: UIColor.fsDarkBlue.withAlphaComponent(0.3), + lineWidth: 1, + displayDataPoints: false, + dataPointColor: .fsDarkBlue, + dataPointBackgroundColor: .fsDarkBlue, + dataPointRadius: 0, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 8, horizontal: 5), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored + ), + title: "dense data with blue theme" + )) + .frame(height: 250) + .padding() + .background(Color.white) + .previewDisplayName("Dense Data") +} + +@main +struct ExampleApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/FSLineChart.podspec b/FSLineChart.podspec deleted file mode 100644 index f239827..0000000 --- a/FSLineChart.podspec +++ /dev/null @@ -1,17 +0,0 @@ -Pod::Spec.new do |s| - s.name = "FSLineChart" - s.version = "0.1.8" - s.summary = "FSLineChart is a simple chart library for iOS." - s.description = <<-DESC - FSLineChart is a simple chart library for iOS. You can change whatever you want: size, color, units,... - DESC - s.homepage = "https://github.com/fulldecent/FSLineChart" - s.screenshots = "https://github.com/fulldecent/FSLineChart/raw/master/Screenshots/fslinechart.png" - s.author = { "William Entriken" => "github.com@phor.net" } - s.license = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' } - s.platform = :ios, '8.0' - s.source = { :git => "https://github.com/ArthurGuibert/FSLineChart.git",:tag => "#{s.version}" } - s.source_files = 'Sources/FSLineChart/**/*.swift' - s.requires_arc = true - s.swift_version = '5.0' -end diff --git a/LICENSE b/LICENSE index e06d208..d87f4c6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,20 @@ -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - +Copyright (c) 2019–2025 William Entriken +Copyright (c) 2019 Yaroslav Zhurakovskiy + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/Package.swift b/Package.swift index 8feba55..3077655 100644 --- a/Package.swift +++ b/Package.swift @@ -1,25 +1,24 @@ -// swift-tools-version:5.1 +// swift-tools-version: 6.1 +// The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription let package = Package( name: "FSLineChart", - platforms: [.iOS(.v8)], products: [ + // Products define the executables and libraries a package produces, making them visible to other packages. .library( name: "FSLineChart", - targets: ["FSLineChart"] - ) + targets: ["FSLineChart"]), ], - dependencies: [], targets: [ + // Targets are the basic building blocks of a package, defining a module or a test suite. + // Targets can depend on other targets in this package and products from dependencies. .target( - name: "FSLineChart", - dependencies: [] - ), + name: "FSLineChart"), .testTarget( name: "FSLineChartTests", dependencies: ["FSLineChart"] - ) + ), ] ) diff --git a/README.md b/README.md index acd10c1..8adbd23 100644 --- a/README.md +++ b/README.md @@ -1,87 +1,115 @@ -FSLineChart -=========== +# FSLineChart A line chart library for iOS. -Screenshots ---- -  - +## Screenshots -Installing FSLineChart ---- +![Action shot](Screenshots/screenshot-1.webp) +![Action shot](Screenshots/screenshot-2.webp) -Add this to your project using Swift Package Manager. In Xcode that is simply: File > Swift Packages > Add Package Dependency... and you're done. Alternative installations options are available for legacy projects. +## Installing FSLineChart -How to use ---- -FSLineChart is a subclass of UIView so it can be added as regular view. The block structure allows you to format the values displayed on the chart the way you want. Here is a simple swift example: +Add this to your project using Swift Package Manager. In Xcode, go to: File > Swift Packages > Add Package Dependency... and follow the prompts. Alternative installation options are available for legacy projects. + +## How to use + +FSLineChart is a subclass of `UIView`, so it can be added as a regular view. Use the `ChartLabels` structure to format the values displayed on the chart. Here’s a simple Swift example: ```swift -var data: [Int] = [] - +import FSLineChart + +let chart = FSLineChart(frame: CGRect(x: 0, y: 0, width: 300, height: 200)) + // Generate some dummy data -for _ in 0...10 { - data.append(Int(20 + (arc4random() % 100))) -} +let data = (0..<10).map { _ in Double.random(in: 20...120) } + +// Configure labels +let labels = ChartLabels( + indexLabel: { "\($0)" }, + valueLabel: { String(format: "$%.0f", $0) } +) +chart.setLabels(labels) + +// Configure style +let style = ChartStyle( + axisColor: .gray, + axisLineWidth: 1, + lineColor: .fsOrange, + fillColor: UIColor.fsOrange.withAlphaComponent(0.25), + lineWidth: 1, + displayDataPoints: true, + dataPointColor: .fsOrange, + dataPointBackgroundColor: .fsOrange, + dataPointRadius: 3, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 5, horizontal: 9), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .mirrored +) +chart.applyStyle(style) + +// Set data and render +try? chart.setChartData(data) +``` + +You can customize the chart’s appearance using the `ChartStyle` structure. The style and labels must be set before calling `setChartData`. Here are the available `ChartStyle` properties: -verticalGridStep = 5 -horizontalGridStep = 9 -labelForIndex = { "\($0)" } -labelForValue = { "$\($0)" } -setChartData(data) +```swift +public struct ChartStyle { + public let axisColor: UIColor + public let axisLineWidth: CGFloat + public let lineColor: UIColor + public let fillColor: UIColor? + public let lineWidth: CGFloat + public let displayDataPoints: Bool + public let dataPointColor: UIColor + public let dataPointBackgroundColor: UIColor + public let dataPointRadius: CGFloat + public let drawInnerGrid: Bool + public let innerGridColor: UIColor + public let innerGridLineWidth: CGFloat + public let gridSteps: (vertical: Int, horizontal: Int) + public let margin: CGFloat + public let bezierSmoothing: Bool + public let bezierSmoothingTension: CGFloat + public let animationDuration: TimeInterval + public let indexLabelFont: UIFont + public let indexLabelColor: UIColor + public let indexLabelBackgroundColor: UIColor + public let valueLabelFont: UIFont + public let valueLabelColor: UIColor + public let valueLabelBackgroundColor: UIColor + public let valueLabelPosition: ValueLabelPosition + + public enum ValueLabelPosition { + case left + case right + case mirrored + } +} ``` -You can also set several parameters. Some of the parameters including `color` and `fillColor` must be set before calling the `setChartData` method. All those properties are available: +The `setChartData` method may throw errors if the data is empty or contains invalid values (e.g., NaN or infinite). Handle these errors appropriately: ```swift -// Index label properties -public var labelForIndex: LabelForIndexGetter? - -public var indexLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 10)! -public var indexLabelTextColor: UIColor = .gray -public var indexLabelBackgroundColor: UIColor = .clear - -// Value label properties -public var labelForValue: LabelForValueGetter? -public var valueLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 11)! -public var valueLabelTextColor: UIColor = .gray -public var valueLabelBackgroundColor: UIColor = UIColor(white: 1, alpha:0.75) -public var valueLabelPosition: ValueLabelPosition = .right - -// Number of visible step in the chart -public var verticalGridStep: Int = 3 -public var horizontalGridStep: Int = 3 - -// Margin of the chart -public var margin: CGFloat = 0.5 - -// Decoration parameters, let you pick the color of the line as well as the color of the axis -public var axisColor: UIColor = UIColor(white: 0.7, alpha: 1.0) -public var axisLineWidth: CGFloat = 1 - -// Chart parameters -public var color: UIColor = .fsLightBlue -public var fillColor: UIColor? = UIColor.fsLightBlue.withAlphaComponent(0.25) -public var lineWidth: CGFloat = 1.0 - -// Data points -public var displayDataPoint: Bool = false -public var dataPointColor: UIColor = .fsLightBlue -public var dataPointBackgroundColor: UIColor = .fsLightBlue -public var dataPointRadius: CGFloat = 1 - -// Grid parameters -public var drawInnerGrid: Bool = true -public var innerGridColor: UIColor = UIColor(white: 0.9, alpha: 1.0) -public var innerGridLineWidth: CGFloat = 0.5 - -// Smoothing -public var bezierSmoothing: Bool = true -public var bezierSmoothingTension: CGFloat = 0.2 +do { + try chart.setChartData(data) +} catch { + print("Failed to set chart data: \(error)") +} ``` +## Examples -Examples ---- -You can clone the repo to see a simple example. I'm also using FSLineChart on [ChartLoot](https://github.com/ArthurGuibert/ChartLoot) if you want to see the integration in a bigger project. +Clone the repository to explore a simple example project showcasing various chart configurations. For a larger integration, see FSLineChart in action in [ChartLoot](https://github.com/ArthurGuibert/ChartLoot). diff --git a/Screenshots/fslinechart.png b/Screenshots/fslinechart.png deleted file mode 100644 index bc9e94c5f3385561f6292aa7a8bc51dd704193f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 55010 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%0AN^3x8!q-;=|nkujfA%Z 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 H7UBO3?7pw6 diff --git a/Screenshots/fslinechart2.png b/Screenshots/fslinechart2.png deleted file mode 100644 index 72b10de60742ac9f3016ab0639925623e1a25670..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36065 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 H00000EX0bq literal 0 HcmV?d00001 diff --git a/Scripts/travis-ci.sh b/Scripts/travis-ci.sh deleted file mode 100755 index dfb525e..0000000 --- a/Scripts/travis-ci.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -EXAMPLE_SCHEME="iOS Example" -EXAMPLE_WORKSPACE="iOS Example/iOS Example.xcworkspace" -IOS_FRAMEWORK_SCHEME="FSLineChart" - -set -o pipefail - -if [ $RUN_TESTS == "YES" ]; then - xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; -else - xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty; -fi - -# Build Framework in Release and Run Tests if specified -if [ $RUN_TESTS == "YES" ]; then - xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty; -else - xcodebuild -scheme "$IOS_FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES build | xcpretty; -fi - -if [ $BUILD_EXAMPLE == "YES" ]; then - xcodebuild -workspace "$EXAMPLE_WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty; -fi - -# Run `pod lib lint` if specified -if [ $POD_LINT == "YES" ]; then - pod lib lint -fi - -if [ $POD_QUALITY_CHECK == "YES" ]; then - ruby Tests/CheckCocoaPodsQualityIndexes.rb FDTake -fi \ No newline at end of file diff --git a/Sources/FSLineChart/BoundsCalculator.swift b/Sources/FSLineChart/BoundsCalculator.swift index 64e39e7..ddb25ce 100644 --- a/Sources/FSLineChart/BoundsCalculator.swift +++ b/Sources/FSLineChart/BoundsCalculator.swift @@ -1,118 +1,121 @@ -// -// BoundsCalculator.swift -// FSLineChart -// -// Created by Yaroslav Zhurakovskiy on 25.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - import CoreGraphics import Foundation +/// Calculates the minimum and maximum bounds for a chart's vertical axis, ensuring rounded steps for readability. class BoundsCalculator { private(set) var min: Double = Double.greatestFiniteMagnitude private(set) var max: Double = -Double.greatestFiniteMagnitude - func computeBounds(data: [Double], verticalGridStep: Int) { + /// Computes the bounds for the given dataset, adjusting for rounded steps and ensuring zero is included if negative values are present. + /// - Parameters: + /// - data: The dataset to analyze. + /// - verticalGridStep: The number of vertical grid lines. + func computeBounds(data: [Double], verticalGridStep: Int) throws { + guard !data.isEmpty else { + throw ChartError.emptyData + } + guard data.allSatisfy({ !$0.isNaN && !$0.isInfinite }) else { + throw ChartError.invalidData + } + min = Double.greatestFiniteMagnitude max = -Double.greatestFiniteMagnitude for number in data { - if number < min { - min = number - } - - if number > max { - max = number - } + if number < min { + min = number + } + if number > max { + max = number + } } - // The idea is to adjust the minimun and the maximum value to display the whole chart in the view, and if possible with nice "round" steps. max = getUpperRoundNumber(max, forGridStep: verticalGridStep) if min < 0 { - // If the minimum is negative then we want to have one of the step to be zero so that the chart is displayed nicely and more comprehensively - var step: Double - - if verticalGridStep > 3 { - step = abs(max - min) / Double(verticalGridStep - 1) - } else { - step = Swift.max(abs(max - min) / 2, Swift.max(abs(min), abs(max))) - } - - step = getUpperRoundNumber(step, forGridStep: verticalGridStep) - - var newMin: Double - var newMax: Double - - if abs(min) > abs(max) { - let m = ceil(abs(min) / step) - - newMin = step * Double(m) * (min > 0 ? 1 : -1) - newMax = step * (Double(verticalGridStep) - m) * (max > 0 ? 1 : -1) - } else { - let m = ceil(abs(max) / step) - - newMax = step * Double(m) * (max > 0 ? 1 : -1) - newMin = step * (Double(verticalGridStep) - m) * (min > 0 ? 1 : -1) - } - - if min < newMin { - newMin -= step - newMax -= step - } - - if max > newMax + step { - newMin += step - newMax += step - } - - min = newMin - max = newMax - - if max < min { - // TODO: use swap - let tmp = max - max = min - min = tmp - } + let step: Double + if verticalGridStep > 3 { + step = abs(max - min) / Double(verticalGridStep - 1) + } else { + step = Swift.max(abs(max - min) / 2, Swift.max(abs(min), abs(max))) + } + + let roundedStep = getUpperRoundNumber(step, forGridStep: verticalGridStep) + + var newMin: Double + var newMax: Double + + if abs(min) > abs(max) { + let m = ceil(abs(min) / roundedStep) + newMin = roundedStep * Double(m) * (min > 0 ? 1 : -1) + newMax = roundedStep * (Double(verticalGridStep) - m) * (max > 0 ? 1 : -1) + } else { + let m = ceil(abs(max) / roundedStep) + newMax = roundedStep * Double(m) * (max > 0 ? 1 : -1) + newMin = roundedStep * (Double(verticalGridStep) - m) * (min > 0 ? 1 : -1) + } + + if min < newMin { + newMin -= roundedStep + newMax -= roundedStep + } + + if max > newMax + roundedStep { + newMin += roundedStep + newMax += roundedStep + } + + min = newMin + max = newMax + + if max < min { + swap(&max, &min) + } } - // No data if max.isNaN { max = 1 } - } - - func getUpperRoundNumber( - _ value: Double, - forGridStep gridStep: Int - ) -> Double { - guard value > 0 else { - return 0 - } - - // We consider a round number the following by 0.5 step instead of true round number (with step of 1) - let logValue = log10(value); - let scale = pow(10, floor(logValue)); - var n = ceil(value / scale * 4); - - let tmp = Int(n) % gridStep; - - if tmp != 0 { - n += Double(gridStep - tmp) - } - - return n * scale / 4.0 - } + } + + /// Rounds a value to a number suitable for grid steps, using a 0.5 step increment. + /// - Parameters: + /// - value: The value to round. + /// - gridStep: The number of grid steps. + /// - Returns: The rounded value. + func getUpperRoundNumber(_ value: Double, forGridStep gridStep: Int) -> Double { + guard value > 0 else { + return 0 + } + + let logValue = log10(value) + let scale = pow(10, floor(logValue)) + var n = ceil(value / scale * 4) + + let tmp = Int(n) % gridStep + if tmp != 0 { + n += Double(gridStep - tmp) + } + + return n * scale / 4.0 + } } extension BoundsCalculator { + /// The minimum vertical bound, ensuring it’s at least zero. var minVerticalBound: CGFloat { - return CGFloat(Swift.min(min, 0)) + return CGFloat(Swift.min(min, 0)) } + /// The maximum vertical bound, ensuring it’s at least zero. var maxVerticalBound: CGFloat { - return CGFloat(Swift.max(max, 0)) + return CGFloat(Swift.max(max, 0)) } } + +/// Errors related to chart data processing. +enum ChartError: Error { + case emptyData + case invalidData + case invalidIndex +} diff --git a/Sources/FSLineChart/ChartUtilities.swift b/Sources/FSLineChart/ChartUtilities.swift new file mode 100644 index 0000000..a67e85f --- /dev/null +++ b/Sources/FSLineChart/ChartUtilities.swift @@ -0,0 +1,216 @@ +import CoreGraphics +import UIKit + +/// Utility functions for chart calculations, designed for testability and reusability. +struct ChartUtilities { + /// Calculates the horizontal scale for a chart based on data and grid steps. + /// - Parameters: + /// - data: The dataset to scale. + /// - horizontalGridStep: The number of horizontal grid lines. + /// - Returns: The calculated scale factor. + static func calculateHorizontalScale(data: [Double], horizontalGridStep: Int) -> CGFloat { + var scale: CGFloat = 1.0 + let q = data.count / horizontalGridStep + if data.count > 1 { + scale = CGFloat(q * horizontalGridStep) / CGFloat(data.count - 1) + } + return scale + } + + /// Computes the point position for a data index in the chart. + /// - Parameters: + /// - index: The index of the data point. + /// - data: The dataset. + /// - scale: The vertical scale factor. + /// - axisWidth: The width of the chart’s axis. + /// - axisHeight: The height of the chart’s axis. + /// - margin: The chart’s margin. + /// - Returns: The computed point. + static func getPointForIndex( + index: Int, + data: [Double], + scale: CGFloat, + axisWidth: CGFloat, + axisHeight: CGFloat, + margin: CGFloat + ) throws -> CGPoint { + guard index >= 0 && index < data.count else { + return .zero + } + + let number = CGFloat(data[index]) + if data.count < 2 { + return CGPoint(x: margin, y: axisHeight + margin - number * scale) + } else { + return CGPoint( + x: margin + CGFloat(index) * (axisWidth / CGFloat(data.count - 1)), + y: axisHeight + margin - number * scale + ) + } + } + + /// Generates a path for the chart’s line or fill area. + /// - Parameters: + /// - data: The dataset. + /// - scale: The vertical scale factor. + /// - axisWidth: The width of the chart’s axis. + /// - axisHeight: The height of the chart’s axis. + /// - margin: The chart’s margin. + /// - smoothed: Whether to apply Bezier smoothing. + /// - smoothingTension: The tension for Bezier smoothing. + /// - closed: Whether to close the path for filling. + /// - Returns: The computed path. + static func getLinePath( + data: [Double], + scale: CGFloat, + axisWidth: CGFloat, + axisHeight: CGFloat, + margin: CGFloat, + smoothed: Bool, + smoothingTension: CGFloat, + closed: Bool + ) throws -> UIBezierPath { + let path = UIBezierPath() + + if smoothed { + for i in 0.. 0 ? try getPointForIndex( + index: i - 1, + data: data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: margin + ) : p + + var m = CGPoint.zero + if i > 0 { + m.x = (nextPoint.x - previousPoint.x) / 2 + m.y = (nextPoint.y - previousPoint.y) / 2 + } else { + m.x = (nextPoint.x - p.x) / 2 + m.y = (nextPoint.y - p.y) / 2 + } + + controlPoint[0].x = p.x + m.x * smoothingTension + controlPoint[0].y = p.y + m.y * smoothingTension + + let nextIndex = i < data.count - 2 ? i + 2 : i + 1 + let nextPoint2 = try getPointForIndex( + index: nextIndex, + data: data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: margin + ) + let previousPoint2 = try getPointForIndex( + index: i, + data: data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: margin + ) + let p2 = try getPointForIndex( + index: i + 1, + data: data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: margin + ) + + m = CGPoint.zero + if i < data.count - 2 { + m.x = (nextPoint2.x - previousPoint2.x) / 2 + m.y = (nextPoint2.y - previousPoint2.y) / 2 + } else { + m.x = (p2.x - previousPoint2.x) / 2 + m.y = (p2.y - previousPoint2.y) / 2 + } + + controlPoint[1].x = p2.x - m.x * smoothingTension + controlPoint[1].y = p2.y - m.y * smoothingTension + + path.addCurve(to: p2, controlPoint1: controlPoint[0], controlPoint2: controlPoint[1]) + } + } else { + for i in 0.. String - // Same as above, but for the value (for adding a currency, or a unit symbol for example) - public typealias LabelForValueGetter = (CGFloat) -> String - - public enum ValueLabelPosition { - case left - case right - case mirrored - } - - // Index label properties - public var labelForIndex: LabelForIndexGetter? - - public var indexLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 10)! - public var indexLabelTextColor: UIColor = .gray - public var indexLabelBackgroundColor: UIColor = .clear - - // Value label properties - public var labelForValue: LabelForValueGetter? - public var valueLabelFont: UIFont = UIFont(name: "HelveticaNeue-Light", size: 11)! - public var valueLabelTextColor: UIColor = .gray - public var valueLabelBackgroundColor: UIColor = UIColor(white: 1, alpha:0.75) - public var valueLabelPosition: ValueLabelPosition = .right - - // Number of visible step in the chart - public var verticalGridStep: Int = 3 - public var horizontalGridStep: Int = 3 - public func setGridStep(_ value: Int) { - verticalGridStep = value - horizontalGridStep = value - } - - // Margin of the chart - public var margin: CGFloat = 0.5 - - // Decoration parameters, let you pick the color of the line as well as the color of the axis - public var axisColor: UIColor = UIColor(white: 0.7, alpha: 1.0) - public var axisLineWidth: CGFloat = 1 - - // Chart parameters - public var color: UIColor = .fsLightBlue - public var fillColor: UIColor? = UIColor.fsLightBlue.withAlphaComponent(0.25) - public var lineWidth: CGFloat = 1.0 - - // Data points - public var displayDataPoint: Bool = false - public var dataPointColor: UIColor = .fsLightBlue - public var dataPointBackgroundColor: UIColor = .fsLightBlue - public var dataPointRadius: CGFloat = 1 - - // Grid parameters - public var drawInnerGrid: Bool = true - public var innerGridColor: UIColor = UIColor(white: 0.9, alpha: 1.0) - public var innerGridLineWidth: CGFloat = 0.5 - - // Smoothing - public var bezierSmoothing: Bool = true - public var bezierSmoothingTension: CGFloat = 0.2 - - // Animations - public var animationDuration: TimeInterval = 0.5 - + /// Initializes the chart with a frame. + /// - Parameter frame: The frame for the chart view. public override init(frame: CGRect) { + configuration = ChartConfiguration( + data: [], + labels: nil, + style: ChartStyle.defaultStyle + ) super.init(frame: frame) - self.commonInit() + commonInit() } + /// Initializes the chart from a coder. + /// - Parameter coder: The coder to initialize from. public required init?(coder: NSCoder) { + configuration = ChartConfiguration( + data: [], + labels: nil, + style: ChartStyle.defaultStyle + ) super.init(coder: coder) - self.commonInit() + commonInit() } private func commonInit() { - self.backgroundColor = .white - layoutManager.chart = self - layoutManager.recalculateAxisSize(from: frame, margin: margin) + backgroundColor = .white + layoutManager.recalculateAxisSize(from: frame, margin: configuration.style.margin) } - public override func layoutSubviews() { - layoutManager.recalculateAxisSize(from: frame, margin: margin) - layoutManager.layoutChart() + /// Lays out the chart’s subviews and updates the axis size. + open override func layoutSubviews() { super.layoutSubviews() + layoutManager.recalculateAxisSize(from: frame, margin: configuration.style.margin) + try? layoutManager.layoutChart(configuration: configuration, in: self) + } + + /// Draws the chart’s grid and axes. + /// - Parameter rect: The rectangle to draw in. + open override func draw(_ rect: CGRect) { + try? renderer.render(configuration: configuration, layoutManager: layoutManager) + } + + /// Sets the chart’s data and triggers a redraw. + /// - Parameter chartData: The data to display. + public func setChartData(_ chartData: [Double]) throws { + configuration = ChartConfiguration( + data: chartData, + labels: configuration.labels, + style: configuration.style + ) + try layoutManager.layoutChart(configuration: configuration, in: self) } - public override func draw(_ rect: CGRect) { - renderer.render(chart: self, layoutManager: layoutManager) + /// Applies a new style to the chart. + /// - Parameter style: The style to apply. + public func applyStyle(_ style: ChartStyle) { + configuration = ChartConfiguration( + data: configuration.data, + labels: configuration.labels, + style: style + ) + try? layoutManager.layoutChart(configuration: configuration, in: self) } + + /// Sets the chart’s label providers. + /// - Parameter labels: The label providers for index and value labels. + public func setLabels(_ labels: ChartLabels?) { + configuration = ChartConfiguration( + data: configuration.data, + labels: labels, + style: configuration.style + ) + try? layoutManager.layoutChart(configuration: configuration, in: self) + } +} - public func setChartData(_ chartData: [Double]) { - data = chartData - layoutManager.layoutChart() +/// Configuration for the chart, including data, labels, and style. +public struct ChartConfiguration { + public let data: [Double] + public let labels: ChartLabels? + public let style: ChartStyle + + public init(data: [Double], labels: ChartLabels?, style: ChartStyle) { + self.data = data + self.labels = labels + self.style = style } } -public extension FSLineChart { - var minVerticalBound: CGFloat { - return layoutManager.minVerticalBound +/// Styling options for the chart’s appearance. +public struct ChartStyle { + public let axisColor: UIColor + public let axisLineWidth: CGFloat + public let lineColor: UIColor + public let fillColor: UIColor? + public let lineWidth: CGFloat + public let displayDataPoints: Bool + public let dataPointColor: UIColor + public let dataPointBackgroundColor: UIColor + public let dataPointRadius: CGFloat + public let drawInnerGrid: Bool + public let innerGridColor: UIColor + public let innerGridLineWidth: CGFloat + public let gridSteps: (vertical: Int, horizontal: Int) + public let margin: CGFloat + public let bezierSmoothing: Bool + public let bezierSmoothingTension: CGFloat + public let animationDuration: TimeInterval + public let indexLabelFont: UIFont + public let indexLabelColor: UIColor + public let indexLabelBackgroundColor: UIColor + public let valueLabelFont: UIFont + public let valueLabelColor: UIColor + public let valueLabelBackgroundColor: UIColor + public let valueLabelPosition: ValueLabelPosition + + public enum ValueLabelPosition { + case left + case right + case mirrored } + + @MainActor + public static let defaultStyle = ChartStyle( + axisColor: UIColor(white: 0.7, alpha: 1.0), + axisLineWidth: 1, + lineColor: .fsLightBlue, + fillColor: UIColor.fsLightBlue.withAlphaComponent(0.25), + lineWidth: 1.0, + displayDataPoints: false, + dataPointColor: .fsLightBlue, + dataPointBackgroundColor: .fsLightBlue, + dataPointRadius: 1, + drawInnerGrid: true, + innerGridColor: UIColor(white: 0.9, alpha: 1.0), + innerGridLineWidth: 0.5, + gridSteps: (vertical: 3, horizontal: 3), + margin: 20, + bezierSmoothing: true, + bezierSmoothingTension: 0.2, + animationDuration: 0.5, + indexLabelFont: .systemFont(ofSize: 10, weight: .light), + indexLabelColor: .gray, + indexLabelBackgroundColor: .clear, + valueLabelFont: .systemFont(ofSize: 11, weight: .light), + valueLabelColor: .gray, + valueLabelBackgroundColor: UIColor(white: 1, alpha: 0.75), + valueLabelPosition: .right + ) + + public init( + axisColor: UIColor, + axisLineWidth: CGFloat, + lineColor: UIColor, + fillColor: UIColor?, + lineWidth: CGFloat, + displayDataPoints: Bool, + dataPointColor: UIColor, + dataPointBackgroundColor: UIColor, + dataPointRadius: CGFloat, + drawInnerGrid: Bool, + innerGridColor: UIColor, + innerGridLineWidth: CGFloat, + gridSteps: (vertical: Int, horizontal: Int), + margin: CGFloat, + bezierSmoothing: Bool, + bezierSmoothingTension: CGFloat, + animationDuration: TimeInterval, + indexLabelFont: UIFont, + indexLabelColor: UIColor, + indexLabelBackgroundColor: UIColor, + valueLabelFont: UIFont, + valueLabelColor: UIColor, + valueLabelBackgroundColor: UIColor, + valueLabelPosition: ValueLabelPosition + ) { + self.axisColor = axisColor + self.axisLineWidth = axisLineWidth + self.lineColor = lineColor + self.fillColor = fillColor + self.lineWidth = lineWidth + self.displayDataPoints = displayDataPoints + self.dataPointColor = dataPointColor + self.dataPointBackgroundColor = dataPointBackgroundColor + self.dataPointRadius = dataPointRadius + self.drawInnerGrid = drawInnerGrid + self.innerGridColor = innerGridColor + self.innerGridLineWidth = innerGridLineWidth + self.gridSteps = gridSteps + self.margin = margin + self.bezierSmoothing = bezierSmoothing + self.bezierSmoothingTension = bezierSmoothingTension + self.animationDuration = animationDuration + self.indexLabelFont = indexLabelFont + self.indexLabelColor = indexLabelColor + self.indexLabelBackgroundColor = indexLabelBackgroundColor + self.valueLabelFont = valueLabelFont + self.valueLabelColor = valueLabelColor + self.valueLabelBackgroundColor = valueLabelBackgroundColor + self.valueLabelPosition = valueLabelPosition + } +} - var maxVerticalBound: CGFloat { - return layoutManager.maxVerticalBound +/// Providers for chart index and value labels. +public struct ChartLabels { + public let indexLabel: (Int) -> String + public let valueLabel: (CGFloat) -> String + + public init(indexLabel: @escaping (Int) -> String, valueLabel: @escaping (CGFloat) -> String) { + self.indexLabel = indexLabel + self.valueLabel = valueLabel } } diff --git a/Sources/FSLineChart/GridRenderer.swift b/Sources/FSLineChart/GridRenderer.swift index 3487a66..da67912 100644 --- a/Sources/FSLineChart/GridRenderer.swift +++ b/Sources/FSLineChart/GridRenderer.swift @@ -1,87 +1,78 @@ -// -// GridRenderer.swift -// FSLineChart -// -// Created by Yaroslav Zhurakovskiy on 25.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - -import Foundation import CoreGraphics import UIKit +/// Renders the grid and axes for a chart. class GridRenderer { - // We pass FSLineChart now for temporarily refactoring reasons. Its better to use some struct. - func render( - chart options: FSLineChart, - layoutManager: LayoutManager - ) { - guard options.data.count > 0 else { - return - } + /// Draws the chart’s grid and axes using the provided configuration. + /// - Parameters: + /// - configuration: The chart’s configuration. + /// - layoutManager: The layout manager for axis dimensions. + @MainActor + func render(configuration: ChartConfiguration, layoutManager: LayoutManager) throws { + guard !configuration.data.isEmpty else { return } + + guard let ctx = UIGraphicsGetCurrentContext() else { return } + UIGraphicsPushContext(ctx) + + ctx.setLineWidth(configuration.style.axisLineWidth) + ctx.setStrokeColor(configuration.style.axisColor.cgColor) - let ctx = UIGraphicsGetCurrentContext()! - UIGraphicsPushContext(ctx); - ctx.setLineWidth(options.axisLineWidth); - ctx.setStrokeColor(options.axisColor.cgColor) - - // draw coordinate axis - ctx.move(to: CGPointMake(options.margin, options.margin)) - ctx.addLine(to: CGPointMake(options.margin, layoutManager.axisHeight + options.margin + 3)) + // Draw coordinate axis + ctx.move(to: CGPoint(x: configuration.style.margin, y: configuration.style.margin)) + ctx.addLine(to: CGPoint(x: configuration.style.margin, y: layoutManager.axisHeight + configuration.style.margin + 3)) ctx.strokePath() - + let scale = layoutManager.calculateHorizontalScale( - data: options.data, - horizontalGridStep: options.horizontalGridStep + data: configuration.data, + horizontalGridStep: configuration.style.gridSteps.horizontal ) let minBound = layoutManager.minVerticalBound let maxBound = layoutManager.maxVerticalBound - - // draw grid - if(options.drawInnerGrid) { - for i in 0.. 0 else { - return - } - - boundsCalculator.computeBounds( - data: data, - verticalGridStep: verticalGridStep + guard !configuration.data.isEmpty else { return } + + try boundsCalculator.computeBounds( + data: configuration.data, + verticalGridStep: configuration.style.gridSteps.vertical ) - strokeChart() - - if displayDataPoint { - strokeDataPoints() + try strokeChart(configuration: configuration, in: view) + + if configuration.style.displayDataPoints { + try strokeDataPoints(configuration: configuration, in: view) } - - if labelForValue != nil { - for i in 0.. CGFloat { + if let cached = cachedHorizontalScale { return cached } + let scale = ChartUtilities.calculateHorizontalScale(data: data, horizontalGridStep: horizontalGridStep) + cachedHorizontalScale = scale + return scale } - func recalculateAxisSize(from frame: CGRect, margin: CGFloat) { - axisWidth = frame.size.width - 2 * margin - axisHeight = frame.size.height - 2 * margin + /// The minimum vertical bound from the bounds calculator. + var minVerticalBound: CGFloat { + return boundsCalculator.minVerticalBound } -} - -fileprivate extension LayoutManager { - func strokeChart() { - let minBound = self.minVerticalBound - let scale = self.verticalScale - - let noPath = getLinePath(scale: 0, withSmoothing:bezierSmoothing, close:false) - let path = getLinePath(scale: scale, withSmoothing:bezierSmoothing, close:false) - let noFill = getLinePath(scale: 0, withSmoothing:bezierSmoothing, close:true) - let fill = getLinePath(scale: scale, withSmoothing:bezierSmoothing, close:true) + /// The maximum vertical bound from the bounds calculator. + var maxVerticalBound: CGFloat { + return boundsCalculator.maxVerticalBound + } - if let fillColor = fillColor { + @MainActor + private func strokeChart(configuration: ChartConfiguration, in view: FSLineChart) throws { + let minBound = boundsCalculator.minVerticalBound + let scale = verticalScale(configuration: configuration) + + let noPath = try ChartUtilities.getLinePath( + data: configuration.data, + scale: 0, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: configuration.style.margin, + smoothed: configuration.style.bezierSmoothing, + smoothingTension: configuration.style.bezierSmoothingTension, + closed: false + ) + let path = try ChartUtilities.getLinePath( + data: configuration.data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: configuration.style.margin, + smoothed: configuration.style.bezierSmoothing, + smoothingTension: configuration.style.bezierSmoothingTension, + closed: false + ) + + let noFill = try ChartUtilities.getLinePath( + data: configuration.data, + scale: 0, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: configuration.style.margin, + smoothed: configuration.style.bezierSmoothing, + smoothingTension: configuration.style.bezierSmoothingTension, + closed: true + ) + let fill = try ChartUtilities.getLinePath( + data: configuration.data, + scale: scale, + axisWidth: axisWidth, + axisHeight: axisHeight, + margin: configuration.style.margin, + smoothed: configuration.style.bezierSmoothing, + smoothingTension: configuration.style.bezierSmoothingTension, + closed: true + ) + + if let fillColor = configuration.style.fillColor { let fillLayer = CAShapeLayer() - fillLayer.frame = CGRectMake(self.bounds.origin.x, self.bounds.origin.y + minBound * scale, self.bounds.size.width, self.bounds.size.height) - fillLayer.bounds = self.bounds; - fillLayer.path = fill.cgPath - fillLayer.strokeColor = nil; - fillLayer.fillColor = fillColor.cgColor; - fillLayer.lineWidth = 0; - fillLayer.lineJoin = .round; - - chart.layer.addSublayer(fillLayer) + fillLayer.frame = CGRect( + x: view.bounds.origin.x, + y: view.bounds.origin.y + minBound * scale, + width: view.bounds.size.width, + height: view.bounds.size.height + ) + fillLayer.bounds = view.bounds + fillLayer.path = noFill.cgPath + fillLayer.strokeColor = nil + fillLayer.fillColor = fillColor.cgColor + fillLayer.lineWidth = 0 + fillLayer.lineJoin = .round + + view.layer.addSublayer(fillLayer) layers.append(fillLayer) - let fillAnimation = CABasicAnimation(keyPath: "path") - fillAnimation.duration = animationDuration; - fillAnimation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut) - fillAnimation.fillMode = .forwards; - fillAnimation.fromValue = noFill.cgPath; - fillAnimation.toValue = fill.cgPath; - fillLayer.add(fillAnimation, forKey:"path") + let animator = UIViewPropertyAnimator(duration: configuration.style.animationDuration, curve: .easeInOut) { + fillLayer.path = fill.cgPath + } + animator.startAnimation() } - + let pathLayer = CAShapeLayer() pathLayer.frame = CGRect( - x: self.bounds.origin.x, - y: self.bounds.origin.y + minBound * scale, - width: self.bounds.size.width, - height: self.bounds.size.height + x: view.bounds.origin.x, + y: view.bounds.origin.y + minBound * scale, + width: view.bounds.size.width, + height: view.bounds.size.height ) - pathLayer.bounds = self.bounds; - pathLayer.path = path.cgPath - pathLayer.strokeColor = color.cgColor - pathLayer.fillColor = nil; - pathLayer.lineWidth = lineWidth; - pathLayer.lineJoin = .round; - - chart.layer.addSublayer(pathLayer) + pathLayer.bounds = view.bounds + pathLayer.path = noPath.cgPath + pathLayer.strokeColor = configuration.style.lineColor.cgColor + pathLayer.fillColor = nil + pathLayer.lineWidth = configuration.style.lineWidth + pathLayer.lineJoin = .round + + view.layer.addSublayer(pathLayer) layers.append(pathLayer) - - if fillColor != nil { - let pathAnimation = CABasicAnimation(keyPath: "path") - pathAnimation.duration = animationDuration; - pathAnimation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut) - pathAnimation.fromValue = noPath.cgPath - pathAnimation.toValue = path.cgPath - pathLayer.add(pathAnimation,forKey:"path") - } else { - let pathAnimation = CABasicAnimation(keyPath: "strokeEnd") - pathAnimation.duration = animationDuration; - pathAnimation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut) - pathAnimation.fromValue = NSNumber(value: 0.0) - pathAnimation.toValue = NSNumber(value: 1.0) - pathLayer.add(pathAnimation, forKey:"path") + + let animator = UIViewPropertyAnimator(duration: configuration.style.animationDuration, curve: .easeInOut) { + pathLayer.path = path.cgPath + pathLayer.strokeEnd = 1.0 } + animator.startAnimation() } - func strokeDataPoints() { - let minBound = minVerticalBound - let scale = verticalScale + @MainActor + private func strokeDataPoints(configuration: ChartConfiguration, in view: FSLineChart) throws { + let minBound = boundsCalculator.minVerticalBound + let scale = verticalScale(configuration: configuration) - for i in 0.. CGPoint { - guard idx >= 0 && idx < data.count else { - return .zero - } - - // Compute the point position in the view from the data with a set scale value - let number = CGFloat(data[idx]) - - if(data.count < 2) { - return CGPointMake(margin, axisHeight + margin - number * scale); - } else { - return CGPointMake( - margin + CGFloat(idx) * (axisWidth / CGFloat(data.count - 1)), - axisHeight + margin - number * scale + fillLayer.frame = CGRect( + x: adjustedPoint.x, + y: adjustedPoint.y, + width: configuration.style.dataPointRadius, + height: configuration.style.dataPointRadius ) - } - } - - func getLinePath( - scale: CGFloat, - withSmoothing smoothed: Bool, - close closed: Bool - ) -> UIBezierPath { - let path = UIBezierPath() - - if(smoothed) { - for i in 0.. 0) { - m.x = (nextPoint.x - previousPoint.x) / 2; - m.y = (nextPoint.y - previousPoint.y) / 2; - } else { - m.x = (nextPoint.x - p.x) / 2; - m.y = (nextPoint.y - p.y) / 2; - } - - controlPoint[0].x = p.x + m.x * bezierSmoothingTension; - controlPoint[0].y = p.y + m.y * bezierSmoothingTension; - - // Second control point - nextPoint = getPointForIndex(i + 2, withScale:scale) - previousPoint = getPointForIndex(i, withScale:scale) - p = getPointForIndex(i + 1, withScale:scale) - m = CGPoint.zero; - - if(i < data.count - 2) { - m.x = (nextPoint.x - previousPoint.x) / 2; - m.y = (nextPoint.y - previousPoint.y) / 2; - } else { - m.x = (p.x - previousPoint.x) / 2; - m.y = (p.y - previousPoint.y) / 2; - } - - controlPoint[1].x = p.x - m.x * bezierSmoothingTension; - controlPoint[1].y = p.y - m.y * bezierSmoothingTension; - - path.addCurve( - to: p, - controlPoint1: controlPoint[0], - controlPoint2: controlPoint[1] - ) - } + fillLayer.bounds = CGRect( + x: adjustedPoint.x, + y: adjustedPoint.y, + width: configuration.style.dataPointRadius, + height: configuration.style.dataPointRadius + ) + fillLayer.path = circle.cgPath + fillLayer.strokeColor = configuration.style.dataPointColor.cgColor + fillLayer.fillColor = configuration.style.dataPointBackgroundColor.cgColor + fillLayer.lineWidth = 1 + fillLayer.lineJoin = .round - } else { - for i in 0.. 0) { - path.addLine(to: getPointForIndex(i, withScale: scale)) - } else { - path.move(to: getPointForIndex(i, withScale: scale)) - } - } - } - - if closed { - // Closing the path for the fill drawing - path.addLine(to: getPointForIndex(data.count - 1, withScale:scale)) - path.addLine(to: getPointForIndex(data.count - 1, withScale:0)) - path.addLine(to: getPointForIndex(0, withScale:0)) - path.addLine(to: getPointForIndex(0, withScale:scale)) + view.layer.addSublayer(fillLayer) + layers.append(fillLayer) } - - return path - } -} - -extension LayoutManager { - func calculateHorizontalScale( - data: [Double], - horizontalGridStep: Int - ) -> CGFloat { - var scale: CGFloat = 1.0 - let q = data.count / horizontalGridStep - - if data.count > 1 { - scale = CGFloat(q * horizontalGridStep) / CGFloat(data.count - 1) - } - - return scale } - private var horizontalScale: CGFloat { - return calculateHorizontalScale( - data: data, - horizontalGridStep: horizontalGridStep - ) - } - - private var verticalScale: CGFloat { - let minBound = self.minVerticalBound - let maxBound = self.maxVerticalBound + @MainActor + private func createLabelForValue(index: Int, configuration: ChartConfiguration, labels: ChartLabels) -> UILabel? { + let minBound = boundsCalculator.minVerticalBound + let maxBound = boundsCalculator.maxVerticalBound - let spread = maxBound - minBound; - var scale: CGFloat = 0 + let value = minBound + (maxBound - minBound) / CGFloat(configuration.style.gridSteps.vertical * (index + 1)) + let text = labels.valueLabel(value) - if (spread != 0) { - scale = axisHeight / spread - } - - return scale - } -} - -fileprivate extension LayoutManager { - private func createLabelForValue(_ index: Int) -> UILabel? { - let minBound = self.minVerticalBound - let maxBound = self.maxVerticalBound - let p = CGPoint( - x: margin + (valueLabelPosition == .right ? axisWidth : 0), - y: axisHeight + margin - CGFloat(index + 1) * axisHeight / CGFloat(verticalGridStep) + x: configuration.style.margin + (configuration.style.valueLabelPosition == .right ? axisWidth : 0), + y: axisHeight + configuration.style.margin - CGFloat(index + 1) * axisHeight / CGFloat(configuration.style.gridSteps.vertical) ) - - let value = minBound + (maxBound - minBound) / CGFloat(verticalGridStep * (index + 1)) - guard let text = labelForValue?(value) else { - return nil - } - + let rect = CGRect( - x: margin, + x: configuration.style.margin, y: p.y + 2, - width: self.frame.size.width - margin * 2 - 4.0, + width: axisWidth - configuration.style.margin * 2 - 4.0, height: 14 ) - let width = (text as NSString).boundingRect( + let width = (text as NSString).boundingRect( with: rect.size, options: [.usesLineFragmentOrigin], - attributes: [.font: valueLabelFont], + attributes: [.font: configuration.style.valueLabelFont], context: nil ).size.width - - + let xPadding: CGFloat = 6 - var xOffset: CGFloat = width + xPadding; - - if valueLabelPosition == .mirrored { - xOffset = -xPadding; + var xOffset: CGFloat = width + xPadding + if configuration.style.valueLabelPosition == .mirrored { + xOffset = -xPadding } - + let label = UILabel( frame: CGRect( x: p.x - xOffset, @@ -344,48 +269,46 @@ fileprivate extension LayoutManager { height: 14 ) ) - label.text = text; - label.font = valueLabelFont; - label.textColor = valueLabelTextColor; - label.textAlignment = .center; - label.backgroundColor = valueLabelBackgroundColor; - + label.text = text + label.font = configuration.style.valueLabelFont + label.textColor = configuration.style.valueLabelColor + label.textAlignment = .center + label.backgroundColor = configuration.style.valueLabelBackgroundColor + return label } - - private func createLabelForIndex(_ index: Int) -> UILabel? { - let scale = self.horizontalScale - let q = data.count / horizontalGridStep; - var itemIndex = q * index; - - if itemIndex >= data.count { - itemIndex = data.count - 1 - } - - guard let text = labelForIndex?(itemIndex) else { - return nil + + @MainActor + private func createLabelForIndex(index: Int, configuration: ChartConfiguration, labels: ChartLabels) -> UILabel? { + let scale = calculateHorizontalScale(data: configuration.data, horizontalGridStep: configuration.style.gridSteps.horizontal) + let q = configuration.data.count / configuration.style.gridSteps.horizontal + var itemIndex = q * index + + if itemIndex >= configuration.data.count { + itemIndex = configuration.data.count - 1 } - - let p = CGPointMake( - margin + CGFloat(index) * (axisWidth / CGFloat(horizontalGridStep)) * scale, - axisHeight + margin + + let text = labels.indexLabel(itemIndex) + + let p = CGPoint( + x: configuration.style.margin + CGFloat(index) * (axisWidth / CGFloat(configuration.style.gridSteps.horizontal)) * scale, + y: axisHeight + configuration.style.margin ) - - + let rect = CGRect( - x: margin, + x: configuration.style.margin, y: p.y + 2, - width: self.frame.size.width - margin * 2 - 4.0, + width: axisWidth - configuration.style.margin * 2 - 4.0, height: 14 - ); - + ) + let width = (text as NSString).boundingRect( with: rect.size, options: [.usesLineFragmentOrigin], - attributes: [.font: indexLabelFont], + attributes: [.font: configuration.style.indexLabelFont], context: nil ).size.width - + let label = UILabel( frame: CGRect( x: p.x - 4.0, @@ -394,122 +317,22 @@ fileprivate extension LayoutManager { height: 14 ) ) - label.text = text; - label.font = indexLabelFont; - label.textColor = indexLabelTextColor; - label.backgroundColor = indexLabelBackgroundColor; - + label.text = text + label.font = configuration.style.indexLabelFont + label.textColor = configuration.style.indexLabelColor + label.backgroundColor = configuration.style.indexLabelBackgroundColor + return label } -} - -// It's done for refactoring purposes -extension LayoutManager { - var data: [Double] { - return chart.data - } - - var dataPointBackgroundColor: UIColor { - return chart.dataPointBackgroundColor - } - - var verticalGridStep: Int { - return chart.verticalGridStep - } - - var bezierSmoothingTension: CGFloat { - return chart.bezierSmoothingTension - } - - var displayDataPoint: Bool { - return chart.displayDataPoint - } - - var labelForValue: FSLineChart.LabelForValueGetter? { - return chart.labelForValue - } - var labelForIndex: FSLineChart.LabelForIndexGetter? { - return chart.labelForIndex - } - - var horizontalGridStep: Int { - return chart.horizontalGridStep - } - - var valueLabelPosition: FSLineChart.ValueLabelPosition { - return chart.valueLabelPosition - } - - var minVerticalBound: CGFloat { - return boundsCalculator.minVerticalBound - } - - var maxVerticalBound: CGFloat { - return boundsCalculator.maxVerticalBound - } - - var margin: CGFloat { - return chart.margin - } - - var color: UIColor { - return chart.color - } - - var lineWidth: CGFloat { - return chart.lineWidth - } - - var frame: CGRect { - return chart.frame - } - - var bounds: CGRect { - return chart.bounds - } - - var fillColor: UIColor? { - return chart.fillColor - } - - var valueLabelFont: UIFont { - return chart.valueLabelFont - } - - var valueLabelTextColor: UIColor { - return chart.valueLabelTextColor - } - - var valueLabelBackgroundColor: UIColor { - return chart.valueLabelBackgroundColor - } - - var indexLabelFont: UIFont { - return chart.indexLabelFont - } - - var dataPointRadius: CGFloat { - return chart.dataPointRadius - } - - var indexLabelTextColor: UIColor { - return chart.indexLabelTextColor - } - - var dataPointColor: UIColor { - return chart.dataPointColor - } - - var bezierSmoothing: Bool { - return chart.bezierSmoothing - } - - var indexLabelBackgroundColor: UIColor { - return chart.indexLabelBackgroundColor - } - - var animationDuration: TimeInterval { - return chart.animationDuration + private func verticalScale(configuration: ChartConfiguration) -> CGFloat { + if let cached = cachedVerticalScale { return cached } + let minBound = boundsCalculator.minVerticalBound + let maxBound = boundsCalculator.maxVerticalBound + + let spread = maxBound - minBound + let scale: CGFloat = spread != 0 ? axisHeight / spread : 0 + cachedVerticalScale = scale + return scale } } diff --git a/Sources/FSLineChart/LegacySupport.swift b/Sources/FSLineChart/LegacySupport.swift deleted file mode 100644 index bc076a8..0000000 --- a/Sources/FSLineChart/LegacySupport.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// LegacySupport.swift -// FSLineChart -// -// Created by Yaroslav Zhurakovskiy on 25.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - -import CoreGraphics - -func CGRectMake(_ x: CGFloat, _ y: CGFloat, _ width: CGFloat, _ height: CGFloat) -> CGRect { - return CGRect(x: x, y: y, width: width, height: height) -} - -func CGPointMake(_ x: CGFloat, _ y: CGFloat) -> CGPoint { - return CGPoint(x: x, y: y) -} diff --git a/Sources/FSLineChart/UIColor+FS.swift b/Sources/FSLineChart/UIColor+FS.swift index a91f62d..970e1cc 100644 --- a/Sources/FSLineChart/UIColor+FS.swift +++ b/Sources/FSLineChart/UIColor+FS.swift @@ -1,50 +1,43 @@ -// -// UIColor+FS.swift -// FSLineChart -// -// Created by Yaroslav Zhurakovskiy on 25.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - import UIKit +/// Custom colors used in FSLineChart for consistent styling. public extension UIColor { static var fsRed: UIColor { return UIColor(red: 1.0, green: 0.22, blue: 0.22, alpha: 1.0) } - + static var fsOrange: UIColor { return UIColor(red: 1.0, green: 0.58, blue: 0.21, alpha: 1.0) } - + static var fsYellow: UIColor { return UIColor(red: 1.0, green: 0.79, blue: 0.28, alpha: 1.0) } - + static var fsGreen: UIColor { return UIColor(red: 0.27, green: 0.85, blue: 0.46, alpha: 1.0) } - + static var fsLightBlue: UIColor { return UIColor(red: 0.18, green: 0.67, blue: 0.84, alpha: 1.0) } - + static var fsDarkBlue: UIColor { return UIColor(red: 0.0, green: 0.49, blue: 0.96, alpha: 1.0) } - + static var fsPurple: UIColor { return UIColor(red: 0.35, green: 0.35, blue: 0.81, alpha: 1.0) } - + static var fsPink: UIColor { return UIColor(red: 1.0, green: 0.17, blue: 0.34, alpha: 1.0) } - + static var fsDarkGray: UIColor { return UIColor(red: 0.56, green: 0.56, blue: 0.58, alpha: 1.0) } - + static var fsLightGray: UIColor { return UIColor(red: 0.78, green: 0.78, blue: 0.8, alpha: 1.0) } diff --git a/iOS Example/iOS Example.xcodeproj/project.pbxproj b/iOS Example/iOS Example.xcodeproj/project.pbxproj deleted file mode 100644 index 44ead82..0000000 --- a/iOS Example/iOS Example.xcodeproj/project.pbxproj +++ /dev/null @@ -1,373 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 52; - objects = { - -/* Begin PBXBuildFile section */ - C438D83F238C2B0D00D5B4B0 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */; }; - C4BAEC6823855FE600B52987 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6723855FE600B52987 /* AppDelegate.swift */; }; - C4BAEC6A23855FE600B52987 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6923855FE600B52987 /* SceneDelegate.swift */; }; - C4BAEC6C23855FE600B52987 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC6B23855FE600B52987 /* ViewController.swift */; }; - C4BAEC6F23855FE600B52987 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C4BAEC6D23855FE600B52987 /* Main.storyboard */; }; - C4BAEC7123855FE700B52987 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C4BAEC7023855FE700B52987 /* Assets.xcassets */; }; - C4BAEC7D2385602E00B52987 /* FSLineChart in Frameworks */ = {isa = PBXBuildFile; productRef = C4BAEC7C2385602E00B52987 /* FSLineChart */; }; - C4BAEC822385607400B52987 /* ExampleChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4BAEC802385607400B52987 /* ExampleChart.swift */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - C438D83E238C2B0D00D5B4B0 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - C4BAEC6423855FE600B52987 /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - C4BAEC6723855FE600B52987 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - C4BAEC6923855FE600B52987 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - C4BAEC6B23855FE600B52987 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - C4BAEC6E23855FE600B52987 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - C4BAEC7023855FE700B52987 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - C4BAEC7523855FE700B52987 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - C4BAEC7E2385607300B52987 /* iOS Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "iOS Example-Bridging-Header.h"; sourceTree = ""; }; - C4BAEC802385607400B52987 /* ExampleChart.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExampleChart.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - C4BAEC6123855FE600B52987 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - C4BAEC7D2385602E00B52987 /* FSLineChart in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - C4BAEC5B23855FE600B52987 = { - isa = PBXGroup; - children = ( - C4BAEC6623855FE600B52987 /* iOS Example */, - C4BAEC6523855FE600B52987 /* Products */, - C4BAEC7B2385602E00B52987 /* Frameworks */, - ); - sourceTree = ""; - }; - C4BAEC6523855FE600B52987 /* Products */ = { - isa = PBXGroup; - children = ( - C4BAEC6423855FE600B52987 /* iOS Example.app */, - ); - name = Products; - sourceTree = ""; - }; - C4BAEC6623855FE600B52987 /* iOS Example */ = { - isa = PBXGroup; - children = ( - C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */, - C4BAEC802385607400B52987 /* ExampleChart.swift */, - C4BAEC6723855FE600B52987 /* AppDelegate.swift */, - C4BAEC6923855FE600B52987 /* SceneDelegate.swift */, - C4BAEC6B23855FE600B52987 /* ViewController.swift */, - C4BAEC6D23855FE600B52987 /* Main.storyboard */, - C4BAEC7023855FE700B52987 /* Assets.xcassets */, - C4BAEC7523855FE700B52987 /* Info.plist */, - C4BAEC7E2385607300B52987 /* iOS Example-Bridging-Header.h */, - ); - path = "iOS Example"; - sourceTree = ""; - }; - C4BAEC7B2385602E00B52987 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - C4BAEC6323855FE600B52987 /* iOS Example */ = { - isa = PBXNativeTarget; - buildConfigurationList = C4BAEC7823855FE700B52987 /* Build configuration list for PBXNativeTarget "iOS Example" */; - buildPhases = ( - C4BAEC6023855FE600B52987 /* Sources */, - C4BAEC6123855FE600B52987 /* Frameworks */, - C4BAEC6223855FE600B52987 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "iOS Example"; - packageProductDependencies = ( - C4BAEC7C2385602E00B52987 /* FSLineChart */, - ); - productName = "iOS Example"; - productReference = C4BAEC6423855FE600B52987 /* iOS Example.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - C4BAEC5C23855FE600B52987 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1120; - LastUpgradeCheck = 1120; - ORGANIZATIONNAME = "William Entriken"; - TargetAttributes = { - C4BAEC6323855FE600B52987 = { - CreatedOnToolsVersion = 11.2.1; - LastSwiftMigration = 1120; - }; - }; - }; - buildConfigurationList = C4BAEC5F23855FE600B52987 /* Build configuration list for PBXProject "iOS Example" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = C4BAEC5B23855FE600B52987; - productRefGroup = C4BAEC6523855FE600B52987 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - C4BAEC6323855FE600B52987 /* iOS Example */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - C4BAEC6223855FE600B52987 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C4BAEC7123855FE700B52987 /* Assets.xcassets in Resources */, - C438D83F238C2B0D00D5B4B0 /* LaunchScreen.xib in Resources */, - C4BAEC6F23855FE600B52987 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - C4BAEC6023855FE600B52987 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C4BAEC6C23855FE600B52987 /* ViewController.swift in Sources */, - C4BAEC6823855FE600B52987 /* AppDelegate.swift in Sources */, - C4BAEC6A23855FE600B52987 /* SceneDelegate.swift in Sources */, - C4BAEC822385607400B52987 /* ExampleChart.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - C438D83D238C2B0D00D5B4B0 /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - C438D83E238C2B0D00D5B4B0 /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; - C4BAEC6D23855FE600B52987 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - C4BAEC6E23855FE600B52987 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - C4BAEC7623855FE700B52987 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - 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_DOCUMENTATION_COMMENTS = YES; - 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; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - C4BAEC7723855FE700B52987 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - 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_DOCUMENTATION_COMMENTS = YES; - 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; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - C4BAEC7923855FE700B52987 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "iOS Example/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "net.phor.iOS-Example"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "iOS Example/iOS Example-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - C4BAEC7A23855FE700B52987 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = "iOS Example/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "net.phor.iOS-Example"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "iOS Example/iOS Example-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C4BAEC5F23855FE600B52987 /* Build configuration list for PBXProject "iOS Example" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C4BAEC7623855FE700B52987 /* Debug */, - C4BAEC7723855FE700B52987 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C4BAEC7823855FE700B52987 /* Build configuration list for PBXNativeTarget "iOS Example" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C4BAEC7923855FE700B52987 /* Debug */, - C4BAEC7A23855FE700B52987 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - -/* Begin XCSwiftPackageProductDependency section */ - C4BAEC7C2385602E00B52987 /* FSLineChart */ = { - isa = XCSwiftPackageProductDependency; - productName = FSLineChart; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = C4BAEC5C23855FE600B52987 /* Project object */; -} diff --git a/iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/iOS Example/iOS Example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/iOS Example/iOS Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/iOS Example/iOS Example/AppDelegate.swift b/iOS Example/iOS Example/AppDelegate.swift deleted file mode 100644 index 7da9044..0000000 --- a/iOS Example/iOS Example/AppDelegate.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// AppDelegate.swift -// iOS Example -// -// Created by Yaroslav Zhurakovskiy on 20.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - -import UIKit - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - - - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. - return true - } - - // MARK: UISceneSession Lifecycle - - func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { - // Called when a new scene session is being created. - // Use this method to select a configuration to create the new scene with. - return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) - } - - func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { - // Called when the user discards a scene session. - // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. - // Use this method to release any resources that were specific to the discarded scenes, as they will not return. - } - - -} - diff --git a/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d8db8d6..0000000 --- a/iOS Example/iOS Example/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" - }, - { - "idiom" : "ios-marketing", - "size" : "1024x1024", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iOS Example/iOS Example/Assets.xcassets/Contents.json b/iOS Example/iOS Example/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/iOS Example/iOS Example/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iOS Example/iOS Example/Base.lproj/LaunchScreen.xib b/iOS Example/iOS Example/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 01f74aa..0000000 --- a/iOS Example/iOS Example/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOS Example/iOS Example/Base.lproj/Main.storyboard b/iOS Example/iOS Example/Base.lproj/Main.storyboard deleted file mode 100644 index 7c0b5e4..0000000 --- a/iOS Example/iOS Example/Base.lproj/Main.storyboard +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOS Example/iOS Example/ExampleChart.swift b/iOS Example/iOS Example/ExampleChart.swift deleted file mode 100644 index 291ae18..0000000 --- a/iOS Example/iOS Example/ExampleChart.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// ExampleChart.swift -// FSLineChart -// -// Created by Arthur GUIBERT on 01/11/2016. -// Copyright © 2016 Arthur GUIBERT. All rights reserved. -// - -import UIKit -import FSLineChart - -class ExampleChart: FSLineChart { - override func awakeFromNib() { - load() - } - - public func load() { - // Generate some dummy data - let data = (0...10).map { _ in Double(Int.random(in: 20...120)) } - - verticalGridStep = 5 - horizontalGridStep = 9 - labelForIndex = { "\($0)" } - labelForValue = { String(format: "$%.02f", $0) } - setChartData(data) - } - -} diff --git a/iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json b/iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 118c98f..0000000 --- a/iOS Example/iOS Example/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iOS Example/iOS Example/Info.plist b/iOS Example/iOS Example/Info.plist deleted file mode 100644 index 2a3483c..0000000 --- a/iOS Example/iOS Example/Info.plist +++ /dev/null @@ -1,64 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main - - - - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/iOS Example/iOS Example/SceneDelegate.swift b/iOS Example/iOS Example/SceneDelegate.swift deleted file mode 100644 index c6bda9a..0000000 --- a/iOS Example/iOS Example/SceneDelegate.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// SceneDelegate.swift -// iOS Example -// -// Created by Yaroslav Zhurakovskiy on 20.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - -import UIKit - -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). - } - - func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } - - -} - diff --git a/iOS Example/iOS Example/ViewController.swift b/iOS Example/iOS Example/ViewController.swift deleted file mode 100644 index 4de9fd4..0000000 --- a/iOS Example/iOS Example/ViewController.swift +++ /dev/null @@ -1,67 +0,0 @@ -// -// ViewController.swift -// iOS Example -// -// Created by Yaroslav Zhurakovskiy on 20.11.2019. -// Copyright © 2019 William Entriken. All rights reserved. -// - -import UIKit -import FSLineChart - -class ViewController: UIViewController { - @IBOutlet weak var chartWithDates: FSLineChart! - @IBOutlet weak var chartWithZeroes: FSLineChart! - - override func viewDidLoad() { - super.viewDidLoad() - - setupChartWithDates() - setupChartWithZeroes() - - loadChartWithDates() - loadChartWithZeroes() - } - - private func loadChartWithDates() { - let chartData = (0..<7).map { Double($0) / 30.0 + Double(Int.random(in: 0...100)) / 500 } - - chartWithDates.setChartData(chartData) - } - - private func loadChartWithZeroes() { - let chartData = (0..<10).map { _ in Double(0) } - chartWithZeroes.setChartData(chartData) - } - - private func setupChartWithDates() { - chartWithDates.verticalGridStep = 6 - chartWithDates.horizontalGridStep = 3 - chartWithDates.fillColor = nil - chartWithDates.displayDataPoint = true - chartWithDates.dataPointColor = .fsOrange - chartWithDates.dataPointBackgroundColor = UIColor.fsOrange - chartWithDates.dataPointRadius = 2 - chartWithDates.color = chartWithDates.dataPointColor.withAlphaComponent(0.3) - chartWithDates.valueLabelPosition = .mirrored - - let months = [ - "January", - "February", - "March", - "April", - "May", - "June", - "July" - ] - chartWithDates.labelForIndex = { months[$0] } - chartWithDates.labelForValue = { String(format: "%.02f €", $0) } - } - - private func setupChartWithZeroes() { - chartWithZeroes.verticalGridStep = 5 - chartWithZeroes.horizontalGridStep = 9 - chartWithZeroes.labelForIndex = { "\($0)" } - chartWithZeroes.labelForValue = { String(format: "%.f", $0) } - } -} diff --git a/iOS Example/iOS Example/iOS Example-Bridging-Header.h b/iOS Example/iOS Example/iOS Example-Bridging-Header.h deleted file mode 100644 index 1b2cb5d..0000000 --- a/iOS Example/iOS Example/iOS Example-Bridging-Header.h +++ /dev/null @@ -1,4 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - From 7e2d0729154d8f8d2fd61ddef0062e11316ebfe0 Mon Sep 17 00:00:00 2001 From: William Entriken Date: Mon, 9 Jun 2025 23:24:57 -0400 Subject: [PATCH 12/12] Update ci.yml --- .github/workflows/ci.yml | 77 +++------------------------------------- 1 file changed, 5 insertions(+), 72 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1816aa0..969d294 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,9 +73,7 @@ jobs: - name: ${{ matrix.name }} run: |- set -o pipefail - brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk - firewalk & - env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire macOS" -destination "platform=macOS" -testPlan "${{ matrix.testPlan }}" clean test | ${{ matrix.outputFilter }} + env NSUnbufferedIO=YES xcodebuild -project "FSLineChart.xcodeproj" -scheme "Example" -destination "platform=iOS" -testPlan "${{ matrix.testPlan }}" clean test | ${{ matrix.outputFilter }} Catalyst: name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} @@ -103,10 +101,8 @@ jobs: runsOn: macOS-13 steps: - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & - name: Catalyst - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire iOS" -destination "platform=macOS" clean test 2>&1 | xcbeautify --renderer github-actions + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "FSLineChart.xcodeproj" -scheme "Example" -destination "platform=iOS" clean test 2>&1 | xcbeautify --renderer github-actions iOS: name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} @@ -144,10 +140,8 @@ jobs: runsOn: firebreak steps: - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & - name: ${{ matrix.name }} - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire iOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "FSLineChart.xcodeproj" -scheme "Example" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions tvOS: name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} @@ -185,67 +179,8 @@ jobs: runsOn: firebreak steps: - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & - name: ${{ matrix.name }} - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire tvOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions - visionOS: - name: ${{ matrix.name }} - runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: "/Applications/Xcode_15.2.app/Contents/Developer" - timeout-minutes: 10 - strategy: - fail-fast: false - matrix: - include: - - destination: "OS=1.0,name=Apple Vision Pro" - name: "visionOS 1.0" - testPlan: "visionOS" - scheme: "Alamofire visionOS" - runsOn: firebreak - steps: - - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & - - name: ${{ matrix.name }} - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "${{ matrix.scheme }}" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions - watchOS: - name: ${{ matrix.name }} - runs-on: ${{ matrix.runsOn }} - env: - DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer - timeout-minutes: 10 - strategy: - fail-fast: false - matrix: - include: - - destination: "OS=10.5,name=Apple Watch Series 9 (45mm)" - name: "watchOS 10.5" - testPlan: "watchOS" - xcode: "Xcode_15.4" - runsOn: firebreak - - destination: "OS=10.2,name=Apple Watch Series 9 (45mm)" - name: "watchOS 10.2" - testPlan: "watchOS" - xcode: "Xcode_15.2" - runsOn: firebreak - - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)" - name: "watchOS 10.0" - testPlan: "watchOS" - xcode: "Xcode_15.0.1" - runsOn: macOS-14 - - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)" - name: "watchOS 9.4" - testPlan: "watchOS" - xcode: "Xcode_14.3.1" - runsOn: macOS-13 - steps: - - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew update && brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk && firewalk & - - name: ${{ matrix.name }} - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire watchOS" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "FSLineChart.xcodeproj" -scheme "Example" -destination "${{ matrix.destination }}" -testPlan "${{ matrix.testPlan }}" clean test 2>&1 | xcbeautify --renderer github-actions SPM: name: ${{ matrix.name }} runs-on: ${{ matrix.runsOn }} @@ -286,8 +221,6 @@ jobs: outputFilter: xcpretty steps: - uses: actions/checkout@v4 - - name: Install Firewalk - run: brew install alamofire/alamofire/firewalk || brew upgrade alamofire/alamofire/firewalk xcbeautify && firewalk & - name: Test SPM run: swift test -c debug | ${{ matrix.outputFilter }} Linux: @@ -367,7 +300,7 @@ jobs: with: languages: swift - name: Build macOS - run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "Alamofire.xcodeproj" -scheme "Alamofire macOS" -destination "platform=macOS" clean build | xcpretty + run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -project "FSLineChart.xcodeproj" -scheme "Example" -destination "platform=macOS" clean build | xcpretty - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 with: