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

Update hint label color selection

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-08-28 20:21:39 +03:00
parent 0c78fe5f12
commit c5d3fe9917
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/src/org/futo/inputmethod/keyboard/Key.kt
View File

@ -19,9 +19,10 @@ import android.graphics.Rect
import android.graphics.Typeface
import android.graphics.drawable.Drawable
import android.text.TextUtils
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import org.futo.inputmethod.keyboard.internal.KeyDrawParams
import org.futo.inputmethod.keyboard.internal.KeySpecParser
import org.futo.inputmethod.keyboard.internal.KeyStyle
import org.futo.inputmethod.keyboard.internal.KeyVisualAttributes
import org.futo.inputmethod.keyboard.internal.KeyboardIconsSet
import org.futo.inputmethod.keyboard.internal.KeyboardParams
@ -368,14 +369,14 @@ data class Key(
}
fun selectHintTextColor(provider: DynamicThemeProvider, params: KeyDrawParams): Int {
if (hasHintLabel) {
return params.mHintLabelColor
return provider.getKeyStyleDescriptor(visualStyle).let { style ->
when {
mPressed -> style.foregroundColorPressed
else -> style.foregroundColor
}
}.let {
Color(it).copy(alpha = 0.5f).toArgb()
}
if (hasShiftedLetterHint) {
return if (isShiftedLetterActivated) params.mShiftedLetterHintActivatedColor
else params.mShiftedLetterHintInactivatedColor
}
return params.mHintLetterColor
}
fun selectMoreKeyTextSize(params: KeyDrawParams): Int {