Merge pull request #5 from yoomoney-tech/release/1.1.0

Release/1.1.0

CHANGELOG.md

@@ -5,6 +5,10 @@
 ### NEXT_VERSION_DESCRIPTION_BEGIN
 ### NEXT_VERSION_DESCRIPTION_END
 
+## [1.1.0] (11-12-2020)
+
+Added draw zero line.
+
 ## [1.0.0] (25-11-2020)
 
 Move mobile analytics chart library to open-source

MobileAnalyticsChartSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name      = 'MobileAnalyticsChartSwift'
-  s.version   = '1.0.0'
+  s.version   = '1.1.0'
   s.homepage  = 'https://github.com/yoomoney-tech/mobile-analytics-chart-swift/browse'
   s.license   = {
     :type => "MIT",

MobileAnalyticsChartSwift.xcodeproj/project.pbxproj

@@ -72,6 +72,7 @@
 		78201DA4250F9D6700408304 /* UIColor+Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78201D92250F9D6700408304 /* UIColor+Style.swift */; };
 		78201DA5250F9D6700408304 /* CGFloat+Space.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78201D93250F9D6700408304 /* CGFloat+Space.swift */; };
 		78201DA6250F9D6700408304 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78201D94250F9D6700408304 /* AppDelegate.swift */; };
+		783658F12582044000CBC150 /* ChartZeroLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 783658F02582044000CBC150 /* ChartZeroLine.swift */; };
 		78E2D565250F9B7B0010639C /* MobileAnalyticsChartSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 78E2D563250F9B7B0010639C /* MobileAnalyticsChartSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		78E2D57E250F9BB40010639C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 78E2D57C250F9BB40010639C /* LaunchScreen.storyboard */; };
 		78E6E8422510F9820052E3D4 /* CustomChartViewIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E6E8412510F9820052E3D4 /* CustomChartViewIO.swift */; };
@@ -155,6 +156,7 @@
 		78201D92250F9D6700408304 /* UIColor+Style.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Style.swift"; sourceTree = "<group>"; };
 		78201D93250F9D6700408304 /* CGFloat+Space.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CGFloat+Space.swift"; sourceTree = "<group>"; };
 		78201D94250F9D6700408304 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		783658F02582044000CBC150 /* ChartZeroLine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartZeroLine.swift; sourceTree = "<group>"; };
 		78E2D560250F9B7B0010639C /* MobileAnalyticsChartSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MobileAnalyticsChartSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		78E2D563250F9B7B0010639C /* MobileAnalyticsChartSwift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MobileAnalyticsChartSwift.h; sourceTree = "<group>"; };
 		78E2D564250F9B7B0010639C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -317,6 +319,7 @@
 				78201D1E250F9D3700408304 /* ChartRangeLabel.swift */,
 				78201D1C250F9D3700408304 /* ChartXAxis.swift */,
 				78201D19250F9D3700408304 /* ChartYAxis.swift */,
+				783658F02582044000CBC150 /* ChartZeroLine.swift */,
 			);
 			path = Configuration;
 			sourceTree = "<group>";
@@ -833,6 +836,7 @@
 				78201D43250F9D3700408304 /* AnalyticsDefinitionFactory.swift in Sources */,
 				78201D48250F9D3700408304 /* AnalyticsChartSpriteKitViewIO.swift in Sources */,
 				78201D44250F9D3700408304 /* AnalyticsYAxisLocalizationFactory.swift in Sources */,
+				783658F12582044000CBC150 /* ChartZeroLine.swift in Sources */,
 				78201D63250F9D3700408304 /* ColorTransition.swift in Sources */,
 				78201D65250F9D3700408304 /* Calculator.swift in Sources */,
 				78201D46250F9D3700408304 /* AnalyticsChartSpriteKitAssembly.swift in Sources */,
@@ -1008,6 +1012,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwift;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1032,6 +1037,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwiftExamplePods;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1182,6 +1188,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwift;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1208,6 +1215,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwift;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -1232,6 +1240,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwiftExamplePods;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1256,6 +1265,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.kassa.MobileAnalyticsChartSwiftExamplePods;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "";

MobileAnalyticsChartSwift.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildSystemType</key>
-	<string>Original</string>
 	<key>PreviewsEnabled</key>
 	<false/>
 </dict>

MobileAnalyticsChartSwift/Calculator/Calculator.swift

@@ -61,6 +61,14 @@ public protocol Calculator {
         linesCount: Int
     ) -> [(position: CGPoint, value: CGFloat)]
 
+    /// Make zero line coordinate for zero line.
+    func makeZeroLine(
+        frame: CGRect,
+        chartMargins: UIEdgeInsets,
+        minValue: CGFloat?,
+        maxValue: CGFloat?
+    ) -> (start: CGPoint, end: CGPoint)?
+
     /// Make dates for range diapasone.
     func makeRangeDates() -> (start: Date, end: Date?)?
 

MobileAnalyticsChartSwift/Calculator/CalculatorImpl.swift

@@ -506,6 +506,38 @@ extension CalculatorImpl: Calculator {
         }
     }
 
+    public func makeZeroLine(
+        frame: CGRect,
+        chartMargins: UIEdgeInsets,
+        minValue: CGFloat?,
+        maxValue: CGFloat?
+    ) -> (start: CGPoint, end: CGPoint)? {
+        guard valuesCount != 0,
+              let minValue = minValue ?? self.minValue,
+              let maxValue = maxValue ?? self.maxValue,
+              maxValue != minValue else {
+            return nil
+        }
+
+        let boundaryDiff = abs(maxValue - minValue)
+
+        guard boundaryDiff > 0 else {
+            return nil
+        }
+
+        let height = frame.height
+            - chartMargins.top
+            - chartMargins.bottom
+        let y = frame.minY
+            + chartMargins.bottom
+            - minValue / boundaryDiff * height
+
+        return (
+            start: CGPoint(x: frame.minX, y: y),
+            end: CGPoint(x: frame.maxX, y: y)
+        )
+    }
+
     public func makeRangeDates() -> (start: Date, end: Date?)? {
         guard let start = data.first?.dates.first else {
             return nil

MobileAnalyticsChartSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

MobileAnalyticsChartSwift/Render/Configuration/ChartZeroLine.swift

@@ -0,0 +1,26 @@
+import UIKit
+
+/// Type of chart zero line.
+public struct ChartZeroLine {
+
+    /// Color of line.
+    public let color: UIColor
+
+    /// Width of line.
+    public let width: CGFloat
+
+    /// Creates instance of `ChartZeroLine`.
+    ///
+    /// - Parameters:
+    ///     - color: Color of line.
+    ///     - width: Width of line.
+    ///
+    /// - Returns: Instance of `ChartZeroLine`.
+    public init(
+        color: UIColor,
+        width: CGFloat
+    ) {
+        self.color = color
+        self.width = width
+    }
+}

MobileAnalyticsChartSwift/Render/RenderConfiguration.swift

@@ -12,6 +12,9 @@ public struct RenderConfiguration {
     /// Entity of chart y axis.
     public let yAxis: ChartYAxis?
 
+    /// Entity of chart zero line.
+    public let zeroLine: ChartZeroLine?
+
     /// Entity of chart gesture state.
     public let gestureState: ChartGestureState
 
@@ -42,6 +45,7 @@ public struct RenderConfiguration {
     ///     - rangeLabel: Entity of chart range label.
     ///     - xAxis: Entity of chart x axis.
     ///     - yAxis: Entity of chart y axis.
+    ///     - zeroLine: Entity of chart zero line.
     ///     - gestureState: Entity of chart gesture state.
     ///     - animation: Entity of chart animation.
     ///     - definition: Entity of chart definition.
@@ -56,6 +60,7 @@ public struct RenderConfiguration {
         rangeLabel: ChartRangeLabel?,
         xAxis: ChartXAxis?,
         yAxis: ChartYAxis?,
+        zeroLine: ChartZeroLine?,
         gestureState: ChartGestureState,
         animation: ChartAnimation,
         definition: ChartDefinition?,
@@ -68,6 +73,7 @@ public struct RenderConfiguration {
         self.rangeLabel = rangeLabel
         self.xAxis = xAxis
         self.yAxis = yAxis
+        self.zeroLine = zeroLine
         self.gestureState = gestureState
         self.animation = animation
         self.definition = definition

MobileAnalyticsChartSwift/Render/RenderDrawer.swift

@@ -10,6 +10,8 @@ public protocol RenderDrawer: class {
 
     func drawYAxisLabels()
 
+    func drawZeroLine()
+
     func drawRangeLabel()
 
     func drawDefinition()

MobileAnalyticsChartSwift/Render/SpriteKit/RenderSpriteKitImpl.swift

@@ -123,6 +123,8 @@ public class RenderSpriteKitImpl: SKScene {
 
     private var yAxisLabels = BasicNode()
 
+    private var zeroLine = SquareNode()
+
     // MARK: - Addition
 
     private var handlerActivated = false
@@ -159,6 +161,7 @@ extension RenderSpriteKitImpl {
             rangeLabel,
             yAxis,
             yAxisLabels,
+            zeroLine,
             xAxisLabels,
             definitionNode,
             definitionView,
@@ -239,6 +242,7 @@ extension RenderSpriteKitImpl {
         }
 
         yAxis.zPosition = 2
+        zeroLine.zPosition = 2
 
         chartsNode.forEach {
             $0.zPosition = 3
@@ -270,6 +274,7 @@ extension RenderSpriteKitImpl {
         setupXAxisLabels()
         setupYAxisLines()
         setupYAxisLabels()
+        setupZeroLine()
     }
 
     private func setupChartNode() {
@@ -318,6 +323,10 @@ extension RenderSpriteKitImpl {
     private func setupYAxisLabels() {
         yAxisLabels.blendMode = .multiply
     }
+
+    private func setupZeroLine() {
+        zeroLine.blendMode = .alpha
+    }
 }
 
 // MARK: - Configuration
@@ -335,6 +344,9 @@ extension RenderSpriteKitImpl {
         if let configurationYAxis = configuration.yAxis {
             configureYAxis(configurationYAxis)
         }
+        if let configurationZeroLine = configuration.zeroLine {
+            configureZeroLine(configurationZeroLine)
+        }
         if let configurationDefinition = configuration.definition {
             configureDefinitionNode(configurationDefinition)
             definitionsPoint.forEach {
@@ -433,6 +445,13 @@ extension RenderSpriteKitImpl {
         yAxisLabelHeight = configuration.labelFont.lineHeight
     }
 
+    private func configureZeroLine(
+        _ configuration: ChartZeroLine
+    ) {
+        zeroLine.strokeColor = configuration.color
+        zeroLine.lineWidth = configuration.width
+    }
+
     private func configureGesture(
         view: SKView,
         configuration: ChartGestureState
@@ -893,6 +912,7 @@ extension RenderSpriteKitImpl: RenderDrawer {
         drawChart()
         drawXAxis()
         drawYAxisLabels()
+        drawZeroLine()
         drawDefinition()
     }
 
@@ -1019,6 +1039,25 @@ extension RenderSpriteKitImpl: RenderDrawer {
         }
     }
 
+    public func drawZeroLine() {
+        guard let configurationZeroLine = configuration.zeroLine else { return }
+
+        if let zeroLinePosition = calculator.makeZeroLine(
+            frame: chartFrame,
+            chartMargins: configuration.chartMargins,
+            minValue: currentMinValue,
+            maxValue: currentMaxValue
+        ) {
+            let path = CGMutablePath()
+            path.move(to: zeroLinePosition.start)
+            path.addLine(to: zeroLinePosition.end)
+            path.closeSubpath()
+            zeroLine.path = path.copy(dashingWithPhase: 5, lengths: [10, 10])
+        } else {
+            zeroLine.path = nil
+        }
+    }
+
     public func drawRangeLabel() {
         guard let configurationRangeLabel = configuration.rangeLabel,
               let dates = calculator.makeRangeDates() else {

MobileAnalyticsChartSwiftExamplePods/Categories/UIColor+Style.swift

@@ -11,13 +11,27 @@ extension UIColor {
         if #available(iOS 13, *) {
             return UIColor { (UITraitCollection: UITraitCollection) -> UIColor in
                 if UITraitCollection.userInterfaceStyle == .dark {
-                    return UIColor(white: 1, alpha: 0.12)
+                    return UIColor(white: 1, alpha: 0.05)
                 } else {
-                    return UIColor(white: 0, alpha: 0.12)
+                    return UIColor(white: 0, alpha: 0.05)
                 }
             }
         } else {
-            return UIColor(white: 0, alpha: 0.12)
+            return UIColor(white: 0, alpha: 0.05)
+        }
+    }()
+
+    static var borderZeroLine: UIColor = {
+        if #available(iOS 13, *) {
+            return UIColor { (UITraitCollection: UITraitCollection) -> UIColor in
+                if UITraitCollection.userInterfaceStyle == .dark {
+                    return UIColor(white: 1, alpha: 0.1)
+                } else {
+                    return UIColor(white: 0, alpha: 0.1)
+                }
+            }
+        } else {
+            return UIColor(white: 0, alpha: 0.21)
         }
     }()