n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wrong update check for theme

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-05-07 12:17:44 -05:00
parent 7fbb62fb4c
commit 360c2f4ada
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/org/futo/inputmethod/latin/LatinIME.kt
View File

@ -53,9 +53,6 @@ import org.futo.inputmethod.latin.uix.DynamicThemeProvider
import org.futo.inputmethod.latin.uix.DynamicThemeProviderOwner import org.futo.inputmethod.latin.uix.DynamicThemeProviderOwner
import org.futo.inputmethod.latin.uix.EmojiTracker.unuseEmoji import org.futo.inputmethod.latin.uix.EmojiTracker.unuseEmoji
import org.futo.inputmethod.latin.uix.EmojiTracker.useEmoji import org.futo.inputmethod.latin.uix.EmojiTracker.useEmoji
import org.futo.inputmethod.latin.uix.HiddenKeysSetting
import org.futo.inputmethod.latin.uix.KeyBordersSetting
import org.futo.inputmethod.latin.uix.KeyHintsSetting
import org.futo.inputmethod.latin.uix.KeyboardBottomOffsetSetting import org.futo.inputmethod.latin.uix.KeyboardBottomOffsetSetting
import org.futo.inputmethod.latin.uix.SUGGESTION_BLACKLIST import org.futo.inputmethod.latin.uix.SUGGESTION_BLACKLIST
import org.futo.inputmethod.latin.uix.THEME_KEY import org.futo.inputmethod.latin.uix.THEME_KEY

22
java/src/org/futo/inputmethod/latin/uix/BasicThemeProvider.kt
View File

@ -56,6 +56,10 @@ fun adjustColorBrightnessForContrast(bgColor: Int, fgColor: Int, desiredContrast
return ColorUtils.HSLToColor(bgHSL) return ColorUtils.HSLToColor(bgHSL)
} }
fun<T> Preferences.get(key: SettingsKey<T>): T {
return this[key.key] ?: key.default
}
class BasicThemeProvider(val context: Context, val overrideColorScheme: ColorScheme? = null) : class BasicThemeProvider(val context: Context, val overrideColorScheme: ColorScheme? = null) :
DynamicThemeProvider { DynamicThemeProvider {
override val primaryKeyboardColor: Int override val primaryKeyboardColor: Int
@ -133,16 +137,11 @@ class BasicThemeProvider(val context: Context, val overrideColorScheme: ColorSch
val keyboardHeight: Float val keyboardHeight: Float
fun hasUpdated(newPreferences: Preferences): Boolean { fun hasUpdated(np: Preferences): Boolean {
return when { return np.get(HiddenKeysSetting) != expertMode
newPreferences[HiddenKeysSetting.key] != expertMode -> true || np.get(KeyBordersSetting) != keyBorders
newPreferences[KeyBordersSetting.key] != keyBorders -> true || np.get(KeyHintsSetting) != showKeyHints
newPreferences[KeyHintsSetting.key] != showKeyHints -> true || np.get(KeyboardHeightMultiplierSetting) != keyboardHeight
newPreferences[KeyboardHeightMultiplierSetting.key] != keyboardHeight -> true
else -> false
}
} }
init { init {
@ -159,8 +158,7 @@ class BasicThemeProvider(val context: Context, val overrideColorScheme: ColorSch
expertMode = context.getSettingBlocking(HiddenKeysSetting) expertMode = context.getSettingBlocking(HiddenKeysSetting)
keyBorders = context.getSettingBlocking(KeyBordersSetting) keyBorders = context.getSettingBlocking(KeyBordersSetting)
showKeyHints = context.getSettingBlocking(KeyHintsSetting) showKeyHints = context.getSettingBlocking(KeyHintsSetting)
keyboardHeight = context.getSettingBlocking(KeyboardHeightMultiplierSetting)
keyboardHeight = context.getSettingBlocking(KeyboardHeightMultiplierSetting.key, KeyboardHeightMultiplierSetting.default)
val primary = colorScheme.primary.toArgb() val primary = colorScheme.primary.toArgb()
val secondary = colorScheme.secondary.toArgb() val secondary = colorScheme.secondary.toArgb()