优化

app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt

@@ -164,37 +164,9 @@ class ThemeConfigFragment : BasePreferenceFragment(),
                     recreateActivities()
                 }
             "themeList" -> ThemeListDialog().show(childFragmentManager, "themeList")
-            "saveDayTheme", "saveNightTheme" -> saveThemeAlert(key)
+            "saveDayTheme", "saveNightTheme" -> alertSaveTheme(key)
-            PreferKey.bgImage -> if (getPrefString(PreferKey.bgImage).isNullOrEmpty()) {
+            PreferKey.bgImage -> selectBgAction(false)
-                selectImage.launch(requestCodeBgLight)
+            PreferKey.bgImageN -> selectBgAction(true)
-            } else {
-                selector(items = arrayListOf("删除图片", "选择图片")) { _, i ->
-                    if (i == 0) {
-                        removePref(PreferKey.bgImage)
-                        upTheme(false)
-                    } else {
-                        selectImage.launch(requestCodeBgLight)
-                    }
-                }
-            }
-            PreferKey.bgImageN -> if (getPrefString(PreferKey.bgImageN).isNullOrEmpty()) {
-                selectImage.launch(requestCodeBgDark)
-            } else {
-                selector(items = arrayListOf("删除图片", "选择图片")) { _, i ->
-                    if (i == 0) {
-                        removePref(PreferKey.bgImageN)
-                        upTheme(true)
-                    } else {
-                        selectImage.launch(requestCodeBgDark)
-                    }
-                }
-            }
-            PreferKey.bgImageBlurring -> alertImageBlurring(PreferKey.bgImageBlurring) {
-                upTheme(false)
-            }
-            PreferKey.bgImageNBlurring -> alertImageBlurring(PreferKey.bgImageNBlurring) {
-                upTheme(true)
-            }
             PreferKey.defaultCover -> if (getPrefString(PreferKey.defaultCover).isNullOrEmpty()) {
                 selectImage.launch(requestCodeCover)
             } else {
@@ -223,7 +195,7 @@ class ThemeConfigFragment : BasePreferenceFragment(),
     }
 
     @SuppressLint("InflateParams")
-    private fun saveThemeAlert(key: String) {
+    private fun alertSaveTheme(key: String) {
         alert(R.string.theme_name) {
             val alertBinding = DialogEditTextBinding.inflate(layoutInflater).apply {
                 textInputLayout.hint = "name"
@@ -245,6 +217,36 @@ class ThemeConfigFragment : BasePreferenceFragment(),
         }.show()
     }
 
+    private fun selectBgAction(isNight: Boolean) {
+        val bgKey = if (isNight) PreferKey.bgImageN else PreferKey.bgImage
+        val blurringKey = if (isNight) PreferKey.bgImageNBlurring else PreferKey.bgImageBlurring
+        val actions = arrayListOf(
+            getString(R.string.background_image_blurring),
+            getString(R.string.select_image)
+        )
+        if (!getPrefString(bgKey).isNullOrEmpty()) {
+            actions.add(getString(R.string.delete))
+        }
+        selector(items = actions) { _, i ->
+            when (i) {
+                0 -> alertImageBlurring(blurringKey) {
+                    upTheme(isNight)
+                }
+                1 -> {
+                    if (isNight) {
+                        selectImage.launch(requestCodeBgDark)
+                    } else {
+                        selectImage.launch(requestCodeBgLight)
+                    }
+                }
+                2 -> {
+                    removePref(bgKey)
+                    upTheme(isNight)
+                }
+            }
+        }
+    }
+
     private fun alertImageBlurring(preferKey: String, success: () -> Unit) {
         alert(R.string.background_image_blurring) {
             val alertBinding = DialogImageBlurringBinding.inflate(layoutInflater).apply {

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

@@ -82,14 +82,6 @@
             app:cpv_dialogType="preset"
             app:iconSpaceReserved="false" />
 
-        <io.legado.app.ui.widget.prefs.Preference
-            android:key="backgroundImage"
-            android:title="@string/background_image" />
-
-        <io.legado.app.ui.widget.prefs.Preference
-            android:key="backgroundImageBlurring"
-            android:title="@string/background_image_blurring" />
-
         <io.legado.app.ui.widget.prefs.ColorPreference
             android:defaultValue="@color/md_grey_200"
             android:key="colorBottomBackground"
@@ -100,12 +92,13 @@
             app:cpv_dialogType="preset"
             app:iconSpaceReserved="false" />
 
+        <io.legado.app.ui.widget.prefs.Preference
+            android:key="backgroundImage"
+            android:title="@string/background_image" />
+
         <io.legado.app.ui.widget.prefs.Preference
             android:key="defaultCover"
-            android:title="@string/default_cover"
+            android:title="@string/default_cover" />
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="saveDayTheme"
@@ -149,14 +142,6 @@
             app:cpv_dialogType="preset"
             app:iconSpaceReserved="false" />
 
-        <io.legado.app.ui.widget.prefs.Preference
-            android:key="backgroundImageNight"
-            android:title="@string/background_image" />
-
-        <io.legado.app.ui.widget.prefs.Preference
-            android:key="backgroundImageNightBlurring"
-            android:title="@string/background_image_blurring" />
-
         <io.legado.app.ui.widget.prefs.ColorPreference
             android:defaultValue="@color/md_grey_800"
             android:key="colorBottomBackgroundNight"
@@ -165,17 +150,20 @@
             app:cpv_dialogType="preset"
             app:iconSpaceReserved="false" />
 
+        <io.legado.app.ui.widget.prefs.Preference
+            android:key="backgroundImageNight"
+            android:title="@string/background_image" />
+
         <io.legado.app.ui.widget.prefs.Preference
             android:key="defaultCoverDark"
-            android:title="@string/default_cover"
+            android:title="@string/default_cover" />
-            app:allowDividerAbove="false"
-            app:allowDividerBelow="false"
-            app:iconSpaceReserved="false" />
 
         <io.legado.app.ui.widget.prefs.Preference
             android:key="saveNightTheme"
             android:summary="@string/save_night_theme_summary"
             android:title="@string/save_theme_config"
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
             app:iconSpaceReserved="false" />
 
     </io.legado.app.ui.widget.prefs.PreferenceCategory>