Procházet zdrojové kódy

Improve error acknowledgement; fix carbs from watch missing in chart

Deniz Cengiz před 1 rokem
rodič
revize
35b1499bae

+ 2 - 1
Trio Watch App Extension/Views/AcknowledgementPendingView.swift

@@ -18,7 +18,7 @@ struct AcknowledgementPendingView: View {
         case .success:
             return Image(systemName: "checkmark.circle").foregroundStyle(Color.loopGreen)
         case .failure:
-            return Image(systemName: "progress.indicator").foregroundStyle(Color.loopRed)
+            return Image(systemName: "xmark").foregroundStyle(Color.loopRed)
         }
     }
 
@@ -34,6 +34,7 @@ struct AcknowledgementPendingView: View {
                 } else if state.showAcknowledgmentBanner {
                     statusIcon.padding()
                     Text(state.acknowledgmentMessage).multilineTextAlignment(.center)
+                        .foregroundStyle(state.acknowledgementStatus == .failure ? Color.loopRed : Color.primary)
                 }
             }
             .padding()

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

@@ -69,7 +69,6 @@ struct TrioMainWatchView: View {
                         rotationDegrees: rotationDegrees,
                         isWatchStateDated: isWatchStateDated || isSessionUnreachable
                     )
-                    .tag(0)
 
                     if state.showSyncingAnimation {
                         Image(systemName: "iphone.radiowaves.left.and.right")
@@ -86,7 +85,7 @@ struct TrioMainWatchView: View {
                                     7 // Font .body == 14, so half of default size for the SF Symbol image
                             )
                     }
-                }
+                }.tag(0)
 
                 // Page 2: Glucose chart
                 GlucoseChartView(glucoseValues: state.glucoseValues)

+ 2 - 0
Trio/Sources/Services/WatchManager/AppleWatchManager.swift

@@ -610,6 +610,7 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
                 carbEntry.carbs = Double(truncating: amount as NSNumber)
                 carbEntry.date = date
                 carbEntry.note = "Via Watch"
+                carbEntry.isFPU = false // set this to false to ensure watch-entered carbs are displayed in main chart
 
                 do {
                     guard context.hasChanges else { return }
@@ -648,6 +649,7 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
                     carbEntry.carbs = NSDecimalNumber(decimal: carbsAmount).doubleValue
                     carbEntry.date = date
                     carbEntry.note = "Via Watch"
+                    carbEntry.isFPU = false // set this to false to ensure watch-entered carbs are displayed in main chart
 
                     guard context.hasChanges else { return }
                     try context.save()