From e21095c1814419f1dc04f6ad9e286f28eb56044d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Thu, 7 Dec 2023 23:53:59 +0900
Subject: [PATCH] =?UTF-8?q?v5.0.1=20=E7=A7=BB=E9=99=A4=E7=A1=AC=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81string?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  1 -
 app/build.gradle                              |  4 +--
 .../top/fumiama/simpledict/MainActivity.kt    | 27 ++++++++++---------
 app/src/main/res/values/strings.xml           | 11 ++++++++
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3015725..f05ad05 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle b/app/build.gradle
index 67b4b8a..285cb83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "top.fumiama.simpledict"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 20
-        versionName '5.0.0'
+        versionCode 21
+        versionName '5.0.1'
         resConfigs "zh", "zh-rCN"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt b/app/src/main/java/top/fumiama/simpledict/MainActivity.kt
index 73e1c24..9a47ac5 100644
--- a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt
+++ b/app/src/main/java/top/fumiama/simpledict/MainActivity.kt
@@ -144,7 +144,7 @@ class MainActivity : AppCompatActivity() {
                     val t = layoutInflater.inflate(R.layout.dialog_input, null, false)
                     AlertDialog.Builder(this@MainActivity)
                             .setView(t)
-                            .setTitle("提示")
+                            .setTitle(android.R.string.dialog_alert_title)
                             .setPositiveButton(android.R.string.ok) { _, _ ->
                                 val info = t.diet.text.toString()
                                 try {
@@ -165,13 +165,13 @@ class MainActivity : AppCompatActivity() {
                                             }
                                             putString("pwd", w)
                                             apply()
-                                            Toast.makeText(this@MainActivity, "下次生效", Toast.LENGTH_SHORT).show()
+                                            Toast.makeText(this@MainActivity, R.string.toast_take_effect_next_time, Toast.LENGTH_SHORT).show()
                                             return@setPositiveButton
                                         }?:throw FileNotFoundException("getSharedPreferences named \"remote\" error.")
                                     } else throw IllegalArgumentException()
                                 } catch (e: Exception) {
                                     e.printStackTrace()
-                                    Toast.makeText(this@MainActivity, "格式非法", Toast.LENGTH_SHORT).show()
+                                    Toast.makeText(this@MainActivity, R.string.toast_invalid_format, Toast.LENGTH_SHORT).show()
                                 }
                             }
                             .setNegativeButton(android.R.string.cancel) { _, _ -> }
@@ -260,11 +260,11 @@ class MainActivity : AppCompatActivity() {
         Thread{
             dict?.fetchDict({
                 runOnUiThread {
-                    Toast.makeText(this@MainActivity, "刷新失败", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this@MainActivity, R.string.toast_refresh_failed, Toast.LENGTH_SHORT).show()
                 }
             }, {
                 runOnUiThread {
-                    Toast.makeText(this@MainActivity, "刷新成功", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this@MainActivity, R.string.toast_refresh_succeeded, Toast.LENGTH_SHORT).show()
                 }
             }) {
                 runOnUiThread {
@@ -278,16 +278,17 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun showDictAlert(key: String, data: String?, line: View?) {
-        val hintAdd = if(data != null && data != "null") "重设" else "添加"
+        val hintAdd = if(data != null && data != "null") R.string.alert_word_button_reset else R.string.alert_word_button_new
         AlertDialog.Builder(this@MainActivity)
                 .setTitle(key)
                 .setMessage(data)
                 .setPositiveButton(hintAdd) { _, _ ->
                     val t = layoutInflater.inflate(R.layout.dialog_input, null, false)
                     t.diet.setText(data)
-                    t.dit.text = "更改将立即生效"
+                    t.dit.setText(R.string.alert_word_info)
+                    t.diet.setHint(R.string.alert_word_hint)
                     AlertDialog.Builder(this@MainActivity)
-                            .setTitle("$hintAdd$key")
+                            .setTitle("${getString(hintAdd)}$key")
                             .setView(t)
                             .setPositiveButton(android.R.string.ok) { _, _ ->
                                 val newText = t.diet.text.toString().trim().replace(Regex("[\\uFF00-\\uFF5E]")) { (it.value[0] - 0xFEE0).toString() }
@@ -296,15 +297,15 @@ class MainActivity : AppCompatActivity() {
                                     if(dict?.set(k, newText) == true) {
                                         line?.tb?.text = newText
                                     } else runOnUiThread {
-                                        Toast.makeText(this, "失败", Toast.LENGTH_SHORT).show()
+                                        Toast.makeText(this, R.string.toast_failed, Toast.LENGTH_SHORT).show()
                                     }
                                 }.start()
-                                else Toast.makeText(this, "未更改", Toast.LENGTH_SHORT).show()
+                                else Toast.makeText(this, R.string.toast_unchanged, Toast.LENGTH_SHORT).show()
                             }
                             .setNegativeButton(android.R.string.cancel) { _, _ -> }
                             .show()
                 }
-                .setNeutralButton("删除") { _, _ ->
+                .setNeutralButton(R.string.alert_word_button_delete) { _, _ ->
                     Thread{
                         if(dict?.del(key) == true) line?.apply {
                             val delKey = SpannableString(key)
@@ -316,7 +317,7 @@ class MainActivity : AppCompatActivity() {
                             tb.text = delData
                         }
                         else runOnUiThread {
-                            Toast.makeText(this, "失败", Toast.LENGTH_SHORT).show()
+                            Toast.makeText(this, R.string.toast_failed, Toast.LENGTH_SHORT).show()
                         }
                     }.start()
                 }
@@ -573,7 +574,7 @@ class MainActivity : AppCompatActivity() {
                         super.onScrolled(recyclerView, dx, dy)
                         val newStart = ad.getPosition()
                         val bar = mControlBarStates[p]
-                        Log.d("MyMain", "new start: $newStart, index: ${bar.index}, sy: ${recyclerView?.scrollY}")
+                        Log.d("MyMain", "new start: $newStart, index: ${bar.index}")
                         if (newStart != bar.index) {
                             bar.index = newStart
                             updateSize()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1db6929..b690874 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,9 +13,20 @@
     <string name="alert_input_server_info">请输入服务器信息</string>
     <string name="alert_input_server_hint">服务器地址:端口_口令</string>
     <string name="alert_select_sort_type">指定排序</string>
+    <string name="alert_word_info">更改将立即生效</string>
+    <string name="alert_word_hint">单词释义</string>
+    <string name="alert_word_button_reset">重设</string>
+    <string name="alert_word_button_new">添加</string>
+    <string name="alert_word_button_delete">删除</string>
 
     <string name="tab_all_words">zenbi</string>
     <string name="tab_liked_words">eujuno</string>
 
     <string name="toast_copied">已复制</string>
+    <string name="toast_failed">失败</string>
+    <string name="toast_unchanged">未更改</string>
+    <string name="toast_take_effect_next_time">下次生效</string>
+    <string name="toast_invalid_format">格式非法</string>
+    <string name="toast_refresh_failed">刷新失败</string>
+    <string name="toast_refresh_succeeded">刷新成功</string>
 </resources>
\ No newline at end of file