Polish UI, add limits, make button sticky WIP

FreeAPS/Sources/Modules/Adjustments/View/Overrides/AdjustmentsRootView+Overrides.swift

@@ -94,7 +94,7 @@ extension Adjustments.RootView {
                 selectedOverride = preset
                 isConfirmDeletePresented = true
             } label: {
-                Label("Delete", systemImage: "trash")
+                Label("Delete", systemImage: "trash.fill")
                     .tint(.red)
             }
             Button(action: {

FreeAPS/Sources/Modules/Adjustments/View/TempTargets/AdjustmentsRootView+TempTargets.swift

@@ -82,7 +82,7 @@ extension Adjustments.RootView {
                     isConfirmDeletePresented = true
                 }
             } label: {
-                Label("Delete", systemImage: "trash")
+                Label("Delete", systemImage: "trash.fill")
                     .tint(.red)
             }
             Button(action: {

FreeAPS/Sources/Modules/DataTable/DataTableStateModel.swift

@@ -338,7 +338,13 @@ extension DataTable {
             }
         }
 
-        func updateFPUEntry(_ treatmentObjectID: NSManagedObjectID, newFat: Decimal, newProtein: Decimal, newNote: String) {
+        func updateEntry(
+            _ treatmentObjectID: NSManagedObjectID,
+            newCarbs: Decimal,
+            newFat: Decimal,
+            newProtein: Decimal,
+            newNote: String
+        ) {
             Task {
                 // Get the original entry's actualDate before deletion
                 let context = CoreDataStack.shared.newTaskContext()
@@ -361,7 +367,7 @@ extension DataTable {
                     id: UUID().uuidString,
                     createdAt: Date(),
                     actualDate: originalDate, // Use the original entry's date
-                    carbs: Decimal(0),
+                    carbs: newCarbs,
                     fat: newFat,
                     protein: newProtein,
                     note: newNote,

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

@@ -14,7 +14,7 @@ struct CarbEntryEditorView: View {
     var state: DataTable.StateModel
     let carbEntry: CarbEntryStored
 
-    @State private var editedAmount: Decimal
+    @State private var editedCarbs: Decimal
     @State private var editedFat: Decimal
     @State private var editedProtein: Decimal
     @State private var editedNote: String
@@ -23,24 +23,115 @@ struct CarbEntryEditorView: View {
     init(state: DataTable.StateModel, carbEntry: CarbEntryStored) {
         self.state = state
         self.carbEntry = carbEntry
-        _editedAmount = State(initialValue: Decimal(carbEntry.carbs))
+        _editedCarbs = State(initialValue: Decimal(carbEntry.carbs))
         _editedFat = State(initialValue: 0) // gets updated in the task block
         _editedProtein = State(initialValue: 0) // gets updated in the task block
         _editedNote = State(initialValue: carbEntry.note ?? "")
         _isFPU = State(initialValue: carbEntry.isFPU)
     }
 
+    private var carbLimitExceeded: Bool {
+        editedCarbs > state.settingsManager.settings.maxCarbs
+    }
+
+    private var fatLimitExceeded: Bool {
+        editedFat > state.settingsManager.settings.maxFat
+    }
+
+    private var proteinLimitExceeded: Bool {
+        editedProtein > state.settingsManager.settings.maxProtein
+    }
+
+    private var limitExceeded: Bool {
+        carbLimitExceeded || fatLimitExceeded || proteinLimitExceeded
+    }
+
+    private var isButtonDisabled: Bool {
+        editedCarbs == 0 && editedFat == 0 && editedProtein == 0
+    }
+
+    private var buttonLabel: some View {
+        if carbLimitExceeded {
+            return Text("Max Carbs of \(state.settingsManager.settings.maxCarbs.description) g Exceeded")
+        } else if fatLimitExceeded {
+            return Text("Max Fat of \(state.settingsManager.settings.maxFat.description) g Exceeded")
+        } else if proteinLimitExceeded {
+            return Text("Max Protein of \(state.settingsManager.settings.maxProtein.description) g Exceeded")
+        }
+
+        return Text("Save and Update")
+    }
+
+    private var buttonBackgroundColor: Color {
+        var treatmentButtonBackground = Color(.systemBlue)
+        if limitExceeded {
+            treatmentButtonBackground = Color(.systemRed)
+        } else if isButtonDisabled {
+            treatmentButtonBackground = Color(.systemGray)
+        }
+
+        return treatmentButtonBackground
+    }
+
+    var stickyButton: some View {
+        ZStack {
+            Rectangle()
+                .frame(width: UIScreen.main.bounds.width, height: 65)
+                .foregroundStyle(colorScheme == .dark ? Color.bgDarkerDarkBlue : Color.white)
+                .background(.thinMaterial)
+                .opacity(0.8)
+                .clipShape(Rectangle())
+
+            Button(
+                action: {
+                    let treatmentObjectID = carbEntry.objectID
+
+                    state.updateEntry(
+                        treatmentObjectID,
+                        newCarbs: editedCarbs,
+                        newFat: editedFat,
+                        newProtein: editedProtein,
+                        newNote: editedNote
+                    )
+                    dismiss()
+                }, label: {
+                    buttonLabel
+                        .font(.headline)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                        .padding(10)
+                }
+            )
+            .frame(width: UIScreen.main.bounds.width * 0.9, height: 40, alignment: .center)
+            .disabled(isButtonDisabled)
+            .background(buttonBackgroundColor)
+            .tint(.white)
+            .clipShape(RoundedRectangle(cornerRadius: 8))
+        }
+    }
+
     var body: some View {
         NavigationView {
             Form {
                 Section {
-                    if isFPU {
+                    HStack {
+                        Text("Carbs")
+                        TextFieldWithToolBar(
+                            text: $editedCarbs,
+                            placeholder: "0",
+                            keyboardType: .numberPad,
+                            numberFormatter: Formatter.decimalFormatterWithOneFractionDigit
+                        )
+                        Text("g").foregroundStyle(.secondary)
+                    }
+
+                    if state.settingsManager.settings.useFPUconversion {
                         HStack {
                             Text("Fat")
                             TextFieldWithToolBar(
                                 text: $editedFat,
-                                placeholder: "Enter fat",
-                                numberFormatter: Formatter.integerFormatter
+                                placeholder: "0",
+                                keyboardType: .numberPad,
+                                numberFormatter: Formatter.decimalFormatterWithOneFractionDigit
                             )
                             Text("g").foregroundStyle(.secondary)
                         }
@@ -49,17 +140,8 @@ struct CarbEntryEditorView: View {
                             Text("Protein")
                             TextFieldWithToolBar(
                                 text: $editedProtein,
-                                placeholder: "Enter protein",
-                                numberFormatter: Formatter.integerFormatter
-                            )
-                            Text("g").foregroundStyle(.secondary)
-                        }
-                    } else {
-                        HStack {
-                            Text("Amount")
-                            TextFieldWithToolBar(
-                                text: $editedAmount,
-                                placeholder: "Enter carbs",
+                                placeholder: "0",
+                                keyboardType: .numberPad,
                                 numberFormatter: Formatter.decimalFormatterWithOneFractionDigit
                             )
                             Text("g").foregroundStyle(.secondary)
@@ -67,42 +149,20 @@ struct CarbEntryEditorView: View {
                     }
 
                     HStack {
-                        Text("Note")
-                        TextField("Optional note", text: $editedNote)
+                        Image(systemName: "square.and.pencil")
+                        TextFieldWithToolBarString(text: $editedNote, placeholder: "Note...", maxLength: 25)
                     }
                 }.listRowBackground(Color.chart)
-
-                Section {
-                    HStack {
-                        Spacer()
-                        Button("Save") {
-                            let treatmentObjectID = carbEntry.objectID
-
-                            if isFPU {
-                                state.updateFPUEntry(
-                                    treatmentObjectID,
-                                    newFat: editedFat,
-                                    newProtein: editedProtein,
-                                    newNote: editedNote
-                                )
-                            } else {
-                                state.updateCarbEntry(
-                                    treatmentObjectID,
-                                    newAmount: editedAmount,
-                                    newNote: editedNote
-                                )
-                            }
-                            dismiss()
-                        }
-                        Spacer()
-                    }
-                }
-                .listRowBackground(Color(.systemBlue))
-                .tint(.white)
+            }
+            .safeAreaInset(
+                edge: .bottom,
+                spacing: 30
+            ) {
+                stickyButton
             }
             .scrollContentBackground(.hidden)
             .background(appState.trioBackgroundColor(for: colorScheme))
-            .navigationTitle("Edit Carbs")
+            .navigationTitle("Edit Meal")
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
                 ToolbarItem(placement: .topBarLeading) {
@@ -113,6 +173,7 @@ struct CarbEntryEditorView: View {
             }
         }
         .task {
+            // TODO: do we still need this, or is grabbing the entire "hold-it-all" entry enough?
             if carbEntry.isFPU {
                 if let originalEntryID = await state.getZeroCarbNonFPUEntry(carbEntry.objectID) {
                     let context = CoreDataStack.shared.persistentContainer.viewContext

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

@@ -583,16 +583,6 @@ extension DataTable {
             }
             .swipeActions {
                 Button(
-                    "Edit",
-                    systemImage: "pencil",
-                    role: .none,
-                    action: {
-                        state.carbEntryToEdit = meal
-                        state.showCarbEntryEditor = true
-                    }
-                ).tint(.blue)
-
-                Button(
                     "Delete",
                     systemImage: "trash.fill",
                     role: .none,
@@ -613,6 +603,16 @@ extension DataTable {
                         isRemoveHistoryItemAlertPresented = true
                     }
                 ).tint(.red)
+
+                Button(
+                    "Edit",
+                    systemImage: "pencil",
+                    role: .none,
+                    action: {
+                        state.carbEntryToEdit = meal
+                        state.showCarbEntryEditor = true
+                    }
+                ).tint(.blue)
             }
             .alert(
                 Text(NSLocalizedString(alertTitle, comment: "")),