From ea19f35d5ef4c17698ddc8a034bedc1d52a566df Mon Sep 17 00:00:00 2001
From: Super12138 <70494801+Super12138@users.noreply.github.com>
Date: Sun, 21 Jul 2024 08:02:55 +0800
Subject: [PATCH] Improve expression

---
 .../main/kotlin/cn/super12138/todo/constant/GlobalValues.kt | 2 +-
 .../kotlin/cn/super12138/todo/utils/{ => sp}/SPDelegates.kt | 2 +-
 .../kotlin/cn/super12138/todo/utils/{ => sp}/SPUtils.kt     | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                  | 6 +++---
 app/src/main/res/values/strings.xml                         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename app/src/main/kotlin/cn/super12138/todo/utils/{ => sp}/SPDelegates.kt (92%)
 rename app/src/main/kotlin/cn/super12138/todo/utils/{ => sp}/SPUtils.kt (97%)

diff --git a/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt b/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt
index da97a81..bfcb475 100644
--- a/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/constant/GlobalValues.kt
@@ -1,6 +1,6 @@
 package cn.super12138.todo.constant
 
-import cn.super12138.todo.utils.SPDelegates
+import cn.super12138.todo.utils.sp.SPDelegates
 
 object GlobalValues {
     var darkMode: String by SPDelegates(Constants.PREF_DARK_MODE, "0")
diff --git a/app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt b/app/src/main/kotlin/cn/super12138/todo/utils/sp/SPDelegates.kt
similarity index 92%
rename from app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt
rename to app/src/main/kotlin/cn/super12138/todo/utils/sp/SPDelegates.kt
index 5af97cd..b00405a 100644
--- a/app/src/main/kotlin/cn/super12138/todo/utils/SPDelegates.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/utils/sp/SPDelegates.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.utils
+package cn.super12138.todo.utils.sp
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt b/app/src/main/kotlin/cn/super12138/todo/utils/sp/SPUtils.kt
similarity index 97%
rename from app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt
rename to app/src/main/kotlin/cn/super12138/todo/utils/sp/SPUtils.kt
index e457b44..dfbf247 100644
--- a/app/src/main/kotlin/cn/super12138/todo/utils/SPUtils.kt
+++ b/app/src/main/kotlin/cn/super12138/todo/utils/sp/SPUtils.kt
@@ -1,4 +1,4 @@
-package cn.super12138.todo.utils
+package cn.super12138.todo.utils.sp
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4692ce3..b4b2001 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -26,7 +26,7 @@
     <string name="ok">确定</string>
     <string name="add_task">添加待办</string>
     <string name="warning">警告</string>
-    <string name="delete_confirm">即将删除全部待办，是否继续？</string>
+    <string name="delete_confirm">删除后，全部待办将无法恢复。确定删除？</string>
     <string name="tasks_textfield_hint">待办内容</string>
     <string name="delete_one">删除</string>
     <string name="check_one">标记为已完成</string>
@@ -57,8 +57,8 @@
     <string name="restore_data">恢复数据</string>
     <string name="please_paste_data">请粘贴数据</string>
     <string name="restore_successful">数据恢复成功</string>
-    <string name="restore_need_restart_app">需要重启应用以应用恢复的数据</string>
-    <string name="json_data_incorrect">JSON 数据格式错误</string>
+    <string name="restore_need_restart_app">需要重启应用载入数据</string>
+    <string name="json_data_incorrect">JSON 数据格式错误，请检查粘贴数据格式</string>
     <string name="restore_failed">恢复失败，请检查是否重复恢复同一次备份的数据</string>
     <string name="view_all_tasks_label">查看全部待办</string>
     <string name="all_tasks_label">全部代办</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 739b2ce..2d9cb61 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,7 +26,7 @@
     <string name="ok">OK</string>
     <string name="add_task">Add Task</string>
     <string name="warning">Warning</string>
-    <string name="delete_confirm">Are you sure you want to delete all tasks?</string>
+    <string name="delete_confirm">After deleting, all to-do items cannot be restored. Are you sure to delete it?</string>
     <string name="tasks_textfield_hint">Tasks</string>
     <string name="delete_one">Delete</string>
     <string name="check_one">Checked this task</string>
@@ -58,7 +58,7 @@
     <string name="please_paste_data">Please paste the data</string>
     <string name="restore_successful">Data restore successful</string>
     <string name="restore_need_restart_app">Need to restart the app to apply the recovered data</string>
-    <string name="json_data_incorrect">JSON data format is incorrect</string>
+    <string name="json_data_incorrect">JSON data format is wrong. Please check the paste data format</string>
     <string name="restore_failed">Restore failed, please check if you are attempting to restore the same backup data again.</string>
     <string name="view_all_tasks_label">View all tasks</string>
     <string name="all_tasks_label">All tasks</string>