Przeglądaj źródła

Change default Glucose Color Scheme to Dynamic

😎
Mike Plante 6 dni temu
rodzic
commit
85e07f5948

+ 3 - 3
Trio/Sources/Models/GlucoseColorScheme.swift

@@ -4,15 +4,15 @@ import UIKit
 
 
 public enum GlucoseColorScheme: String, JSON, CaseIterable, Identifiable, Codable, Hashable {
 public enum GlucoseColorScheme: String, JSON, CaseIterable, Identifiable, Codable, Hashable {
     public var id: String { rawValue }
     public var id: String { rawValue }
-    case staticColor
     case dynamicColor
     case dynamicColor
+    case staticColor
 
 
     var displayName: String {
     var displayName: String {
         switch self {
         switch self {
-        case .staticColor:
-            return String(localized: "Static")
         case .dynamicColor:
         case .dynamicColor:
             return String(localized: "Dynamic")
             return String(localized: "Dynamic")
+        case .staticColor:
+            return String(localized: "Static")
         }
         }
     }
     }
 }
 }

+ 1 - 1
Trio/Sources/Models/TrioSettings.swift

@@ -41,7 +41,7 @@ struct TrioSettings: JSON, Equatable, Encodable {
     var eA1cDisplayUnit: EstimatedA1cDisplayUnit = .percent
     var eA1cDisplayUnit: EstimatedA1cDisplayUnit = .percent
     var high: Decimal = 180
     var high: Decimal = 180
     var low: Decimal = 70
     var low: Decimal = 70
-    var glucoseColorScheme: GlucoseColorScheme = .staticColor
+    var glucoseColorScheme: GlucoseColorScheme = .dynamicColor
     var xGridLines: Bool = true
     var xGridLines: Bool = true
     var yGridLines: Bool = true
     var yGridLines: Bool = true
     var hideInsulinBadge: Bool = false
     var hideInsulinBadge: Bool = false

+ 1 - 1
Trio/Sources/Modules/UserInterfaceSettings/UserInterfaceSettingsStateModel.swift

@@ -11,7 +11,7 @@ extension UserInterfaceSettings {
         @Published var forecastDisplayType: ForecastDisplayType = .cone
         @Published var forecastDisplayType: ForecastDisplayType = .cone
         @Published var showCarbsRequiredBadge: Bool = true
         @Published var showCarbsRequiredBadge: Bool = true
         @Published var carbsRequiredThreshold: Decimal = 0
         @Published var carbsRequiredThreshold: Decimal = 0
-        @Published var glucoseColorScheme: GlucoseColorScheme = .staticColor
+        @Published var glucoseColorScheme: GlucoseColorScheme = .dynamicColor
         @Published var eA1cDisplayUnit: EstimatedA1cDisplayUnit = .percent
         @Published var eA1cDisplayUnit: EstimatedA1cDisplayUnit = .percent
         @Published var timeInRangeType: TimeInRangeType = .timeInTightRange
         @Published var timeInRangeType: TimeInRangeType = .timeInTightRange
         @Published var requireAdjustmentsConfirmation: Bool = false
         @Published var requireAdjustmentsConfirmation: Bool = false

+ 7 - 7
Trio/Sources/Modules/UserInterfaceSettings/View/UserInterfaceSettingsRootView.swift

@@ -127,13 +127,7 @@ extension UserInterfaceSettings {
                                                     "Set the color scheme for glucose readings on the main glucose graph, live activities, and bolus calculator. Descriptions for each option found below."
                                                     "Set the color scheme for glucose readings on the main glucose graph, live activities, and bolus calculator. Descriptions for each option found below."
                                                 )
                                                 )
                                                 VStack(alignment: .leading, spacing: 5) {
                                                 VStack(alignment: .leading, spacing: 5) {
-                                                    Text("Static:").bold()
-                                                    Text("Red = Below Range")
-                                                    Text("Green = In Range")
-                                                    Text("Yellow = Above Range")
-                                                }
-                                                VStack(alignment: .leading, spacing: 5) {
-                                                    Text("Dynamic:").bold()
+                                                    Text("Dynamic (Default):").bold()
                                                     Text("Green = At Target")
                                                     Text("Green = At Target")
                                                     Text(
                                                     Text(
                                                         "Gradient Red = As readings approach and exceed below target, they gradually become more red."
                                                         "Gradient Red = As readings approach and exceed below target, they gradually become more red."
@@ -142,6 +136,12 @@ extension UserInterfaceSettings {
                                                         "Gradient Purple = As readings approach and exceed above target, they become more purple."
                                                         "Gradient Purple = As readings approach and exceed above target, they become more purple."
                                                     )
                                                     )
                                                 }
                                                 }
+                                                VStack(alignment: .leading, spacing: 5) {
+                                                    Text("Static:").bold()
+                                                    Text("Red = Below Range")
+                                                    Text("Green = In Range")
+                                                    Text("Yellow = Above Range")
+                                                }
                                             }
                                             }
                                         )
                                         )
                                     shouldDisplayHint.toggle()
                                     shouldDisplayHint.toggle()