From e4ed4842022992c248a24032b9721de17c3ee85c Mon Sep 17 00:00:00 2001 From: BlackyHawky Date: Sun, 22 Oct 2023 15:37:26 +0200 Subject: [PATCH 1/3] Expose all colors to users (only for user-defined themes) - Automatic color selection maintained by default - French translation done --- .../openboard/inputmethod/keyboard/KeyboardTheme.java | 8 ++++++-- .../inputmethod/latin/settings/ColorsSettingsFragment.kt | 4 ++++ .../openboard/inputmethod/latin/settings/Settings.java | 6 ++++++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 4 ++++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java index b92918ac9d..2f2fd1b45f 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java @@ -134,17 +134,21 @@ public static Colors getThemeColors(final String themeColors, final String theme case THEME_USER: final int accent = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_ACCENT_SUFFIX, false); final int keyBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_KEYS_SUFFIX, false); + final int functionalKeyBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, false); + final int spaceBarBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACE_BAR_SUFFIX, false); final int keyTextColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_TEXT_SUFFIX, false); final int hintTextColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, false); final int background = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_BACKGROUND_SUFFIX, false); - return new Colors(themeStyle, hasBorders, accent, background, keyBgColor, ColorUtilKt.brightenOrDarken(keyBgColor, true), keyBgColor, keyTextColor, hintTextColor); + return new Colors(themeStyle, hasBorders, accent, background, keyBgColor, functionalKeyBgColor, spaceBarBgColor, keyTextColor, hintTextColor); case THEME_USER_NIGHT: final int accent2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_ACCENT_SUFFIX, true); final int keyBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_KEYS_SUFFIX, true); + final int functionalKeyBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, true); + final int spaceBarBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACE_BAR_SUFFIX, true); final int keyTextColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_TEXT_SUFFIX, true); final int hintTextColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, true); final int background2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_BACKGROUND_SUFFIX, true); - return new Colors(themeStyle, hasBorders, accent2, background2, keyBgColor2, ColorUtilKt.brightenOrDarken(keyBgColor2, true), keyBgColor2, keyTextColor2, hintTextColor2); + return new Colors(themeStyle, hasBorders, accent2, background2, keyBgColor2, functionalKeyBgColor2, spaceBarBgColor2, keyTextColor2, hintTextColor2); case THEME_DARK: return new Colors( themeStyle, 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 e4f7427957..6e6c62d089 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 @@ -33,6 +33,8 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings) { private val colorPrefs = listOf( Settings.PREF_COLOR_BACKGROUND_SUFFIX, Settings.PREF_COLOR_KEYS_SUFFIX, + Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, + Settings.PREF_COLOR_SPACE_BAR_SUFFIX, Settings.PREF_COLOR_TEXT_SUFFIX, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, Settings.PREF_COLOR_ACCENT_SUFFIX, @@ -65,6 +67,8 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings) { val colorPrefNames = listOf( R.string.select_color_background, R.string.select_color_key_background, + R.string.select_color_functional_key_background, + R.string.select_color_space_bar_background, R.string.select_color_key, R.string.select_color_key_hint, R.string.select_color_accent, diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java index 3df70692fd..7bebc209e4 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java @@ -62,6 +62,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static final String PREF_THEME_USER_COLOR_PREFIX = "theme_color_"; public static final String PREF_THEME_USER_COLOR_NIGHT_PREFIX = "theme_dark_color_"; public static final String PREF_COLOR_KEYS_SUFFIX = "keys"; + public static final String PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX = "functional_keys"; + public static final String PREF_COLOR_SPACE_BAR_SUFFIX = "space_bar"; public static final String PREF_COLOR_ACCENT_SUFFIX = "accent"; public static final String PREF_COLOR_TEXT_SUFFIX = "text"; public static final String PREF_COLOR_HINT_TEXT_SUFFIX = "hint_text"; @@ -514,6 +516,10 @@ private static int determineAutoColor(final SharedPreferences prefs, final Conte else return Color.LTGRAY; case PREF_COLOR_KEYS_SUFFIX: return ColorUtilKt.brightenOrDarken(readUserColor(prefs, context, PREF_COLOR_BACKGROUND_SUFFIX, isNight), isNight); + case PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX: + return ColorUtilKt.brightenOrDarken(readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight), true); + case PREF_COLOR_SPACE_BAR_SUFFIX: + return readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight); case PREF_COLOR_BACKGROUND_SUFFIX: default: return ContextCompat.getColor(getDayNightContext(context, isNight), R.color.keyboard_background); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f1eb58e0ee..f2ee55f822 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -220,6 +220,8 @@ Nouveau dictionnaire: Texte des touches Indice des touches Arrière-plan des touches + Arrière-plan des touches fonctionnelles + Arrière-plan de la barre d\'espace Couleur d\'accentuation À propos Lien vers GitHub diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 780c0b980c..b8d9fae80c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -606,6 +606,10 @@ New dictionary: Key hint text Key background + + Functional key background + + Space bar background Accent From d2e80ae6b8df3dbe0fab6b9fc35d1d2d20718aae Mon Sep 17 00:00:00 2001 From: BlackyHawky Date: Sun, 22 Oct 2023 17:22:07 +0200 Subject: [PATCH 2/3] Separate the colour of the spacebar text from the key hints - the color of the spacebar text is now distinct from the color of the key hints - "space_bar" renamed to "spacebar" to be more consistent --- .../inputmethod/keyboard/KeyboardTheme.java | 23 ++++++++++++------- .../inputmethod/latin/common/Colors.kt | 6 ++--- .../latin/settings/ColorsSettingsFragment.kt | 6 +++-- .../inputmethod/latin/settings/Settings.java | 8 +++++-- app/src/main/res/values-fr/strings.xml | 3 ++- app/src/main/res/values/colors.xml | 2 ++ app/src/main/res/values/strings.xml | 4 +++- 7 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java index 2f2fd1b45f..85bfb1e2b4 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java @@ -135,20 +135,22 @@ public static Colors getThemeColors(final String themeColors, final String theme final int accent = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_ACCENT_SUFFIX, false); final int keyBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_KEYS_SUFFIX, false); final int functionalKeyBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, false); - final int spaceBarBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACE_BAR_SUFFIX, false); + final int spaceBarBgColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACEBAR_SUFFIX, false); final int keyTextColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_TEXT_SUFFIX, false); final int hintTextColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, false); + final int spaceBarTextColor = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACEBAR_TEXT_SUFFIX, false); final int background = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_BACKGROUND_SUFFIX, false); - return new Colors(themeStyle, hasBorders, accent, background, keyBgColor, functionalKeyBgColor, spaceBarBgColor, keyTextColor, hintTextColor); + return new Colors(themeStyle, hasBorders, accent, background, keyBgColor, functionalKeyBgColor, spaceBarBgColor, keyTextColor, hintTextColor, spaceBarTextColor); case THEME_USER_NIGHT: final int accent2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_ACCENT_SUFFIX, true); final int keyBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_KEYS_SUFFIX, true); final int functionalKeyBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, true); - final int spaceBarBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACE_BAR_SUFFIX, true); + final int spaceBarBgColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACEBAR_SUFFIX, true); final int keyTextColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_TEXT_SUFFIX, true); final int hintTextColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, true); + final int spaceBarTextColor2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_SPACEBAR_TEXT_SUFFIX, true); final int background2 = Settings.readUserColor(prefs, context, Settings.PREF_COLOR_BACKGROUND_SUFFIX, true); - return new Colors(themeStyle, hasBorders, accent2, background2, keyBgColor2, functionalKeyBgColor2, spaceBarBgColor2, keyTextColor2, hintTextColor2); + return new Colors(themeStyle, hasBorders, accent2, background2, keyBgColor2, functionalKeyBgColor2, spaceBarBgColor2, keyTextColor2, hintTextColor2, spaceBarTextColor2); case THEME_DARK: return new Colors( themeStyle, @@ -160,7 +162,8 @@ public static Colors getThemeColors(final String themeColors, final String theme Color.parseColor("#2d393f"), Color.parseColor("#364248"), ContextCompat.getColor(context, R.color.key_text_color_lxx_dark), - ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark) + ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark), + ContextCompat.getColor(context, R.color.spacebar_letter_color_lxx_dark) ); case THEME_HOLO_WHITE: return new Colors( @@ -173,6 +176,7 @@ public static Colors getThemeColors(final String themeColors, final String theme Color.parseColor("#444444"), // should be 222222, but the key drawable is already grey Color.parseColor("#FFFFFF"), Color.parseColor("#FFFFFF"), + Color.parseColor("#282828"), Color.parseColor("#282828") ); case THEME_DARKER: @@ -185,7 +189,8 @@ public static Colors getThemeColors(final String themeColors, final String theme ContextCompat.getColor(context, R.color.key_background_functional_lxx_dark_border), ContextCompat.getColor(context, R.color.key_background_normal_lxx_dark_border), ContextCompat.getColor(context, R.color.key_text_color_lxx_dark), - ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark) + ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark), + ContextCompat.getColor(context, R.color.spacebar_letter_color_lxx_dark) ); case THEME_BLACK: return new Colors( @@ -197,7 +202,8 @@ public static Colors getThemeColors(final String themeColors, final String theme ContextCompat.getColor(context, R.color.background_amoled_dark), ContextCompat.getColor(context, R.color.background_amoled_dark), ContextCompat.getColor(context, R.color.key_text_color_lxx_dark), - ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark) + ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_dark), + ContextCompat.getColor(context, R.color.spacebar_letter_color_lxx_dark) ); case THEME_LIGHT: default: @@ -210,7 +216,8 @@ public static Colors getThemeColors(final String themeColors, final String theme ContextCompat.getColor(context, R.color.key_background_functional_lxx_light_border), ContextCompat.getColor(context, R.color.key_background_normal_lxx_light_border), ContextCompat.getColor(context, R.color.key_text_color_lxx_light), - ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_light) + ContextCompat.getColor(context, R.color.key_hint_letter_color_lxx_light), + ContextCompat.getColor(context, R.color.spacebar_letter_color_lxx_light) ); } } 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 2e6cb6ccbb..e45c5108d4 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 @@ -35,7 +35,8 @@ class Colors ( val functionalKey: Int, val spaceBar: Int, val keyText: Int, - val keyHintText: Int + val keyHintText: Int, + val spaceBarText: Int ) { val navBar: Int /** brightened or darkened variant of [background], to be used if exact background color would be @@ -45,7 +46,6 @@ class Colors ( val doubleAdjustedBackground: Int /** brightened or darkened variant of [keyText] */ val adjustedKeyText: Int - val spaceBarText: Int val backgroundFilter: ColorFilter val adjustedBackgroundFilter: ColorFilter @@ -74,11 +74,9 @@ class Colors ( val darkerBackground = adjustLuminosityAndKeepAlpha(background, -0.2f) navBar = darkerBackground keyboardBackground = GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(background, darkerBackground)) - spaceBarText = keyText } else { navBar = background keyboardBackground = null - spaceBarText = keyHintText } // create color filters 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 6e6c62d089..b4ea5515bd 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 @@ -34,9 +34,10 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings) { Settings.PREF_COLOR_BACKGROUND_SUFFIX, Settings.PREF_COLOR_KEYS_SUFFIX, Settings.PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX, - Settings.PREF_COLOR_SPACE_BAR_SUFFIX, + Settings.PREF_COLOR_SPACEBAR_SUFFIX, Settings.PREF_COLOR_TEXT_SUFFIX, Settings.PREF_COLOR_HINT_TEXT_SUFFIX, + Settings.PREF_COLOR_SPACEBAR_TEXT_SUFFIX, Settings.PREF_COLOR_ACCENT_SUFFIX, ) @@ -68,9 +69,10 @@ open class ColorsSettingsFragment : Fragment(R.layout.color_settings) { R.string.select_color_background, R.string.select_color_key_background, R.string.select_color_functional_key_background, - R.string.select_color_space_bar_background, + R.string.select_color_spacebar_background, R.string.select_color_key, R.string.select_color_key_hint, + R.string.select_color_spacebar_text, R.string.select_color_accent, ).map { requireContext().getString(it) } val prefPrefix = if (isNight) Settings.PREF_THEME_USER_COLOR_NIGHT_PREFIX else Settings.PREF_THEME_USER_COLOR_PREFIX diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java index 7bebc209e4..d78991fab9 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java @@ -63,7 +63,8 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static final String PREF_THEME_USER_COLOR_NIGHT_PREFIX = "theme_dark_color_"; public static final String PREF_COLOR_KEYS_SUFFIX = "keys"; public static final String PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX = "functional_keys"; - public static final String PREF_COLOR_SPACE_BAR_SUFFIX = "space_bar"; + public static final String PREF_COLOR_SPACEBAR_SUFFIX = "spacebar"; + public static final String PREF_COLOR_SPACEBAR_TEXT_SUFFIX = "spacebar_text"; public static final String PREF_COLOR_ACCENT_SUFFIX = "accent"; public static final String PREF_COLOR_TEXT_SUFFIX = "text"; public static final String PREF_COLOR_HINT_TEXT_SUFFIX = "hint_text"; @@ -518,8 +519,11 @@ private static int determineAutoColor(final SharedPreferences prefs, final Conte return ColorUtilKt.brightenOrDarken(readUserColor(prefs, context, PREF_COLOR_BACKGROUND_SUFFIX, isNight), isNight); case PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX: return ColorUtilKt.brightenOrDarken(readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight), true); - case PREF_COLOR_SPACE_BAR_SUFFIX: + case PREF_COLOR_SPACEBAR_SUFFIX: return readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight); + case PREF_COLOR_SPACEBAR_TEXT_SUFFIX: + if (ColorUtilKt.isBrightColor(readUserColor(prefs, context, PREF_COLOR_SPACEBAR_SUFFIX, isNight))) return Color.DKGRAY; + else return Color.LTGRAY; case PREF_COLOR_BACKGROUND_SUFFIX: default: return ContextCompat.getColor(getDayNightContext(context, isNight), R.color.keyboard_background); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f2ee55f822..4ae0e74eb2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -221,7 +221,8 @@ Nouveau dictionnaire: Indice des touches Arrière-plan des touches Arrière-plan des touches fonctionnelles - Arrière-plan de la barre d\'espace + Arrière-plan de la barre d\'espace + Texte de la barre d\'espace Couleur d\'accentuation À propos Lien vers GitHub diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e1ef8ccb9d..a8e66ec075 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -49,11 +49,13 @@ #B337474F + #B337474F #37474F #FFFFFF #80FFFFFF + #80FFFFFF #0d0d0d diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8d9fae80c..a99fa757f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -609,7 +609,9 @@ New dictionary: Functional key background - Space bar background + Space bar background + + Space bar text Accent From 3ffad62515e1e849af03e5ec9da69e4c07d19a84 Mon Sep 17 00:00:00 2001 From: BlackyHawky Date: Mon, 23 Oct 2023 21:40:46 +0200 Subject: [PATCH 3/3] Change automatic color for spacebar text & key hints --- .../dslul/openboard/inputmethod/latin/settings/Settings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java index d78991fab9..cad025f39c 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java @@ -514,7 +514,7 @@ private static int determineAutoColor(final SharedPreferences prefs, final Conte else return Color.WHITE; case PREF_COLOR_HINT_TEXT_SUFFIX: if (ColorUtilKt.isBrightColor(readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight))) return Color.DKGRAY; - else return Color.LTGRAY; + else return readUserColor(prefs, context, PREF_COLOR_TEXT_SUFFIX, isNight); case PREF_COLOR_KEYS_SUFFIX: return ColorUtilKt.brightenOrDarken(readUserColor(prefs, context, PREF_COLOR_BACKGROUND_SUFFIX, isNight), isNight); case PREF_COLOR_FUNCTIONAL_KEYS_SUFFIX: @@ -523,7 +523,7 @@ private static int determineAutoColor(final SharedPreferences prefs, final Conte return readUserColor(prefs, context, PREF_COLOR_KEYS_SUFFIX, isNight); case PREF_COLOR_SPACEBAR_TEXT_SUFFIX: if (ColorUtilKt.isBrightColor(readUserColor(prefs, context, PREF_COLOR_SPACEBAR_SUFFIX, isNight))) return Color.DKGRAY; - else return Color.LTGRAY; + else return readUserColor(prefs, context, PREF_COLOR_TEXT_SUFFIX, isNight); case PREF_COLOR_BACKGROUND_SUFFIX: default: return ContextCompat.getColor(getDayNightContext(context, isNight), R.color.keyboard_background);