Show the glucose chart in the widget (#377)

Show the glucose chart in the widget. Thanks @bharat!

Author: Bharat Mediratta

Cartfile

@@ -1,6 +1,6 @@
 github "LoopKit/LoopKit" ~> 1.2.0
 github "LoopKit/xDripG5" ~> 0.8.0
-github "i-schuetz/SwiftCharts" ~> 0.5.0
+github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
 github "mddub/dexcom-share-client-swift" ~> 0.2.0
 github "mddub/G4ShareSpy" ~> 0.3.1
 github "ps2/rileylink_ios" ~> 1.0

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "amplitude/Amplitude-iOS" "v3.14.0"
+github "amplitude/Amplitude-iOS" "v3.14.1"
 github "mddub/G4ShareSpy" "v0.3.1"
 github "LoopKit/LoopKit" "v1.2.0"
-github "i-schuetz/SwiftCharts" "0.5.1"
+github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
 github "mddub/dexcom-share-client-swift" "v0.2.0"
 github "ps2/rileylink_ios" "v1.0"
 github "LoopKit/xDripG5" "v0.8.0"

Carthage/Build/iOS/SwiftCharts.framework/Headers/SwiftCharts-Swift.h

@@ -7,16 +7,11 @@
 //
 
 import Foundation
-import LoopKit
 import SwiftCharts
 
 
 extension ChartPoint {
-    static func pointsForGlucoseRangeSchedule(_ glucoseRangeSchedule: GlucoseRangeSchedule, xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
-        let targetRanges = glucoseRangeSchedule.between(
-            start: ChartAxisValueDate.dateFromScalar(xAxisValues.first!.scalar),
-            end: ChartAxisValueDate.dateFromScalar(xAxisValues.last!.scalar)
-        )
+    static func pointsForDatedRanges(_ targetRanges: [DatedRangeContext], xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
         let dateFormatter = DateFormatter()
 
         var maxPoints: [ChartPoint] = []
@@ -36,8 +31,8 @@ extension ChartPoint {
                 endDate = ChartAxisValueDate(date: targetRanges[index + 1].startDate, formatter: dateFormatter)
             }
 
-            let minValue = ChartAxisValueDouble(range.value.minValue)
-            let maxValue = ChartAxisValueDouble(range.value.maxValue)
+            let minValue = ChartAxisValueDouble(range.minValue)
+            let maxValue = ChartAxisValueDouble(range.maxValue)
 
             maxPoints += [
                 ChartPoint(x: startDate, y: maxValue),
@@ -53,7 +48,7 @@ extension ChartPoint {
         return maxPoints + minPoints.reversed()
     }
 
-    static func pointsForGlucoseRangeScheduleOverrideDuration(_ override: AbsoluteScheduleValue<DoubleRange>, xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
+    static func pointsForDatedRangeOverrideDuration(_ override: DatedRangeContext, xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
         let startDate = Date()
 
         guard override.endDate.timeIntervalSince(startDate) > 0,
@@ -65,8 +60,8 @@ extension ChartPoint {
         let dateFormatter = DateFormatter()
         let startDateAxisValue = ChartAxisValueDate(date: startDate, formatter: dateFormatter)
         let endDateAxisValue = ChartAxisValueDate(date: min(lastXAxisValue.date, override.endDate), formatter: dateFormatter)
-        let minValue = ChartAxisValueDouble(override.value.minValue)
-        let maxValue = ChartAxisValueDouble(override.value.maxValue)
+        let minValue = ChartAxisValueDouble(override.minValue)
+        let maxValue = ChartAxisValueDouble(override.maxValue)
 
         return [
             ChartPoint(x: startDateAxisValue, y: maxValue),
@@ -76,20 +71,20 @@ extension ChartPoint {
         ]
     }
 
-    static func pointsForGlucoseRangeScheduleOverride(_ override: AbsoluteScheduleValue<DoubleRange>, xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
+    static func pointsForDatedRangeOverride(_ override: DatedRangeContext, xAxisValues: [ChartAxisValue]) -> [ChartPoint] {
         let startDate = Date()
 
         guard override.endDate.timeIntervalSince(startDate) > 0,
             let lastXAxisValue = xAxisValues.last as? ChartAxisValueDate
-            else {
-                return []
+        else {
+            return []
         }
 
         let dateFormatter = DateFormatter()
         let startDateAxisValue = ChartAxisValueDate(date: startDate, formatter: dateFormatter)
         let endDateAxisValue = ChartAxisValueDate(date: lastXAxisValue.date, formatter: dateFormatter)
-        let minValue = ChartAxisValueDouble(override.value.minValue)
-        let maxValue = ChartAxisValueDouble(override.value.maxValue)
+        let minValue = ChartAxisValueDouble(override.minValue)
+        let maxValue = ChartAxisValueDouble(override.maxValue)
 
         return [
             ChartPoint(x: startDateAxisValue, y: maxValue),
@@ -98,16 +93,5 @@ extension ChartPoint {
             ChartPoint(x: startDateAxisValue, y: minValue)
         ]
     }
-}
-
 
-extension ChartPoint: TimelineValue {
-    public var startDate: Date {
-        if let dateValue = x as? ChartAxisValueDate {
-            return dateValue.date
-        } else {
-            return Date.distantPast
-        }
-    }
 }
-