Fix the Return key for EditorInfo.IME_FLAG_NO_ENTER_ACTION

yuetyam · Sep 2, 2024 · a72a03d · a72a03d
1 parent 4da6e7d
commit a72a03d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/org/jyutping/jyutping/JyutpingInputMethodService.kt b/app/src/main/java/org/jyutping/jyutping/JyutpingInputMethodService.kt
@@ -3,6 +3,7 @@ package org.jyutping.jyutping
 import android.content.Context
 import android.content.res.Configuration
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import androidx.compose.runtime.MutableIntState
 import androidx.compose.runtime.MutableState
@@ -454,6 +455,8 @@ class JyutpingInputMethodService: LifecycleInputMethodService(),
                 if (isBuffering.value) {
                         currentInputConnection.commitText(bufferText, bufferText.length)
                         bufferText = PresetString.EMPTY
+                } else if (currentInputEditorInfo.imeOptions == EditorInfo.IME_FLAG_NO_ENTER_ACTION) {
+                        currentInputConnection.commitText(PresetString.NEW_LINE, PresetString.NEW_LINE.length)
                 } else {
                         sendDefaultEditorAction(true)
                 }

diff --git a/app/src/main/java/org/jyutping/jyutping/keyboard/Engine.kt b/app/src/main/java/org/jyutping/jyutping/keyboard/Engine.kt
@@ -65,8 +65,7 @@ object Engine {
                                                 qualified.add(newItem)
                                         } else {
                                                 if (!continuous.startsWith(text)) continue
-                                                val combinedInput = item.input + textTones
-                                                val newItem = Candidate(text = item.text, romanization = item.romanization, input = combinedInput)
+                                                val newItem = Candidate(text = item.text, romanization = item.romanization, input = text)
                                                 qualified.add(newItem)
                                         }
                                 }

diff --git a/app/src/main/java/org/jyutping/jyutping/presets/PresetString.kt b/app/src/main/java/org/jyutping/jyutping/presets/PresetString.kt
@@ -4,4 +4,5 @@ object PresetString {
         const val EMPTY: String = ""
         const val SPACE: String = " "
         const val SEPARATOR: String = "'"
+        const val NEW_LINE: String = "\n"
 }