From 5b309a71e96cce0956a6a151d83ff18bfa0f6582 Mon Sep 17 00:00:00 2001
From: hingbong <hingbonglo@gmail.com>
Date: Sat, 18 Apr 2020 12:55:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86=20?=
 =?UTF-8?q?zh-rHK=20=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hingbong <hingbonglo@gmail.com>
---
 .../app/ui/book/read/ReadBookViewModel.kt     |   2 +-
 app/src/main/res/values-zh-rHK/strings.xml    |  34 ++++++
 app/src/main/res/values/strings.xml           |  34 ++++++
 app/src/main/res/xml/about.xml                |  30 ++---
 app/src/main/res/xml/donate.xml               |  10 +-
 app/src/main/res/xml/pref_config_backup.xml   |  54 ++++-----
 app/src/main/res/xml/pref_config_theme.xml    | 108 +++++++++---------
 app/src/main/res/xml/pref_main.xml            |  10 +-
 8 files changed, 175 insertions(+), 107 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
index 936393af9..cc129056a 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
@@ -178,7 +178,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                 }
             }
         }.onStart {
-            ReadBook.upMsg("正在自动换源")
+            ReadBook.upMsg(context.getString(R.string.source_auto_changing))
         }.onFinally {
             ReadBook.upMsg(null)
         }
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 91fa397fc..7f07c94e0 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -8,6 +8,10 @@
     <string name="menu_backup">Home</string>
     <string name="menu_restore">還原</string>
     <string name="menu_import_old">導入閲讀數據</string>
+    <string name="mkdirs">創建子文件夾</string>
+    <string name="mkdirs_description">創建 legado 文件夾作爲備份路徑</string>
+    <string name="backup_path">備份路徑</string>
+    <string name="menu_import_old_version">導入舊版數據</string>
     <string name="menu_import_github">導入 Github 數據</string>
     <string name="menu_replace_rule">淨化替換</string>
     <string name="menu_send">Send</string>
@@ -558,8 +562,11 @@
     <string name="export">導出</string>
     <string name="load_toc">加載目錄</string>
     <string name="tts">TTS</string>
+    <string name="web_dav_pw">WebDav 密碼</string>
     <string name="web_dav_pw_s">輸入你的 WebDav 授權密碼</string>
     <string name="web_dav_url_s">輸入你的服務器地址</string>
+    <string name="web_dav_url">WebDav 服務器地址</string>
+    <string name="web_dav_account">WebDav 賬號</string>
     <string name="web_dav_account_s">輸入你的 WebDav 賬號</string>
     <string name="rss_source">訂閲源</string>
     <string name="rss_source_edit">編輯訂閲源</string>
@@ -651,4 +658,31 @@
     <string name="toc_updateing">更新目錄中</string>
     <string name="media_button_on_exit_title">全程響應耳機按鍵</string>
     <string name="media_button_on_exit_summary">即使退出軟件也響應耳機按鍵</string>
+    <string name="contributors">開發人員</string>
+    <string name="contact">聯繫我們</string>
+    <string name="license">開源許可</string>
+    <string name="follow_official_account">關注公衆號</string>
+    <string name="wechat">WeChat</string>
+    <string name="thanks">你的支持是我更新的動力</string>
+    <string name="about_official_account">公众号[开源阅读软件]</string>
+    <string name="source_auto_changing">正在自動換源</string>
+    <string name="click_to_apply">點擊加入</string>
+    <string name="middle">中</string>
+    <string name="information">信息</string>
+
+    <!--color-->
+    <string name="primary">主色調</string>
+    <string name="accent">強調色</string>
+    <string name="background_color">背景色</string>
+    <string name="navbar_color">導航欄顏色</string>
+    <string name="day">白天</string>
+    <string name="day_color_primary">白天，主色調</string>
+    <string name="day_color_accent">白天，強調色</string>
+    <string name="day_background_color">白天，背景色</string>
+    <string name="day_navbar_color">白天，導航欄顏色</string>
+    <string name="night">夜間</string>
+    <string name="night_primary">夜間，主色調</string>
+    <string name="night_accent">夜間，強調色</string>
+    <string name="night_background_color">夜間，背景色</string>
+    <string name="night_navbar_color">夜間，導航欄顏色</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abf628b2f..a1a1642bd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,6 +8,10 @@
     <string name="menu_backup">Home</string>
     <string name="menu_restore">恢复</string>
     <string name="menu_import_old">导入阅读数据</string>
+    <string name="mkdirs">创建子文件夹</string>
+    <string name="mkdirs_description">创建legado文件夹作为备份文件夹</string>
+    <string name="backup_path">备份路径</string>
+    <string name="menu_import_old_version">导入旧版数据</string>
     <string name="menu_import_github">导入Github数据</string>
     <string name="menu_replace_rule">净化替换</string>
     <string name="menu_send">Send</string>
@@ -558,8 +562,11 @@
     <string name="export">导出</string>
     <string name="load_toc">加载目录</string>
     <string name="tts">TTS</string>
+    <string name="web_dav_pw">WebDav 密码</string>
     <string name="web_dav_pw_s">输入你的WebDav授权密码</string>
     <string name="web_dav_url_s">输入你的服务器地址</string>
+    <string name="web_dav_url">WebDav 服务器地址</string>
+    <string name="web_dav_account">WebDav 账号</string>
     <string name="web_dav_account_s">输入你的WebDav账号</string>
     <string name="rss_source">订阅源</string>
     <string name="rss_source_edit">编辑订阅源</string>
@@ -651,6 +658,33 @@
     <string name="toc_updateing">更新目录中</string>
     <string name="media_button_on_exit_title">全程响应耳机按键</string>
     <string name="media_button_on_exit_summary">即使退出软件也响应耳机按键</string>
+    <string name="contributors">开发人员</string>
+    <string name="contact">联系我们</string>
+    <string name="license">开源许可</string>
+    <string name="other" translatable="false">其它</string>
+    <string name="official_account" translatable="false">开源阅读软件</string>
+    <string name="follow_official_account">关注公众号</string>
+    <string name="wechat">微信</string>
+    <string name="thanks">您的支持是我更新的动力</string>
+    <string name="about_official_account">公众号[开源阅读软件]</string>
+    <string name="source_auto_changing">正在自动换源</string>
+    <string name="click_to_apply">点击加入</string>
     <string name="middle">中</string>
     <string name="information">信息</string>
+
+    <!--color-->
+    <string name="primary">主色调</string>
+    <string name="accent">强调色</string>
+    <string name="background_color">背景色</string>
+    <string name="navbar_color">底部操作栏颜色</string>
+    <string name="day">白天</string>
+    <string name="day_color_primary">白天，主色调</string>
+    <string name="day_color_accent">白天，强调色</string>
+    <string name="day_background_color">白天，背景色</string>
+    <string name="day_navbar_color">白天，底栏色</string>
+    <string name="night">夜间</string>
+    <string name="night_primary">夜间，主色调</string>
+    <string name="night_accent">夜间，强调色</string>
+    <string name="night_background_color">夜间，背景色</string>
+    <string name="night_navbar_color">夜间，底栏色</string>
 </resources>
diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml
index 2970ab12b..3c607cd9d 100644
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -4,8 +4,8 @@
 
     <io.legado.app.ui.widget.prefs.Preference
         android:key="contributors"
-        android:title="开发人员"
-        android:summary="gedoor,Invinciblelee等, 详情请在github中查看"
+            android:title="@string/contributors"
+            android:summary="gedoor,Invinciblelee等, 详情请在github中查看"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.Preference
@@ -21,23 +21,23 @@
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
-        android:title="联系我们"
-        app:layout="@layout/view_preference_category"
+            android:title="@string/contact"
+            app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="gzGzh"
-            android:title="关注公众号"
-            android:summary="开源阅读软件"
-            app:iconSpaceReserved="false" />
+                android:key="gzGzh"
+                android:title="@string/follow_official_account"
+                android:summary="@string/official_account"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="qq"
             android:title="@string/join_qq_group"
-            android:summary="点击加入"
-            app:iconSpaceReserved="false" />
+                android:summary="@string/click_to_apply"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="mail"
@@ -62,16 +62,16 @@
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
-        android:title="其它"
-        app:layout="@layout/view_preference_category"
+            android:title="@string/other"
+            app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="license"
-            android:title="开源许可"
-            app:iconSpaceReserved="false" />
+                android:key="license"
+                android:title="@string/license"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="disclaimer"
diff --git a/app/src/main/res/xml/donate.xml b/app/src/main/res/xml/donate.xml
index 8732f864c..7c86c54b7 100644
--- a/app/src/main/res/xml/donate.xml
+++ b/app/src/main/res/xml/donate.xml
@@ -3,16 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
-        android:title="微信"
-        app:layout="@layout/view_preference_category"
+        android:title="@string/wechat"
+            app:layout="@layout/view_preference_category"
         app:allowDividerAbove="false"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="gzGzh"
-            android:title="关注公众号"
-            android:summary="关注[开源阅读软件]点击广告支持我"
+                android:key="gzGzh"
+                android:title="@string/follow_official_account"
+                android:summary="关注[开源阅读软件]点击广告支持我"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
diff --git a/app/src/main/res/xml/pref_config_backup.xml b/app/src/main/res/xml/pref_config_backup.xml
index 4f635e310..515da6622 100644
--- a/app/src/main/res/xml/pref_config_backup.xml
+++ b/app/src/main/res/xml/pref_config_backup.xml
@@ -11,30 +11,30 @@
 
         <io.legado.app.ui.widget.prefs.EditTextPreference
             android:key="web_dav_url"
-            android:title="WebDav 服务器地址"
-            android:summary="@string/web_dav_url_s"
+                android:title="@string/web_dav_url"
+                android:summary="@string/web_dav_url_s"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.EditTextPreference
-            android:key="web_dav_account"
-            android:title="WebDav 账号"
-            android:summary="@string/web_dav_account_s"
+                android:key="web_dav_account"
+                android:title="@string/web_dav_account"
+                android:summary="@string/web_dav_account_s"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.EditTextPreference
-            android:key="web_dav_password"
-            android:title="WebDav 密码"
-            android:summary="@string/web_dav_pw_s"
+                android:key="web_dav_password"
+                android:title="@string/web_dav_pw"
+                android:summary="@string/web_dav_pw_s"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.SwitchPreference
-            android:key="webDavCreateDir"
-            android:defaultValue="true"
-            android:title="创建子文件夹"
-            android:summary="创建legado文件夹作为备份文件夹"
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:iconSpaceReserved="false" />
+                android:key="webDavCreateDir"
+                android:defaultValue="true"
+                android:title="@string/mkdirs"
+                android:summary="@string/mkdirs_description"
+                app:allowDividerAbove="false"
+                app:allowDividerBelow="false"
+                app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
@@ -44,24 +44,24 @@
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="backupUri"
-            android:title="备份路径"
-            app:iconSpaceReserved="false" />
+                android:key="backupUri"
+                android:title="@string/backup_path"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="web_dav_backup"
-            android:title="备份"
-            app:iconSpaceReserved="false" />
+                android:key="web_dav_backup"
+                android:title="@string/backup"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="web_dav_restore"
-            android:title="恢复"
-            app:iconSpaceReserved="false" />
+                android:key="web_dav_restore"
+                android:title="@string/restore"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="import_old"
-            android:title="导入旧版本数据"
-            app:iconSpaceReserved="false" />
+                android:key="import_old"
+                android:title="@string/menu_import_old_version"
+                app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml
index bf90dd7ab..94bef734c 100644
--- a/app/src/main/res/xml/pref_config_theme.xml
+++ b/app/src/main/res/xml/pref_config_theme.xml
@@ -42,86 +42,86 @@
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
-        android:title="白天"
-        app:layout="@layout/view_preference_category"
+        android:title="@string/day"
+            app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_light_blue_600"
-            android:key="colorPrimary"
-            android:summary="白天，主色调"
-            android:title="主色调"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_light_blue_600"
+                android:key="colorPrimary"
+                android:summary="@string/day_color_primary"
+                android:title="@string/primary"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_pink_800"
-            android:key="colorAccent"
-            android:summary="白天，强调色"
-            android:title="强调色"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_pink_800"
+                android:key="colorAccent"
+                android:summary="@string/day_color_accent"
+                android:title="@string/accent"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_grey_100"
-            android:key="colorBackground"
-            android:summary="白天，背景色"
-            android:title="背景色"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_grey_100"
+                android:key="colorBackground"
+                android:summary="@string/day_background_color"
+                android:title="@string/background_color"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_grey_200"
-            android:key="colorBottomBackground"
-            android:summary="白天，底栏色"
-            android:title="底部操作栏颜色"
-            app:cpv_dialogType="preset"
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_grey_200"
+                android:key="colorBottomBackground"
+                android:summary="@string/day_navbar_color"
+                android:title="@string/navbar_color"
+                app:cpv_dialogType="preset"
+                app:allowDividerAbove="false"
+                app:allowDividerBelow="false"
+                app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
-        android:title="夜间"
-        app:layout="@layout/view_preference_category"
+            android:title="@string/night"
+            app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_grey_900"
-            android:key="colorPrimaryNight"
-            android:summary="夜间，主色调"
-            android:title="主色调"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_grey_900"
+                android:key="colorPrimaryNight"
+                android:summary="@string/night_primary"
+                android:title="@string/primary"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_deep_orange_800"
-            android:key="colorAccentNight"
-            android:summary="夜间，强调色"
-            android:title="强调色"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_deep_orange_800"
+                android:key="colorAccentNight"
+                android:summary="@string/night_accent"
+                android:title="@string/accent"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_black_1000"
-            android:key="colorBackgroundNight"
-            android:summary="夜间，背景色"
-            android:title="背景色"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_black_1000"
+                android:key="colorBackgroundNight"
+                android:summary="@string/night_background_color"
+                android:title="@string/background_color"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.ColorPreference
-            android:defaultValue="@color/md_grey_800"
-            android:key="colorBottomBackgroundNight"
-            android:summary="夜间，底栏色"
-            android:title="底部操作栏颜色"
-            app:cpv_dialogType="preset"
-            app:iconSpaceReserved="false" />
+                android:defaultValue="@color/md_grey_800"
+                android:key="colorBottomBackgroundNight"
+                android:summary="@string/night_navbar_color"
+                android:title="@string/navbar_color"
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index 2526b1ba2..7c63c98fe 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -86,15 +86,15 @@
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="donate"
-            android:summary="您的支持是我更新的动力"
-            android:title="@string/donate"
+                android:summary="@string/thanks"
+                android:title="@string/donate"
             android:icon="@drawable/ic_cfg_jz"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
-            android:key="about"
-            android:summary="公众号[开源阅读软件]"
-            android:title="@string/about"
+                android:key="about"
+                android:summary="@string/about_official_account"
+                android:title="@string/about"
             android:icon="@drawable/ic_cfg_about"
             app:iconSpaceReserved="false" />