[LOOP-3193] watch uses display unit (#373)

* watch uses display unit and sync with settings unit updates

* fixing unit tests

* using closed HKQuantity range in loop settings

* cleaned up unit test

Author: nhamming

Common/Models/WatchContext.swift

@@ -18,7 +18,7 @@ final class WatchContext: RawRepresentable {
 
     var creationDate = Date()
 
-    var preferredGlucoseUnit: HKUnit?
+    var displayGlucoseUnit: HKUnit?
 
     var glucose: HKQuantity?
     var glucoseTrendRawValue: Int?
@@ -61,9 +61,9 @@ final class WatchContext: RawRepresentable {
         isClosedLoop = rawValue["cl"] as? Bool
 
         if let unitString = rawValue["gu"] as? String {
-            preferredGlucoseUnit = HKUnit(from: unitString)
+            displayGlucoseUnit = HKUnit(from: unitString)
         }
-        let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter
+        let unit = displayGlucoseUnit ?? .milligramsPerDeciliter
         if let glucoseValue = rawValue["gv"] as? Double {
             glucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
         }
@@ -110,8 +110,8 @@ final class WatchContext: RawRepresentable {
 
         raw["cob"] = cob
 
-        let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter
-        raw["gu"] = preferredGlucoseUnit?.unitString
+        let unit = displayGlucoseUnit ?? .milligramsPerDeciliter
+        raw["gu"] = displayGlucoseUnit?.unitString
         raw["gv"] = glucose?.doubleValue(for: unit)
 
         raw["gt"] = glucoseTrendRawValue

Loop/Extensions/SettingsStore+SimulatedCoreData.swift

@@ -113,8 +113,8 @@ fileprivate extension StoredSettings {
         return StoredSettings(date: date,
                               dosingEnabled: true,
                               glucoseTargetRangeSchedule: glucoseTargetRangeSchedule,
-                              preMealTargetRange: DoubleRange(minValue: 80.0, maxValue: 90.0),
-                              workoutTargetRange: DoubleRange(minValue: 150.0, maxValue: 160.0),
+                              preMealTargetRange: DoubleRange(minValue: 80.0, maxValue: 90.0).quantityRange(for: .milligramsPerDeciliter),
+                              workoutTargetRange: DoubleRange(minValue: 150.0, maxValue: 160.0).quantityRange(for: .milligramsPerDeciliter),
                               overridePresets: nil,
                               scheduleOverride: nil,
                               preMealOverride: preMealOverride,

Loop/Models/WatchContext+LoopKit.swift

@@ -18,6 +18,6 @@ extension WatchContext {
         self.glucoseDate = glucose?.startDate
         self.glucoseIsDisplayOnly = glucose?.isDisplayOnly
         self.glucoseWasUserEntered = glucose?.wasUserEntered
-        self.preferredGlucoseUnit = glucoseUnit
+        self.displayGlucoseUnit = glucoseUnit
     }
 }

LoopCore/LoopSettings.swift

@@ -20,9 +20,9 @@ public struct LoopSettings: Equatable {
 
     public var glucoseTargetRangeSchedule: GlucoseRangeSchedule?
 
-    public var preMealTargetRange: DoubleRange?
+    public var preMealTargetRange: ClosedRange<HKQuantity>?
 
-    public var legacyWorkoutTargetRange: DoubleRange?
+    public var legacyWorkoutTargetRange: ClosedRange<HKQuantity>?
 
     public var indefiniteWorkoutOverrideEnabledDate: Date?
 
@@ -154,12 +154,12 @@ extension LoopSettings {
     }
 
     private func makePreMealOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
-        guard let preMealTargetRange = preMealTargetRange, let unit = glucoseUnit else {
+        guard let preMealTargetRange = preMealTargetRange else {
             return nil
         }
         return TemporaryScheduleOverride(
             context: .preMeal,
-            settings: TemporaryScheduleOverrideSettings(unit: unit, targetRange: preMealTargetRange),
+            settings: TemporaryScheduleOverrideSettings(targetRange: preMealTargetRange),
             startDate: date,
             duration: .finite(duration),
             enactTrigger: .local,
@@ -173,7 +173,7 @@ extension LoopSettings {
     }
 
     public mutating func legacyWorkoutOverride(beginningAt date: Date = Date(), for duration: TimeInterval) -> TemporaryScheduleOverride? {
-        guard let legacyWorkoutTargetRange = legacyWorkoutTargetRange, let unit = glucoseUnit else {
+        guard let legacyWorkoutTargetRange = legacyWorkoutTargetRange else {
             return nil
         }
 
@@ -183,7 +183,7 @@ extension LoopSettings {
 
         return TemporaryScheduleOverride(
             context: .legacyWorkout,
-            settings: TemporaryScheduleOverrideSettings(unit: unit, targetRange: legacyWorkoutTargetRange),
+            settings: TemporaryScheduleOverrideSettings(targetRange: legacyWorkoutTargetRange),
             startDate: date,
             duration: duration.isInfinite ? .indefinite : .finite(duration),
             enactTrigger: .local,
@@ -216,6 +216,7 @@ extension LoopSettings {
 extension LoopSettings: RawRepresentable {
     public typealias RawValue = [String: Any]
     private static let version = 1
+    fileprivate static let codingGlucoseUnit = HKUnit.milligramsPerDeciliter
 
     public init?(rawValue: RawValue) {
         guard
@@ -235,20 +236,20 @@ extension LoopSettings: RawRepresentable {
             // Migrate the glucose range schedule override targets
             if let overrideRangesRawValue = glucoseRangeScheduleRawValue["overrideRanges"] as? [String: DoubleRange.RawValue] {
                 if let preMealTargetRawValue = overrideRangesRawValue["preMeal"] {
-                    self.preMealTargetRange = DoubleRange(rawValue: preMealTargetRawValue)
+                    self.preMealTargetRange = DoubleRange(rawValue: preMealTargetRawValue)?.quantityRange(for: LoopSettings.codingGlucoseUnit)
                 }
                 if let legacyWorkoutTargetRawValue = overrideRangesRawValue["workout"] {
-                    self.legacyWorkoutTargetRange = DoubleRange(rawValue: legacyWorkoutTargetRawValue)
+                    self.legacyWorkoutTargetRange = DoubleRange(rawValue: legacyWorkoutTargetRawValue)?.quantityRange(for: LoopSettings.codingGlucoseUnit)
                 }
             }
         }
 
         if let rawPreMealTargetRange = rawValue["preMealTargetRange"] as? DoubleRange.RawValue {
-            self.preMealTargetRange = DoubleRange(rawValue: rawPreMealTargetRange)
+            self.preMealTargetRange = DoubleRange(rawValue: rawPreMealTargetRange)?.quantityRange(for: LoopSettings.codingGlucoseUnit)
         }
 
         if let rawLegacyWorkoutTargetRange = rawValue["legacyWorkoutTargetRange"] as? DoubleRange.RawValue {
-            self.legacyWorkoutTargetRange = DoubleRange(rawValue: rawLegacyWorkoutTargetRange)
+            self.legacyWorkoutTargetRange = DoubleRange(rawValue: rawLegacyWorkoutTargetRange)?.quantityRange(for: LoopSettings.codingGlucoseUnit)
         }
 
         self.indefiniteWorkoutOverrideEnabledDate = rawValue["indefiniteWorkoutOverrideEnabledDate"] as? Date
@@ -282,8 +283,8 @@ extension LoopSettings: RawRepresentable {
         ]
 
         raw["glucoseTargetRangeSchedule"] = glucoseTargetRangeSchedule?.rawValue
-        raw["preMealTargetRange"] = preMealTargetRange?.rawValue
-        raw["legacyWorkoutTargetRange"] = legacyWorkoutTargetRange?.rawValue
+        raw["preMealTargetRange"] = preMealTargetRange?.doubleRange(for: LoopSettings.codingGlucoseUnit).rawValue
+        raw["legacyWorkoutTargetRange"] = legacyWorkoutTargetRange?.doubleRange(for: LoopSettings.codingGlucoseUnit).rawValue
         raw["indefiniteWorkoutOverrideEnabledDate"] = indefiniteWorkoutOverrideEnabledDate
         raw["preMealOverride"] = preMealOverride?.rawValue
         raw["scheduleOverride"] = scheduleOverride?.rawValue

LoopTests/LoopSettingsAlerterTests.swift

@@ -21,12 +21,12 @@ class LoopSettingsAlerterTests: XCTestCase, LoopSettingsAlerterDelegate {
     var settings: LoopSettings = LoopSettings()
 
     override func setUp() {
-        settings.preMealTargetRange = DoubleRange(minValue: 80, maxValue: 80)
+        settings.preMealTargetRange = DoubleRange(minValue: 80, maxValue: 80).quantityRange(for: .milligramsPerDeciliter)
         settings.glucoseTargetRangeSchedule = GlucoseRangeSchedule(
             unit: .milligramsPerDeciliter,
             dailyItems: [.init(startTime: 0, value: DoubleRange(minValue: 95, maxValue: 105))]
         )
-        settings.legacyWorkoutTargetRange = DoubleRange(minValue: 120, maxValue: 150)
+        settings.legacyWorkoutTargetRange = DoubleRange(minValue: 120, maxValue: 150).quantityRange(for: .milligramsPerDeciliter)
         settings.enableLegacyWorkoutOverride(for: .infinity)
 
         alert = nil

LoopTests/LoopSettingsTests.swift

@@ -12,7 +12,7 @@ import LoopKit
 
 
 class LoopSettingsTests: XCTestCase {
-    private let preMealRange = DoubleRange(minValue: 80, maxValue: 80)
+    private let preMealRange = DoubleRange(minValue: 80, maxValue: 80).quantityRange(for: .milligramsPerDeciliter)
     private let targetRange = DoubleRange(minValue: 95, maxValue: 105)
 
     private lazy var settings: LoopSettings = {
@@ -29,7 +29,7 @@ class LoopSettingsTests: XCTestCase {
         var settings = self.settings
         let preMealStart = Date()
         settings.enablePreMealOverride(at: preMealStart, for: 1 /* hour */ * 60 * 60)
-        let actualPreMealRange = settings.effectiveGlucoseTargetRangeSchedule()?.value(at: preMealStart.addingTimeInterval(30 /* minutes */ * 60))
+        let actualPreMealRange = settings.effectiveGlucoseTargetRangeSchedule()?.quantityRange(at: preMealStart.addingTimeInterval(30 /* minutes */ * 60))
         XCTAssertEqual(preMealRange, actualPreMealRange)
     }
 
@@ -81,19 +81,19 @@ class LoopSettingsTests: XCTestCase {
         )
         settings.scheduleOverride = override
 
-        let actualPreMealRange = settings.effectiveGlucoseTargetRangeSchedule()?.value(at: preMealStart.addingTimeInterval(30 /* minutes */ * 60))
+        let actualPreMealRange = settings.effectiveGlucoseTargetRangeSchedule()?.quantityRange(at: preMealStart.addingTimeInterval(30 /* minutes */ * 60))
         XCTAssertEqual(actualPreMealRange, preMealRange)
 
         // The pre-meal range should be projected into the future, despite the simultaneous schedule override
-        let preMealRangeDuringOverride = settings.effectiveGlucoseTargetRangeSchedule()?.value(at: preMealStart.addingTimeInterval(2 /* hours */ * 60 * 60))
+        let preMealRangeDuringOverride = settings.effectiveGlucoseTargetRangeSchedule()?.quantityRange(at: preMealStart.addingTimeInterval(2 /* hours */ * 60 * 60))
         XCTAssertEqual(preMealRangeDuringOverride, preMealRange)
     }
 
     func testScheduleOverrideWithExpiredPreMealOverride() {
         var settings = self.settings
         settings.preMealOverride = TemporaryScheduleOverride(
             context: .preMeal,
-            settings: TemporaryScheduleOverrideSettings(unit: .milligramsPerDeciliter, targetRange: preMealRange),
+            settings: TemporaryScheduleOverrideSettings(targetRange: preMealRange),
             startDate: Date(timeIntervalSinceNow: -2 /* hours */ * 60 * 60),
             duration: .finite(1 /* hours */ * 60 * 60),
             enactTrigger: .local,

LoopTests/ViewModels/BolusEntryViewModelTests.swift

@@ -188,7 +188,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertNil(bolusEntryViewModel.preMealOverride)
         XCTAssertNil(bolusEntryViewModel.scheduleOverride)
         XCTAssertNil(bolusEntryViewModel.targetGlucoseSchedule)
-        let newGlucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: .millimolesPerLiter, dailyItems: [
+        let newGlucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: .milligramsPerDeciliter, dailyItems: [
             RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 100, maxValue: 110)),
             RepeatingScheduleValue(startTime: TimeInterval(28800), value: DoubleRange(minValue: 90, maxValue: 100)),
             RepeatingScheduleValue(startTime: TimeInterval(75600), value: DoubleRange(minValue: 100, maxValue: 110))
@@ -215,7 +215,7 @@ class BolusEntryViewModelTests: XCTestCase {
         XCTAssertNil(bolusEntryViewModel.preMealOverride)
         XCTAssertNil(bolusEntryViewModel.scheduleOverride)
         XCTAssertNil(bolusEntryViewModel.targetGlucoseSchedule)
-        let newGlucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: .millimolesPerLiter, dailyItems: [
+        let newGlucoseTargetRangeSchedule = GlucoseRangeSchedule(unit: .milligramsPerDeciliter, dailyItems: [
             RepeatingScheduleValue(startTime: TimeInterval(0), value: DoubleRange(minValue: 100, maxValue: 110)),
             RepeatingScheduleValue(startTime: TimeInterval(28800), value: DoubleRange(minValue: 90, maxValue: 100)),
             RepeatingScheduleValue(startTime: TimeInterval(75600), value: DoubleRange(minValue: 100, maxValue: 110))

WatchApp Extension/Controllers/ActionHUDController.swift

@@ -8,6 +8,7 @@
 
 import WatchKit
 import WatchConnectivity
+import HealthKit
 import LoopKit
 import LoopCore
 import SwiftUI
@@ -93,7 +94,7 @@ final class ActionHUDController: HUDInterfaceController {
             }
         }
 
-        glucoseFormatter.setPreferredNumberFormatter(for: loopManager.settings.glucoseUnit ?? .milligramsPerDeciliter)
+        glucoseFormatter.setPreferredNumberFormatter(for: loopManager.displayGlucoseUnit)
     }
 
     private var canEnableOverride: Bool {
@@ -138,7 +139,12 @@ final class ActionHUDController: HUDInterfaceController {
         }
 
         let buttonToSelect = loopManager.settings.preMealOverride?.isActive() == true ? SelectedButton.on : SelectedButton.off
-        let viewModel = OnOffSelectionViewModel(title: NSLocalizedString("Pre-Meal", comment: "Title for sheet to enable/disable pre-meal on watch"), message: formattedGlucoseRangeString(from: range), onSelection: setPreMealEnabled, selectedButton: buttonToSelect, selectedButtonTint: .carbsColor)
+        let viewModel = OnOffSelectionViewModel(
+            title: NSLocalizedString("Pre-Meal", comment: "Title for sheet to enable/disable pre-meal on watch"),
+            message: formattedGlucoseRangeString(from: range),
+            onSelection: setPreMealEnabled,
+            selectedButton: buttonToSelect,
+            selectedButtonTint: .carbsColor)
 
         presentController(withName: OnOffSelectionController.className, context: viewModel)
     }
@@ -220,15 +226,17 @@ final class ActionHUDController: HUDInterfaceController {
         }
     }
 
-    private func formattedGlucoseRangeString(from range: DoubleRange) -> String {
-        String(
+    private func formattedGlucoseRangeString(from range: ClosedRange<HKQuantity>) -> String {
+        let unit = loopManager.displayGlucoseUnit
+        let rangeDouble = range.doubleRange(for: unit)
+        return String(
             format: NSLocalizedString(
                 "%1$@ – %2$@ %3$@",
                 comment: "Format string for glucose range (1: lower bound)(2: upper bound)(3: unit)"
             ),
-            glucoseFormatter.numberFormatter.string(from: range.minValue) ?? String(range.minValue),
-            glucoseFormatter.numberFormatter.string(from: range.maxValue) ?? String(range.maxValue),
-            glucoseFormatter.string(from: loopManager.settings.glucoseUnit ?? .milligramsPerDeciliter)
+            glucoseFormatter.numberFormatter.string(from: rangeDouble.minValue) ?? String(rangeDouble.minValue),
+            glucoseFormatter.numberFormatter.string(from: rangeDouble.maxValue) ?? String(rangeDouble.maxValue),
+            glucoseFormatter.string(from: unit)
         )
     }
 

WatchApp Extension/Controllers/HUDInterfaceController.swift

@@ -70,7 +70,7 @@ class HUDInterfaceController: WKInterfaceController {
         if date != nil {
             glucoseLabel.setText(NSLocalizedString("– – –", comment: "No glucose value representation (3 dashes for mg/dL)"))
             glucoseLabel.setHidden(false)
-            if let glucose = activeContext.glucose, let glucoseDate = activeContext.glucoseDate, let unit = activeContext.preferredGlucoseUnit, glucoseDate.timeIntervalSinceNow > -LoopCoreConstants.inputDataRecencyInterval {
+            if let glucose = activeContext.glucose, let glucoseDate = activeContext.glucoseDate, let unit = activeContext.displayGlucoseUnit, glucoseDate.timeIntervalSinceNow > -LoopCoreConstants.inputDataRecencyInterval {
                 let formatter = NumberFormatter.glucoseFormatter(for: unit)
 
                 if let glucoseValue = formatter.string(from: glucose.doubleValue(for: unit)) {

WatchApp Extension/ExtensionDelegate.swift

@@ -161,10 +161,10 @@ final class ExtensionDelegate: NSObject, WKExtensionDelegate {
             return
         }
 
-        if context.preferredGlucoseUnit == nil {
+        if context.displayGlucoseUnit == nil {
             let type = HKQuantityType.quantityType(forIdentifier: .bloodGlucose)!
             loopManager.healthStore.preferredUnits(for: [type]) { (units, error) in
-                context.preferredGlucoseUnit = units[type]
+                context.displayGlucoseUnit = units[type]
 
                 DispatchQueue.main.async {
                     self.loopManager.updateContext(context)