luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-17 07:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove traces old name theme family/variant

Browse source
This commit is contained in:
Helium314 2023-11-03 12:42:23 +01:00
parent 1c0fb0c672
commit f8165e5505
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt
View file

@ -38,7 +38,7 @@ class AppearanceSettingsFragment : SubScreenFragment() {
removeUnsuitablePreferences()
setupTheme()
setThemeVariantPrefs(sharedPreferences.getString(Settings.PREF_THEME_STYLE, KeyboardTheme.STYLE_MATERIAL)!!)
setColorPrefs(sharedPreferences.getString(Settings.PREF_THEME_STYLE, KeyboardTheme.STYLE_MATERIAL)!!)
setupScalePrefs(Settings.PREF_KEYBOARD_HEIGHT_SCALE, SettingsValues.DEFAULT_SIZE_SCALE)
if (splitScalePref != null) {
@ -91,9 +91,9 @@ class AppearanceSettingsFragment : SubScreenFragment() {
}
}
private fun setThemeVariantPrefs(themeFamily: String) {
private fun setColorPrefs(style: String) {
colorsPref.apply {
entryValues = if (themeFamily == KeyboardTheme.STYLE_HOLO) KeyboardTheme.COLORS
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)
@ -110,7 +110,7 @@ class AppearanceSettingsFragment : SubScreenFragment() {
}
}
colorsNightPref?.apply {
entryValues = if (themeFamily == KeyboardTheme.STYLE_HOLO) KeyboardTheme.COLORS_DARK
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)
@ -134,7 +134,7 @@ class AppearanceSettingsFragment : SubScreenFragment() {
entryValues = KeyboardTheme.STYLES
onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value ->
summary = entries[entryValues.indexOfFirst { it == value }]
setThemeVariantPrefs(value.toString())
setColorPrefs(value.toString())
true
}
summary = entries[entryValues.indexOfFirst { it == value }]