Simplify navigation path behavoir; some cleanup

Trio Watch App Extension/WatchOSButtonStyle.swift

@@ -26,3 +26,12 @@ struct WatchOSButtonStyle: ButtonStyle {
             .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
     }
 }
+
+struct PressableIconButtonStyle: ButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .background(Color.clear)
+            .opacity(configuration.isPressed ? 0.3 : 1.0) // Change opacity when pressed
+            .animation(.easeInOut(duration: 0.25), value: configuration.isPressed) // Smooth transition
+    }
+}

Trio Watch App Extension/Helper/Helper+Navigation.swift

@@ -0,0 +1,7 @@
+import SwiftUI
+
+enum NavigationDestinations: String {
+    case carbInput
+    case bolusInput
+    case bolusConfirm
+}

Trio Watch App Extension/NavigationState.swift

@@ -1,15 +0,0 @@
-import SwiftUI
-
-class NavigationState: ObservableObject {
-    @Published var path = NavigationPath() // Tracks the navigation stack
-
-    func resetToRoot() {
-        path.removeLast(path.count) // Clears the navigation stack to return to root
-    }
-}
-
-enum NavigationDestinations: String {
-    case carbInput
-    case bolusInput
-    case bolusConfirm
-}

Trio Watch App Extension/Views/BolusConfirmationView.swift

@@ -3,7 +3,7 @@ import SwiftUI
 import WatchKit
 
 struct BolusConfirmationView: View {
-    @ObservedObject var navigationState: NavigationState
+    @Binding var navigationPath: [NavigationDestinations]
     let state: WatchState
     @Binding var bolusAmount: Double
     @Binding var confirmationProgress: Double
@@ -52,7 +52,7 @@ struct BolusConfirmationView: View {
                 }
                 bolusAmount = 0 // reset bolus in state
                 confirmationProgress = 0 // reset auth progress
-                navigationState.resetToRoot()
+                navigationPath.removeLast(navigationPath.count)
             }
             .buttonStyle(.bordered)
         }
@@ -83,7 +83,7 @@ struct BolusConfirmationView: View {
                     state.sendBolusRequest(Decimal(bolusAmount))
                     bolusAmount = 0 // reset bolus in state
                     confirmationProgress = 0 // reset auth progress
-                    navigationState.resetToRoot()
+                    navigationPath.removeLast(navigationPath.count)
 
                     // TODO: add a fancy success animation
                 }

Trio Watch App Extension/Views/BolusInputView.swift

@@ -5,7 +5,7 @@ import WatchKit
 // MARK: - Bolus Input View
 
 struct BolusInputView: View {
-    @ObservedObject var navigationState: NavigationState
+    @Binding var navigationPath: [NavigationDestinations]
     @State private var bolusAmount = 0.0
 
     let state: WatchState
@@ -33,75 +33,95 @@ struct BolusInputView: View {
 
     var body: some View {
         VStack {
-            if state.carbsAmount > 0 {
-                HStack {
-                    Text("Carbs:").bold().font(.subheadline).padding(.leading)
-                    Text("\(state.carbsAmount) g").font(.subheadline).foregroundStyle(Color.orange)
+            if effectiveBolusLimit == 0 {
+                VStack(spacing: 10) {
                     Spacer()
-                }
-            }
 
-            Spacer()
+                    Text("Bolus limit cannot be fetched from phone!").font(.headline)
+                    Text("Check device settings, connect to phone, and try again.").font(.caption)
 
-            HStack {
-                // "-" Button
-                Button(action: {
-                    if bolusAmount > 0 { bolusAmount -= 1 }
-                }) {
-                    Image(systemName: "minus.circle.fill")
-                        .font(.title3)
-                        .foregroundColor(.blue)
+                    Spacer()
+                }
+                .foregroundColor(.red)
+                .scenePadding()
+            } else {
+                if state.carbsAmount > 0 {
+                    HStack {
+                        Text("Carbs:").bold().font(.subheadline).padding(.leading)
+                        Text("\(state.carbsAmount) g").font(.subheadline).foregroundStyle(Color.orange)
+                        Spacer()
+                    }
                 }
-                .buttonStyle(.borderless)
-                .disabled(bolusAmount < 1)
 
                 Spacer()
 
-                // Display the current carb amount
-                Text(String(format: "%.2f U", bolusAmount))
-                    .fontWeight(.bold)
-                    .font(.system(.title2, design: .rounded))
-                    .foregroundColor(.primary)
-                    .focusable(true)
-                    .focused($isCrownFocused)
-                    .digitalCrownRotation(
-                        $bolusAmount,
-                        from: 0,
-                        through: effectiveBolusLimit,
-                        by: 1, // TODO: use pump increment here
-                        sensitivity: .medium,
-                        isContinuous: false,
-                        isHapticFeedbackEnabled: true
-                    )
+                HStack {
+                    // "-" Button
+                    Button(action: {
+                        if bolusAmount > 0 { bolusAmount -= 1 }
+                    }) {
+                        Image(systemName: "minus.circle.fill")
+                            .font(.title3)
+                            .foregroundColor(.blue)
+                    }
+                    .buttonStyle(.borderless)
+                    .disabled(bolusAmount < 1)
 
-                Spacer()
+                    Spacer()
 
-                // "+" Button
-                Button(action: {
-                    bolusAmount += 0.5
-                }) {
-                    Image(systemName: "plus.circle.fill")
-                        .font(.title3)
-                        .foregroundColor(.blue)
-                }
-                .buttonStyle(.borderless)
-                .disabled(bolusAmount >= effectiveBolusLimit)
-            }.padding(.horizontal)
+                    // Display the current carb amount
+                    Text(String(format: "%.2f U", bolusAmount))
+                        .fontWeight(.bold)
+                        .font(.system(.title2, design: .rounded))
+                        .foregroundColor(bolusAmount > 0.0 && bolusAmount >= effectiveBolusLimit ? .red : .primary)
+                        .focusable(true)
+                        .focused($isCrownFocused)
+                        .digitalCrownRotation(
+                            $bolusAmount,
+                            from: 0,
+                            through: effectiveBolusLimit,
+                            by: 1, // TODO: use pump increment here
+                            sensitivity: .medium,
+                            isContinuous: false,
+                            isHapticFeedbackEnabled: true
+                        )
 
-            Text("Insulin")
-                .font(.subheadline)
-                .foregroundColor(.secondary)
-                .padding(.bottom)
+                    Spacer()
+
+                    // "+" Button
+                    Button(action: {
+                        bolusAmount += 0.5
+                    }) {
+                        Image(systemName: "plus.circle.fill")
+                            .font(.title3)
+                            .foregroundColor(.blue)
+                    }
+                    .buttonStyle(.borderless)
+                    .disabled(bolusAmount >= effectiveBolusLimit)
+                }.padding(.horizontal)
+
+                Text("Insulin")
+                    .font(.subheadline)
+                    .foregroundColor(.secondary)
+                    .padding(.bottom)
+
+                Spacer()
 
-            Spacer()
+                if bolusAmount > 0.0 && bolusAmount >= effectiveBolusLimit {
+                    Text("Bolus Limit Reached!")
+                        .font(.footnote)
+                        .foregroundColor(.red)
+                }
 
-            Button("Log Bolus") {
-                state.bolusAmount = min(bolusAmount, effectiveBolusLimit)
-                navigationState.path.append(NavigationDestinations.bolusConfirm)
+                Button("Log Bolus") {
+                    state.bolusAmount = min(bolusAmount, effectiveBolusLimit)
+//                    navigationState.path.append(NavigationDestinations.bolusConfirm)
+                    navigationPath.append(NavigationDestinations.bolusConfirm)
+                }
+                .buttonStyle(.bordered)
+                .tint(.blue)
+                .disabled(!(bolusAmount > 0.0) || bolusAmount >= effectiveBolusLimit)
             }
-            .buttonStyle(.bordered)
-            .tint(.blue)
-            .disabled(!(bolusAmount > 0.0) || bolusAmount >= effectiveBolusLimit)
         }
         .background(trioBackgroundColor)
         .toolbar {
@@ -125,7 +145,3 @@ struct BolusInputView: View {
         }
     }
 }
-
-#Preview {
-    BolusInputView(navigationState: NavigationState(), state: WatchState())
-}

Trio Watch App Extension/Views/CarbsInputView.swift

@@ -4,7 +4,7 @@ import SwiftUI
 // MARK: - Carbs Input View
 
 struct CarbsInputView: View {
-    @ObservedObject var navigationState: NavigationState
+    @Binding var navigationPath: [NavigationDestinations]
     @State private var carbsAmount: Double = 0.0 // Needs to be Double due to .digitalCrownRotation() stride
     @FocusState private var isCrownFocused: Bool // Manage crown focus
 
@@ -55,7 +55,7 @@ struct CarbsInputView: View {
                 Text(String(format: "%.0f g", carbsAmount))
                     .fontWeight(.bold)
                     .font(.system(.title2, design: .rounded))
-                    .foregroundColor(.primary)
+                    .foregroundColor(carbsAmount > 0.0 && carbsAmount >= effectiveCarbsLimit ? .red : .primary)
                     .focusable(true)
                     .focused($isCrownFocused)
                     .digitalCrownRotation(
@@ -89,14 +89,20 @@ struct CarbsInputView: View {
 
             Spacer()
 
+            if carbsAmount > 0.0 && carbsAmount >= effectiveCarbsLimit {
+                Text("Carbs Limit Reached!")
+                    .font(.footnote)
+                    .foregroundColor(.red)
+            }
+
             Button(buttonLabel) {
                 if continueToBolus {
                     state.carbsAmount = Int(min(carbsAmount, effectiveCarbsLimit))
-                    navigationState.path.append(NavigationDestinations.bolusInput)
+                    navigationPath.append(NavigationDestinations.bolusInput)
                 } else {
                     // TODO: add a fancy success animation
                     state.sendCarbsRequest(Int(min(carbsAmount, effectiveCarbsLimit)))
-                    navigationState.resetToRoot()
+                    navigationPath.removeLast(navigationPath.count)
                 }
             }
             .buttonStyle(.bordered)

Trio Watch App Extension/Views/TreatmentMenuView.swift

@@ -22,7 +22,7 @@ struct TreatmentMenuView: View {
     }
 
     var body: some View {
-        NavigationView {
+        VStack {
             List {
                 ForEach(treatments) { treatment in
                     Button(action: {

Trio Watch App Extension/Views/TrioMainWatchView.swift

@@ -2,8 +2,6 @@ import Charts
 import SwiftUI
 
 struct TrioMainWatchView: View {
-    // Shared navigation state
-    @StateObject private var navigationState = NavigationState()
     @State private var state = WatchState()
 
     // misc
@@ -16,6 +14,7 @@ struct TrioMainWatchView: View {
     @State private var showingOverrideSheet: Bool = false
     // navigation flag for meal bolus combo
     @State private var continueToBolus = false
+    @State private var navigationPath: [NavigationDestinations] = []
 
     // treatments
     @State private var selectedTreatment: TreatmentOption?
@@ -27,7 +26,7 @@ struct TrioMainWatchView: View {
     )
 
     var body: some View {
-        NavigationStack(path: $navigationState.path) {
+        NavigationStack(path: $navigationPath) {
             TabView(selection: $currentPage) {
                 // Page 1: Current glucose trend in "BG bobble"
                 GlucoseTrendView(state: state, rotationDegrees: rotationDegrees)
@@ -94,7 +93,7 @@ struct TrioMainWatchView: View {
                     }
                 }
             }
-            .sheet(isPresented: $showingTreatmentMenuSheet) {
+            .fullScreenCover(isPresented: $showingTreatmentMenuSheet) {
                 TreatmentMenuView(selectedTreatment: $selectedTreatment) {
                     handleTreatmentSelection()
                 }
@@ -118,15 +117,18 @@ struct TrioMainWatchView: View {
                 switch destination {
                 case .carbInput:
                     CarbsInputView(
-                        navigationState: navigationState,
+                        navigationPath: $navigationPath,
                         state: state,
                         continueToBolus: selectedTreatment == .mealBolusCombo
                     )
                 case .bolusInput:
-                    BolusInputView(navigationState: navigationState, state: state)
+                    BolusInputView(
+                        navigationPath: $navigationPath,
+                        state: state
+                    )
                 case .bolusConfirm:
                     BolusConfirmationView(
-                        navigationState: navigationState,
+                        navigationPath: $navigationPath,
                         state: state,
                         bolusAmount: $state.bolusAmount,
                         confirmationProgress: $state.confirmationProgress
@@ -169,11 +171,11 @@ struct TrioMainWatchView: View {
 
         switch treatment {
         case .meal:
-            navigationState.path.append(NavigationDestinations.carbInput)
+            navigationPath.append(NavigationDestinations.carbInput)
         case .bolus:
-            navigationState.path.append(NavigationDestinations.bolusInput)
+            navigationPath.append(NavigationDestinations.bolusInput)
         case .mealBolusCombo:
-            navigationState.path.append(NavigationDestinations.carbInput)
+            navigationPath.append(NavigationDestinations.carbInput)
         }
     }
 }

Trio.xcodeproj/project.pbxproj

@@ -413,6 +413,7 @@
 		DD09D47D2C5986DA003FEA5D /* CalendarEventSettingsProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD09D47C2C5986DA003FEA5D /* CalendarEventSettingsProvider.swift */; };
 		DD09D47F2C5986E5003FEA5D /* CalendarEventSettingsStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD09D47E2C5986E5003FEA5D /* CalendarEventSettingsStateModel.swift */; };
 		DD09D4822C5986F6003FEA5D /* CalendarEventSettingsRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD09D4812C5986F6003FEA5D /* CalendarEventSettingsRootView.swift */; };
+		DD09D5C72D29EB2F000D82C9 /* Helper+Navigation.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD09D5C62D29EB26000D82C9 /* Helper+Navigation.swift */; };
 		DD1745132C54169400211FAC /* DevicesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1745122C54169400211FAC /* DevicesView.swift */; };
 		DD1745152C54388A00211FAC /* TherapySettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1745142C54388A00211FAC /* TherapySettingsView.swift */; };
 		DD1745172C54389F00211FAC /* FeatureSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1745162C54389F00211FAC /* FeatureSettingsView.swift */; };
@@ -452,10 +453,8 @@
 		DD32CF9E2CC824C5003686D6 /* TrioRemoteControl+Override.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD32CF9D2CC824C2003686D6 /* TrioRemoteControl+Override.swift */; };
 		DD32CFA02CC824D6003686D6 /* TrioRemoteControl+APNS.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD32CF9F2CC824D3003686D6 /* TrioRemoteControl+APNS.swift */; };
 		DD32CFA22CC824E2003686D6 /* TrioRemoteControl+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD32CFA12CC824E1003686D6 /* TrioRemoteControl+Helpers.swift */; };
-		DD3A3CE32D29C49500AE478E /* NavigationState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3A3CE22D29C49500AE478E /* NavigationState.swift */; };
 		DD3A3CE72D29C93F00AE478E /* Helper+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3A3CE62D29C93F00AE478E /* Helper+Extensions.swift */; };
-		DD3A3CE92D29C97800AE478E /* WatchOSButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3A3CE82D29C97800AE478E /* WatchOSButtonStyle.swift */; };
-		DD3A3CEB2D29C9AB00AE478E /* PressableIconButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3A3CEA2D29C9AB00AE478E /* PressableIconButtonStyle.swift */; };
+		DD3A3CE92D29C97800AE478E /* Helper+ButtonStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD3A3CE82D29C97800AE478E /* Helper+ButtonStyles.swift */; };
 		DD5DC9F12CF3D97C00AB8703 /* AdjustmentsStateModel+Overrides.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5DC9F02CF3D96E00AB8703 /* AdjustmentsStateModel+Overrides.swift */; };
 		DD5DC9F32CF3D9DD00AB8703 /* AdjustmentsStateModel+TempTargets.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5DC9F22CF3D9D600AB8703 /* AdjustmentsStateModel+TempTargets.swift */; };
 		DD5DC9F72CF3DA9300AB8703 /* TargetPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD5DC9F62CF3DA9300AB8703 /* TargetPicker.swift */; };
@@ -1130,6 +1129,7 @@
 		DD09D47C2C5986DA003FEA5D /* CalendarEventSettingsProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarEventSettingsProvider.swift; sourceTree = "<group>"; };
 		DD09D47E2C5986E5003FEA5D /* CalendarEventSettingsStateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarEventSettingsStateModel.swift; sourceTree = "<group>"; };
 		DD09D4812C5986F6003FEA5D /* CalendarEventSettingsRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarEventSettingsRootView.swift; sourceTree = "<group>"; };
+		DD09D5C62D29EB26000D82C9 /* Helper+Navigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Helper+Navigation.swift"; sourceTree = "<group>"; };
 		DD1745122C54169400211FAC /* DevicesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DevicesView.swift; sourceTree = "<group>"; };
 		DD1745142C54388A00211FAC /* TherapySettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TherapySettingsView.swift; sourceTree = "<group>"; };
 		DD1745162C54389F00211FAC /* FeatureSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureSettingsView.swift; sourceTree = "<group>"; };
@@ -1169,10 +1169,8 @@
 		DD32CF9D2CC824C2003686D6 /* TrioRemoteControl+Override.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TrioRemoteControl+Override.swift"; sourceTree = "<group>"; };
 		DD32CF9F2CC824D3003686D6 /* TrioRemoteControl+APNS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TrioRemoteControl+APNS.swift"; sourceTree = "<group>"; };
 		DD32CFA12CC824E1003686D6 /* TrioRemoteControl+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TrioRemoteControl+Helpers.swift"; sourceTree = "<group>"; };
-		DD3A3CE22D29C49500AE478E /* NavigationState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationState.swift; sourceTree = "<group>"; };
 		DD3A3CE62D29C93F00AE478E /* Helper+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Helper+Extensions.swift"; sourceTree = "<group>"; };
-		DD3A3CE82D29C97800AE478E /* WatchOSButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchOSButtonStyle.swift; sourceTree = "<group>"; };
-		DD3A3CEA2D29C9AB00AE478E /* PressableIconButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PressableIconButtonStyle.swift; sourceTree = "<group>"; };
+		DD3A3CE82D29C97800AE478E /* Helper+ButtonStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Helper+ButtonStyles.swift"; sourceTree = "<group>"; };
 		DD5DC9F02CF3D96E00AB8703 /* AdjustmentsStateModel+Overrides.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdjustmentsStateModel+Overrides.swift"; sourceTree = "<group>"; };
 		DD5DC9F22CF3D9D600AB8703 /* AdjustmentsStateModel+TempTargets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AdjustmentsStateModel+TempTargets.swift"; sourceTree = "<group>"; };
 		DD5DC9F62CF3DA9300AB8703 /* TargetPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TargetPicker.swift; sourceTree = "<group>"; };
@@ -2531,10 +2529,7 @@
 		BDFF7A9C2D25FA730016C40C /* Trio Watch App Extension */ = {
 			isa = PBXGroup;
 			children = (
-				DD3A3CEA2D29C9AB00AE478E /* PressableIconButtonStyle.swift */,
-				DD3A3CE82D29C97800AE478E /* WatchOSButtonStyle.swift */,
-				DD3A3CE62D29C93F00AE478E /* Helper+Extensions.swift */,
-				DD3A3CE22D29C49500AE478E /* NavigationState.swift */,
+				DD3A3CEC2D29CFBA00AE478E /* Helper */,
 				BDA25F1A2D26BCE800035F34 /* Views */,
 				BDA25EE52D260D5800035F34 /* WatchState.swift */,
 				BDFF7A9E2D25FA970016C40C /* Preview Content */,
@@ -2834,6 +2829,16 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		DD3A3CEC2D29CFBA00AE478E /* Helper */ = {
+			isa = PBXGroup;
+			children = (
+				DD09D5C62D29EB26000D82C9 /* Helper+Navigation.swift */,
+				DD3A3CE82D29C97800AE478E /* Helper+ButtonStyles.swift */,
+				DD3A3CE62D29C93F00AE478E /* Helper+Extensions.swift */,
+			);
+			path = Helper;
+			sourceTree = "<group>";
+		};
 		DD5DC9EF2CF3D95400AB8703 /* AdjustmentsStateModel+Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -3987,22 +3992,21 @@
 			buildActionMask = 2147483647;
 			files = (
 				BDA25F222D26D62800035F34 /* BolusInputView.swift in Sources */,
-				DD3A3CE32D29C49500AE478E /* NavigationState.swift in Sources */,
 				BDFF7A882D25F97D0016C40C /* TrioMainWatchView.swift in Sources */,
 				BDA25F202D26D5FE00035F34 /* CarbsInputView.swift in Sources */,
 				BDA25F1C2D26BD0700035F34 /* TrendShape.swift in Sources */,
 				BDFF7A892D25F97D0016C40C /* TrioWatchApp.swift in Sources */,
+				DD09D5C72D29EB2F000D82C9 /* Helper+Navigation.swift in Sources */,
 				BD54A9742D281AEF00F9C1EE /* TempTargetPresetWatch.swift in Sources */,
 				BD54A95C2D2808A300F9C1EE /* OverridePresetWatch.swift in Sources */,
 				BD54A9592D27FB7800F9C1EE /* OverridePresetsView.swift in Sources */,
 				BDA25F1E2D26D5DD00035F34 /* GlucoseChartView.swift in Sources */,
-				DD3A3CEB2D29C9AB00AE478E /* PressableIconButtonStyle.swift in Sources */,
 				DD6F63CC2D27F615007D94CF /* TreatmentMenuView.swift in Sources */,
 				DD3A3CE72D29C93F00AE478E /* Helper+Extensions.swift in Sources */,
 				DD246F062D2836AA0027DDE0 /* GlucoseTrendView.swift in Sources */,
 				DD8262CB2D289297009F6F62 /* BolusConfirmationView.swift in Sources */,
 				BD54A9712D281A8100F9C1EE /* TempTargetPresetsView.swift in Sources */,
-				DD3A3CE92D29C97800AE478E /* WatchOSButtonStyle.swift in Sources */,
+				DD3A3CE92D29C97800AE478E /* Helper+ButtonStyles.swift in Sources */,
 				BDA25EE62D260D5E00035F34 /* WatchState.swift in Sources */,
 				BD04ECCE2D29952A008C5FEB /* BolusProgressOverlay.swift in Sources */,
 			);