refactor: extract space bar and emoji/language long press handlers

Author: naveensingh

app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt

@@ -619,7 +619,7 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
                 }
             }
 
-            if (keyboardMode != KEYBOARD_LETTERS) return@let
+            if (keyboardMode != KEYBOARD_LETTERS) return keyboard
             val emojiKeyIndex = keys.indexOfFirst { it.code == MyKeyboard.KEYCODE_EMOJI_OR_LANGUAGE }
             if (emojiKeyIndex != -1 && spaceKeyIndex != -1) {
                 val emojiKey = keys[emojiKeyIndex]

app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt

@@ -1186,26 +1186,9 @@ class MyKeyboardView @JvmOverloads constructor(
      */
     private fun onLongPress(popupKey: MyKeyboard.Key, me: MotionEvent): Boolean {
         if (popupKey.code == KEYCODE_SPACE) {
-            return if (!mCursorControlActive) {
-                setCurrentKeyPressed(false)
-                mRepeatKeyIndex = NOT_A_KEY
-                mHandler?.removeMessages(MSG_REPEAT)
-                vibrateIfNeeded()
-                SwitchLanguageDialog(this) {
-                    mOnKeyboardActionListener?.reloadKeyboard()
-                }
-                true
-            } else false
+            return onSpaceBarLongPressed()
         } else if (popupKey.code == KEYCODE_EMOJI_OR_LANGUAGE) {
-            setCurrentKeyPressed(false)
-            if (context.config.showEmojiKey) {
-                openEmojiPalette()
-            } else {
-                SwitchLanguageDialog(this) {
-                    mOnKeyboardActionListener?.reloadKeyboard()
-                }
-            }
-            return true
+            return onEmojiOrLanguageLongPressed()
         } else {
             val popupKeyboardId = popupKey.popupResId
             if (popupKeyboardId != 0) {
@@ -1617,6 +1600,32 @@ class MyKeyboardView @JvmOverloads constructor(
         setupStoredClips()
     }
 
+    private fun onSpaceBarLongPressed(): Boolean {
+        return if (!mCursorControlActive) {
+            setCurrentKeyPressed(false)
+            mRepeatKeyIndex = NOT_A_KEY
+            mHandler?.removeMessages(MSG_REPEAT)
+            vibrateIfNeeded()
+            SwitchLanguageDialog(this) {
+                mOnKeyboardActionListener?.reloadKeyboard()
+            }
+            true
+        } else false
+    }
+
+    private fun onEmojiOrLanguageLongPressed(): Boolean {
+        setCurrentKeyPressed(false)
+        if (context.config.showEmojiKey) {
+            openEmojiPalette()
+        } else {
+            SwitchLanguageDialog(this) {
+                mOnKeyboardActionListener?.reloadKeyboard()
+            }
+        }
+
+        return true
+    }
+
     private fun setupStoredClips() {
         ensureBackgroundThread {
             val clips = ArrayList<ListItem>()