Display glucose units preference updates

Author: ps2

G7SensorKitUI/G7CGMManager/G7CGMManager+UI.swift

@@ -28,15 +28,15 @@ extension G7CGMManager: CGMManagerUI {
         return nil
     }
 
-    public static func setupViewController(bluetoothProvider: LoopKit.BluetoothProvider, displayGlucoseUnitObservable: LoopKitUI.DisplayGlucoseUnitObservable, colorPalette: LoopKitUI.LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool) -> LoopKitUI.SetupUIResult<LoopKitUI.CGMManagerViewController, LoopKitUI.CGMManagerUI>
+    public static func setupViewController(bluetoothProvider: LoopKit.BluetoothProvider, displayGlucosePreference: DisplayGlucosePreference, colorPalette: LoopKitUI.LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool) -> LoopKitUI.SetupUIResult<LoopKitUI.CGMManagerViewController, LoopKitUI.CGMManagerUI>
     {
-        let vc = G7UICoordinator(colorPalette: colorPalette, displayGlucoseUnitObservable: displayGlucoseUnitObservable, allowDebugFeatures: allowDebugFeatures)
+        let vc = G7UICoordinator(colorPalette: colorPalette, displayGlucosePreference: displayGlucosePreference, allowDebugFeatures: allowDebugFeatures)
         return .userInteractionRequired(vc)
     }
 
-    public func settingsViewController(bluetoothProvider: BluetoothProvider, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) ->CGMManagerViewController {
+    public func settingsViewController(bluetoothProvider: BluetoothProvider, displayGlucosePreference: DisplayGlucosePreference, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool) ->CGMManagerViewController {
 
-        return G7UICoordinator(cgmManager: self, colorPalette: colorPalette, displayGlucoseUnitObservable: displayGlucoseUnitObservable, allowDebugFeatures: allowDebugFeatures)
+        return G7UICoordinator(cgmManager: self, colorPalette: colorPalette, displayGlucosePreference: displayGlucosePreference, allowDebugFeatures: allowDebugFeatures)
     }
 
     public var smallImage: UIImage? {

G7SensorKitUI/G7CGMManager/G7UICoordinator.swift

@@ -14,18 +14,18 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN
     var cgmManagerOnboardingDelegate: LoopKitUI.CGMManagerOnboardingDelegate?
     var completionDelegate: LoopKitUI.CompletionDelegate?
     var cgmManager: G7CGMManager?
-    var displayGlucoseUnitObservable: DisplayGlucoseUnitObservable
+    var displayGlucosePreference: DisplayGlucosePreference
 
     var colorPalette: LoopUIColorPalette
 
     init(cgmManager: G7CGMManager? = nil,
          colorPalette: LoopUIColorPalette,
-         displayGlucoseUnitObservable: DisplayGlucoseUnitObservable,
+         displayGlucosePreference: DisplayGlucosePreference,
          allowDebugFeatures: Bool)
     {
         self.cgmManager = cgmManager
         self.colorPalette = colorPalette
-        self.displayGlucoseUnitObservable = displayGlucoseUnitObservable
+        self.displayGlucosePreference = displayGlucosePreference
         super.init(navigationBarClass: UINavigationBar.self, toolbarClass: UIToolbar.self)
     }
 
@@ -75,7 +75,7 @@ class G7UICoordinator: UINavigationController, CGMManagerOnboarding, CompletionN
                         }
                     }
                 },
-                viewModel: G7SettingsViewModel(cgmManager: cgmManager!, displayGlucoseUnitObservable: displayGlucoseUnitObservable)
+                viewModel: G7SettingsViewModel(cgmManager: cgmManager!, displayGlucosePreference: displayGlucosePreference)
             )
             let hostingController = DismissibleHostingController(rootView: view, colorPalette: colorPalette)
             return hostingController

G7SensorKitUI/Views/G7SettingsViewModel.swift

@@ -29,7 +29,7 @@ class G7SettingsViewModel: ObservableObject {
         }
     }
 
-    var displayGlucoseUnitObservable: DisplayGlucoseUnitObservable
+    let displayGlucosePreference: DisplayGlucosePreference
 
     private var lastReading: G7GlucoseMessage?
 
@@ -40,15 +40,6 @@ class G7SettingsViewModel: ObservableObject {
         return formatter
     }()
 
-    private lazy var glucoseFormatter: QuantityFormatter = {
-        let formatter = QuantityFormatter()
-        formatter.setPreferredNumberFormatter(for: displayGlucoseUnitObservable.displayGlucoseUnit)
-        formatter.numberFormatter.notANumberSymbol = "–"
-        return formatter
-    }()
-
-    private let quantityFormatter = QuantityFormatter()
-
     private var cgmManager: G7CGMManager
 
     var progressBarState: G7ProgressBarState {
@@ -68,9 +59,9 @@ class G7SettingsViewModel: ObservableObject {
         }
     }
 
-    init(cgmManager: G7CGMManager, displayGlucoseUnitObservable: DisplayGlucoseUnitObservable) {
+    init(cgmManager: G7CGMManager, displayGlucosePreference: DisplayGlucosePreference) {
         self.cgmManager = cgmManager
-        self.displayGlucoseUnitObservable = displayGlucoseUnitObservable
+        self.displayGlucosePreference = displayGlucosePreference
         updateValues()
 
         self.cgmManager.addStateObserver(self, queue: DispatchQueue.main)
@@ -188,19 +179,13 @@ class G7SettingsViewModel: ObservableObject {
         case .some(.aboveRange):
             return LocalizedString("HIGH", comment: "String displayed instead of a glucose value above the CGM range")
         default:
-            quantityFormatter.setPreferredNumberFormatter(for: displayGlucoseUnitObservable.displayGlucoseUnit)
-            let valueStr = quantityFormatter.string(from: quantity, for: displayGlucoseUnitObservable.displayGlucoseUnit, includeUnit: false) ?? ""
-            return String(format: "%@ %@", valueStr, displayGlucoseUnitObservable.displayGlucoseUnit.shortLocalizedUnitString())
+            return displayGlucosePreference.formatter.string(from: quantity)!
         }
     }
 
     var lastGlucoseTrendString: String {
         if let lastReading = lastReading, lastReading.hasReliableGlucose, let trendRate = lastReading.trendRate {
-            let glucoseUnitPerMinute = displayGlucoseUnitObservable.displayGlucoseUnit.unitDivided(by: .minute())
-            // This seemingly strange replacement of glucose units is only to display the unit string correctly
-            let trendPerMinute = HKQuantity(unit: displayGlucoseUnitObservable.displayGlucoseUnit, doubleValue: trendRate.doubleValue(for: glucoseUnitPerMinute))
-            let formatted = glucoseFormatter.string(from: trendPerMinute, for: displayGlucoseUnitObservable.displayGlucoseUnit)!
-            return String(format: LocalizedString("%@/min", comment: "Format string for glucose trend per minute. (1: glucose value and unit)"), formatted)
+            return displayGlucosePreference.minuteRateFormatter.string(from: trendRate)!
         } else {
             return ""
         }