From de0e04176c227097205f6042cdf5dcefa6989cdd Mon Sep 17 00:00:00 2001
From: GKF <gekunfei@live.com>
Date: Tue, 11 Jun 2019 11:17:47 +0800
Subject: [PATCH] up

---
 app/src/main/res/xml/pref_config_theme.xml |  2 +-
 app/src/main/res/xml/pref_main.xml         | 65 ++++++++++++++++------
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml
index 510ce3603..f5013bd7b 100644
--- a/app/src/main/res/xml/pref_config_theme.xml
+++ b/app/src/main/res/xml/pref_config_theme.xml
@@ -31,7 +31,7 @@
         android:title="@string/e_ink_mode"
         app:iconSpaceReserved="false" />
 
-    <Preference
+    <androidx.preference.Preference
         android:key="defaultTheme"
         android:summary="@string/restore_default_theme"
         android:title="@string/default_theme"
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
index e8039bbfc..4cc79904a 100644
--- a/app/src/main/res/xml/pref_main.xml
+++ b/app/src/main/res/xml/pref_main.xml
@@ -2,24 +2,6 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.preference.Preference
-        android:key="setting"
-        android:title="设置"
-        android:summary="与功能相关的一些设置"
-        app:iconSpaceReserved="false" />
-
-    <androidx.preference.Preference
-        android:key="web_dav_setting"
-        android:title="云备份设置"
-        android:summary="通过WebDav云备份"
-        app:iconSpaceReserved="false" />
-
-    <androidx.preference.Preference
-        android:key="theme_setting"
-        android:title="主题设置"
-        android:summary="与界面/颜色相关的一些设置"
-        app:iconSpaceReserved="false" />
-
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
         android:defaultValue="false"
         android:key="isNightTheme"
@@ -27,4 +9,51 @@
         android:title="暗色主题"
         app:iconSpaceReserved="false" />
 
+    <io.legado.app.lib.theme.prefs.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="webService"
+        android:summary="开启/关闭Web阅读和写源"
+        android:title="Web服务"
+        app:iconSpaceReserved="false" />
+
+    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory
+        android:title="设置"
+        app:iconSpaceReserved="false">
+
+        <androidx.preference.Preference
+            android:key="web_dav_setting"
+            android:summary="通过WebDav云备份"
+            android:title="云备份设置"
+            app:iconSpaceReserved="false" />
+
+        <androidx.preference.Preference
+            android:key="theme_setting"
+            android:summary="与界面/颜色相关的一些设置"
+            android:title="主题设置"
+            app:iconSpaceReserved="false" />
+
+        <androidx.preference.Preference
+            android:key="setting"
+            android:summary="与功能相关的一些设置"
+            android:title="其它设置"
+            app:iconSpaceReserved="false" />
+
+    </io.legado.app.lib.theme.prefs.ATEPreferenceCategory>
+
+    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory app:iconSpaceReserved="false">
+
+        <androidx.preference.Preference
+            android:key="about"
+            android:summary="您的支持是我更新的动力"
+            android:title="@string/donate"
+            app:iconSpaceReserved="false" />
+
+        <androidx.preference.Preference
+            android:key="about"
+            android:summary="公众号[开源阅读软件]"
+            android:title="@string/about"
+            app:iconSpaceReserved="false" />
+
+    </io.legado.app.lib.theme.prefs.ATEPreferenceCategory>
+
 </androidx.preference.PreferenceScreen>
\ No newline at end of file