ソースを参照

主题设置项显示

HapeLee 1 年間 前
親
コミット
fb621d9639

+ 12 - 8
app/src/main/java/io/legato/kazusa/ui/config/ThemeConfigFragment.kt

@@ -145,10 +145,6 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
             upPreferenceSummary("colorPrimary", getString(R.string.seed_photo_alart))
             upPreferenceSummary(PreferKey.colorImage, getString(R.string.click_to_delete))
         }
-        if (!getPrefString(PreferKey.bgImage).isNullOrBlank())
-            upPreferenceSummary(PreferKey.bgImage, getString(R.string.click_to_delete))
-        if (!getPrefString(PreferKey.bgImageN).isNullOrBlank())
-            upPreferenceSummary(PreferKey.bgImageN, getString(R.string.click_to_delete))
         upPreferenceSummary(PreferKey.bgImage)
         upPreferenceSummary(PreferKey.bgImageN)
     }
@@ -218,6 +214,11 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
                 //recreateActivities()
             }
 
+            PreferKey.bgImage,
+            PreferKey.bgImageN -> {
+                upPreferenceSummary(key, getString(R.string.click_to_delete))
+            }
+
             PreferKey.colorImage -> handleRestartRequired()
 
             PreferKey.showDiscovery, PreferKey.showRss,
@@ -400,10 +401,13 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
             }
 
             PreferKey.bgImage,
-            PreferKey.bgImageN -> preference.summary = if (value.isNullOrBlank()) {
-                getString(R.string.select_image)
-            } else {
-                value
+            PreferKey.bgImageN -> {
+                val hasImage = !getPrefString(preferenceKey).isNullOrBlank()
+                preference.summary = if (hasImage) {
+                    getString(R.string.click_to_delete)
+                } else {
+                    getString(R.string.select_image)
+                }
             }
 
             else -> preference.summary = value