瀏覽代碼

Fix bolusProgress flag reset; set default unit to mgdl

Deniz Cengiz 1 年之前
父節點
當前提交
ea02be74bf

+ 1 - 1
Trio Watch App Extension/Views/BolusProgressOverlay.swift

@@ -55,7 +55,7 @@ struct BolusProgressOverlay: View {
             }
         }
         .onDisappear {
-            state.activeBolusAmount = 0 // Double-check to reset when view disappears
+            state.activeBolusAmount = 0 // Triple-check to reset when view disappears
         }
     }
 }

+ 2 - 0
Trio Watch App Extension/Views/TrioMainWatchView.swift

@@ -24,9 +24,11 @@ struct TrioMainWatchView: View {
         let sortedPresets = presets.sorted { predicate($0) && !predicate($1) }
         return !sortedPresets.isEmpty && sortedPresets.first(where: predicate) != nil
     }
+
     private var isTempTargetActive: Bool {
         isAdjustmentActive(for: state.tempTargetPresets) { $0.isEnabled }
     }
+
     private var isOverrideActive: Bool {
         isAdjustmentActive(for: state.overridePresets) { $0.isEnabled }
     }

+ 5 - 0
Trio Watch App Extension/WatchState.swift

@@ -186,6 +186,7 @@ import WatchConnectivity
 
     func sendCancelBolusRequest() {
         isBolusCanceled = true
+
         guard let session = session, session.isReachable else { return }
 
         let message: [String: Any] = [
@@ -195,6 +196,10 @@ import WatchConnectivity
         session.sendMessage(message, replyHandler: nil) { error in
             print("Error sending cancel bolus request: \(error.localizedDescription)")
         }
+
+        // Reset when cancelled
+        bolusProgress = 0
+        activeBolusAmount = 0
     }
 
     // MARK: – Handle Acknowledgement Messages FROM Phone

+ 1 - 1
Trio/Sources/Models/WatchState.swift

@@ -5,7 +5,7 @@ struct WatchState: Hashable, Equatable, Sendable {
     var trend: String?
     var delta: String?
     var glucoseValues: [(date: Date, glucose: Double)] = []
-    var units: GlucoseUnits = .mmolL
+    var units: GlucoseUnits = .mgdL
     var iob: String?
     var cob: String?
     var lastLoopTime: String?