fix: use actual keycode instead of index for key sound feedback

Co-Authored-By: iSilen <[email protected]>

Author: 2 people

app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardGestureFrame.kt

@@ -256,6 +256,7 @@ open class KeyboardGestureFrame(context: Context) : FrameLayout(context) {
                 onKeyActionListener?.invoke(keyIndex, KeyBehavior.CLICK)
                 launchRepeatClickJob(pointerId, state)
             } else {
+                if (hasPopupKeys(keyIndex)) onKeyStateListener?.invoke(keyIndex, KeyBehavior.LONG_CLICK, true, true, false)
                 if (onKeyActionListener?.invoke(keyIndex, KeyBehavior.LONG_CLICK) == true) {
                     deactivateKeyFeedback(keyIndex, KeyBehavior.LONG_CLICK)
                     activePointers.delete(pointerId)

app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt

@@ -114,7 +114,6 @@ class KeyboardView(
 
         onKeyActionListener = { keyIndex, behavior ->
             if (behavior == KeyBehavior.LONG_CLICK && hasPopupKeys(keyIndex)) {
-                keyboardActionListener?.onPress(keyIndex, false)
                 val popupKeys = mKeys.get(keyIndex).popup
                 val bounds = getKeyBounds(keyIndex)
                 popupActionListener.onPopupAction(
@@ -163,7 +162,7 @@ class KeyboardView(
 
         onKeyStateListener = { keyIndex, behavior, isVisible, isPressed, isRepeating ->
             val key = mKeys.getOrNull(keyIndex)
-            if (isPressed || (isRepeating && vibrateOnKeyRepeat)) keyboardActionListener?.onPress(keyIndex, !isRepeating)
+            if (isPressed || (isRepeating && vibrateOnKeyRepeat)) keyboardActionListener?.onPress(key?.getCode(behavior) ?: 0, !isRepeating)
             if (!isRepeating) {
                 if (isVisible) {
                     key?.onPressed()
@@ -173,7 +172,7 @@ class KeyboardView(
                     key?.onReleased()
                     invalidateKey(key)
                     hidePopup(keyIndex)
-                    if (behavior == KeyBehavior.LONG_CLICK || vibrateOnKeyRelease) keyboardActionListener?.onPress(keyIndex, false)
+                    if (behavior == KeyBehavior.LONG_CLICK || vibrateOnKeyRelease) keyboardActionListener?.onPress(key?.getCode(behavior) ?: 0, false)
                 }
             }
         }