polscm32 2 лет назад
Родитель
Сommit
248a8bf9ca

+ 38 - 0
FreeAPS/Resources/Assets.xcassets/Colors/Tap_Bar.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
+  }
+}

+ 1 - 0
FreeAPS/Sources/Helpers/Color+Extensions.swift

@@ -56,6 +56,7 @@ extension Color {
     static let bgDarkBlue = Color("Background_DarkBlue")
     static let bgDarkerDarkBlue = Color("Background_DarkerDarkBlue")
     static let chart = Color("Chart")
+    static let tapBar = Color("Tap_Bar")
     //   static let insulin = Color("Insulin")
     static let uam = Color("UAM")
     static let zt = Color("ZT")

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift

@@ -196,7 +196,7 @@ struct CircleShape: View {
     var body: some View {
         Circle()
             .stroke(gradient, lineWidth: 6)
-            .background(Circle().fill(Color("Chart")))
+            .background(Circle().fill(Color.chart))
             .frame(width: 130, height: 130)
     }
 }

+ 1 - 1
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -985,7 +985,7 @@ extension Home {
                             "Profile",
                             systemImage: state.isTempTargetActive || overrideString != nil ? "person.fill" : "person"
                         ) }
-            }
+            }.tint(Color.tapBar)
         }
 
         var body: some View {

+ 2 - 2
FreeAPS/Sources/Modules/OverrideProfilesConfig/View/OverrideProfilesRootView.swift

@@ -94,7 +94,7 @@ extension OverrideProfilesConfig {
                             .foregroundColor(
                                 state
                                     .percentage >= 130 ? .red :
-                                    (isEditing ? .orange : .blue)
+                                    (isEditing ? .orange : Color.tapBar)
                             )
                             .font(.largeTitle)
                         Slider(
@@ -104,7 +104,7 @@ extension OverrideProfilesConfig {
                             onEditingChanged: { editing in
                                 isEditing = editing
                             }
-                        ).accentColor(state.percentage >= 130 ? .red : .blue)
+                        )
                         Spacer()
                         Toggle(isOn: $state._indefinite) {
                             Text("Enable indefinitely")