Swiftcharts update

Cartfile

@@ -1,6 +1,6 @@
 github "LoopKit/LoopKit" == 1.2.2
 github "LoopKit/xDripG5" ~> 0.8.0
-github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
+github "i-schuetz/SwiftCharts" ~> 0.6.0
 github "mddub/dexcom-share-client-swift" == 0.2.1
 github "mddub/G4ShareSpy" == 0.3.2
 github "ps2/rileylink_ios" == 1.0.1

Cartfile.resolved

@@ -1,7 +1,7 @@
 github "LoopKit/LoopKit" "v1.2.2"
 github "LoopKit/xDripG5" "v0.8.0"
 github "amplitude/Amplitude-iOS" "v3.14.1"
-github "bharat/SwiftCharts" "9faad7c38762a177ae01382def605a77c0e61aba"
+github "i-schuetz/SwiftCharts" "0.6"
 github "mddub/G4ShareSpy" "v0.3.2"
 github "mddub/dexcom-share-client-swift" "v0.2.1"
 github "ps2/rileylink_ios" "v1.0.1"

Loop Status Extension/StatusViewController.swift

@@ -26,7 +26,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         }
     }
     @IBOutlet weak var subtitleLabel: UILabel!
-    @IBOutlet weak var glucoseChartContentView: ChartContentView!
+    @IBOutlet weak var glucoseChartContentView: LoopUI.ChartContentView!
 
     private lazy var charts: StatusChartsManager = {
         let charts = StatusChartsManager(
@@ -44,7 +44,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 settings.trailing = 8
                 settings.axisTitleLabelsToLabelsSpacing = 0
                 settings.labelsToAxisSpacingX = 6
-                settings.labelsWidthY = 30
+                settings.clipInnerFrame = false
                 return settings
             }()
         )

Loop.xcodeproj/project.pbxproj

@@ -826,7 +826,6 @@
 			children = (
 				C17884621D51A7A400405663 /* BatteryIndicator.swift */,
 				C17824991E1999FA00D9D25C /* CaseCountable.swift */,
-				4331E0771C85302200FBE832 /* CGPoint.swift */,
 				4F6663931E905FD2009E74FC /* ChartColorPalette+Loop.swift */,
 				4346D1F51C78501000ABAFE3 /* ChartPoint+Loop.swift */,
 				4389916A1E91B689000EEF90 /* ChartSettings+Loop.swift */,

Loop/Extensions/ChartSettings+Loop.swift

@@ -10,13 +10,13 @@ import SwiftCharts
 
 extension ChartSettings {
     static var `default`: ChartSettings {
-        let settings = ChartSettings()
+        var settings = ChartSettings()
         settings.top = 12
         settings.bottom = 0
         settings.trailing = 8
         settings.axisTitleLabelsToLabelsSpacing = 0
         settings.labelsToAxisSpacingX = 6
-        settings.labelsWidthY = 30
+        settings.clipInnerFrame = false
         return settings
     }
 }

Loop/View Controllers/PredictionTableViewController.swift

@@ -42,10 +42,11 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
             }
         ]
 
-        let chartPanGestureRecognizer = UIPanGestureRecognizer()
-        chartPanGestureRecognizer.delegate = self
-        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
-        charts.panGestureRecognizer = chartPanGestureRecognizer
+        let gestureRecognizer = UILongPressGestureRecognizer()
+        gestureRecognizer.delegate = self
+        gestureRecognizer.minimumPressDuration = 0.1
+        gestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
+        charts.gestureRecognizer = gestureRecognizer
     }
 
     deinit {
@@ -249,7 +250,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
             cell.titleLabel?.textColor = UIColor.secondaryLabelColor
             cell.selectionStyle = .none
 
-            cell.addGestureRecognizer(charts.panGestureRecognizer!)
+            cell.addGestureRecognizer(charts.gestureRecognizer!)
 
             return cell
         case .inputs:

Loop/View Controllers/StatusTableViewController.swift

@@ -84,11 +84,12 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             }
         ]
 
-        let chartPanGestureRecognizer = UIPanGestureRecognizer()
-        chartPanGestureRecognizer.delegate = self
-        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
-        tableView.addGestureRecognizer(chartPanGestureRecognizer)
-        charts.panGestureRecognizer = chartPanGestureRecognizer
+        let gestureRecognizer = UILongPressGestureRecognizer()
+        gestureRecognizer.delegate = self
+        gestureRecognizer.minimumPressDuration = 0.1
+        gestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
+        tableView.addGestureRecognizer(gestureRecognizer)
+        charts.gestureRecognizer = gestureRecognizer
 
         // Toolbar
         toolbarItems![0].accessibilityLabel = NSLocalizedString("Add Meal", comment: "The label of the carb entry button")
@@ -543,7 +544,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
             self.tableView(tableView, updateSubtitleFor: cell, at: indexPath)
 
-            let alpha: CGFloat = charts.panGestureRecognizer?.state == .possible ? 1 : 0
+            let alpha: CGFloat = charts.gestureRecognizer?.state == .possible ? 1 : 0
             cell.titleLabel?.alpha = alpha
             cell.subtitleLabel?.alpha = alpha