[LOOP-4975] Update Open Loop Freshness Syncing Between StatusHUD and SettingsView (#705)

Author: Camji55

Loop Widget Extension/Widgets/SystemStatusWidget.swift

@@ -26,7 +26,7 @@ struct SystemStatusWidgetEntryView: View {
         } else {
             let mostRecentGlucoseDataDate = entry.mostRecentGlucoseDataDate ?? Date().addingTimeInterval(.minutes(16))
             let mostRecentPumpDataDate = entry.mostRecentPumpDataDate ?? Date().addingTimeInterval(.minutes(16))
-            age = abs(max(min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow), min(0, mostRecentPumpDataDate.timeIntervalSinceNow)))
+            age = max(abs(min(0, mostRecentPumpDataDate.timeIntervalSinceNow)), abs(min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow)))
         }
 
         return LoopCompletionFreshness(age: age)

Loop/Managers/LoopAppManager.swift

@@ -290,6 +290,8 @@ class LoopAppManager: NSObject {
 
         loopDataManager = LoopDataManager(
             lastLoopCompleted: ExtensionDataManager.context?.lastLoopCompleted,
+            publishedMostRecentGlucoseDataDate: ExtensionDataManager.context?.mostRecentGlucoseDataDate,
+            publishedMostRecentPumpDataDate: ExtensionDataManager.context?.mostRecentPumpDataDate,
             temporaryPresetsManager: temporaryPresetsManager,
             settingsProvider: settingsManager,
             doseStore: doseStore,

Loop/Managers/LoopDataManager.swift

@@ -99,6 +99,8 @@ final class LoopDataManager: ObservableObject {
     }
 
     @Published private(set) var lastLoopCompleted: Date?
+    @Published private(set) var publishedMostRecentGlucoseDataDate: Date?
+    @Published private(set) var publishedMostRecentPumpDataDate: Date?
 
     var deliveryDelegate: DeliveryDelegate?
 
@@ -148,6 +150,8 @@ final class LoopDataManager: ObservableObject {
 
     init(
         lastLoopCompleted: Date?,
+        publishedMostRecentGlucoseDataDate: Date?,
+        publishedMostRecentPumpDataDate: Date?,
         temporaryPresetsManager: TemporaryPresetsManager,
         settingsProvider: SettingsProvider,
         doseStore: DoseStoreProtocol,
@@ -163,6 +167,8 @@ final class LoopDataManager: ObservableObject {
     ) {
 
         self.lastLoopCompleted = lastLoopCompleted
+        self.publishedMostRecentGlucoseDataDate = publishedMostRecentGlucoseDataDate
+        self.publishedMostRecentPumpDataDate = publishedMostRecentPumpDataDate
         self.temporaryPresetsManager = temporaryPresetsManager
         self.settingsProvider = settingsProvider
         self.doseStore = doseStore
@@ -431,6 +437,8 @@ final class LoopDataManager: ObservableObject {
             logger.error("Error updating Loop state: %{public}@", String(describing: loopError))
         }
         displayState = newState
+        publishedMostRecentGlucoseDataDate = mostRecentGlucoseDataDate
+        publishedMostRecentPumpDataDate = mostRecentPumpDataDate
         await updateRemoteRecommendation()
     }
 

Loop/View Controllers/StatusTableViewController.swift

@@ -166,6 +166,27 @@ final class StatusTableViewController: LoopChartsTableViewController {
                 }
             }
             .store(in: &cancellables)
+        
+        loopManager.$lastLoopCompleted
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] lastLoopCompleted in
+                self?.hudView?.loopCompletionHUD.lastLoopCompleted = lastLoopCompleted
+            }
+            .store(in: &cancellables)
+        
+        loopManager.$publishedMostRecentGlucoseDataDate
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] mostRecentGlucoseDataDate in
+                self?.hudView?.loopCompletionHUD.mostRecentGlucoseDataDate = mostRecentGlucoseDataDate
+            }
+            .store(in: &cancellables)
+        
+        loopManager.$publishedMostRecentPumpDataDate
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] mostRecentPumpDataDate in
+                self?.hudView?.loopCompletionHUD.mostRecentPumpDataDate = mostRecentPumpDataDate
+            }
+            .store(in: &cancellables)
 
         if let gestureRecognizer = charts.gestureRecognizer {
             tableView.addGestureRecognizer(gestureRecognizer)
@@ -1627,8 +1648,8 @@ final class StatusTableViewController: LoopChartsTableViewController {
                                           initialDosingEnabled: self.settingsManager.settings.dosingEnabled, automaticDosingStatus: self.automaticDosingStatus,
                                           automaticDosingStrategy: self.settingsManager.settings.automaticDosingStrategy,
                                           lastLoopCompletion: loopManager.$lastLoopCompleted,
-                                          mostRecentGlucoseDataDate: { [weak self] in self?.loopManager.mostRecentGlucoseDataDate },
-                                          mostRecentPumpDataDate: { [weak self] in self?.loopManager.mostRecentPumpDataDate },
+                                          mostRecentGlucoseDataDate: loopManager.$publishedMostRecentGlucoseDataDate,
+                                          mostRecentPumpDataDate: loopManager.$publishedMostRecentPumpDataDate,
                                           availableSupports: supportManager.availableSupports,
                                           isOnboardingComplete: onboardingManager.isComplete,
                                           therapySettingsViewModelDelegate: deviceManager,

Loop/View Models/SettingsViewModel.swift

@@ -83,8 +83,8 @@ public class SettingsViewModel: ObservableObject {
     @Published private(set) var automaticDosingStatus: AutomaticDosingStatus
 
     @Published private(set) var lastLoopCompletion: Date?
-    let mostRecentGlucoseDataDate: () -> Date?
-    let mostRecentPumpDataDate: () -> Date?
+    @Published private(set) var mostRecentGlucoseDataDate: Date?
+    @Published private(set) var mostRecentPumpDataDate: Date?
 
     var closedLoopDescriptiveText: String? {
         return delegate?.closedLoopDescriptiveText
@@ -116,9 +116,9 @@ public class SettingsViewModel: ObservableObject {
             let lastLoopCompletion = lastLoopCompletion ?? Date().addingTimeInterval(.minutes(16))
             age = abs(min(0, lastLoopCompletion.timeIntervalSinceNow))
         } else {
-            let mostRecentGlucoseDataDate = mostRecentGlucoseDataDate() ?? Date().addingTimeInterval(.minutes(16))
-            let mostRecentPumpDataDate = mostRecentPumpDataDate() ?? Date().addingTimeInterval(.minutes(16))
-            age = abs(max(min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow), min(0, mostRecentPumpDataDate.timeIntervalSinceNow)))
+            let mostRecentGlucoseDataDate = mostRecentGlucoseDataDate ?? Date().addingTimeInterval(.minutes(16))
+            let mostRecentPumpDataDate = mostRecentPumpDataDate ?? Date().addingTimeInterval(.minutes(16))
+            age = max(abs(min(0, mostRecentPumpDataDate.timeIntervalSinceNow)), abs(min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow)))
         }
 
         return LoopCompletionFreshness(age: age)
@@ -139,8 +139,8 @@ public class SettingsViewModel: ObservableObject {
                 automaticDosingStatus: AutomaticDosingStatus,
                 automaticDosingStrategy: AutomaticDosingStrategy,
                 lastLoopCompletion: Published<Date?>.Publisher,
-                mostRecentGlucoseDataDate: @escaping () -> Date?,
-                mostRecentPumpDataDate: @escaping () -> Date?,
+                mostRecentGlucoseDataDate: Published<Date?>.Publisher,
+                mostRecentPumpDataDate: Published<Date?>.Publisher,
                 availableSupports: [SupportUI],
                 isOnboardingComplete: Bool,
                 therapySettingsViewModelDelegate: TherapySettingsViewModelDelegate?,
@@ -159,8 +159,8 @@ public class SettingsViewModel: ObservableObject {
         self.automaticDosingStatus = automaticDosingStatus
         self.automaticDosingStrategy = automaticDosingStrategy
         self.lastLoopCompletion = nil
-        self.mostRecentGlucoseDataDate = mostRecentGlucoseDataDate
-        self.mostRecentPumpDataDate = mostRecentPumpDataDate
+        self.mostRecentGlucoseDataDate = nil
+        self.mostRecentPumpDataDate = nil
         self.availableSupports = availableSupports
         self.isOnboardingComplete = isOnboardingComplete
         self.therapySettingsViewModelDelegate = therapySettingsViewModelDelegate
@@ -190,7 +190,12 @@ public class SettingsViewModel: ObservableObject {
         lastLoopCompletion
             .assign(to: \.lastLoopCompletion, on: self)
             .store(in: &cancellables)
-
+        mostRecentGlucoseDataDate
+            .assign(to: \.mostRecentGlucoseDataDate, on: self)
+            .store(in: &cancellables)
+        mostRecentPumpDataDate
+            .assign(to: \.mostRecentPumpDataDate, on: self)
+            .store(in: &cancellables)
     }
 }
 
@@ -215,8 +220,8 @@ extension SettingsViewModel {
                                  automaticDosingStatus: AutomaticDosingStatus(automaticDosingEnabled: true, isAutomaticDosingAllowed: true),
                                  automaticDosingStrategy: .automaticBolus,
                                  lastLoopCompletion: FakeLastLoopCompletionPublisher().$mockLastLoopCompletion,
-                                 mostRecentGlucoseDataDate: { nil },
-                                 mostRecentPumpDataDate: { nil },
+                                 mostRecentGlucoseDataDate: FakeLastLoopCompletionPublisher().$mockLastLoopCompletion,
+                                 mostRecentPumpDataDate: FakeLastLoopCompletionPublisher().$mockLastLoopCompletion,
                                  availableSupports: [],
                                  isOnboardingComplete: false,
                                  therapySettingsViewModelDelegate: nil,

LoopUI/Views/LoopCompletionHUDView.swift

@@ -173,8 +173,8 @@ public final class LoopCompletionHUDView: BaseHUDView {
                 caption?.text = "–"
                 accessibilityLabel = nil
             }
-        } else if let mostRecentPumpDataDate, let mostRecentGlucoseDataDate {
-            let ago = abs(max(min(0, mostRecentPumpDataDate.timeIntervalSinceNow), min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow)))
+        } else if !loopIconClosed, let mostRecentPumpDataDate, let mostRecentGlucoseDataDate {
+            let ago = max(abs(min(0, mostRecentPumpDataDate.timeIntervalSinceNow)), abs(min(0, mostRecentGlucoseDataDate.timeIntervalSinceNow)))
 
             freshness = LoopCompletionFreshness(age: ago)
 
@@ -220,7 +220,7 @@ extension LoopCompletionHUDView {
     public var loopCompletionMessage: (title: String, message: String) {
         switch freshness {
         case .fresh:
-            if loopStateView.open {
+            if !loopIconClosed {
                 let reason = closedLoopDisallowedLocalizedDescription ?? LocalizedString(
                     "Tap Settings to toggle Closed Loop ON if you wish for the app to automate your insulin.",
                     comment: "Instructions for user to close loop if it is allowed."
@@ -257,7 +257,7 @@ extension LoopCompletionHUDView {
                 )
             }
         case .aging:
-            if loopStateView.open {
+            if !loopIconClosed {
                 return (
                     title: LocalizedString(
                         "Caution",
@@ -285,7 +285,7 @@ extension LoopCompletionHUDView {
                 )
             }
         case .stale:
-            if loopStateView.open {
+            if !loopIconClosed {
                 return (
                     title: LocalizedString(
                         "Device Error",