feat,refactor(ime): reform how to handle the return (enter) key

Depend on the editor info to decide what action to perform

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/ime/core/Trime.java

@@ -88,6 +88,7 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.CopyOnWriteArrayList;
+import splitties.bitflags.BitFlagsKt;
 import splitties.systemservices.SystemServicesKt;
 import timber.log.Timber;
 
@@ -121,6 +122,8 @@ public Config getImeConfig() {
   public InputFeedbackManager inputFeedbackManager = null; // 效果管理器
   private IntentReceiver mIntentReceiver = null;
 
+  public EditorInfo editorInfo = null;
+
   private boolean isWindowShown = false; // 键盘窗口是否已显示
 
   private boolean isAutoCaps; // 句首自動大寫
@@ -606,6 +609,35 @@ public void onDestroy() {
     self = null;
   }
 
+  private void handleReturnKey() {
+    if (editorInfo == null) sendDownUpKeyEvents(KeyEvent.KEYCODE_ENTER);
+    if ((editorInfo.inputType & InputType.TYPE_MASK_CLASS) == InputType.TYPE_NULL) {
+      sendDownUpKeyEvents(KeyEvent.KEYCODE_ENTER);
+    }
+    if (BitFlagsKt.hasFlag(editorInfo.imeOptions, EditorInfo.IME_FLAG_NO_ENTER_ACTION)) {
+      final InputConnection ic = getCurrentInputConnection();
+      if (ic != null) ic.commitText("\n", 1);
+      return;
+    }
+    if (!TextUtils.isEmpty(editorInfo.actionLabel)
+        && editorInfo.actionId != EditorInfo.IME_ACTION_UNSPECIFIED) {
+      final InputConnection ic = getCurrentInputConnection();
+      if (ic != null) ic.performEditorAction(editorInfo.actionId);
+      return;
+    }
+    final int action = editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;
+    final InputConnection ic = getCurrentInputConnection();
+    switch (action) {
+      case EditorInfo.IME_ACTION_UNSPECIFIED:
+      case EditorInfo.IME_ACTION_NONE:
+        if (ic != null) ic.commitText("\n", 1);
+        break;
+      default:
+        if (ic != null) ic.performEditorAction(action);
+        break;
+    }
+  }
+
   @Override
   public void onConfigurationChanged(@NonNull Configuration newConfig) {
     final Configuration config = getResources().getConfiguration();
@@ -732,9 +764,16 @@ public void setShowComment(boolean show_comment) {
     mComposition.setShowComment(show_comment);
   }
 
+  @Override
+  public void onStartInput(EditorInfo attribute, boolean restarting) {
+    editorInfo = attribute;
+    Timber.d("onStartInput: restarting=%s", restarting);
+  }
+
   @Override
   public void onStartInputView(EditorInfo attribute, boolean restarting) {
-    super.onStartInputView(attribute, restarting);
+    Timber.d("onStartInputView: restarting=%s", restarting);
+    editorInfo = attribute;
     if (getPrefs().getThemeAndColor().getAutoDark()) {
       int nightModeFlags =
           getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
@@ -842,6 +881,12 @@ public void onFinishInputView(boolean finishingInput) {
     }
   }
 
+  @Override
+  public void onFinishInput() {
+    editorInfo = null;
+    super.onFinishInput();
+  }
+
   public void bindKeyboardToInputView() {
     if (mainKeyboardView != null) {
       // Bind the selected keyboard to the input view.
@@ -1224,11 +1269,7 @@ public void launchSettings() {
   private boolean performEnter(int keyCode) { // 回車
     if (keyCode == KeyEvent.KEYCODE_ENTER) {
       DraftHelper.INSTANCE.onInputEventChanged();
-      if (textInputManager.getPerformEnterAsLineBreak()) {
-        commitText("\n");
-      } else {
-        sendKeyChar('\n');
-      }
+      handleReturnKey();
       return true;
     }
     return false;

app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt

@@ -75,7 +75,6 @@ class TextInputManager private constructor() :
 
     var needSendUpRimeKey: Boolean = false
     var shouldUpdateRimeOption: Boolean = true
-    var performEnterAsLineBreak: Boolean = false
     var isComposable: Boolean = false
     var shouldResetAsciiMode: Boolean = false
 
@@ -199,7 +198,6 @@ class TextInputManager private constructor() :
         super.onStartInputView(instance, restarting)
         Trime.getService().selectLiquidKeyboard(-1)
         isComposable = false
-        performEnterAsLineBreak = false
         var tempAsciiMode = if (shouldResetAsciiMode) false else null
         var keyboardType =
             when (instance.editorInfo!!.imeOptions and EditorInfo.IME_FLAG_FORCE_ASCII) {
@@ -218,7 +216,7 @@ class TextInputManager private constructor() :
                         InputType.TYPE_CLASS_TEXT -> {
                             when (inputAttrsRaw and InputType.TYPE_MASK_VARIATION) {
                                 InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE -> {
-                                    null.also { performEnterAsLineBreak = true }
+                                    null
                                 }
                                 InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS,
                                 InputType.TYPE_TEXT_VARIATION_PASSWORD,