UI

* refactoring, nav bar titles in large
* change plus.circle.fill to plus in history view, display sheet title .inline
* change 'grams' to 'g' in add carbs view

Dependencies/LoopKit/LoopKitUI/Views/Settings Editors/InsulinModelSelection.swift

@@ -84,7 +84,7 @@ public struct InsulinModelSelection: View {
             content
         case .settings:
             contentWithCancel
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
         }
     }
     

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/BeepPreferenceSelectionView.swift

@@ -88,7 +88,7 @@ struct BeepPreferenceSelectionView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(LocalizedString("Confidence Reminders", comment: "navigation title for confidence reminders"))
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/LowReservoirReminderEditView.swift

@@ -75,7 +75,7 @@ struct LowReservoirReminderEditView: View {
             .disabled(saving || !valueChanged)
         }
         .navigationTitle("")
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/PlayTestBeepsView.swift

@@ -49,7 +49,7 @@ struct PlayTestBeepsView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/PumpManagerDetailsView.swift

@@ -66,7 +66,7 @@ struct PumpManagerDetailsView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .onFirstAppear {
             asyncAction()
         }

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/ReadPodInfoView.swift

@@ -63,7 +63,7 @@ struct ReadPodInfoView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/ReadPodStatusView.swift

@@ -59,7 +59,7 @@ struct ReadPodStatusView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniBLE/OmniBLE/PumpManagerUI/Views/SilencePodSelectionView.swift

@@ -86,7 +86,7 @@ struct SilencePodSelectionView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(LocalizedString("Silence Pod", comment: "navigation title for Silnce Pod"))
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

Dependencies/OmniKit/OmniKitUI/Views/BeepPreferenceSelectionView.swift

@@ -89,7 +89,7 @@ struct BeepPreferenceSelectionView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(LocalizedString("Confidence Reminders", comment: "navigation title for confidence reminders"))
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

Dependencies/OmniKit/OmniKitUI/Views/LowReservoirReminderEditView.swift

@@ -76,7 +76,7 @@ struct LowReservoirReminderEditView: View {
             .disabled(saving || !valueChanged)
         }
         .navigationTitle("")
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

Dependencies/OmniKit/OmniKitUI/Views/PlayTestBeepsView.swift

@@ -49,7 +49,7 @@ struct PlayTestBeepsView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniKit/OmniKitUI/Views/PumpManagerDetailsView.swift

@@ -66,7 +66,7 @@ struct PumpManagerDetailsView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .onFirstAppear {
             asyncAction()
         }

Dependencies/OmniKit/OmniKitUI/Views/ReadPodInfoView.swift

@@ -64,7 +64,7 @@ struct ReadPodInfoView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniKit/OmniKitUI/Views/ReadPodStatusView.swift

@@ -60,7 +60,7 @@ struct ReadPodStatusView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(title)
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
         .onFirstAppear {
             asyncAction()

Dependencies/OmniKit/OmniKitUI/Views/SilencePodSelectionView.swift

@@ -87,7 +87,7 @@ struct SilencePodSelectionView: View {
         }
         .insetGroupedListStyle()
         .navigationTitle(LocalizedString("Silence Pod", comment: "navigation title for Silnce Pod"))
-        .navigationBarTitleDisplayMode(.inline)
+         .navigationBarTitleDisplayMode(.large)
         .alert(isPresented: $alertIsPresented, content: { alert(error: error) })
     }
 

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

@@ -69,7 +69,7 @@ extension AddCarbs {
                             autofocus: true,
                             cleanInput: true
                         )
-                        Text("grams").foregroundColor(.secondary)
+                        Text("g").foregroundColor(.secondary)
                     }
 
                     if state.useFPUconversion {
@@ -128,7 +128,7 @@ extension AddCarbs {
                     .popover(isPresented: $isPromptPresented) {
                         presetPopover
                     }
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
 
                 Section {
                     Button { state.add(override, fetch: editMode) }
@@ -140,7 +140,7 @@ extension AddCarbs {
 
                 Section {
                     mealPresets
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
             }.scrollContentBackground(.hidden).background(color)
                 .onAppear {
                     configureView {
@@ -148,7 +148,7 @@ extension AddCarbs {
                     }
                 }
                 .navigationTitle("Add Meal")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
         }
 
         private var presetPopover: some View {
@@ -313,7 +313,7 @@ extension AddCarbs {
                     autofocus: false,
                     cleanInput: true
                 )
-                Text("grams").foregroundColor(.secondary)
+                Text("g").foregroundColor(.secondary)
             }
             HStack {
                 Text("Protein").foregroundColor(.red)
@@ -326,7 +326,7 @@ extension AddCarbs {
                     cleanInput: true
                 ).foregroundColor(.loopRed)
 
-                Text("grams").foregroundColor(.secondary)
+                Text("g").foregroundColor(.secondary)
             }
         }
     }

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

@@ -49,7 +49,7 @@ extension AddTempTarget {
                         ForEach(state.presets) { preset in
                             presetView(for: preset)
                         }
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 }
 
                 HStack {
@@ -57,7 +57,7 @@ extension AddTempTarget {
                     Toggle(isOn: $state.viewPercantage) {}.controlSize(.mini)
                     Image(systemName: "figure.highintensity.intervaltraining")
                     Image(systemName: "fork.knife")
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
 
                 if state.viewPercantage {
                     Section {
@@ -98,7 +98,7 @@ extension AddTempTarget {
                                 ).accentColor(.green)
                             }
                         }
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 } else {
                     Section(header: Text("Custom")) {
                         HStack {
@@ -116,7 +116,7 @@ extension AddTempTarget {
                         DatePicker("Date", selection: $state.date)
                         Button { isPromptPresented = true }
                         label: { Text("Save as preset") }
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 }
                 if state.viewPercantage {
                     Section {
@@ -130,7 +130,7 @@ extension AddTempTarget {
                         Button { isPromptPresented = true }
                         label: { Text("Save as preset") }
                             .disabled(state.duration == 0)
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 }
 
                 Section {
@@ -138,7 +138,7 @@ extension AddTempTarget {
                     label: { Text("Enact") }
                     Button { state.cancel() }
                     label: { Text("Cancel Temp Target") }
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
             }.scrollContentBackground(.hidden).background(color)
                 .popover(isPresented: $isPromptPresented) {
                     Form {
@@ -159,7 +159,7 @@ extension AddTempTarget {
                     state.hbt = isEnabledArray.first?.hbt ?? 160
                 }
                 .navigationTitle("Enact Temp Target")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .toolbar {
                     ToolbarItem(placement: .navigationBarLeading) {
                         Button("Close") {

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

@@ -82,12 +82,12 @@ extension Bolus {
                     } else {
                         predictionChart
                     }
-                } header: { Text("Predictions") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Predictions") }.listRowBackground(Color.chart)
 
                 if fetch {
                     Section {
                         mealEntries
-                    } header: { Text("Meal Summary") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    } header: { Text("Meal Summary") }.listRowBackground(Color.chart)
                 }
 
                 Section {
@@ -173,7 +173,7 @@ extension Bolus {
                         }
                     }
 
-                } header: { Text("Bolus") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Bolus") }.listRowBackground(Color.chart)
 
                 if state.amount > 0 {
                     Section {
@@ -196,12 +196,12 @@ extension Bolus {
                             appState.currentTab = .home
                         }
                         label: { Text("Continue without bolus") }.frame(maxWidth: .infinity, alignment: .center)
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 }
             }.scrollContentBackground(.hidden).background(color)
                 .blur(radius: showInfo ? 3 : 0)
                 .navigationTitle("Enact Bolus")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         if fetch {

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

@@ -61,12 +61,12 @@ extension Bolus {
                     } else {
                         predictionChart
                     }
-                } header: { Text("Predictions") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Predictions") }.listRowBackground(Color.chart)
 
                 if fetch {
                     Section {
                         mealEntries
-                    } header: { Text("Meal Summary") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    } header: { Text("Meal Summary") }.listRowBackground(Color.chart)
                 }
 
                 Section {
@@ -113,7 +113,7 @@ extension Bolus {
                         Text(!(state.amount > state.maxBolus) ? "U" : "😵").foregroundColor(.secondary)
                     }
 
-                } header: { Text("Bolus") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Bolus") }.listRowBackground(Color.chart)
 
                 if state.amount > 0 {
                     Section {
@@ -137,7 +137,7 @@ extension Bolus {
                             appState.currentTab = .home
                         }
                         label: { Text("Continue without bolus") }.frame(maxWidth: .infinity, alignment: .center)
-                    }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                    }.listRowBackground(Color.chart)
                 }
             }.scrollContentBackground(.hidden).background(color)
                 .alert(isPresented: $displayError) {
@@ -169,7 +169,7 @@ extension Bolus {
                 }
 
                 .navigationTitle("Enact Bolus")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         if fetch {

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

@@ -55,7 +55,7 @@ extension ConfigEditor {
                         }
                     }
                     .navigationTitle(file)
-                    .navigationBarTitleDisplayMode(.inline)
+                     .navigationBarTitleDisplayMode(.large)
                     .padding()
             }
             .scrollContentBackground(.hidden).background(color)

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

@@ -104,7 +104,7 @@ extension DataTable {
             }.background(color)
                 .onAppear(perform: configureView)
                 .navigationTitle("History")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .toolbar {
                     ToolbarItem(placement: .topBarTrailing) {
                         switch state.mode {
@@ -133,8 +133,8 @@ extension DataTable {
             Button(
                 action: action,
                 label: {
-                    Image(systemName: "plus.circle.fill")
-                    Text("Add")
+                    Image(systemName: "plus")
+                        .font(.system(size: 20))
                 }
             )
         }
@@ -161,7 +161,7 @@ extension DataTable {
                         Text("No data.")
                     }
                 }
-            }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+            }.listRowBackground(Color.chart)
         }
 
         private var mealsList: some View {
@@ -180,7 +180,7 @@ extension DataTable {
                         Text("No data.")
                     }
                 }
-            }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+            }.listRowBackground(Color.chart)
         }
 
         private var glucoseList: some View {
@@ -199,7 +199,7 @@ extension DataTable {
                         Text("No data.")
                     }
                 }
-            }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+            }.listRowBackground(Color.chart)
         }
 
         @ViewBuilder private func addGlucoseView() -> some View {
@@ -221,7 +221,7 @@ extension DataTable {
                                 )
                                 Text(state.units.rawValue).foregroundStyle(.secondary)
                             }
-                        }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                        }.listRowBackground(Color.chart)
 
                         Section {
                             HStack {
@@ -244,7 +244,7 @@ extension DataTable {
                 }
                 .onAppear(perform: configureView)
                 .navigationTitle("Add Glucose")
-                .navigationBarTitleDisplayMode(.automatic)
+                .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         Button("Close") {
@@ -403,11 +403,11 @@ extension DataTable {
                                 )
                                 Text("U").foregroundColor(.secondary)
                             }
-                        }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                        }.listRowBackground(Color.chart)
 
                         Section {
                             DatePicker("Date", selection: $state.externalInsulinDate, in: ...Date())
-                        }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                        }.listRowBackground(Color.chart)
 
                         let amountWarningCondition = (state.externalInsulinAmount > state.maxBolus)
 
@@ -459,7 +459,7 @@ extension DataTable {
                 }
                 .onAppear(perform: configureView)
                 .navigationTitle("External Insulin")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         Button("Close") {

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

@@ -273,12 +273,12 @@ extension OverrideProfilesConfig {
                     Text(
                         "Your profile basal insulin will be adjusted with the override percentage and your profile ISF and CR will be inversly adjusted with the percentage."
                     )
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
 
                 Button("Return to Normal") {
                     state.cancelProfile()
                     dismiss()
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
                     .frame(maxWidth: .infinity, alignment: .center)
                     .buttonStyle(BorderlessButtonStyle())
                     .disabled(!state.isEnabled)
@@ -287,7 +287,7 @@ extension OverrideProfilesConfig {
                 .onAppear(perform: configureView)
                 .onAppear { state.savedSettings() }
                 .navigationBarTitle("Profiles")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
         }
 
         @ViewBuilder private func profilesView(for preset: OverridePresets) -> some View {

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

@@ -35,13 +35,13 @@ extension Settings {
                     Text(
                         "iAPS v\(state.versionNumber) (\(state.buildNumber))\nBranch: \(state.branch) \(state.copyrightNotice) "
                     ).textCase(nil)
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
 
                 Section {
                     Text("Pump").navigationLink(to: .pumpConfig, from: self)
                     Text("CGM").navigationLink(to: .cgm, from: self)
                     Text("Watch").navigationLink(to: .watch, from: self)
-                } header: { Text("Devices") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Devices") }.listRowBackground(Color.chart)
 
                 Section {
                     Text("Nightscout").navigationLink(to: .nighscoutConfig, from: self)
@@ -49,7 +49,7 @@ extension Settings {
                         Text("Apple Health").navigationLink(to: .healthkit, from: self)
                     }
                     Text("Notifications").navigationLink(to: .notificationsConfig, from: self)
-                } header: { Text("Services") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Services") }.listRowBackground(Color.chart)
 
                 Section {
                     Text("Pump Settings").navigationLink(to: .pumpSettingsEditor, from: self)
@@ -57,12 +57,12 @@ extension Settings {
                     Text("Insulin Sensitivities").navigationLink(to: .isfEditor, from: self)
                     Text("Carb Ratios").navigationLink(to: .crEditor, from: self)
                     Text("Target Glucose").navigationLink(to: .targetsEditor, from: self)
-                } header: { Text("Configuration") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Configuration") }.listRowBackground(Color.chart)
 
                 Section {
                     Text("OpenAPS").navigationLink(to: .preferencesEditor, from: self)
                     Text("Autotune").navigationLink(to: .autotuneConfig, from: self)
-                } header: { Text("OpenAPS") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("OpenAPS") }.listRowBackground(Color.chart)
 
                 Section {
                     Text("UI/UX").navigationLink(to: .statisticsConfig, from: self)
@@ -70,7 +70,7 @@ extension Settings {
                     Text("Bolus Calculator").navigationLink(to: .bolusCalculatorConfig, from: self)
                     Text("Fat And Protein Conversion").navigationLink(to: .fpuConfig, from: self)
                     Text("Dynamic ISF").navigationLink(to: .dynamicISF, from: self)
-                } header: { Text("Extra Features") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Extra Features") }.listRowBackground(Color.chart)
 
                 Section {
                     Toggle("Debug options", isOn: $state.debugOptions)
@@ -134,18 +134,18 @@ extension Settings {
                                 .navigationLink(to: .configEditor(file: OpenAPS.FreeAPS.settings), from: self)
                         }
                     }
-                } header: { Text("Developer") }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                } header: { Text("Developer") }.listRowBackground(Color.chart)
 
                 Section {
                     Toggle("Animated Background", isOn: $state.animatedBackground)
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
 
                 Section {
                     Text("Share logs")
                         .onTapGesture {
                             showShareSheet = true
                         }
-                }.listRowBackground(colorScheme == .dark ? Color.chart : Color.white)
+                }.listRowBackground(Color.chart)
             }.scrollContentBackground(.hidden).background(color)
                 .sheet(isPresented: $showShareSheet) {
                     ShareSheet(activityItems: state.logItems())
@@ -159,7 +159,7 @@ extension Settings {
                         }
                     }
                 }
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .onDisappear(perform: { state.uploadProfileAndSettings(false) })
         }
     }

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

@@ -167,7 +167,7 @@ extension Stat {
             }.background(color)
                 .onAppear(perform: configureView)
                 .navigationBarTitle("Statistics")
-                .navigationBarTitleDisplayMode(.inline)
+                 .navigationBarTitleDisplayMode(.large)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         Button("Close") {