Refactoring

FreeAPS/Sources/Helpers/Color+Extensions.swift

@@ -53,6 +53,9 @@ extension Color {
     static let loopYellow = Color("LoopYellow")
     static let loopRed = Color("LoopRed")
     static let loopManualTemp = Color("ManualTempBasal")
+    static let bgDarkBlue = Color("Background_DarkBlue")
+    static let bgDarkerDarkBlue = Color("Background_DarkerDarkBlue")
+    static let chart = Color("Chart")
     //   static let insulin = Color("Insulin")
     static let uam = Color("UAM")
     static let zt = Color("ZT")

FreeAPS/Sources/Modules/AddCarbs/View/AddCarbsRootView.swift

@@ -33,10 +33,8 @@ extension AddCarbs {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/AddTempTarget/View/AddTempTargetRootView.swift

@@ -28,10 +28,8 @@ extension AddTempTarget {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/AutotuneConfig/View/AutotuneConfigRootView.swift

@@ -11,10 +11,8 @@ extension AutotuneConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/BasalProfileEditor/View/BasalProfileEditorRootView.swift

@@ -11,10 +11,8 @@ extension BasalProfileEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Bolus/View/AlternativeBolusCalcRootView.swift

@@ -58,10 +58,8 @@ extension Bolus {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom
@@ -209,7 +207,8 @@ extension Bolus {
                             }
                         } else {
                             Button {
-                                carbsView()
+                                keepForNextWiew = true
+                                state.backToCarbsView(complexEntry: true, meal, override: false)
                             } label: {
                                 HStack {
                                     Image(systemName: "chevron.backward")
@@ -700,11 +699,6 @@ extension Bolus {
             ((meal.first?.fat ?? 0) > 0) || ((meal.first?.protein ?? 0) > 0)
         }
 
-        func carbsView() {
-            keepForNextWiew = true
-            state.backToCarbsView(complexEntry: true, meal, override: false)
-        }
-
         var mealEntries: some View {
             VStack {
                 if let carbs = meal.first?.carbs, carbs > 0 {

FreeAPS/Sources/Modules/Bolus/View/DefaultBolusCalcRootView.swift

@@ -38,10 +38,8 @@ extension Bolus {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom
@@ -178,7 +176,8 @@ extension Bolus {
                             }
                         } else {
                             Button {
-                                carbsView()
+                                keepForNextWiew = true
+                                state.backToCarbsView(complexEntry: true, meal, override: false)
                             } label: {
                                 HStack {
                                     Image(systemName: "chevron.backward")
@@ -214,11 +213,6 @@ extension Bolus {
             ((meal.first?.fat ?? 0) > 0) || ((meal.first?.protein ?? 0) > 0)
         }
 
-        func carbsView() {
-            keepForNextWiew = true
-            state.backToCarbsView(complexEntry: true, meal, override: false)
-        }
-
         var mealEntries: some View {
             VStack {
                 if let carbs = meal.first?.carbs, carbs > 0 {

FreeAPS/Sources/Modules/BolusCalculatorConfig/View/BolusCalculatorConfigRootView.swift

@@ -10,10 +10,8 @@ extension BolusCalculatorConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/CGM/View/CGMRootView.swift

@@ -12,10 +12,8 @@ extension CGM {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/CREditor/View/CREditorRootView.swift

@@ -11,10 +11,8 @@ extension CREditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Calibrations/View/CalibrationsRootView.swift

@@ -10,10 +10,8 @@ extension Calibrations {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/ConfigEditor/View/ConfigEditorRootView.swift

@@ -12,10 +12,8 @@ extension ConfigEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -60,10 +60,8 @@ extension DataTable {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom
@@ -115,9 +113,15 @@ extension DataTable {
                     }
                     ToolbarItem(placement: .topBarTrailing) {
                         switch state.mode {
-                        case .treatments: addInsulinButton
+                        case .treatments: addButton( {
+                            showExternalInsulin = true
+                            state.externalInsulinDate = Date()
+                        })
                         case .meals: EmptyView()
-                        case .glucose: addGlucoseButton
+                        case .glucose: addButton({
+                            showManualGlucose = true
+                            state.manualGlucose = 0 
+                        })
                         }
                     }
                 }
@@ -130,26 +134,15 @@ extension DataTable {
                 }
         }
         
-        private var addGlucoseButton: some View {
+         @ViewBuilder func addButton(_ action: @escaping () -> Void) -> some View {
             Button(
-                action: { showManualGlucose = true
-                    state.manualGlucose = 0 },
-                label: { 
+                action: action,
+                label: {
                     Image(systemName: "plus.circle.fill")
                     Text("Add")
                 }
             )
         }
-        
-        private var addInsulinButton: some View {
-            Button(action: { showExternalInsulin = true
-               state.externalInsulinDate = Date() }, label: {
-               HStack {
-                   Image(systemName: "plus.circle.fill")
-                   Text("Add")
-               }
-           })
-        }
 
         private var treatmentsList: some View {
             List {

FreeAPS/Sources/Modules/Dynamic/View/DynamicRootView.swift

@@ -18,10 +18,8 @@ extension Dynamic {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/FPUConfig/View/FPUConfigRootView.swift

@@ -10,10 +10,8 @@ extension FPUConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/HealthKit/View/AppleHealthKitRootView.swift

@@ -10,10 +10,8 @@ extension AppleHealthKit {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/ISFEditor/View/ISFEditorRootView.swift

@@ -11,10 +11,8 @@ extension ISFEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/IconConfig/View/IconConfigRootWiew.swift

@@ -7,10 +7,8 @@ extension IconConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/LibreConfig/View/LibreConfigRootView.swift

@@ -11,10 +11,8 @@ extension LibreConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Main/View/MainRootView.swift

@@ -10,10 +10,8 @@ extension Main {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/ManualTempBasal/View/ManualTempBasalRootView.swift

@@ -10,10 +10,8 @@ extension ManualTempBasal {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/NightscoutConfig/View/NightscoutConfigRootView.swift

@@ -14,10 +14,8 @@ extension NightscoutConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/NotificationsConfig/View/NotificationsConfigRootView.swift

@@ -39,10 +39,8 @@ extension NotificationsConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/OverrideProfilesConfig/View/OverrideProfilesRootView.swift

@@ -19,10 +19,8 @@ extension OverrideProfilesConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/PreferencesEditor/View/PreferencesEditorRootView.swift

@@ -16,10 +16,8 @@ extension PreferencesEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/PumpConfig/View/PumpConfigRootView.swift

@@ -10,10 +10,8 @@ extension PumpConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/PumpSettingsEditor/View/PumpSettingsEditorRootView.swift

@@ -10,10 +10,8 @@ extension PumpSettingsEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -13,10 +13,8 @@ extension Settings {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Snooze/View/SnoozeRootView.swift

@@ -11,10 +11,8 @@ extension Snooze {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/Stat/View/StatRootView.swift

@@ -40,10 +40,8 @@ extension Stat {
         private var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/StatConfig/View/StatConfigRootView.swift

@@ -10,10 +10,8 @@ extension StatConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/TargetsEditor/View/TargetsEditorRootView.swift

@@ -11,10 +11,8 @@ extension TargetsEditor {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/WatchConfig/View/WatchConfigRootView.swift

@@ -10,10 +10,8 @@ extension WatchConfig {
         var color: LinearGradient {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
-                    Color("Background_1"),
-                    Color("Background_1"),
-                    Color("Background_2")
-                    // Color("Background_1")
+                    Color.bgDarkBlue,
+                   Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom