From e999e4900b4e9824ee6cf9d33ade2a70499e28dc Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 14 Jan 2022 23:30:07 +0100 Subject: [PATCH] highlight the currently selected character after long pressing a key --- .../keyboard/helpers/MyKeyboard.kt | 5 --- .../keyboard/views/MyKeyboardView.kt | 34 +++++++++++++++++-- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt index f41e800..b72cc69 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt @@ -322,11 +322,6 @@ class MyKeyboard { edgeFlags = parent.rowEdgeFlags } - /** Informs the key that it has been pressed, in case it needs to change its appearance or state. */ - fun onPressed() { - pressed = !pressed - } - fun parseCSV(value: String): ArrayList { var count = 0 var lastIndex = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index 9074d3f..84fd57c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -127,6 +127,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut private var mMiniKeyboardOffsetY = 0 private val mMiniKeyboardCache: MutableMap private var mKeys = ArrayList() + private var mMiniKeyboardSelectedKeyIndex = -1 /** * Returns the [OnKeyboardActionListener] object. * @return the listener attached to this keyboard @@ -569,6 +570,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut keyBackground.setBounds(0, 0, key.width, key.height) } + keyBackground.state = if (key.pressed) { + intArrayOf(android.R.attr.state_pressed) + } else { + intArrayOf() + } + canvas.translate((key.x + kbdPaddingLeft).toFloat(), (key.y + kbdPaddingTop).toFloat()) keyBackground.draw(canvas) if (label?.isNotEmpty() == true) { @@ -748,7 +755,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut if (mCurrentKeyIndex != NOT_A_KEY && keys.size > mCurrentKeyIndex) { val newKey = keys[mCurrentKeyIndex] - newKey.onPressed() invalidateKey(mCurrentKeyIndex) val keyCode = newKey.codes[0] sendAccessibilityEventForUnicodeCharacter(AccessibilityEvent.TYPE_VIEW_HOVER_ENTER, keyCode) @@ -938,7 +944,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut } val popupKey = mKeys[mCurrentKey] - val result = onLongPress(popupKey) + val result = onLongPress(popupKey, me) if (result) { mAbortKey = true showPreview(NOT_A_KEY) @@ -954,7 +960,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut * @return true if the long press is handled, false otherwise. Subclasses should call the * method on the base class if the subclass doesn't wish to handle the call. */ - protected fun onLongPress(popupKey: MyKeyboard.Key): Boolean { + protected fun onLongPress(popupKey: MyKeyboard.Key, me: MotionEvent): Boolean { val popupKeyboardId = popupKey.popupResId if (popupKeyboardId != 0) { mMiniKeyboardContainer = mMiniKeyboardCache[popupKey] @@ -1017,6 +1023,20 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut val xOffset = Math.max(0, x) mMiniKeyboard!!.setPopupOffset(xOffset, y) + // make sure we highlight the proper key right after long pressing it, before any ACTION_MOVE event occurs + val miniKeyboardX = if (xOffset + mMiniKeyboard!!.measuredWidth <= measuredWidth) { + xOffset + } else { + measuredWidth - mMiniKeyboard!!.measuredWidth + } + var selectedKeyIndex = Math.floor((me.x - miniKeyboardX) / popupKey.width.toDouble()).toInt() + selectedKeyIndex = Math.max(0, Math.min(selectedKeyIndex, mMiniKeyboard!!.mKeys.size - 1)) + for (i in 0 until mMiniKeyboard!!.mKeys.size) { + mMiniKeyboard!!.mKeys[i].pressed = i == selectedKeyIndex + } + mMiniKeyboardSelectedKeyIndex = selectedKeyIndex + mMiniKeyboard!!.invalidateAllKeys() + val miniShiftStatus = if (isShifted()) SHIFT_ON_PERMANENT else SHIFT_OFF mMiniKeyboard!!.setShifted(miniShiftStatus) mPopupKeyboard.contentView = mMiniKeyboardContainer @@ -1089,6 +1109,13 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut val widthPerKey = mMiniKeyboard!!.width / mMiniKeyboard!!.mKeys.size var selectedKeyIndex = Math.floor((me.x - coords[0]) / widthPerKey.toDouble()).toInt() selectedKeyIndex = Math.max(0, Math.min(selectedKeyIndex, mMiniKeyboard!!.mKeys.size - 1)) + if (selectedKeyIndex != mMiniKeyboardSelectedKeyIndex) { + for (i in 0 until mMiniKeyboard!!.mKeys.size) { + mMiniKeyboard!!.mKeys[i].pressed = i == selectedKeyIndex + } + mMiniKeyboardSelectedKeyIndex = selectedKeyIndex + mMiniKeyboard!!.invalidateAllKeys() + } if (coords[0] - me.x > mPopupMaxMoveDistance || // left me.x - (coords[0] + mMiniKeyboard!!.width) > mPopupMaxMoveDistance || // right @@ -1109,6 +1136,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut val selectedKeyCodes = keys[selectedKeyIndex].codes onKeyboardActionListener!!.onKey(selectedKeyCodes[0], selectedKeyCodes.toIntArray()) } + mMiniKeyboardSelectedKeyIndex = -1 dismissPopupKeyboard() } }