Show the glucose chart in the widget

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"

Loop/Extensions/ChartPoint.swift → Common/Extensions/ChartPoint.swift

@@ -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
-        }
-    }
 }
-

Loop/Extensions/CollectionType.swift → Common/Extensions/CollectionType.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import LoopKit
 
 
 extension BidirectionalCollection where Index: Strideable, Iterator.Element: Comparable, Index.Stride == Int {
@@ -72,24 +71,3 @@ extension BidirectionalCollection where Index: Strideable, Iterator.Element: Str
     }
 }
 
-
-public extension Sequence where Iterator.Element: TimelineValue {
-    /// Returns the closest element index in the sorted sequence prior to the specified date
-    ///
-    /// - parameter date: The date to use in the search
-    ///
-    /// - returns: The closest index, if any exist before the specified date
-    func closestIndexPriorToDate(_ date: Date) -> Int? {
-        var closestIndex: Int?
-
-        for (index, value) in self.enumerated() {
-            if value.startDate <= date {
-                closestIndex = index
-            } else {
-                break
-            }
-        }
-
-        return closestIndex
-    }
-}

Common/Extensions/HKUnit.swift

@@ -20,6 +20,10 @@ extension HKUnit {
             return 1
         }
     }
+
+    static func milligramsPerDeciliterUnit() -> HKUnit {
+        return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))
+    }
 
     static func millimolesPerLiterUnit() -> HKUnit {
         return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())

Common/Extensions/UIColor.swift

@@ -16,8 +16,6 @@ extension UIColor {
 
     @nonobjc static let cellBackgroundColor = UIColor(white: 239 / 255, alpha: 1)
 
-    @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)
-
     @nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()
 
     @nonobjc static let COBTintColor = UIColor(red: 99 / 255, green: 218 / 255, blue: 56 / 255, alpha: 1)

Loop/Managers/StatusChartManager.swift → Common/Managers/StatusChartsManager.swift

@@ -9,11 +9,15 @@
 import Foundation
 import HealthKit
 
-// TODO: Remove this dependency
-import LoopKit
-
 import SwiftCharts
 
+protocol TargetPointsCalculator {
+    var glucosePoints: [ChartPoint] { get }
+    var overridePoints: [ChartPoint] { get }
+    var overrideDurationPoints: [ChartPoint] { get }
+
+    func calculate(_ xAxisValues: [ChartAxisValue]?)
+}
 
 final class StatusChartsManager {
 
@@ -44,9 +48,9 @@ final class StatusChartsManager {
         return numberFormatter
     }
 
-    private lazy var axisLineColor = UIColor.clear
+    private lazy var axisLineColor = UIColor.axisLineColor
 
-    private lazy var axisLabelSettings: ChartLabelSettings = ChartLabelSettings(font: UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption1), fontColor: UIColor.secondaryLabelColor)
+    private lazy var axisLabelSettings: ChartLabelSettings = ChartLabelSettings(font: UIFont.preferredFont(forTextStyle: UIFontTextStyle.caption1), fontColor: UIColor.axisLabelColor)
 
     private lazy var guideLinesLayerSettings: ChartGuideLinesLayerSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.gridColor)
 
@@ -117,12 +121,6 @@ final class StatusChartsManager {
         }
     }
 
-    var glucoseTargetRangeSchedule: GlucoseRangeSchedule? {
-        didSet {
-            targetGlucosePoints = []
-        }
-    }
-
     var glucoseDisplayRange: (min: HKQuantity, max: HKQuantity)? {
         didSet {
             if let range = glucoseDisplayRange {
@@ -168,6 +166,12 @@ final class StatusChartsManager {
     /// The chart points for alternate predicted glucose
     var alternatePredictedGlucosePoints: [ChartPoint]?
 
+    var targetPointsCalculator: TargetPointsCalculator? {
+        didSet {
+            targetGlucosePoints = []
+        }
+    }
+
     private var targetGlucosePoints: [ChartPoint] = [] {
         didSet {
             glucoseChart = nil
@@ -238,7 +242,7 @@ final class StatusChartsManager {
         }
     }
 
-    private var xAxisValues: [ChartAxisValue]? {
+    internal var xAxisValues: [ChartAxisValue]? {
         didSet {
             if let xAxisValues = xAxisValues, xAxisValues.count > 1 {
                 xAxisModel = ChartAxisModel(axisValues: xAxisValues, lineColor: axisLineColor)
@@ -636,7 +640,7 @@ final class StatusChartsManager {
         return Chart(frame: frame, layers: layers.flatMap { $0 })
     }
 
-    private func generateXAxisValues() {
+    internal func generateXAxisValues() {
         let timeFormatter = DateFormatter()
         timeFormatter.dateFormat = "h a"
 
@@ -676,25 +680,16 @@ final class StatusChartsManager {
             generateXAxisValues()
         }
 
-        if  let xAxisValues = xAxisValues, xAxisValues.count > 1,
-            targetGlucosePoints.count == 0,
-            let targets = glucoseTargetRangeSchedule
-        {
-            targetGlucosePoints = ChartPoint.pointsForGlucoseRangeSchedule(targets, xAxisValues: xAxisValues)
-
-            if let override = targets.temporaryOverride {
-                targetOverridePoints = ChartPoint.pointsForGlucoseRangeScheduleOverride(override, xAxisValues: xAxisValues)
-
-                targetOverrideDurationPoints = ChartPoint.pointsForGlucoseRangeScheduleOverrideDuration(override, xAxisValues: xAxisValues)
-            } else {
-                targetOverridePoints = []
-                targetOverrideDurationPoints = []
-            }
+        if let calculator = targetPointsCalculator,
+           targetGlucosePoints.count == 0 {
+            calculator.calculate(xAxisValues)
+            targetGlucosePoints = calculator.glucosePoints
+            targetOverridePoints = calculator.overridePoints
+            targetOverrideDurationPoints = calculator.overrideDurationPoints
         }
     }
 }
 
-
 private extension HKUnit {
     var glucoseUnitYAxisSegmentSize: Double {
         if self == HKUnit.milligramsPerDeciliterUnit() {