From 3cbacc8644aa1468a8d453ec829ce3da61664688 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Mon, 15 Feb 2021 16:16:51 +0800
Subject: [PATCH] [app] Update dark mode strings

---
 app/src/main/res/values-ru/strings.xml     |  4 ----
 app/src/main/res/values-uk/strings.xml     |  4 ----
 app/src/main/res/values-zh-rCN/strings.xml |  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/arrays.xml         |  6 +++---
 app/src/main/res/values/strings.xml        |  4 ----
 app/src/main/res/xml/prefs.xml             | 21 ++++++++++-----------
 8 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6233a507..bc4a5b81 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,7 +41,6 @@
     <string name="dont_show_again">Больше не показывать</string>
     <string name="enable_module">Включить модуль</string>
     <string name="failed_to_save_scope_list">Не удалось сохранить список областей</string>
-    <string name="follow_system">Системная</string>
     <string name="info">Информация</string>
     <string name="install_warning_title">Осторожно!</string>
     <string name="loading">Загрузка…</string>
@@ -101,9 +100,6 @@
     <string name="settings_restore_failed">Не удалось восстановить</string>
     <string name="settings_restore_success">Восстановление завершено!</string>
     <string name="settings_restoring">Восстановление…</string>
-    <string name="settings_theme">Тема</string>
-    <string name="settings_theme_dark">Темная</string>
-    <string name="settings_theme_light">Светлая</string>
     <string name="settings_variant">Вариант</string>
     <string name="sort_by_install_time">Сортировать по времени установки</string>
     <string name="sort_by_install_time_reverse">Сортировать по времени установки (обратный)</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7401635d..f673f847 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -40,7 +40,6 @@
     <string name="dont_show_again">Не показувати знову</string>
     <string name="enable_module">Увімкнути модуль</string>
     <string name="failed_to_save_scope_list">Не вдалося зберегти список областей</string>
-    <string name="follow_system">Слідувати системі</string>
     <string name="info">Інформація</string>
     <string name="install_warning_title">Обережно!</string>
     <string name="loading">Завантаження…</string>
@@ -100,9 +99,6 @@
     <string name="settings_restore_failed">Не вдалося відновити</string>
     <string name="settings_restore_success">Відновлення закінчено!</string>
     <string name="settings_restoring">Відновлення…</string>
-    <string name="settings_theme">Тема</string>
-    <string name="settings_theme_dark">Темна</string>
-    <string name="settings_theme_light">Світла</string>
     <string name="settings_variant">Варіант</string>
     <string name="sort_by_install_time">Сортувати за часом встановлення</string>
     <string name="sort_by_install_time_reverse">Сортувати за часом встановлення (зворотній)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 71343144..aefe145a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -64,9 +64,6 @@
 
     <!-- Settings tab -->
     <string name="settings_group_framework">框架</string>
-    <string name="settings_theme">主题</string>
-    <string name="settings_theme_light">亮色</string>
-    <string name="settings_theme_dark">暗色</string>
 
     <!-- Support tab -->
 
@@ -103,7 +100,6 @@
     <string name="compile_failed">优化失败或返回值为空</string>
     <string name="compile_failed_with_info">优化失败: </string>
     <string name="not_installed">未安装</string>
-    <string name="follow_system">跟随系统</string>
     <string name="pure_black_dark_theme">使用纯黑深色主题</string>
     <string name="sort_by_name">应用名称</string>
     <string name="sort_by_name_reverse">应用名称（降序）</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 9a6f4c1a..ff047661 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -63,9 +63,6 @@
 
     <!-- Settings tab -->
     <string name="settings_group_framework">框架</string>
-    <string name="settings_theme">主題</string>
-    <string name="settings_theme_light">亮色</string>
-    <string name="settings_theme_dark">暗色</string>
 
     <!-- Support tab -->
 
@@ -100,7 +97,6 @@
     <string name="app_launch">運行</string>
     <string name="compile_failed">優化失敗或返回值為空</string>
     <string name="not_installed">未安裝</string>
-    <string name="follow_system">跟隨系統</string>
     <string name="pure_black_dark_theme">使用純黑深色主題</string><![CDATA[>
 
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 23240067..9ed82012 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -44,11 +44,8 @@
 
     <!-- Settings tab -->
     <string name="settings_group_framework">框架</string>
-    <string name="settings_theme">主題</string>
     <string name="settings_enable_resources">啟用資源鉤子</string>
     <string name="settings_enable_resources_summary"><b>警告: </b> 資源鉤子已被棄用</string>
-    <string name="settings_theme_light">亮色</string>
-    <string name="settings_theme_dark">暗色</string>
 
     <!-- Support tab -->
 
@@ -89,7 +86,6 @@
     <string name="compile_failed_with_info">最佳化失敗: </string>
     <string name="not_installed">未安裝</string>
     <string name="pure_black_dark_theme">使用純黑深色主題</string>
-    <string name="follow_system">跟隨系統</string>
     <string name="sort_by_name">程式名稱</string>
     <string name="sort_by_name_reverse">程式名稱（降序）</string>
     <string name="sort_by_package_name">包體名稱</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 29783c98..f50460cb 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -22,9 +22,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
 
     <string-array name="theme_texts" translatable="false">
-        <item>@string/follow_system</item>
-        <item>@string/settings_theme_light</item>
-        <item>@string/settings_theme_dark</item>
+        <item>@string/dark_theme_follow_system</item>
+        <item>@string/dark_theme_off</item>
+        <item>@string/dark_theme_on</item>
     </string-array>
 
     <string-array name="theme_values" translatable="false">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 226fff02..4d2c1620 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,9 +67,6 @@
     <string name="settings_group_framework">Framework</string>
     <string name="settings_enable_resources">Enable resource hooks</string>
     <string name="settings_enable_resources_summary"><b>WARNING:</b> Resource hooks are deprecated</string>
-    <string name="settings_theme">Theme</string>
-    <string name="settings_theme_light">Light</string>
-    <string name="settings_theme_dark">Dark</string>
 
     <!-- Support tab -->
 
@@ -112,7 +109,6 @@
     <string name="compile_failed_with_info">Optimization failed: </string>
     <string name="not_installed">Not installed</string>
     <string name="pure_black_dark_theme">Use the pure black dark theme</string>
-    <string name="follow_system">Follow system</string>
     <string name="sort_by_name">Sort by application name</string>
     <string name="sort_by_name_reverse">Sort by application name (reverse)</string>
     <string name="sort_by_package_name">Sort by package name</string>
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index d5b7642e..4c866beb 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -18,10 +18,9 @@
   ~ Copyright (C) 2021 LSPosed Contributors
   -->
 
-<!--suppress ALL -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <PreferenceCategory
+    <com.takisoft.preferencex.PreferenceCategory
         android:key="group_network"
         android:title="@string/group_network"
         app:iconSpaceReserved="false">
@@ -32,9 +31,9 @@
             android:summary="@string/dns_over_http_summary"
             android:title="@string/dns_over_http"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </com.takisoft.preferencex.PreferenceCategory>
 
-    <PreferenceCategory
+    <com.takisoft.preferencex.PreferenceCategory
         android:title="@string/settings_group_theme"
         app:iconSpaceReserved="false">
         <io.github.lsposed.manager.util.theme.ThemeColorPreference
@@ -49,20 +48,20 @@
             android:entryValues="@array/theme_values"
             android:key="theme"
             android:summary="%s"
-            android:title="@string/settings_theme"
+            android:title="@string/dark_theme"
             app:iconSpaceReserved="false" />
         <SwitchPreference
             android:key="black_dark_theme"
             android:title="@string/pure_black_dark_theme"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </com.takisoft.preferencex.PreferenceCategory>
 
-    <PreferenceCategory
+    <com.takisoft.preferencex.PreferenceCategory
         android:key="group_framework"
         android:title="@string/settings_group_framework"
         app:iconSpaceReserved="false">
 
-        <SimpleMenuPreference
+        <com.takisoft.preferencex.SimpleMenuPreference
             android:defaultValue="1"
             android:entries="@array/variant_texts"
             android:entryValues="@array/variant_values"
@@ -86,9 +85,9 @@
             android:title="@string/pref_title_disable_verbose_log"
             android:persistent="false"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </com.takisoft.preferencex.PreferenceCategory>
 
-    <PreferenceCategory
+    <com.takisoft.preferencex.PreferenceCategory
         android:key="group_backup"
         android:title="@string/settings_backup_and_restore"
         app:iconSpaceReserved="false">
@@ -103,5 +102,5 @@
         <Preference
             android:summary="@string/settings_backup_and_restore_summery"
             app:iconSpaceReserved="false" />
-    </PreferenceCategory>
+    </com.takisoft.preferencex.PreferenceCategory>
 </PreferenceScreen>