Migrate colors from phone to watch; adjust everywhere

Trio Watch App Extension/Assets.xcassets/Colors/Basal.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.500",
+          "blue" : "0.988",
+          "green" : "0.588",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.500",
+          "blue" : "0.988",
+          "green" : "0.588",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/Chart.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.180",
+          "green" : "0.130",
+          "red" : "0.130"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/Insulin.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.588",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.588",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/LoopGray.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.741",
+          "green" : "0.741",
+          "red" : "0.741"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.741",
+          "green" : "0.741",
+          "red" : "0.741"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/LoopGreen.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.592",
+          "green" : "0.812",
+          "red" : "0.435"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.592",
+          "green" : "0.812",
+          "red" : "0.435"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/LoopPink.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.796",
+          "green" : "0.750",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.796",
+          "green" : "0.750",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/LoopRed.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.341",
+          "green" : "0.341",
+          "red" : "0.922"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.341",
+          "green" : "0.341",
+          "red" : "0.922"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/LoopYellow.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.271",
+          "green" : "0.757",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.950",
+          "blue" : "0.271",
+          "green" : "0.757",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/TabBar.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.950",
+          "green" : "0.550",
+          "red" : "0.490"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.950",
+          "green" : "0.550",
+          "red" : "0.490"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/TempBasal.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.500",
+          "blue" : "0.976",
+          "green" : "0.839",
+          "red" : "0.635"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.988",
+          "green" : "0.588",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/UAM.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.271",
+          "green" : "0.518",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.271",
+          "green" : "0.518",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Assets.xcassets/Colors/ZT.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.937",
+          "green" : "0.380",
+          "red" : "0.443"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.937",
+          "green" : "0.380",
+          "red" : "0.443"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Trio Watch App Extension/Views/AcknowledgementPendingView.swift

@@ -16,9 +16,9 @@ struct AcknowledgementPendingView: View {
         case .pending:
             return Image(systemName: "progress.indicator").foregroundStyle(Color.secondary)
         case .success:
-            return Image(systemName: "checkmark.circle").foregroundStyle(Color.green)
+            return Image(systemName: "checkmark.circle").foregroundStyle(Color.loopGreen)
         case .failure:
-            return Image(systemName: "progress.indicator").foregroundStyle(Color.red)
+            return Image(systemName: "progress.indicator").foregroundStyle(Color.loopRed)
         }
     }
 

Trio Watch App Extension/Views/BolusConfirmationView.swift

@@ -36,12 +36,12 @@ struct BolusConfirmationView: View {
                     Spacer()
                     Text(String(format: "%.1f U", bolusAmount))
                         .bold()
-                        .foregroundStyle(.blue)
+                        .foregroundStyle(Color.insulin)
                 }.padding(.horizontal)
             }
 
             ProgressView(value: confirmationProgress, total: 1.0)
-                .tint(confirmationProgress >= 1.0 ? .green : .gray)
+                .tint(confirmationProgress >= 1.0 ? .loopGreen : .gray)
                 .padding(.horizontal)
 
             Spacer()

Trio Watch App Extension/Views/BolusInputView.swift

@@ -42,7 +42,7 @@ struct BolusInputView: View {
 
                     Spacer()
                 }
-                .foregroundColor(.red)
+                .foregroundColor(.loopRed)
                 .scenePadding()
             } else {
                 if state.carbsAmount > 0 {
@@ -62,7 +62,7 @@ struct BolusInputView: View {
                     }) {
                         Image(systemName: "minus.circle.fill")
                             .font(.title3)
-                            .foregroundColor(.blue)
+                            .foregroundColor(Color.insulin)
                     }
                     .buttonStyle(.borderless)
                     .disabled(bolusAmount < 1)
@@ -73,7 +73,7 @@ struct BolusInputView: View {
                     Text(String(format: "%.2f U", bolusAmount))
                         .fontWeight(.bold)
                         .font(.system(.title2, design: .rounded))
-                        .foregroundColor(bolusAmount > 0.0 && bolusAmount >= effectiveBolusLimit ? .red : .primary)
+                        .foregroundColor(bolusAmount > 0.0 && bolusAmount >= effectiveBolusLimit ? .loopRed : .primary)
                         .focusable(true)
                         .focused($isCrownFocused)
                         .digitalCrownRotation(
@@ -94,7 +94,7 @@ struct BolusInputView: View {
                     }) {
                         Image(systemName: "plus.circle.fill")
                             .font(.title3)
-                            .foregroundColor(.blue)
+                            .foregroundColor(Color.insulin)
                     }
                     .buttonStyle(.borderless)
                     .disabled(bolusAmount >= effectiveBolusLimit)
@@ -110,16 +110,15 @@ struct BolusInputView: View {
                 if bolusAmount > 0.0 && bolusAmount >= effectiveBolusLimit {
                     Text("Bolus Limit Reached!")
                         .font(.footnote)
-                        .foregroundColor(.red)
+                        .foregroundColor(.loopRed)
                 }
 
                 Button("Log Bolus") {
                     state.bolusAmount = min(bolusAmount, effectiveBolusLimit)
-//                    navigationState.path.append(NavigationDestinations.bolusConfirm)
                     navigationPath.append(NavigationDestinations.bolusConfirm)
                 }
                 .buttonStyle(.bordered)
-                .tint(.blue)
+                .tint(Color.insulin)
                 .disabled(!(bolusAmount > 0.0) || bolusAmount >= effectiveBolusLimit)
             }
         }
@@ -131,7 +130,7 @@ struct BolusInputView: View {
                     .aspectRatio(contentMode: .fit)
                     .frame(width: 14, height: 14)
                     .padding()
-                    .background(Color.blue)
+                    .background(Color.insulin)
                     .foregroundStyle(.white)
                     .clipShape(Circle())
             }

Trio Watch App Extension/Views/CarbsInputView.swift

@@ -55,7 +55,7 @@ struct CarbsInputView: View {
                 Text(String(format: "%.0f g", carbsAmount))
                     .fontWeight(.bold)
                     .font(.system(.title2, design: .rounded))
-                    .foregroundColor(carbsAmount > 0.0 && carbsAmount >= effectiveCarbsLimit ? .red : .primary)
+                    .foregroundColor(carbsAmount > 0.0 && carbsAmount >= effectiveCarbsLimit ? .loopRed : .primary)
                     .focusable(true)
                     .focused($isCrownFocused)
                     .digitalCrownRotation(
@@ -92,7 +92,7 @@ struct CarbsInputView: View {
             if carbsAmount > 0.0 && carbsAmount >= effectiveCarbsLimit {
                 Text("Carbs Limit Reached!")
                     .font(.footnote)
-                    .foregroundColor(.red)
+                    .foregroundColor(.loopRed)
             }
 
             Button(buttonLabel) {

Trio Watch App Extension/Views/GlucoseChartView.swift

@@ -35,9 +35,9 @@ struct GlucoseChartView: View {
         if value > 180 {
             return .orange
         } else if value < 70 {
-            return .red
+            return .loopRed
         } else {
-            return .green
+            return .loopGreen
         }
     }
 

Trio Watch App Extension/Views/GlucoseTrendView.swift

@@ -25,13 +25,13 @@ struct GlucoseTrendView: View {
 
         switch minutes {
         case ...5:
-            return .green
+            return .loopGreen
         case 5 ... 10:
-            return .yellow
+            return .loopYellow
         case 11...:
-            return .red
+            return .loopRed
         default:
-            return .yellow
+            return .loopYellow
         }
     }
 

Trio Watch App Extension/Views/OverridePresetsView.swift

@@ -32,7 +32,7 @@ struct OverridePresetsView: View {
                     }
                     .foregroundColor(.white)
                     .listRowBackground(
-                        Color.red
+                        Color.loopRed
                             .clipShape(RoundedRectangle(cornerRadius: 8))
                     )
                 }

Trio Watch App Extension/Views/TempTargetPresetsView.swift

@@ -32,7 +32,7 @@ struct TempTargetPresetsView: View {
                     }
                     .foregroundColor(.white)
                     .listRowBackground(
-                        Color.red
+                        Color.loopRed
                             .clipShape(RoundedRectangle(cornerRadius: 8))
                     )
                 }

Trio Watch App Extension/Views/TreatmentMenuView.swift

@@ -67,7 +67,7 @@ struct TreatmentMenuView: View {
             .aspectRatio(contentMode: .fit)
             .frame(width: iconSize, height: iconSize)
             .padding(is40mm ? 6 : 10)
-            .background(Color.blue)
+            .background(Color.insulin)
             .clipShape(Circle())
     }
 }

Trio Watch App Extension/Views/TrioMainWatchView.swift

@@ -66,7 +66,7 @@ struct TrioMainWatchView: View {
                 ToolbarItem(placement: .topBarLeading) {
                     HStack {
                         Image(systemName: "syringe.fill")
-                            .foregroundStyle(.blue)
+                            .foregroundStyle(Color.insulin)
 
                         Text(state.iob ?? "--")
                             .foregroundStyle(.white)
@@ -79,7 +79,7 @@ struct TrioMainWatchView: View {
                             .foregroundStyle(.white)
 
                         Image(systemName: "fork.knife")
-                            .foregroundStyle(.orange)
+                            .foregroundStyle(Color.orange)
                     }.font(.caption)
                 }
 
@@ -104,8 +104,8 @@ struct TrioMainWatchView: View {
                         showingTempTargetSheet = true
                     } label: {
                         Image(systemName: "target")
-                            .foregroundStyle(isTempTargetActive ? Color.primary : Color.green.opacity(0.75))
-                    }.tint(isTempTargetActive ? Color.green.opacity(0.75) : nil)
+                            .foregroundStyle(isTempTargetActive ? Color.primary : Color.loopGreen.opacity(0.75))
+                    }.tint(isTempTargetActive ? Color.loopGreen.opacity(0.75) : nil)
                 }
             }
             .fullScreenCover(isPresented: $showingTreatmentMenuSheet) {