perf: reduce keyboard and one_hand_mode loading time

Author: tumuyan

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

@@ -410,8 +410,11 @@ public void onOptionChanged(@NonNull String option, boolean value) {
           else if (c == '2' && value) oneHandMode = 2;
           else if (c == '3') oneHandMode = value ? 1 : 2;
           else oneHandMode = 0;
+
           loadBackground();
-          initKeyboard();
+          if (keyboardSwitcher != null) keyboardSwitcher.newOrReset();
+          resetKeyboard();
+          bindKeyboardToInputView();
         }
     }
     if (mainKeyboardView != null) mainKeyboardView.invalidateAllKeys();
@@ -512,7 +515,9 @@ private void loadBackground() {
 
     int[] padding =
         mConfig.getKeyboardPadding(oneHandMode, orientation == Configuration.ORIENTATION_LANDSCAPE);
-    Timber.i("padding= %s %s %s", padding[0], padding[1], padding[2]);
+    Timber.i(
+        "update KeyboardPadding: Trime.loadBackground, padding= %s %s %s",
+        padding[0], padding[1], padding[2]);
     mainKeyboardView.setPadding(padding[0], 0, padding[1], padding[2]);
 
     final Drawable d3 = mConfig.getDrawable_("root_background");
@@ -549,6 +554,10 @@ public void resetCandidate() {
   /** 重置鍵盤、候選條、狀態欄等 !!注意，如果其中調用Rime.setOption，切換方案會卡住 */
   private void reset() {
     if (inputRootBinding == null) return;
+    final LinearLayout symbolInputView = inputRootBinding.symbol.symbolInput;
+    final LinearLayout mainInputView = inputRootBinding.main.mainInput;
+    if (symbolInputView != null) symbolInputView.setVisibility(View.GONE);
+    if (mainInputView != null) mainInputView.setVisibility(View.VISIBLE);
     getImeConfig().reset();
     loadConfig();
     getImeConfig().initCurrentColors();
@@ -563,7 +572,7 @@ public void initKeyboard() {
     setNavBarColor();
     mNeedUpdateRimeOption = true; // 不能在Rime.onMessage中調用set_option，會卡死
     bindKeyboardToInputView();
-    loadBackground();
+    // loadBackground(); // reset()调用过resetCandidate()，resetCandidate()一键调用过loadBackground();
     updateComposing(); // 切換主題時刷新候選
   }
 

app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.java

@@ -101,7 +101,7 @@ public Keyboard(@NonNull Context context) {
 
     final DisplayMetrics dm = context.getResources().getDisplayMetrics();
     mDisplayWidth = dm.widthPixels;
-    int[] keyboardPadding = config.getKeyboardPadding(land);
+    int[] keyboardPadding = config.getKeyboardPadding();
     mDisplayWidth = mDisplayWidth - keyboardPadding[0] - keyboardPadding[1];
     /* Height of the screen */
     // final int mDisplayHeight = dm.heightPixels;

app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardSwitcher.kt

@@ -1,7 +1,9 @@
 package com.osfans.trime.ime.keyboard
 
+import android.content.res.Configuration
 import com.osfans.trime.ime.core.Trime
 import com.osfans.trime.setup.Config
+import timber.log.Timber
 
 /** Manages [Keyboard]s and their status. **/
 class KeyboardSwitcher {
@@ -26,6 +28,14 @@ class KeyboardSwitcher {
     fun newOrReset() {
         val ims = Trime.getService()
         keyboardNames = Config.get(ims).keyboardNames
+
+        val land = (
+            ims.resources.configuration.orientation
+                == Configuration.ORIENTATION_LANDSCAPE
+            )
+        Config.get(ims).getKeyboardPadding(land)
+        Timber.d("update KeyboardPadding: KeyboardSwitcher.init")
+
         keyboards = Array(keyboardNames.size) { i ->
             Keyboard(ims, keyboardNames[i])
         }

app/src/main/java/com/osfans/trime/settings/components/ColorPickerDialog.kt

@@ -6,6 +6,7 @@ import com.osfans.trime.R
 import com.osfans.trime.ime.core.Preferences
 import com.osfans.trime.ime.core.Trime
 import com.osfans.trime.setup.Config
+import timber.log.Timber
 
 /** 顯示配色方案列表
  *  Show Color Scheme List
@@ -40,10 +41,13 @@ class ColorPickerDialog(
     }
 
     private fun selectColor() {
+        Timber.i("select")
         if (checkedColor < 0 || checkedColor >= colorKeys.size) return
         val colorKey = colorKeys[checkedColor]
         prefs.looks.selectedColor = colorKey
+        Timber.i("initKeyboard")
         Trime.getService()?.initKeyboard() // 立刻重初始化键盘生效
+        Timber.i("done")
     }
 
     /** 调用该方法显示对话框 **/

app/src/main/java/com/osfans/trime/settings/components/ThemePickerDialog.kt

@@ -12,7 +12,6 @@ import com.osfans.trime.setup.Config
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
@@ -112,7 +111,6 @@ class ThemePickerDialog(
 
     private suspend fun doInBackground(): String = withContext(Dispatchers.IO) {
         setTheme()
-        delay(1000) // Simulate async task
         return@withContext "OK"
     }
 

app/src/main/java/com/osfans/trime/setup/Config.java

@@ -256,6 +256,7 @@ public void setTheme(String theme) {
   }
 
   private void init() {
+    Timber.d("init() themeName=%s schema_id=%s", themeName, schema_id);
     try {
       Rime.deploy_config_file(themeName + ".yaml", "config_version");
       Map<String, ?> m = YamlUtils.INSTANCE.loadMap(themeName, "");
@@ -279,6 +280,8 @@ private void init() {
       Rime.setShowSwitches(getPrefs().getKeyboard().getSwitchesEnabled());
       Rime.setShowSwitchArrow(getPrefs().getKeyboard().getSwitchArrowEnabled());
       reset();
+      initCurrentColors();
+      Timber.d("init() finins");
     } catch (Exception e) {
       e.printStackTrace();
       setTheme(defaultName);
@@ -432,6 +435,7 @@ public int[] getKeyboardPadding() {
   }
 
   public int[] getKeyboardPadding(boolean land_mode) {
+    Timber.i("update KeyboardPadding: getKeyboardPadding(boolean land_mode) ");
     return getKeyboardPadding(one_hand_mode, land_mode);
   }