Browse Source

convert alert to confirmationDialog for stopping override

Also rewords the task from "Cancel" to "Stop"
Mike Plante 1 năm trước cách đây
mục cha
commit
2d5708031f

+ 20 - 18
FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -10,7 +10,7 @@ extension Home {
 
         @StateObject var state = StateModel()
         @State var isStatusPopupPresented = false
-        @State var showCancelAlert = false
+        @State var isConfirmStopOverrideShown = false
         @State var isMenuPresented = false
         @State var showTreatments = false
         @State var selectedTab: Int = 0
@@ -547,25 +547,27 @@ extension Home {
                                 .foregroundStyle(Color.clear)
                         }
                     }
-                }.padding(.horizontal, 10)
-                    .alert(
-                        "Return to Normal?", isPresented: $showCancelAlert,
-                        actions: {
-                            Button("No", role: .cancel) {}
-                            Button("Yes", role: .destructive) {
-                                Task {
-                                    guard let objectID = latestOverride.first?.objectID else { return }
-                                    await state.cancelOverride(withID: objectID)
-                                }
-                            }
-                        }, message: { Text("This will change settings back to your normal profile.") }
-                    )
-                    .padding(.trailing, 8)
-                    .onTapGesture {
-                        if !latestOverride.isEmpty {
-                            showCancelAlert = true
+                }
+                .padding(.horizontal, 10)
+                .confirmationDialog(
+                    "Stop the Override \"\(latestOverride.first?.name ?? "")\"?",
+                    isPresented: $isConfirmStopOverrideShown,
+                    titleVisibility: .visible
+                ) {
+                    Button("Stop", role: .destructive) {
+                        Task {
+                            guard let objectID = latestOverride.first?.objectID else { return }
+                            await state.cancelOverride(withID: objectID)
                         }
                     }
+                    Button("Cancel", role: .cancel) {}
+                }
+                .padding(.trailing, 8)
+                .onTapGesture {
+                    if !latestOverride.isEmpty {
+                        isConfirmStopOverrideShown = true
+                    }
+                }
             }.padding(.horizontal, 10).padding(.bottom, UIDevice.adjustPadding(min: nil, max: 10))
                 .overlay {
                     /// just show temp target if no profile is already active

+ 4 - 4
FreeAPS/Sources/Modules/OverrideConfig/View/OverrideRootView.swift

@@ -167,13 +167,13 @@ extension OverrideConfig {
                 }
                 .onMove(perform: state.reorderOverride)
                 .confirmationDialog(
-                    "Delete the preset \"\(selectedOverride?.name ?? "")\"?",
+                    "Delete the Override Preset \"\(selectedOverride?.name ?? "")\"?",
                     isPresented: $isConfirmDeleteShown,
                     titleVisibility: .visible
                 ) {
                     if let itemToDelete = selectedOverride {
                         Button(
-                            state.currentActiveOverride == selectedOverride ? "Cancel and Delete" : "Delete",
+                            state.currentActiveOverride == selectedOverride ? "Stop and Delete" : "Delete",
                             role: .destructive
                         ) {
                             if state.currentActiveOverride == selectedOverride {
@@ -200,7 +200,7 @@ extension OverrideConfig {
                         Text(
                             state
                                 .currentActiveOverride == selectedOverride ?
-                                "This preset is currently running. Deleting will cancel it." : ""
+                                "This override preset is currently running. Deleting will stop it." : ""
                         )
                     }
                 }
@@ -250,7 +250,7 @@ extension OverrideConfig {
                     await state.disableAllActiveOverrides(createOverrideRunEntry: true)
                 }
             }, label: {
-                Text("Cancel Override")
+                Text("Stop Override")
 
             })
                 .frame(maxWidth: .infinity, alignment: .center)