From 6fe4a5b6f3da290bc427766f379ef2fb89d944a8 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Fri, 26 Jan 2024 19:16:57 +0100 Subject: [PATCH] enable setting key background color for key borders off, use it for pressed key background useful for adding transparency with a background image --- .../java/org/dslul/openboard/inputmethod/latin/common/Colors.kt | 2 +- .../inputmethod/latin/settings/ColorsSettingsFragment.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt index 9dd4390b..320c9e12 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt @@ -441,7 +441,7 @@ class DefaultColors ( } else { // need to set color to background if key borders are disabled, or there will be ugly keys backgroundStateList = stateList(brightenOrDarken(background, true), background) - keyStateList = stateList(brightenOrDarken(background, true), Color.TRANSPARENT) + keyStateList = stateList(keyBackground, Color.TRANSPARENT) functionalKeyStateList = keyStateList actionKeyStateList = if (themeStyle == STYLE_HOLO) functionalKeyStateList else stateList(brightenOrDarken(accent, true), accent) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt index 06744042..b50846b3 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/ColorsSettingsFragment.kt @@ -52,7 +52,7 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings), MenuProvi private val colorPrefsToHideInitially by lazy { listOf(Settings.PREF_COLOR_SUGGESTION_TEXT_SUFFIX,Settings.PREF_COLOR_SPACEBAR_TEXT_SUFFIX, Settings.PREF_COLOR_GESTURE_SUFFIX) + if (prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false)) listOf(Settings.PREF_COLOR_SPACEBAR_SUFFIX) - else listOf(Settings.PREF_COLOR_KEYS_SUFFIX, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX) + else listOf(Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX) } override fun onResume() {