From 79c9a85082dc2e3a2e881b7ab31377bd560a29f3 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 26 Jan 2025 11:36:17 +0100 Subject: [PATCH] better choice of color for deactivated toolbar key --- .../java/helium314/keyboard/latin/common/Colors.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/latin/common/Colors.kt b/app/src/main/java/helium314/keyboard/latin/common/Colors.kt index e5bf3d664..b9790e4a0 100644 --- a/app/src/main/java/helium314/keyboard/latin/common/Colors.kt +++ b/app/src/main/java/helium314/keyboard/latin/common/Colors.kt @@ -150,7 +150,11 @@ class DynamicColors(context: Context, override val themeStyle: String, override private val spaceBarStateList: ColorStateList private val adjustedBackgroundStateList: ColorStateList private val stripBackgroundList: ColorStateList - private val toolbarKeyStateList = activatedStateList(keyText, darken(darken(keyText))) + private val toolbarKeyStateList = activatedStateList( + keyText, + if (isBrightColor(keyText)) darken(darken(keyText)) + else brighten(brighten(keyText)) + ) /** darkened variant of [accent] because the accent color is always light for dynamic colors */ private val adjustedAccent: Int = darken(accent) @@ -398,7 +402,11 @@ class DefaultColors ( private val spaceBarStateList: ColorStateList private val adjustedBackgroundStateList: ColorStateList private val stripBackgroundList: ColorStateList - private val toolbarKeyStateList = activatedStateList(suggestionText, darken(darken(suggestionText))) + private val toolbarKeyStateList = activatedStateList( + suggestionText, + if (isBrightColor(suggestionText)) darken(darken(suggestionText)) + else brighten(brighten(suggestionText)) + ) private var backgroundSetupDone = false init {