Update for QuantityFormatter changes (#575)

Author: ps2

Loop Status Extension/StatusViewController.swift

@@ -267,11 +267,10 @@ class StatusViewController: UIViewController, NCWidgetProviding {
             self.hudView.pumpStatusHUD.lifecycleProgress = context.pumpLifecycleProgressContext
 
             // Active carbs
-            let carbsFormatter = QuantityFormatter()
-            carbsFormatter.setPreferredNumberFormatter(for: carbUnit)
+            let carbsFormatter = QuantityFormatter(for: carbUnit)
 
             if let carbsOnBoard = context.carbsOnBoard,
-               let activeCarbsNumberString = carbsFormatter.string(from: HKQuantity(unit: carbUnit, doubleValue: carbsOnBoard), for: carbUnit)
+               let activeCarbsNumberString = carbsFormatter.string(from: HKQuantity(unit: carbUnit, doubleValue: carbsOnBoard))
             {
                 self.activeCarbsAmountLabel.text = String(format: NSLocalizedString("%1$@", comment: "The subtitle format describing the grams of active carbs.  (1: localized carb value description)"), activeCarbsNumberString)
             } else {
@@ -299,9 +298,6 @@ class StatusViewController: UIViewController, NCWidgetProviding {
             }
 
             // Charts
-            let glucoseFormatter = QuantityFormatter()
-            glucoseFormatter.setPreferredNumberFormatter(for: unit)
-
             self.charts.predictedGlucose.glucoseUnit = unit
             self.charts.predictedGlucose.setGlucoseValues(glucose)
 

Loop/Extensions/DeviceDataManager+BolusEntryViewModelDelegate.swift

@@ -70,7 +70,7 @@ extension DeviceDataManager: BolusEntryViewModelDelegate, ManualDoseViewModelDel
     }
 
     var preferredGlucoseUnit: HKUnit {
-        return displayGlucoseUnitObservable.displayGlucoseUnit
+        return displayGlucosePreference.unit
     }
 
     var pumpInsulinType: InsulinType? {

Loop/Extensions/DeviceDataManager+DeviceStatus.swift

@@ -87,7 +87,7 @@ extension DeviceDataManager {
         {
             return .openAppURL(url)
         } else if let cgmManagerUI = (cgmManager as? CGMManagerUI) {
-            return .presentViewController(cgmManagerUI.settingsViewController(bluetoothProvider: bluetoothProvider, displayGlucoseUnitObservable: displayGlucoseUnitObservable, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures))
+            return .presentViewController(cgmManagerUI.settingsViewController(bluetoothProvider: bluetoothProvider, displayGlucosePreference: displayGlucosePreference, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures))
         } else {
             return .setupNewCGM
         }

Loop/Managers/DeviceDataManager.swift

@@ -84,7 +84,7 @@ final class DeviceDataManager {
 
     private var displayGlucoseUnitObservers = WeakSynchronizedSet<DisplayGlucoseUnitObserver>()
 
-    public private(set) var displayGlucoseUnitObservable: DisplayGlucoseUnitObservable
+    public private(set) var displayGlucosePreference: DisplayGlucosePreference
 
     // MARK: - CGM
 
@@ -341,7 +341,7 @@ final class DeviceDataManager {
         self.automaticDosingStatus = automaticDosingStatus
 
         // HealthStorePreferredGlucoseUnitDidChange will be notified once the user completes the health access form. Set to .milligramsPerDeciliter until then
-        displayGlucoseUnitObservable = DisplayGlucoseUnitObservable(displayGlucoseUnit: .milligramsPerDeciliter)
+        displayGlucosePreference = DisplayGlucosePreference(displayGlucoseUnit: .milligramsPerDeciliter)
 
         self.trustedTimeChecker = trustedTimeChecker
 
@@ -452,7 +452,7 @@ final class DeviceDataManager {
 
             Task { @MainActor in
                 if let unit = await self.healthStore.cachedPreferredUnits(for: .bloodGlucose) {
-                    self.displayGlucoseUnitObservable.displayGlucoseUnitDidChange(to: unit)
+                    self.displayGlucosePreference.unitDidChange(to: unit)
                     self.notifyObserversOfDisplayGlucoseUnitChange(to: unit)
                 }
             }
@@ -599,7 +599,7 @@ final class DeviceDataManager {
             return .failure(UnknownCGMManagerIdentifierError())
         }
 
-        let result = cgmManagerUIType.setupViewController(bluetoothProvider: bluetoothProvider, displayGlucoseUnitObservable: displayGlucoseUnitObservable, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures, prefersToSkipUserInteraction: prefersToSkipUserInteraction)
+        let result = cgmManagerUIType.setupViewController(bluetoothProvider: bluetoothProvider, displayGlucosePreference: displayGlucosePreference, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures, prefersToSkipUserInteraction: prefersToSkipUserInteraction)
         if case .createdAndOnboarded(let cgmManagerUI) = result {
             cgmManagerOnboarding(didCreateCGMManager: cgmManagerUI)
             cgmManagerOnboarding(didOnboardCGMManager: cgmManagerUI)
@@ -1697,7 +1697,7 @@ extension DeviceDataManager {
         let queue = DispatchQueue.main
         displayGlucoseUnitObservers.insert(observer, queue: queue)
         queue.async {
-            observer.displayGlucoseUnitDidChange(to: self.displayGlucoseUnitObservable.displayGlucoseUnit)
+            observer.unitDidChange(to: self.displayGlucosePreference.unit)
         }
     }
 
@@ -1707,7 +1707,7 @@ extension DeviceDataManager {
 
     func notifyObserversOfDisplayGlucoseUnitChange(to displayGlucoseUnit: HKUnit) {
         self.displayGlucoseUnitObservers.forEach {
-            $0.displayGlucoseUnitDidChange(to: displayGlucoseUnit)
+            $0.unitDidChange(to: displayGlucoseUnit)
         }
     }
 }

Loop/Managers/LoopAppManager.swift

@@ -206,7 +206,7 @@ class LoopAppManager: NSObject {
                                               trustedTimeChecker: trustedTimeChecker
         )
         settingsManager.deviceStatusProvider = deviceDataManager
-        settingsManager.displayGlucoseUnitObservable = deviceDataManager.displayGlucoseUnitObservable
+        settingsManager.displayGlucosePreference = deviceDataManager.displayGlucosePreference
 
 
         overrideHistory.delegate = self

Loop/Managers/NotificationManager.swift

@@ -139,8 +139,7 @@ extension NotificationManager {
     @MainActor
     static func sendRemoteBolusNotification(amount: Double) {
         let notification = UNMutableNotificationContent()
-        let quantityFormatter = QuantityFormatter()
-        quantityFormatter.setPreferredNumberFormatter(for: .internationalUnit())
+        let quantityFormatter = QuantityFormatter(for: .internationalUnit())
         guard let amountDescription = quantityFormatter.numberFormatter.string(from: amount) else {
             return
         }
@@ -163,8 +162,7 @@ extension NotificationManager {
     @MainActor
     static func sendRemoteBolusFailureNotification(for error: Error, amount: Double) {
         let notification = UNMutableNotificationContent()
-        let quantityFormatter = QuantityFormatter()
-        quantityFormatter.setPreferredNumberFormatter(for: .internationalUnit())
+        let quantityFormatter = QuantityFormatter(for: .internationalUnit())
         guard let amountDescription = quantityFormatter.numberFormatter.string(from: amount) else {
             return
         }

Loop/Managers/OnboardingManager.swift

@@ -132,7 +132,7 @@ class OnboardingManager {
     }
 
     private func displayOnboarding(_ onboarding: OnboardingUI, resuming: Bool) -> Bool {
-        var onboardingViewController = onboarding.onboardingViewController(onboardingProvider: self, displayGlucoseUnitObservable: deviceDataManager.displayGlucoseUnitObservable, colorPalette: .default)
+        var onboardingViewController = onboarding.onboardingViewController(onboardingProvider: self, displayGlucosePreference: deviceDataManager.displayGlucosePreference, colorPalette: .default)
         onboardingViewController.cgmManagerOnboardingDelegate = deviceDataManager
         onboardingViewController.pumpManagerOnboardingDelegate = deviceDataManager
         onboardingViewController.serviceOnboardingDelegate = servicesManager
@@ -352,7 +352,7 @@ extension OnboardingManager: CGMManagerProvider {
             return .failure(OnboardingError.invalidState)
         }
 
-        return .success(.userInteractionRequired(cgmManagerUI.settingsViewController(bluetoothProvider: self, displayGlucoseUnitObservable: deviceDataManager.displayGlucoseUnitObservable, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures)))
+        return .success(.userInteractionRequired(cgmManagerUI.settingsViewController(bluetoothProvider: self, displayGlucosePreference: deviceDataManager.displayGlucosePreference, colorPalette: .default, allowDebugFeatures: FeatureFlags.allowDebugFeatures)))
     }
 }
 

Loop/Managers/SettingsManager.swift

@@ -32,7 +32,7 @@ class SettingsManager {
 
     var alertMuter: AlertMuter
 
-    var displayGlucoseUnitObservable: DisplayGlucoseUnitObservable?
+    var displayGlucosePreference: DisplayGlucosePreference?
 
     public var latestSettings: StoredSettings
 
@@ -139,7 +139,7 @@ class SettingsManager {
                               controllerDevice: UIDevice.current.controllerDevice,
                               cgmDevice: deviceStatusProvider?.cgmManagerStatus?.device,
                               pumpDevice: deviceStatusProvider?.pumpManagerStatus?.device,
-                              bloodGlucoseUnit: displayGlucoseUnitObservable?.displayGlucoseUnit,
+                              bloodGlucoseUnit: displayGlucosePreference?.unit,
                               automaticDosingStrategy: newLoopSettings.automaticDosingStrategy)
     }
 

Loop/View Controllers/CarbAbsorptionViewController.swift

@@ -504,7 +504,7 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
         let navigationWrapper: UINavigationController
         if FeatureFlags.simpleBolusCalculatorEnabled && !automaticDosingStatus.automaticDosingEnabled {
             let viewModel = SimpleBolusViewModel(delegate: deviceManager, displayMealEntry: true)
-            let bolusEntryView = SimpleBolusView(viewModel: viewModel).environmentObject(DisplayGlucoseUnitObservable(displayGlucoseUnit: .milligramsPerDeciliter))
+            let bolusEntryView = SimpleBolusView(viewModel: viewModel).environmentObject(DisplayGlucosePreference(displayGlucoseUnit: .milligramsPerDeciliter))
             let hostingController = DismissibleHostingController(rootView: bolusEntryView, isModalInPresentation: false)
             navigationWrapper = UINavigationController(rootViewController: hostingController)
             hostingController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: navigationWrapper, action: #selector(dismissWithAnimation))

Loop/View Controllers/CarbEntryViewController.swift

@@ -28,7 +28,7 @@ final class CarbEntryViewController: LoopChartsTableViewController, Identifiable
     var preferredCarbUnit = HKUnit.gram()
 
     private var glucoseUnit: HKUnit {
-        return deviceManager.displayGlucoseUnitObservable.displayGlucoseUnit
+        return deviceManager.displayGlucosePreference.unit
     }
 
     var maxCarbEntryQuantity = LoopConstants.maxCarbEntryQuantity
@@ -566,7 +566,7 @@ final class CarbEntryViewController: LoopChartsTableViewController, Identifiable
 
         viewModel.analyticsServicesManager = deviceManager.analyticsServicesManager
 
-        let bolusEntryView = BolusEntryView(viewModel: viewModel).environmentObject(deviceManager.displayGlucoseUnitObservable)
+        let bolusEntryView = BolusEntryView(viewModel: viewModel).environmentObject(deviceManager.displayGlucosePreference)
 
         // After confirming a bolus, pop back to this controller's predecessor, i.e. all the way back out of the carb flow.
         let predecessorViewControllerType = (navigationController?.viewControllers.dropLast().last).map { type(of: $0) } ?? UIViewController.self