From e7c50cf12560b594a9ba457f55466430af4801c1 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 23 May 2020 20:16:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/widget/prefs/PreferenceCategory.kt |  10 +-
 .../app/ui/widget/prefs/SwitchPreference.kt   |   2 +-
 .../res/layout/view_preference_category.xml   |   1 +
 app/src/main/res/xml/pref_config_read.xml     | 157 +++++++++---------
 4 files changed, 88 insertions(+), 82 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
index 9cf6c2bfd..c150dbe56 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/PreferenceCategory.kt
@@ -12,7 +12,6 @@ import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ColorUtils
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.backgroundColor
-import io.legado.app.utils.getCompatColor
 
 
 class PreferenceCategory(context: Context, attrs: AttributeSet) : PreferenceCategory(context, attrs) {
@@ -28,12 +27,9 @@ class PreferenceCategory(context: Context, attrs: AttributeSet) : PreferenceCate
             val view = it.findViewById(R.id.preference_title)
             if (view is TextView) {  //  && !view.isInEditMode
                 view.text = title
-                if (view.isInEditMode) {
-                    view.setTextColor(context.getCompatColor(R.color.colorAccent))
-                } else {
-                    view.setBackgroundColor(context.backgroundColor)
-                    view.setTextColor(context.accentColor)
-                }
+                if (view.isInEditMode) return
+                view.setBackgroundColor(context.backgroundColor)
+                view.setTextColor(context.accentColor)
                 view.isVisible = title != null && title.isNotEmpty()
 
                 val da = it.findViewById(R.id.preference_divider_above)
diff --git a/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt b/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
index 2f6becfc2..41038169f 100644
--- a/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
+++ b/app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt
@@ -26,7 +26,7 @@ class SwitchPreference(context: Context, attrs: AttributeSet) :
             widgetLayoutResource,
             R.id.switchWidget
         )
-        if (v is SwitchCompat) {
+        if (v is SwitchCompat && !v.isInEditMode) {
             ATH.setTint(v, context.accentColor)
         }
         super.onBindViewHolder(holder)
diff --git a/app/src/main/res/layout/view_preference_category.xml b/app/src/main/res/layout/view_preference_category.xml
index 72cf9b5ca..6bdc58c5a 100644
--- a/app/src/main/res/layout/view_preference_category.xml
+++ b/app/src/main/res/layout/view_preference_category.xml
@@ -19,6 +19,7 @@
         android:paddingLeft="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textColor="@color/colorAccent"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <View
diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml
index 1ed0294e5..4f9a5b80f 100644
--- a/app/src/main/res/xml/pref_config_read.xml
+++ b/app/src/main/res/xml/pref_config_read.xml
@@ -2,79 +2,88 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <io.legado.app.ui.widget.prefs.NameListPreference
-        android:key="@string/pk_requested_direction"
-        android:defaultValue="0"
-        android:title="@string/screen_direction"
-        android:entries="@array/screen_direction_title"
-        android:entryValues="@array/screen_direction_value"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.NameListPreference
-        android:key="keep_light"
-        android:defaultValue="0"
-        android:entryValues="@array/screen_time_out_value"
-        android:entries="@array/screen_time_out"
-        android:title="@string/keep_light"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:title="@string/pt_hide_status_bar"
-        android:key="hideStatusBar"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="true"
-        android:title="@string/read_body_to_lh"
-        android:key="readBodyToLh"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:title="@string/pt_hide_navigation_bar"
-        android:key="hideNavigationBar"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="true"
-        android:title="@string/volume_key_page"
-        android:key="volumeKeyPage"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="true"
-        android:title="@string/click_turn_page"
-        android:key="clickTurnPage"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:title="@string/click_all_next_page"
-        android:key="clickAllNext"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:title="@string/volume_key_page_on_play"
-        android:key="volumeKeyPageOnPlay"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="true"
-        android:title="@string/auto_change_source"
-        android:key="autoChangeSource"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.SwitchPreference
-        android:defaultValue="false"
-        android:title="@string/selectText"
-        android:key="selectText"
-        app:iconSpaceReserved="false" />
-
-    <io.legado.app.ui.widget.prefs.Preference
-        android:key="customPageKey"
-        android:title="@string/custom_page_key"
-        app:iconSpaceReserved="false" />
+    <io.legado.app.ui.widget.prefs.PreferenceCategory
+        android:title="@string/setting"
+        app:allowDividerAbove="false"
+        app:allowDividerBelow="false"
+        app:iconSpaceReserved="false">
+
+        <io.legado.app.ui.widget.prefs.NameListPreference
+            android:key="@string/pk_requested_direction"
+            android:defaultValue="0"
+            android:title="@string/screen_direction"
+            android:entries="@array/screen_direction_title"
+            android:entryValues="@array/screen_direction_value"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.NameListPreference
+            android:key="keep_light"
+            android:defaultValue="0"
+            android:entryValues="@array/screen_time_out_value"
+            android:entries="@array/screen_time_out"
+            android:title="@string/keep_light"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/pt_hide_status_bar"
+            android:key="hideStatusBar"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:title="@string/read_body_to_lh"
+            android:key="readBodyToLh"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/pt_hide_navigation_bar"
+            android:key="hideNavigationBar"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:title="@string/volume_key_page"
+            android:key="volumeKeyPage"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:title="@string/click_turn_page"
+            android:key="clickTurnPage"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/click_all_next_page"
+            android:key="clickAllNext"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/volume_key_page_on_play"
+            android:key="volumeKeyPageOnPlay"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="true"
+            android:title="@string/auto_change_source"
+            android:key="autoChangeSource"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.SwitchPreference
+            android:defaultValue="false"
+            android:title="@string/selectText"
+            android:key="selectText"
+            app:iconSpaceReserved="false" />
+
+        <io.legado.app.ui.widget.prefs.Preference
+            android:key="customPageKey"
+            android:title="@string/custom_page_key"
+            app:iconSpaceReserved="false" />
+
+
+    </io.legado.app.ui.widget.prefs.PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file