From 64dcc81a8ec1d316dabc5e96c5d576df8bfcf650 Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Mon, 7 Sep 2020 15:48:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=AD=98=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/config/ThemeConfigFragment.kt      |  4 +++
 app/src/main/res/values-zh-rHK/strings.xml    |  4 +--
 app/src/main/res/values-zh-rTW/strings.xml    |  4 +--
 app/src/main/res/values-zh/strings.xml        |  4 +--
 app/src/main/res/values/strings.xml           |  4 +--
 app/src/main/res/xml/pref_config_theme.xml    | 30 +++++++++----------
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
index 6a56b345f..4ac41081f 100644
--- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
@@ -166,6 +166,10 @@ class ThemeConfigFragment : BasePreferenceFragment(),
                     AppConfig.elevation = it
                     recreateActivities()
                 }
+            "saveDayTheme" -> {
+            }
+            "saveNightTheme" -> {
+            }
         }
         return super.onPreferenceTreeClick(preference)
     }
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 73b26d911..e9dc8e01c 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -445,8 +445,6 @@
     <string name="theme">主題</string>
     <string name="theme_mode">主題模式</string>
     <string name="theme_mode_desc">選擇主題模式</string>
-    <string name="default_theme">默認主題</string>
-    <string name="restore_default_theme">恢復主題為默認配色</string>
     <string name="join_qq_group">加入QQ羣</string>
     <string name="bg_image_per">獲取背景圖片需存儲權限</string>
     <string name="input_book_source_url">輸入書源網址</string>
@@ -758,4 +756,6 @@
     <string name="save_theme_config">保存主题配置</string>
     <string name="save_day_theme_summary">保存白天主题配置以共调用和分享</string>
     <string name="save_night_theme_summary">保存夜间主题配置以共调用和分享</string>
+    <string name="theme_list">主题列表</string>
+    <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1b7f51944..549b7ca89 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -446,8 +446,6 @@
     <string name="theme">主題</string>
     <string name="theme_mode">主題模式</string>
     <string name="theme_mode_desc">選擇主題模式</string>
-    <string name="default_theme">預設主題</string>
-    <string name="restore_default_theme">復原主題為預設配色</string>
     <string name="join_qq_group">加入QQ群</string>
     <string name="bg_image_per">獲取背景圖片需儲存權限</string>
     <string name="input_book_source_url">輸入書源網址</string>
@@ -758,5 +756,7 @@
     <string name="save_theme_config">保存主题配置</string>
     <string name="save_day_theme_summary">保存白天主题配置以共调用和分享</string>
     <string name="save_night_theme_summary">保存夜间主题配置以共调用和分享</string>
+    <string name="theme_list">主题列表</string>
+    <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 8635558f7..592bed1bc 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -448,8 +448,6 @@
     <string name="theme">主题</string>
     <string name="theme_mode">主题模式</string>
     <string name="theme_mode_desc">选择主题模式</string>
-    <string name="default_theme">默认主题</string>
-    <string name="restore_default_theme">恢复主题为默认配色</string>
     <string name="join_qq_group">加入QQ群</string>
     <string name="bg_image_per">获取背景图片需存储权限</string>
     <string name="input_book_source_url">输入书源网址</string>
@@ -758,4 +756,6 @@
     <string name="save_theme_config">保存主题配置</string>
     <string name="save_day_theme_summary">保存白天主题配置以共调用和分享</string>
     <string name="save_night_theme_summary">保存夜间主题配置以共调用和分享</string>
+    <string name="theme_list">主题列表</string>
+    <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab58e184f..33091d3c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -450,8 +450,6 @@
     <string name="theme">Theme</string>
     <string name="theme_mode">Theme mode</string>
     <string name="theme_mode_desc">Select a theme you want</string>
-    <string name="default_theme">Default theme</string>
-    <string name="restore_default_theme">Restore theme to default color</string>
     <string name="join_qq_group">Join QQ group</string>
     <string name="bg_image_per">Set the background image requires storage permission</string>
     <string name="input_book_source_url">Input book source address</string>
@@ -759,5 +757,7 @@
     <string name="save_theme_config">保存主题配置</string>
     <string name="save_day_theme_summary">保存白天主题配置以共调用和分享</string>
     <string name="save_night_theme_summary">保存夜间主题配置以共调用和分享</string>
+    <string name="theme_list">主题列表</string>
+    <string name="theme_list_summary">使用保存主题,导入,分享主题</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml
index 70f5790c3..673332a25 100644
--- a/app/src/main/res/xml/pref_config_theme.xml
+++ b/app/src/main/res/xml/pref_config_theme.xml
@@ -4,13 +4,13 @@
 
     <io.legado.app.ui.widget.prefs.IconListPreference
         android:defaultValue="ic_launcher"
+        android:entries="@array/icon_names"
+        android:entryValues="@array/icons"
         android:key="launcherIcon"
-        android:title="@string/change_icon"
         android:summary="@string/change_icon_summary"
-        android:entryValues="@array/icons"
-        android:entries="@array/icon_names"
-        app:icons="@array/icons"
-        app:iconSpaceReserved="false" />
+        android:title="@string/change_icon"
+        app:iconSpaceReserved="false"
+        app:icons="@array/icons" />
 
     <io.legado.app.ui.widget.prefs.SwitchPreference
         android:defaultValue="true"
@@ -34,19 +34,19 @@
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.Preference
-        android:key="defaultTheme"
-        android:summary="@string/restore_default_theme"
-        android:title="@string/default_theme"
+        android:key="themeList"
+        android:summary="@string/theme_list_summary"
+        android:title="@string/theme_list"
         app:allowDividerAbove="false"
         app:allowDividerBelow="false"
         app:iconSpaceReserved="false" />
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/day"
-        app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:layout="@layout/view_preference_category">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
             android:defaultValue="@color/md_light_blue_600"
@@ -77,15 +77,15 @@
             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:cpv_dialogType="preset"
             app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="saveDayTheme"
-            android:title="@string/save_theme_config"
             android:summary="@string/save_day_theme_summary"
+            android:title="@string/save_theme_config"
             app:allowDividerAbove="false"
             app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
@@ -94,10 +94,10 @@
 
     <io.legado.app.ui.widget.prefs.PreferenceCategory
         android:title="@string/night"
-        app:layout="@layout/view_preference_category"
         app:allowDividerAbove="true"
         app:allowDividerBelow="false"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:layout="@layout/view_preference_category">
 
         <io.legado.app.ui.widget.prefs.ColorPreference
             android:defaultValue="@color/md_grey_900"
@@ -133,8 +133,8 @@
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="saveNightTheme"
-            android:title="@string/save_theme_config"
             android:summary="@string/save_night_theme_summary"
+            android:title="@string/save_theme_config"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>