show current theme in settings

sdex · Aug 12, 2021 · 7b3a2c5 · 7b3a2c5
1 parent 7b43b8e
commit 7b3a2c5
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/app/src/main/java/com/sdex/activityrunner/manifest/ManifestViewerActivity.kt b/app/src/main/java/com/sdex/activityrunner/manifest/ManifestViewerActivity.kt
@@ -106,7 +106,7 @@ class ManifestViewerActivity : BaseActivity() {
         }
     }
 
-    private fun isNightTheme(theme: Int) =
+    private fun isNightTheme(@AppCompatDelegate.NightMode theme: Int) =
         theme == AppCompatDelegate.MODE_NIGHT_YES ||
                 (theme == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM &&
                         (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==

diff --git a/app/src/main/java/com/sdex/activityrunner/preferences/AppPreferences.kt b/app/src/main/java/com/sdex/activityrunner/preferences/AppPreferences.kt
@@ -37,6 +37,7 @@ class AppPreferences(context: Context) {
     val isRootIntegrationEnabled: Boolean
         get() = userPreferences.getBoolean(KEY_ROOT_INTEGRATION, false)
 
+    @AppCompatDelegate.NightMode
     val theme: Int
         get() = userPreferences.getString(KEY_THEME, null)?.toInt()
             ?: AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM

diff --git a/app/src/main/java/com/sdex/activityrunner/preferences/SettingsActivity.kt b/app/src/main/java/com/sdex/activityrunner/preferences/SettingsActivity.kt
@@ -9,9 +9,7 @@ import com.sdex.commons.BaseActivity
 
 class SettingsActivity : BaseActivity() {
 
-    override fun getLayout(): Int {
-        return R.layout.activity_settings
-    }
+    override fun getLayout() = R.layout.activity_settings
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/app/src/main/java/com/sdex/activityrunner/preferences/SettingsFragment.kt b/app/src/main/java/com/sdex/activityrunner/preferences/SettingsFragment.kt
@@ -32,9 +32,20 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         val themePreference = findPreference(KEY_THEME) as ListPreference?
-        themePreference?.setOnPreferenceChangeListener { _, newValue ->
-            AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt())
-            return@setOnPreferenceChangeListener true
+        themePreference?.summary = getCurrentTheme(AppPreferences(requireContext()).theme)
+            themePreference?.setOnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt())
+                themePreference.summary = getCurrentTheme(newValue.toString().toInt())
+                return@setOnPreferenceChangeListener true
+            }
+    }
+
+    private fun getCurrentTheme(@AppCompatDelegate.NightMode theme: Int): CharSequence? {
+        val values = resources.getStringArray(R.array.pref_appearance_theme_list_titles)
+        return when (theme) {
+            AppCompatDelegate.MODE_NIGHT_NO -> values[1]
+            AppCompatDelegate.MODE_NIGHT_YES -> values[2]
+            else -> values[0]
         }
     }
 

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -93,9 +93,6 @@
     <!-- settings -->
     <string name="pref_header_appearance">Внешний вид</string>
     <string name="pref_appearance_theme_title">Тема</string>
-    <string name="pref_appearance_theme_summary">Установить тему приложения</string>
-    <string name="pref_appearance_theme_black_title">Черный цвет</string>
-    <string name="pref_appearance_theme_black_summary">Для AMOLED экранов</string>
 
     <string name="pref_header_advanced">Дополнительно</string>
     <string name="pref_advanced_system_apps_title">Индикатор системных приложений</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -125,9 +125,6 @@
     <!-- settings -->
     <string name="pref_header_appearance">Appearance</string>
     <string name="pref_appearance_theme_title">Theme</string>
-    <string name="pref_appearance_theme_summary">Set application theme</string>
-    <string name="pref_appearance_theme_black_title">True black color</string>
-    <string name="pref_appearance_theme_black_summary">For AMOLED screens</string>
 
     <string name="pref_header_advanced">Advanced</string>
     <string name="pref_advanced_system_apps_title">Show system app indicator</string>

diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
@@ -29,7 +29,6 @@
             android:entries="@array/pref_appearance_theme_list_titles"
             android:entryValues="@array/pref_appearance_theme_list_values"
             android:key="appearance_theme"
-            android:summary="@string/pref_appearance_theme_summary"
             android:title="@string/pref_appearance_theme_title" />
 
     </androidx.preference.PreferenceCategory>