From 88dfabfa9ce884f004abc067669e78ab7ff3c6fb Mon Sep 17 00:00:00 2001 From: Super12138 <70494801+Super12138@users.noreply.github.com> Date: Sun, 12 Jan 2025 11:53:28 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/super12138/todo/ui/pages/main/MainPage.kt | 6 +++--- .../todo/ui/pages/main/ManagerFragment.kt | 2 +- .../todo/ui/pages/main/TodoBottomSheet.kt | 6 +++--- .../todo/ui/pages/main/components/ChipGroup.kt | 2 +- .../todo/ui/pages/main/components/TodoCard.kt | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 14 +++++++------- app/src/main/res/values/strings.xml | 14 +++++++------- 7 files changed, 23 insertions(+), 23 deletions(-) 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 8a45caa..11dc9fb 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 @@ -62,7 +62,7 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) { ) { Icon( imageVector = Icons.Outlined.Settings, - contentDescription = stringResource(R.string.pages_settings) + contentDescription = stringResource(R.string.page_settings) ) } } @@ -80,11 +80,11 @@ fun MainPage(viewModel: MainViewModel, modifier: Modifier = Modifier) { ) { Icon( imageVector = Icons.Outlined.Add, - contentDescription = stringResource(R.string.actions_add_task) + contentDescription = stringResource(R.string.action_add_task) ) AnimatedVisibility(isExpanded) { Text( - text = stringResource(R.string.actions_add_task), + text = stringResource(R.string.action_add_task), modifier = Modifier.padding(start = 8.dp) ) } diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt index 807ab8d..e3fcb55 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/ManagerFragment.kt @@ -43,7 +43,7 @@ fun ManagerFragment( modifier = Modifier.fillMaxSize() ) { Text( - text = stringResource(R.string.tips_no_task), + text = stringResource(R.string.tip_no_task), style = MaterialTheme.typography.titleMedium ) } diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt index ce7fded..a4b9b75 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/TodoBottomSheet.kt @@ -53,7 +53,7 @@ fun TodoBottomSheet( modifier = Modifier.padding(horizontal = 16.dp) ) { Text( - text = stringResource(R.string.actions_add_task), + text = stringResource(R.string.action_add_task), style = MaterialTheme.typography.headlineMedium ) @@ -89,7 +89,7 @@ fun TodoBottomSheet( Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { OutlinedButton(onClick = onClose) { - Text(stringResource(R.string.actions_cancel)) + Text(stringResource(R.string.action_cancel)) } FilledTonalButton( onClick = { @@ -108,7 +108,7 @@ fun TodoBottomSheet( ) } ) { - Text(stringResource(R.string.actions_save)) + Text(stringResource(R.string.action_save)) } } Spacer(Modifier.size(30.dp)) diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/ChipGroup.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/ChipGroup.kt index ad17a5b..4bd22e4 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/ChipGroup.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/ChipGroup.kt @@ -48,7 +48,7 @@ fun FilterChipGroup( ) { Icon( imageVector = Icons.Outlined.Check, - contentDescription = stringResource(R.string.tips_select_this), + contentDescription = stringResource(R.string.tip_select_this), modifier = Modifier.size(FilterChipDefaults.IconSize) ) } diff --git a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt index 22d5fd8..18c121b 100644 --- a/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt +++ b/app/src/main/kotlin/cn/super12138/todo/ui/pages/main/components/TodoCard.kt @@ -67,7 +67,7 @@ fun TodoCard( Icon( imageVector = Icons.Outlined.Check, tint = MaterialTheme.colorScheme.primary, - contentDescription = stringResource(R.string.tips_mark_completed) + contentDescription = stringResource(R.string.tip_mark_completed) ) } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 83efb4a..d97c07a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,13 +1,13 @@ 待办 - 设置 - 添加待办 - 目前没有任务要完成的，好好休息一下吧~ + 设置 + 添加待办 + 目前没有任务要完成的，好好休息一下吧~ 待办内容 - 取消 - 保存 + 取消 + 保存 没有输入待办内容 - 选择该项 - 标记为已完成 + 选择该项 + 标记为已完成 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d3ce570..f0a5eb2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,12 +1,12 @@ To Do - Settings - Add Task - There are no tasks to complete at the moment, take a good rest! + Settings + Add Task + There are no tasks to complete at the moment, take a good rest! Task content - Cancel - Save + Cancel + Save No task content entered - Select this - Mark as completed + Select this + Mark as completed \ No newline at end of file