fenix/Simple-Keyboard
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Keyboard.git synced 2025-04-22 06:07:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

more color updating

Browse Source
This commit is contained in:
tibbi 2022-01-17 22:40:10 +01:00
parent e8adf2e9ff
commit 21de46fc1d
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt
View File

@ -20,6 +20,7 @@ import android.widget.TextView
import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.applyColorFilter import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.getContrastColor
import com.simplemobiletools.keyboard.R import com.simplemobiletools.keyboard.R
import com.simplemobiletools.keyboard.extensions.config import com.simplemobiletools.keyboard.extensions.config
import com.simplemobiletools.keyboard.helpers.* import com.simplemobiletools.keyboard.helpers.*
@ -343,6 +344,15 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
} }
} }
override fun onVisibilityChanged(changedView: View, visibility: Int) {
super.onVisibilityChanged(changedView, visibility)
if (visibility == VISIBLE) {
mTextColor = context.config.textColor
mBackgroundColor = context.config.backgroundColor
mPrimaryColor = context.getAdjustedPrimaryColor()
}
}
private fun initGestureDetector() { private fun initGestureDetector() {
if (mGestureDetector == null) { if (mGestureDetector == null) {
mGestureDetector = GestureDetector(context, object : SimpleOnGestureListener() { mGestureDetector = GestureDetector(context, object : SimpleOnGestureListener() {
@ -621,6 +631,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
paint.typeface = Typeface.DEFAULT paint.typeface = Typeface.DEFAULT
} }
paint.color = if (key.focused) {
mPrimaryColor.getContrastColor()
} else {
mKeyTextColor
}
// Draw the text // Draw the text
canvas.drawText( canvas.drawText(
label, ((key.width - padding.left - padding.right) / 2 + padding.left).toFloat(), label, ((key.width - padding.left - padding.right) / 2 + padding.left).toFloat(),
@ -643,6 +659,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
key.icon = resources.getDrawable(drawableId) key.icon = resources.getDrawable(drawableId)
} }
if (code == MyKeyboard.KEYCODE_ENTER) {
key.icon!!.applyColorFilter(mPrimaryColor.getContrastColor())
}
val drawableX = (key.width - key.icon!!.intrinsicWidth) / 2 val drawableX = (key.width - key.icon!!.intrinsicWidth) / 2
val drawableY = (key.height - key.icon!!.intrinsicHeight) / 2 val drawableY = (key.height - key.icon!!.intrinsicHeight) / 2
canvas.translate(drawableX.toFloat(), drawableY.toFloat()) canvas.translate(drawableX.toFloat(), drawableY.toFloat())