From 08713e392203dacf2c9c2cb97463fe318d3af2d8 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Fri, 16 Dec 2022 01:43:18 +0800
Subject: [PATCH] Use SummaryProvider instead of String formatting marker

---
 .../java/com/hippo/ehviewer/ui/fragment/EhFragment.kt |  5 +++++
 app/src/main/res/xml/advanced_settings.xml            |  4 ++--
 app/src/main/res/xml/eh_settings.xml                  | 11 +++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt
index 5cb4f1584..282d94b7f 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.kt
@@ -19,6 +19,7 @@ import android.app.Activity
 import android.content.res.Configuration
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
@@ -36,6 +37,7 @@ class EhFragment : BasePreferenceFragment() {
         val listThumbSize = findPreference<Preference>(Settings.KEY_LIST_THUMB_SIZE)
         val detailSize = findPreference<Preference>(Settings.KEY_DETAIL_SIZE)
         val thumbSize = findPreference<Preference>(Settings.KEY_THUMB_SIZE)
+        val thumbResolution = findPreference<Preference>(Settings.KEY_THUMB_RESOLUTION)
         val showTagTranslations = findPreference<Preference>(Settings.KEY_SHOW_TAG_TRANSLATIONS)
         val tagTranslationsSource = findPreference<Preference>("tag_translations_source")
         Settings.getDisplayName()?.let { account?.summary = it }
@@ -47,6 +49,9 @@ class EhFragment : BasePreferenceFragment() {
         thumbSize!!.onPreferenceChangeListener = this
         showTagTranslations!!.onPreferenceChangeListener = this
         blackDarkTheme!!.onPreferenceChangeListener = this
+        thumbResolution!!.setSummaryProvider {
+            getString(R.string.settings_eh_thumb_resolution_summary, (it as ListPreference).entry)
+        }
         if (!EhTagDatabase.isTranslatable(requireActivity())) {
             preferenceScreen.removePreference(showTagTranslations)
             preferenceScreen.removePreference(tagTranslationsSource!!)
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index 35e77b963..74664dd9a 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -46,19 +46,19 @@
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="320"
         android:key="read_cache_size"
-        android:summary="%s"
         android:title="@string/settings_advanced_read_cache_size"
         app:entries="@array/read_cache_size_entries"
         app:entryValues="@array/read_cache_size_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="system"
         android:key="app_language"
-        android:summary="%s"
         android:title="@string/settings_advanced_app_language_title"
         app:entries="@array/app_language_entries"
         app:entryValues="@array/app_language_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.ProxyPreference
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index 9253f1434..c14251732 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -26,10 +26,10 @@
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="1"
         android:key="gallery_site"
-        android:summary="%s"
         android:title="@string/settings_eh_gallery_site"
         app:entries="@array/gallery_site_entries"
         app:entryValues="@array/gallery_site_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <com.hippo.ehviewer.preference.SignInRequiredPreference
@@ -49,8 +49,8 @@
         android:entries="@array/night_mode_entries"
         android:entryValues="@array/night_mode_values"
         android:key="theme"
-        android:summary="%s"
         android:title="@string/dark_theme"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <rikka.material.preference.MaterialSwitchPreference
@@ -61,19 +61,19 @@
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="launch_page"
-        android:summary="%s"
         android:title="@string/settings_eh_launch_page"
         app:entries="@array/launch_page_entries"
         app:entryValues="@array/launch_page_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="list_mode"
-        android:summary="%s"
         android:title="@string/settings_eh_list_mode"
         app:entries="@array/list_mode_entries"
         app:entryValues="@array/list_mode_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <SeekBarPreference
@@ -88,10 +88,10 @@
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="detail_size"
-        android:summary="%s"
         android:title="@string/settings_eh_detail_size"
         app:entries="@array/detail_size_entries"
         app:entryValues="@array/detail_size_entry_values"
+        app:useSimpleSummaryProvider="true"
         app:iconSpaceReserved="false" />
 
     <SeekBarPreference
@@ -107,7 +107,6 @@
     <rikka.preference.SimpleMenuPreference
         android:defaultValue="0"
         android:key="thumb_resolution"
-        android:summary="@string/settings_eh_thumb_resolution_summary"
         android:title="@string/settings_eh_thumb_resolution"
         app:entries="@array/thumb_resolution_entries"
         app:entryValues="@array/thumb_resolution_entry_values"