up

app/src/main/res/xml/pref_config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
+<androidx.preference.PreferenceScreen
 >
 
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>

app/src/main/res/xml/pref_config_theme.xml

@@ -1,85 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:app="http://schemas.android.com/apk/res-auto">
+<androidx.preference.PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
             android:defaultValue="false"
             android:key="immersionStatusBar"
             android:summary="@string/status_bar_immersion"
-            android:title="@string/immersion_status_bar"/>
+            android:title="@string/immersion_status_bar"
+            app:iconSpaceReserved="false"/>
 
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
             android:defaultValue="false"
             android:key="navigationBarColorChange"
             android:summary="@string/navigation_bar_color_change_s"
-            android:title="@string/navigation_bar_color_change"/>
+            android:title="@string/navigation_bar_color_change"
+            app:iconSpaceReserved="false"/>
 
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
             android:defaultValue="true"
             android:key="behaviorMain"
             android:summary="@string/behavior_main_s"
-            android:title="@string/behavior_main_t"/>
+            android:title="@string/behavior_main_t"
+            app:iconSpaceReserved="false"/>
 
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
             android:defaultValue="false"
             android:key="E-InkMode"
             android:summary="@string/e_ink_mode_detail"
-            android:title="@string/e_ink_mode"/>
+            android:title="@string/e_ink_mode"
+            app:iconSpaceReserved="false"/>
 
     <Preference
             android:key="defaultTheme"
             android:summary="@string/restore_default_theme"
-            android:title="@string/default_theme"/>
+            android:title="@string/default_theme"
+            app:iconSpaceReserved="false"/>
 
-    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory android:title="白天">
+    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory
+            android:title="白天"
+            app:iconSpaceReserved="false">
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_grey_100"
                 android:key="colorPrimary"
                 android:summary="白天，主色调"
                 android:title="主色调"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_pink_600"
                 android:key="colorAccent"
                 android:summary="白天，强调色"
                 android:title="强调色"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_grey_100"
                 android:key="colorBackground"
                 android:summary="白天，背景色"
                 android:title="背景色"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
     </io.legado.app.lib.theme.prefs.ATEPreferenceCategory>
 
-    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory android:title="夜间">
+    <io.legado.app.lib.theme.prefs.ATEPreferenceCategory
+            android:title="夜间"
+            app:iconSpaceReserved="false">
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_grey_800"
                 android:key="colorPrimaryNight"
                 android:summary="夜间，主色调"
                 android:title="主色调"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_pink_800"
                 android:key="colorAccentNight"
                 android:summary="夜间，强调色"
                 android:title="强调色"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
         <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
                 android:defaultValue="@color/md_grey_800"
                 android:key="colorBackgroundNight"
                 android:summary="夜间，背景色"
                 android:title="背景色"
-                app:cpv_dialogType="preset"/>
+                app:cpv_dialogType="preset"
+                app:iconSpaceReserved="false"/>
 
     </io.legado.app.lib.theme.prefs.ATEPreferenceCategory>
 
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>