Merge pull request #24 from tradingview/feature/migrate_to_3.6

Migrate backend to 3.6.1

Author: makedonsky94

Example/LightweightCharts/Example/FloatingTooltipViewController.swift

@@ -26,7 +26,10 @@ class FloatingTooltipViewController: UIViewController {
 
     private func setupUI() {
         let options = ChartOptions(
-            layout: LayoutOptions(backgroundColor: "#ffffff", textColor: "#333"),
+            layout: LayoutOptions(
+                background: .solid(color: "#ffffff"),
+                textColor: "#333"
+            ),
             rightPriceScale: VisiblePriceScaleOptions(
                 scaleMargins: PriceScaleMargins(
                     top: 0.2,
@@ -39,6 +42,9 @@ class FloatingTooltipViewController: UIViewController {
             grid: GridOptions(
                 verticalLines: GridLineOptions(color: "#ffffff"),
                 horizontalLines: GridLineOptions(color: "#eee")
+            ),
+            kineticScroll: KineticScrollOptions(
+                touch: false, mouse: false
             )
         )
         let chart = LightweightCharts(options: options)
@@ -79,7 +85,8 @@ class FloatingTooltipViewController: UIViewController {
             topColor: "rgba(0, 150, 136, 0.56)",
             bottomColor: "rgba(0, 150, 136, 0.04)",
             lineColor: "rgba(0, 150, 136, 1.0)",
-            lineWidth: .two
+            lineWidth: .two,
+            lastPriceAnimation: .continuous
         )
         let series = chart.addAreaSeries(options: options)
         let data = [

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - LightweightCharts (3.5.0)
+  - LightweightCharts (3.6.1)
 
 DEPENDENCIES:
   - LightweightCharts (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  LightweightCharts: 9a374056b466a14aba9513907af6c6763a209cc3
+  LightweightCharts: f4f71d444412003d793ba5dee4c38dc7aea66097
 
 PODFILE CHECKSUM: 10aa45b030d82b96cfc0e4e3b143c5488576107b
 

LightweightCharts.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name                    = 'LightweightCharts'
-  s.version                 = '3.5.0'
+  s.version                 = '3.6.1'
   s.summary                 = 'LightweightCharts for iOS.'
   s.description             = 'LightweightCharts pod. Swift wrapper above JavaScript library.'
   s.homepage                = 'https://tradingview.com'
@@ -19,9 +19,9 @@ Pod::Spec.new do |s|
       :script => 'LIBRARY=${TEMP_DIR}/lightweight-charts.js
       
 if [ "${CONFIGURATION}" = "Release" ]; then
-    curl -o $LIBRARY https://unpkg.com/lightweight-charts@3.5.0/dist/lightweight-charts.standalone.production.js
+    curl -o $LIBRARY https://unpkg.com/lightweight-charts@3.6.1/dist/lightweight-charts.standalone.production.js
 else
-    curl -o $LIBRARY https://unpkg.com/lightweight-charts@3.5.0/dist/lightweight-charts.standalone.development.js
+    curl -o $LIBRARY https://unpkg.com/lightweight-charts@3.6.1/dist/lightweight-charts.standalone.development.js
 fi
 
 cp -f $LIBRARY ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/lightweight-charts.js'

LightweightCharts/Classes/LightweightChartsModels/ColorType.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+public enum ColorType: String, Codable {
+    case solid = "solid"
+    case verticalGradient = "gradient"
+}

LightweightCharts/Classes/LightweightChartsModels/Options/Basics/LastPriceAnimationMode.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+/**
+ This enum is used to specify the type of the last price animation for series such as area or line
+ */
+public enum LastPriceAnimationMode: Int, Codable {
+    /**
+     Animation is always disabled
+     */
+    case disabled
+    
+    /**
+     Animation is always enabled
+     */
+    case continuous
+    
+    /**
+     Animation is active some time after data update
+     */
+    case onDataUpdate
+}

LightweightCharts/Classes/LightweightChartsModels/Options/ChartOptions/ChartOptions.swift

@@ -69,6 +69,11 @@ public struct ChartOptions: Codable {
      Structure that describes scaling behavior or boolean flag that disables/enables all kinds of scales
      */
     public var handleScale: TogglableOptions<HandleScaleOptions>?
+    
+    /**
+     Structure that describes kinetic scroll behavior
+     */
+    public var kineticScroll: KineticScrollOptions?
 
     public init(width: Double? = nil,
                 height: Double? = nil,
@@ -82,7 +87,8 @@ public struct ChartOptions: Codable {
                 grid: GridOptions? = nil,
                 localization: LocalizationOptions? = nil,
                 handleScroll: HandleScrollOptions? = nil,
-                handleScale: TogglableOptions<HandleScaleOptions>? = nil) {
+                handleScale: TogglableOptions<HandleScaleOptions>? = nil,
+                kineticScroll: KineticScrollOptions? = nil) {
         self.width = width
         self.height = height
         self.watermark = watermark
@@ -96,6 +102,7 @@ public struct ChartOptions: Codable {
         self.localization = localization
         self.handleScroll = handleScroll
         self.handleScale = handleScale
+        self.kineticScroll = kineticScroll
     }
 
 }

LightweightCharts/Classes/LightweightChartsModels/Options/ChartOptions/KineticScrollOptions.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+/**
+ You can disable or enable kinetic scroll via mouse or via touch gestures separately
+ */
+public struct KineticScrollOptions: Codable {
+    
+    /**
+     If true, kinetic scroll is enabled via touch gestures
+     */
+    var touch: Bool?
+    
+    /**
+     If true, kinetic scroll is enabled via mouse
+     */
+    var mouse: Bool?
+    
+    public init(touch: Bool? = nil, mouse: Bool? = nil) {
+        self.touch = touch
+        self.mouse = mouse
+    }
+}

LightweightCharts/Classes/LightweightChartsModels/Options/ChartOptions/LayoutOptions.swift

@@ -8,8 +8,11 @@ public struct LayoutOptions: Codable {
     /**
      Background color of the chart area and the scales
      */
+    @available(*, deprecated, message: "Use background instead")
     public var backgroundColor: ChartColor?
 
+    public var background: SurfaceColor?
+    
     /**
      Color of a text on the scales
      */
@@ -26,13 +29,14 @@ public struct LayoutOptions: Codable {
     public var fontFamily: String?
 
     public init(backgroundColor: ChartColor? = nil,
+                background: SurfaceColor? = nil,
                 textColor: ChartColor? = nil,
                 fontSize: Double? = nil,
                 fontFamily: String? = nil) {
         self.backgroundColor = backgroundColor
+        self.background = background
         self.textColor = textColor
         self.fontSize = fontSize
         self.fontFamily = fontFamily
     }
-    
 }

LightweightCharts/Classes/LightweightChartsModels/Options/SeriesOptions/Options/AreaSeriesOptions.swift

@@ -27,6 +27,7 @@ public struct AreaSeriesOptions: SeriesOptionsCommon {
     public var crosshairMarkerRadius: Double?
     public var crosshairMarkerBorderColor: ChartColor?
     public var crosshairMarkerBackgroundColor: ChartColor?
+    public var lastPriceAnimation: LastPriceAnimationMode?
 
     public init(lastValueVisible: Bool? = nil,
                 title: String? = nil,
@@ -51,7 +52,8 @@ public struct AreaSeriesOptions: SeriesOptionsCommon {
                 crosshairMarkerVisible: Bool? = nil,
                 crosshairMarkerRadius: Double? = nil,
                 crosshairMarkerBorderColor: ChartColor? = nil,
-                crosshairMarkerBackgroundColor: ChartColor? = nil) {
+                crosshairMarkerBackgroundColor: ChartColor? = nil,
+                lastPriceAnimation: LastPriceAnimationMode? = nil) {
         self.lastValueVisible = lastValueVisible
         self.title = title
         self.priceScaleId = priceScaleId
@@ -76,6 +78,7 @@ public struct AreaSeriesOptions: SeriesOptionsCommon {
         self.crosshairMarkerRadius = crosshairMarkerRadius
         self.crosshairMarkerBorderColor = crosshairMarkerBorderColor
         self.crosshairMarkerBackgroundColor = crosshairMarkerBackgroundColor
+        self.lastPriceAnimation = lastPriceAnimation
     }
 
 }

LightweightCharts/Classes/LightweightChartsModels/Options/SeriesOptions/Options/LineSeriesOptions.swift

@@ -26,6 +26,7 @@ public struct LineSeriesOptions: SeriesOptionsCommon {
     public var crosshairMarkerRadius: Double?
     public var crosshairMarkerBorderColor: ChartColor?
     public var crosshairMarkerBackgroundColor: ChartColor?
+    public var lastPriceAnimation: LastPriceAnimationMode?
 
     public init(lastValueVisible: Bool? = nil,
                 title: String? = nil,
@@ -49,7 +50,8 @@ public struct LineSeriesOptions: SeriesOptionsCommon {
                 crosshairMarkerVisible: Bool? = nil,
                 crosshairMarkerRadius: Double? = nil,
                 crosshairMarkerBorderColor: ChartColor? = nil,
-                crosshairMarkerBackgroundColor: ChartColor? = nil) {
+                crosshairMarkerBackgroundColor: ChartColor? = nil,
+                lastPriceAnimation: LastPriceAnimationMode? = nil) {
         self.lastValueVisible = lastValueVisible
         self.title = title
         self.priceScaleId = priceScaleId
@@ -73,6 +75,7 @@ public struct LineSeriesOptions: SeriesOptionsCommon {
         self.crosshairMarkerRadius = crosshairMarkerRadius
         self.crosshairMarkerBorderColor = crosshairMarkerBorderColor
         self.crosshairMarkerBackgroundColor = crosshairMarkerBackgroundColor
+        self.lastPriceAnimation = lastPriceAnimation
     }
 
 }