diff --git a/Podfile b/Podfile index e684169f..1b624b72 100644 --- a/Podfile +++ b/Podfile @@ -8,21 +8,21 @@ use_frameworks! def shared_pods pod 'ActionSheetPicker-3.0', '~> 2.3.0' pod 'ChameleonFramework', '~> 2.1.0' - pod 'Charts', '~> 4.1.0' + pod 'DGCharts', '~> 5.1.0' pod 'Crashlytics', '~> 3.12.0' pod 'Fabric' pod 'IP-UIKit-Wisdom', '~> 0.0.10' pod 'KVOController', '~> 1.2.0' pod 'MZTimerLabel', '~> 0.5.4' pod 'PureLayout', '~> 3.1.4' - pod 'SVProgressHUD', '~> 2.2.5' + pod 'SVProgressHUD', :git => 'https://github.com/mitsuke2020/SVProgressHUD.git' pod 'UICircularProgressRing' pod 'XMLDictionary', '~> 1.4.1' - pod 'Realm', '~> 4.3.2' + pod 'Realm', '~> 20.0.3' pod 'RealmSwift' pod 'AEXML' - pod 'RxSwift', '~> 6.2.0' - pod 'RxCocoa', '~> 6.2.0' + pod 'RxSwift', '~> 6.9.0' + pod 'RxCocoa', '~> 6.9.0' pod 'Introspect' pod 'CocoaLumberjack/Swift' pod 'DeviceGuru' diff --git a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphViewLineChartView.swift b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphViewLineChartView.swift index 4d331d78..922276a9 100644 --- a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphViewLineChartView.swift +++ b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphViewLineChartView.swift @@ -6,7 +6,7 @@ // Copyright © 2022 SiliconLabs. All rights reserved. // -import Charts +import DGCharts class RSSIGraphLineChartView: LineChartView { diff --git a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphXAxisRenderer.swift b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphXAxisRenderer.swift index 6e79ed5d..80da019c 100644 --- a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphXAxisRenderer.swift +++ b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphXAxisRenderer.swift @@ -7,7 +7,7 @@ // import Foundation -import Charts +import DGCharts class RSSIGraphXAxisRenderer: XAxisRenderer { diff --git a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphYAxisRenderer.swift b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphYAxisRenderer.swift index 211defef..5e6d6e34 100644 --- a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphYAxisRenderer.swift +++ b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/RSSIGraphYAxisRenderer.swift @@ -7,7 +7,7 @@ // import Foundation -import Charts +import DGCharts class RSSIGraphYAxisRenderer : YAxisRenderer { private let arrowWidth = CGFloat(6) diff --git a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/SILGraphView.swift b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/SILGraphView.swift index 1139ab92..7b278e8c 100644 --- a/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/SILGraphView.swift +++ b/SiliconLabsApp/ViewControllers/RSSIGraph/UI/GraphView/SILGraphView.swift @@ -7,7 +7,7 @@ // import UIKit -import Charts +import DGCharts import RxSwift import RxRelay diff --git a/SiliconLabsApp/ViewControllers/RangeTestApp/SILRangeTestAppViewController.swift b/SiliconLabsApp/ViewControllers/RangeTestApp/SILRangeTestAppViewController.swift index 2d7a333c..b54af503 100644 --- a/SiliconLabsApp/ViewControllers/RangeTestApp/SILRangeTestAppViewController.swift +++ b/SiliconLabsApp/ViewControllers/RangeTestApp/SILRangeTestAppViewController.swift @@ -9,7 +9,7 @@ import UIKit import ActionSheetPicker_3_0 import ChameleonFramework -import Charts +import DGCharts import SVProgressHUD fileprivate struct Constants { @@ -627,7 +627,7 @@ extension SILRangeTestAppViewController { } private class CubicLineSampleFillFormatter: FillFormatter { - func getFillLinePosition(dataSet: Charts.LineChartDataSetProtocol, dataProvider: Charts.LineChartDataProvider) -> CGFloat { + func getFillLinePosition(dataSet: DGCharts.LineChartDataSetProtocol, dataProvider: DGCharts.LineChartDataProvider) -> CGFloat { return -100 } }