pull in latest changes, solve merge conflicts

Trio Watch App Extension/Views/BolusConfirmationView.swift

@@ -10,6 +10,12 @@ struct BolusConfirmationView: View {
 
     @FocusState private var isCrownFocused: Bool
 
+    var trioBackgroundColor = LinearGradient(
+        gradient: Gradient(colors: [Color.bgDarkBlue, Color.bgDarkerDarkBlue]),
+        startPoint: .top,
+        endPoint: .bottom
+    )
+
     var body: some View {
         VStack(spacing: 10) {
             Spacer()
@@ -86,6 +92,7 @@ struct BolusConfirmationView: View {
             }
         }
         .navigationTitle("Confirm")
+        .background(trioBackgroundColor)
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 Image(systemName: "digitalcrown.arrow.counterclockwise.fill")

Trio Watch App Extension/Views/BolusInputView.swift

@@ -7,7 +7,6 @@ import WatchKit
 struct BolusInputView: View {
     @ObservedObject var navigationState: NavigationState
     @State private var bolusAmount = 0.0
-    @State private var navigateToConfirmation = false
 
     let state: WatchState
 
@@ -26,6 +25,12 @@ struct BolusInputView: View {
         )
     }
 
+    var trioBackgroundColor = LinearGradient(
+        gradient: Gradient(colors: [Color.bgDarkBlue, Color.bgDarkerDarkBlue]),
+        startPoint: .top,
+        endPoint: .bottom
+    )
+
     var body: some View {
         VStack {
             if state.carbsAmount > 0 {
@@ -98,6 +103,7 @@ struct BolusInputView: View {
             .tint(.blue)
             .disabled(!(bolusAmount > 0.0) || bolusAmount >= effectiveBolusLimit)
         }
+        .background(trioBackgroundColor)
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 Image(systemName: "syringe.fill")

Trio Watch App Extension/Views/CarbsInputView.swift

@@ -6,7 +6,6 @@ import SwiftUI
 struct CarbsInputView: View {
     @ObservedObject var navigationState: NavigationState
     @State private var carbsAmount: Double = 0.0 // Needs to be Double due to .digitalCrownRotation() stride
-    @State private var navigateToBolus = false // Track navigation to BolusInputView
     @FocusState private var isCrownFocused: Bool // Manage crown focus
 
     let state: WatchState
@@ -25,6 +24,12 @@ struct CarbsInputView: View {
         )
     }
 
+    var trioBackgroundColor = LinearGradient(
+        gradient: Gradient(colors: [Color.bgDarkBlue, Color.bgDarkerDarkBlue]),
+        startPoint: .top,
+        endPoint: .bottom
+    )
+
     var body: some View {
         let buttonLabel = continueToBolus ? "Proceed" : "Log Carbs"
 
@@ -98,6 +103,7 @@ struct CarbsInputView: View {
             .tint(.orange)
             .disabled(!(carbsAmount > 0.0) || carbsAmount >= effectiveCarbsLimit)
         }
+        .background(trioBackgroundColor)
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 Image(systemName: "fork.knife")

Trio Watch App Extension/Views/TrioMainWatchView.swift

@@ -91,7 +91,7 @@ struct TrioMainWatchView: View {
                     }
 
                     Button {
-                        showingTreatmentMenuSheet.toggle()
+                        showingTreatmentMenuSheet = true
                     } label: {
                         Image(systemName: "plus")
                             .foregroundStyle(Color.bgDarkerDarkBlue)
@@ -170,12 +170,11 @@ struct TrioMainWatchView: View {
             configuration.label
                 .font(fontSize)
                 .fontWeight(is40mm ? .medium : .semibold)
-                .padding(is40mm ? 6 : 10)
+                .padding(is40mm ? 6 : 8)
                 .background(
                     backgroundGradient.opacity(configuration.isPressed ? 0.8 : 1.0)
                 )
                 .clipShape(Circle())
-                .scaleEffect(configuration.isPressed ? 0.95 : 1.0)
                 .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
         }
     }