From 31c58b3a03017c2f238e4ad14c2500e426e3e53a Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Thu, 6 Feb 2025 16:32:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(editor):=20=E5=88=A0=E9=99=A4=E5=89=8D?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../super12138/todo/ui/components/Dialogs.kt  |  5 +++-
 .../todo/ui/pages/editor/TodoEditorPage.kt    | 25 +++++++++++++------
 .../super12138/todo/ui/pages/main/MainPage.kt |  5 +---
 app/src/main/res/values-zh-rCN/strings.xml    |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/components/Dialogs.kt b/app/src/main/kotlin/cn/super12138/todo/ui/components/Dialogs.kt
index f9f192a..313faca 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/components/Dialogs.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/components/Dialogs.kt
@@ -29,7 +29,10 @@ fun WarningDialog(
         text = { Text(description) },
         confirmButton = stringResource(R.string.action_confirm),
         dismissButton = stringResource(R.string.action_cancel),
-        onConfirm = onConfirm,
+        onConfirm = {
+            onConfirm()
+            onDismiss()
+        },
         onDismiss = onDismiss,
         modifier = modifier
     )
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
index 297a2bb..c323d8c 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/editor/TodoEditorPage.kt
@@ -68,7 +68,8 @@ fun TodoEditorPage(
     animatedVisibilityScope: AnimatedVisibilityScope,
     modifier: Modifier = Modifier
 ) {
-    var showConfirmDialog by rememberSaveable { mutableStateOf(false) }
+    var showExitConfirmDialog by rememberSaveable { mutableStateOf(false) }
+    var showDeleteConfirmDialog by rememberSaveable { mutableStateOf(false) }
 
     val context = LocalContext.current
     val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
@@ -84,7 +85,7 @@ fun TodoEditorPage(
         if ((toDo?.subject ?: 0) != selectedSubjectIndex) isModified = true
         if ((toDo?.priority ?: 0f) != priorityState) isModified = true
         if (isModified) {
-            showConfirmDialog = true
+            showExitConfirmDialog = true
         } else {
             onNavigateUp()
         }
@@ -105,20 +106,20 @@ fun TodoEditorPage(
                             icon = {
                                 Icon(
                                     imageVector = Icons.Outlined.Delete,
-                                    contentDescription = stringResource(R.string.action_delete)
+                                    contentDescription = null
                                 )
                             },
                             text = { Text(stringResource(R.string.action_delete)) },
                             expanded = true,
                             containerColor = MaterialTheme.colorScheme.errorContainer,
-                            onClick = onDelete
+                            onClick = { showDeleteConfirmDialog = true }
                         )
                     }
                     AnimatedExtendedFloatingActionButton(
                         icon = {
                             Icon(
                                 imageVector = Icons.Outlined.Save,
-                                contentDescription = stringResource(R.string.action_save)
+                                contentDescription = null
                             )
                         },
                         text = { Text(stringResource(R.string.action_save)) },
@@ -246,13 +247,21 @@ fun TodoEditorPage(
     }
 
     WarningDialog(
-        visible = showConfirmDialog,
+        visible = showExitConfirmDialog,
         icon = Icons.AutoMirrored.Outlined.Undo,
         description = stringResource(R.string.tip_discard_changes),
         onConfirm = {
-            showConfirmDialog = false
+            showExitConfirmDialog = false
             onNavigateUp()
         },
-        onDismiss = { showConfirmDialog = false }
+        onDismiss = { showExitConfirmDialog = false }
+    )
+
+    WarningDialog(
+        visible = showDeleteConfirmDialog,
+        icon = Icons.Outlined.Delete,
+        description = stringResource(R.string.tip_delete_task, 1),
+        onConfirm = onDelete,
+        onDismiss = { showDeleteConfirmDialog = false }
     )
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
index 743a115..14157d9 100644
--- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/MainPage.kt
@@ -212,10 +212,7 @@ fun MainPage(
         visible = showDeleteConfirmDialog,
         icon = Icons.Outlined.Delete,
         description = stringResource(R.string.tip_delete_task, selectedTodoIds.value.size),
-        onConfirm = {
-            showDeleteConfirmDialog = false
-            viewModel.deleteSelectedTodo()
-        },
+        onConfirm = { viewModel.deleteSelectedTodo() },
         onDismiss = { showDeleteConfirmDialog = false }
     )
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 002a7be..9d6ee8c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -31,7 +31,7 @@
     <string name="title_selected_count">已选择 %s 项</string>
     <string name="action_confirm">确定</string>
     <string name="title_warning">警告</string>
-    <string name="tip_delete_task">即将删除你选择的 %s 项待办。删除后将无法恢复这些待办，确定删除？</string>
+    <string name="tip_delete_task">即将删除 %s 项待办。删除后将无法恢复这些待办，确定删除？</string>
     <string name="action_back">返回</string>
     <string name="pref_about">关于</string>
     <string name="pref_about_desc">关于本应用</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3454b95..c0020af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,7 @@
     <string name="title_selected_count">%s selected</string>
     <string name="action_confirm">Confirm</string>
     <string name="title_warning">Warning</string>
-    <string name="tip_delete_task">You are about to delete the %s selected tasks. Once deleted, these tasks cannot be recovered. Are you sure you want to delete them?</string>
+    <string name="tip_delete_task">You are about to delete the %s tasks. Once deleted, these tasks cannot be recovered. Are you sure you want to delete them?</string>
     <string name="placeholder_divider" translatable="false">/</string>
     <string name="action_back">Back</string>
     <string name="pref_about">About</string>