chore: support for hiding icon in the launcher

Also did: - Refactor: move `Trime` service to specified package and make a alias for it - Clean up: remove old `Pref` activity
osfans · Jun 25, 2021 · 64720b4 · 64720b4
1 parent 68def36
commit 64720b4
Show file tree

Hide file tree

Showing 20 changed files with 117 additions and 389 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
                  android:allowBackup="true"
                  android:theme="@style/PreferenceTheme">
 
-        <service android:name="Trime" android:label="@string/ime_name"
+        <service android:name=".TrimeImeService" android:label="@string/ime_name"
                 android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
@@ -50,13 +50,23 @@
             </intent-filter>
         </activity> -->
 
-        <activity android:name=".settings.PrefMainActivity" android:label="@string/ime_name">
+        <!-- Settings activity -->
+        <activity android:name=".settings.PrefMainActivity"
+            android:label="@string/ime_name"
+            android:launchMode="singleTask"/>
+
+        <!-- Using an activity alias to disable/enable the app icon in the launcher -->
+        <activity-alias
+            android:name="com.osfans.trime.PrefLauncherAlias"
+            android:label="@string/ime_name"
+            android:launchMode="singleTask"
+            android:targetActivity=".settings.PrefMainActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
+        </activity-alias>
 
         <activity android:name=".settings.HelpActivity"
             android:label="@string/pref_help" />

diff --git a/app/src/main/java/com/osfans/trime/Composition.java b/app/src/main/java/com/osfans/trime/Composition.java
@@ -37,6 +37,9 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
+
+import com.osfans.trime.ime.core.Trime;
+
 import java.util.List;
 import java.util.Map;
 

diff --git a/app/src/main/java/com/osfans/trime/Effect.java b/app/src/main/java/com/osfans/trime/Effect.java
@@ -29,7 +29,7 @@
 import android.os.Build;
 
 /** 處理按鍵聲音、震動、朗讀等效果 */
-class Effect {
+public class Effect {
   private static final int MAX_VOLUME = 101; //100%音量時只響一下，暫從100改成101
   private int duration = 10;
   private long durationLong;

diff --git a/app/src/main/java/com/osfans/trime/Function.java b/app/src/main/java/com/osfans/trime/Function.java
@@ -36,6 +36,9 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.KeyEvent;
+
+import com.osfans.trime.settings.PrefMainActivity;
+
 import java.text.FieldPosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -128,7 +131,7 @@ private static void startIntent(Context context, String action, String arg) {
   }
 
   public static void showPrefDialog(Context context) {
-    Intent intent = new Intent(context, Pref.class);
+    Intent intent = new Intent(context, PrefMainActivity.class);
     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY);
     context.startActivity(intent);
   }

diff --git a/app/src/main/java/com/osfans/trime/KeyboardSwitch.java b/app/src/main/java/com/osfans/trime/KeyboardSwitch.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 /** 管理多個{@link Keyboard 鍵盤} */
-class KeyboardSwitch {
+public class KeyboardSwitch {
 
   private final Context context;