From 34b316120a993bbeb6db27dbc3d47c72a2a548cd Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Fri, 4 Jul 2025 11:01:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=87=8D=E7=BB=84=E6=80=A7=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todo/ui/pages/editor/TodoEditorPage.kt | 38 ++++++++--------- .../super12138/todo/ui/pages/main/MainPage.kt | 15 ++++--- .../todo/ui/pages/settings/SettingsData.kt | 21 +++++----- .../ui/pages/settings/SettingsDataCategory.kt | 42 +++++++++---------- 4 files changed, 57 insertions(+), 59 deletions(-) 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 2335ec3..d94901a 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 @@ -246,24 +246,24 @@ fun TodoEditorPage( } } } + + ConfirmDialog( + visible = uiState.showExitConfirmDialog, + icon = Icons.AutoMirrored.Outlined.Undo, + text = stringResource(R.string.tip_discard_changes), + onConfirm = { + uiState.showExitConfirmDialog = false + onNavigateUp() + }, + onDismiss = { uiState.showExitConfirmDialog = false } + ) + + ConfirmDialog( + visible = uiState.showDeleteConfirmDialog, + icon = Icons.Outlined.Delete, + text = stringResource(R.string.tip_delete_task, 1), + onConfirm = onDelete, + onDismiss = { uiState.showDeleteConfirmDialog = false } + ) } - - ConfirmDialog( - visible = uiState.showExitConfirmDialog, - icon = Icons.AutoMirrored.Outlined.Undo, - text = stringResource(R.string.tip_discard_changes), - onConfirm = { - uiState.showExitConfirmDialog = false - onNavigateUp() - }, - onDismiss = { uiState.showExitConfirmDialog = false } - ) - - ConfirmDialog( - visible = uiState.showDeleteConfirmDialog, - icon = Icons.Outlined.Delete, - text = stringResource(R.string.tip_delete_task, 1), - onConfirm = onDelete, - onDismiss = { uiState.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 bbda843..859b7bf 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 @@ -211,13 +211,12 @@ fun MainPage( ) } } + ConfirmDialog( + visible = showDeleteConfirmDialog, + icon = Icons.Outlined.Delete, + text = stringResource(R.string.tip_delete_task, selectedTodoIds.size), + onConfirm = { viewModel.deleteSelectedTodo() }, + onDismiss = { showDeleteConfirmDialog = false } + ) } - - ConfirmDialog( - visible = showDeleteConfirmDialog, - icon = Icons.Outlined.Delete, - text = stringResource(R.string.tip_delete_task, selectedTodoIds.size), - onConfirm = { viewModel.deleteSelectedTodo() }, - onDismiss = { showDeleteConfirmDialog = false } - ) } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt index dc86d23..b98852a 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsData.kt @@ -147,18 +147,17 @@ fun SettingsData( ) } } + ConfirmDialog( + visible = showRestoreDialog, + icon = Icons.Outlined.RestartAlt, + title = stringResource(R.string.tip_tips), + text = stringResource(R.string.tip_restore_success), + showDismissButton = false, + onConfirm = { restartApp(context) }, + onDismiss = { showRestoreDialog = false }, + properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false) + ) } - - ConfirmDialog( - visible = showRestoreDialog, - icon = Icons.Outlined.RestartAlt, - title = stringResource(R.string.tip_tips), - text = stringResource(R.string.tip_restore_success), - showDismissButton = false, - onConfirm = { restartApp(context) }, - onDismiss = { showRestoreDialog = false }, - properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false) - ) } /** diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDataCategory.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDataCategory.kt index 3c05589..fa2661d 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDataCategory.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/settings/SettingsDataCategory.kt @@ -106,27 +106,27 @@ fun SettingsDataCategory( } } } - } - CategoryPromptDialog( - visible = showDialog, - text = stringResource(R.string.tip_enter_category), - onSave = { - if (!categories.contains(it)) { - scope.launch { - DataStoreManager.setCategories(categories + it) + CategoryPromptDialog( + visible = showDialog, + text = stringResource(R.string.tip_enter_category), + onSave = { + if (!categories.contains(it)) { + scope.launch { + DataStoreManager.setCategories(categories + it) + } + } else { + scope.launch { + /*snackbarHostState.showSnackbar( + message = context.getString(R.string.error_category_duplicate) + )*/ + // 调换分类位置 + val tempList = categories - it + DataStoreManager.setCategories(tempList + it) + } } - } else { - scope.launch { - /*snackbarHostState.showSnackbar( - message = context.getString(R.string.error_category_duplicate) - )*/ - // 调换分类位置 - val tempList = categories - it - DataStoreManager.setCategories(tempList + it) - } - } - }, - onDismiss = { showDialog = false } - ) + }, + onDismiss = { showDialog = false } + ) + } } \ No newline at end of file