refactor(ime,util): move launchMainActivity to ShortcutUtils

osfans · Jan 10, 2023 · fe4c5bb · fe4c5bb
1 parent e18767c
commit fe4c5bb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/app/src/main/java/com/osfans/trime/ime/core/Trime.java b/app/src/main/java/com/osfans/trime/ime/core/Trime.java
@@ -21,7 +21,6 @@
 import static android.graphics.Color.parseColor;
 
 import android.app.Dialog;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.RectF;
@@ -80,7 +79,6 @@
 import com.osfans.trime.ime.text.Composition;
 import com.osfans.trime.ime.text.ScrollView;
 import com.osfans.trime.ime.text.TextInputManager;
-import com.osfans.trime.ui.main.PrefMainActivity;
 import com.osfans.trime.util.DimensionsKt;
 import com.osfans.trime.util.ShortcutUtils;
 import com.osfans.trime.util.StringUtils;
@@ -1005,13 +1003,9 @@ private boolean onKeyEvent(@NonNull KeyEvent event) {
     }
 
     final int unicodeChar = event.getUnicodeChar();
-    final String s = String.valueOf((char) unicodeChar);
-    final int i = Event.getClickCode(s);
-    int mask = 0;
-    if (i > 0) {
-      keyCode = i;
-    } else { // 空格、回車等
-      mask = event.getMetaState();
+    int mask = event.getMetaState();
+    if (unicodeChar > 0) {
+      keyCode = unicodeChar;
     }
     final boolean ret = handleKey(keyCode, mask);
     if (isComposing()) setCandidatesViewShown(textInputManager.isComposable()); // 藍牙鍵盤打字時顯示候選欄
@@ -1142,7 +1136,7 @@ private boolean hookKeyboard(int code, int mask) { // 編輯操作
             ExtractedText et = ic.getExtractedText(etr, 0);
             if (et == null) {
               Timber.d("hookKeyboard paste, et == null, try commitText");
-              if (ic.commitText(ShortcutUtils.INSTANCE.pasteFromClipboard(self), 1)) {
+              if (ic.commitText(ShortcutUtils.pasteFromClipboard(this), 1)) {
                 return true;
               }
             } else if (ic.performContextMenuAction(android.R.id.paste)) {
@@ -1247,17 +1241,6 @@ public void showDialogAboveInputView(@NonNull final Dialog dialog) {
     dialog.show();
   }
 
-  /** Hides the IME and launches {@link PrefMainActivity}. */
-  public void launchSettings() {
-    requestHideSelf(0);
-    final Intent i = new Intent(this, PrefMainActivity.class);
-    i.addFlags(
-        Intent.FLAG_ACTIVITY_NEW_TASK
-            | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-            | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-    getApplicationContext().startActivity(i);
-  }
-
   /**
    * 如果爲{@link KeyEvent#KEYCODE_ENTER 回車鍵}，則換行
    *

diff --git a/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt b/app/src/main/java/com/osfans/trime/ime/text/TextInputManager.kt
@@ -405,7 +405,7 @@ class TextInputManager private constructor() :
                         "sound" -> trime.showDialogAboveInputView(
                             trime.soundPicker(R.style.Theme_AppCompat_DayNight_Dialog_Alert)
                         )
-                        else -> trime.launchSettings()
+                        else -> ShortcutUtils.launchMainActivity(trime)
                     }
                 }
             }
@@ -550,7 +550,7 @@ class TextInputManager private constructor() :
                 inputMethodManager.showInputMethodPicker()
             }
             .setPositiveButton(R.string.set_ime) { dialog, _ ->
-                trime.launchSettings()
+                ShortcutUtils.launchMainActivity(trime)
                 dialog.dismiss()
             }
         if (Rime.getCurrentRimeSchema() == (".default")) {

diff --git a/app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt b/app/src/main/java/com/osfans/trime/util/ShortcutUtils.kt
@@ -18,6 +18,7 @@ import com.osfans.trime.core.Rime
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.ime.core.Trime
 import com.osfans.trime.ui.main.LogActivity
+import com.osfans.trime.ui.main.PrefMainActivity
 import splitties.systemservices.clipboardManager
 import timber.log.Timber
 import java.text.FieldPosition
@@ -146,6 +147,18 @@ object ShortcutUtils {
         append(KeyEvent.KEYCODE_CALCULATOR, "android.intent.category.APP_CALCULATOR")
     }
 
+    fun launchMainActivity(context: Context) {
+        context.startActivity(
+            Intent(context, PrefMainActivity::class.java).apply {
+                addFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK
+                        or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
+                        or Intent.FLAG_ACTIVITY_CLEAR_TOP
+                )
+            }
+        )
+    }
+
     fun launchLogActivity(context: Context) {
         context.startActivity(
             Intent(context, LogActivity::class.java)