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

fix crash when day/night switch is removed

Browse source
This commit is contained in:
Helium314 2023-08-31 16:05:16 +02:00
parent 50258ef435
commit 61a73572b8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC
private lateinit var themeFamilyPref: ListPreference private lateinit var themeFamilyPref: ListPreference
private lateinit var themeVariantPref: ListPreference private lateinit var themeVariantPref: ListPreference
private lateinit var customThemeVariantNightPref: ListPreference private var customThemeVariantNightPref: ListPreference? = null
private lateinit var keyBordersPref: TwoStatePreference private lateinit var keyBordersPref: TwoStatePreference
private var dayNightPref: TwoStatePreference? = null private var dayNightPref: TwoStatePreference? = null
private lateinit var userColorsPref: Preference private lateinit var userColorsPref: Preference
@ -128,7 +128,7 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC
// doing things on changing, but with the old values is not good, this is at least a little better // doing things on changing, but with the old values is not good, this is at least a little better
private fun updateAfterPreferenceChanged() { private fun updateAfterPreferenceChanged() {
customThemeVariantNightPref.apply { customThemeVariantNightPref?.apply {
if (KeyboardTheme.getIsCustom(selectedThemeId)) { if (KeyboardTheme.getIsCustom(selectedThemeId)) {
// show preference to allow choosing a night theme // show preference to allow choosing a night theme
// can't hide a preference, at least not without category or maybe some androidx things // can't hide a preference, at least not without category or maybe some androidx things
@ -250,8 +250,8 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC
updateThemePreferencesState(skipThemeFamily = true) updateThemePreferencesState(skipThemeFamily = true)
true true
} }
customThemeVariantNightPref = preferenceScreen.findPreference(Settings.PREF_CUSTOM_THEME_VARIANT_NIGHT) as ListPreference customThemeVariantNightPref = preferenceScreen.findPreference(Settings.PREF_CUSTOM_THEME_VARIANT_NIGHT) as? ListPreference
customThemeVariantNightPref.apply { customThemeVariantNightPref?.apply {
onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value ->
// not so nice workaround, could be removed in the necessary re-work: new value seems // not so nice workaround, could be removed in the necessary re-work: new value seems
// to be stored only after this method call, but we update the summary and user-defined color enablement in here -> store it now // to be stored only after this method call, but we update the summary and user-defined color enablement in here -> store it now