diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt index 484d70bc0..12b665248 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt @@ -96,10 +96,7 @@ class AppearanceSettingsFragment : SubScreenFragment() { colorsPref.apply { entryValues = if (style == KeyboardTheme.STYLE_HOLO) KeyboardTheme.COLORS else KeyboardTheme.COLORS.filterNot { it == KeyboardTheme.THEME_HOLO_WHITE }.toTypedArray() - entries = entryValues.map { - val resId = resources.getIdentifier("theme_name_$it", "string", requireContext().packageName) - if (resId == 0) it else getString(resId) - }.toTypedArray() + entries = entryValues.getNamesFromResourcesIfAvailable("theme_name_") if (value !in entryValues) value = entryValues.first().toString() summary = entries[entryValues.indexOfFirst { it == value }] @@ -113,10 +110,7 @@ class AppearanceSettingsFragment : SubScreenFragment() { colorsNightPref?.apply { entryValues = if (style == KeyboardTheme.STYLE_HOLO) KeyboardTheme.COLORS_DARK else KeyboardTheme.COLORS_DARK.filterNot { it == KeyboardTheme.THEME_HOLO_WHITE }.toTypedArray() - entries = entryValues.map { - val resId = resources.getIdentifier("theme_name_$it", "string", requireContext().packageName) - if (resId == 0) it else getString(resId) - }.toTypedArray() + entries = entryValues.getNamesFromResourcesIfAvailable("theme_name_") if (value !in entryValues) value = entryValues.first().toString() summary = entries[entryValues.indexOfFirst { it == value }] @@ -132,10 +126,7 @@ class AppearanceSettingsFragment : SubScreenFragment() { private fun setupTheme() { stylePref.apply { entryValues = KeyboardTheme.STYLES - entries = entryValues.map { - val resId = resources.getIdentifier("style_name_$it", "string", requireContext().packageName) - if (resId == 0) it else getString(resId) - }.toTypedArray() + entries = entryValues.getNamesFromResourcesIfAvailable("style_name_") if (value !in entryValues) value = entryValues.first().toString() @@ -179,6 +170,11 @@ class AppearanceSettingsFragment : SubScreenFragment() { }) } + private fun Array.getNamesFromResourcesIfAvailable(prefix: String) = + map { val resId = resources.getIdentifier("$prefix$it", "string", requireContext().packageName) + if (resId == 0) it else getString(resId) + }.toTypedArray() + companion object { private const val PERCENTAGE_FLOAT = 100.0f } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d7702a90..b870384da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -238,8 +238,6 @@ Keyboard height scale Bottom padding scale - - Set size of the empty space below the keyboard English (UK) diff --git a/app/src/main/res/xml/prefs_screen_appearance.xml b/app/src/main/res/xml/prefs_screen_appearance.xml index 2a8a0bca1..444ea8240 100644 --- a/app/src/main/res/xml/prefs_screen_appearance.xml +++ b/app/src/main/res/xml/prefs_screen_appearance.xml @@ -84,7 +84,6 @@