refactor(data, ime): update or remove some deprecated methods and parameters

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/theme/Config.java

@@ -18,6 +18,7 @@
 
 package com.osfans.trime.data.theme;
 
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
@@ -63,7 +64,7 @@ public static Config get() {
 
   private String soundPackageName, currentSound;
   private static final String defaultThemeName = "trime";
-  private String currentSchemaId, currentColorSchemeId;
+  private String currentColorSchemeId;
 
   private Map<String, Object> generalStyle;
   private Map<String, String> fallbackColors;
@@ -76,10 +77,6 @@ public static Config get() {
   public Keyboards keyboards;
 
   public Config() {
-    this(false);
-  }
-
-  public Config(boolean skipDeploy) {
     self = this;
     ThemeManager.init();
     soundPackageName = appPrefs.getKeyboard().getSoundPackage();
@@ -88,11 +85,7 @@ public Config(boolean skipDeploy) {
     DataManager.sync();
     Rime.get(!DataManager.INSTANCE.getSharedDataDir().exists());
 
-    //    正常逻辑不应该部署全部主题，init()方法已经做过当前主题的部署
-    //    Timber.d(methodName + "deployTheme");
-    //    deployTheme();
-
-    init(true);
+    init();
 
     Timber.d("Setting sound from color ...");
     setSoundFromColor();
@@ -141,17 +134,15 @@ public void setSoundFromColor() {
     }
   }
 
-  public void init(boolean skipDeployment) {
-    Timber.d("Initializing theme ..., skip deployment: %s", skipDeployment);
-    Timber.d(
-        "Current theme: %s, current schema id: %s", ThemeManager.getActiveTheme(), currentSchemaId);
+  public void init() {
+    Timber.i("Initializing theme, current theme name: %s ...", ThemeManager.getActiveTheme());
     try {
       final String fullThemeFileName = ThemeManager.getActiveTheme() + ".yaml";
       final File themeFile = new File(Rime.get_user_data_dir(), "build/" + fullThemeFileName);
-      if (skipDeployment && themeFile.exists()) {
-        Timber.d("Skipped theme file deployment");
+      if (themeFile.exists()) {
+        Timber.i("Deployed file exists, skipping deployment ...");
       } else {
-        Timber.d("The theme has not been deployed yet, deploying ...");
+        Timber.i("The theme has not been deployed yet, deploying ...");
         Rime.deploy_config_file(fullThemeFileName, "config_version");
       }
 
@@ -179,7 +170,6 @@ public void init(boolean skipDeployment) {
       Timber.d("Setting up all theme config map takes %s ms", end - start);
       initLiquidKeyboard();
       Timber.d("init() initLiquidKeyboard done");
-      reloadSchemaId();
       Timber.d("init() reset done");
       initCurrentColors();
       initEnterLabels();
@@ -190,15 +180,11 @@ public void init(boolean skipDeployment) {
       Timber.e(e, "Failed to parse the theme!");
       if (!ThemeManager.getActiveTheme().equals(defaultThemeName)) {
         ThemeManager.switchTheme(defaultThemeName);
-        init(false);
+        init();
       }
     }
   }
 
-  public void reloadSchemaId() {
-    currentSchemaId = Rime.getSchemaId();
-  }
-
   @Nullable
   public static Object obtainValue(Map<String, Object> map, @NonNull String vararg) {
     if (map == null || map.isEmpty() || vararg.isEmpty()) return null;
@@ -665,7 +651,7 @@ private Drawable drawableBitmapObject(Object o) {
           final byte[] chunk = bitmap.getNinePatchChunk();
           // 如果 .9.png 没有经过第一步，那么 chunk 就是 null, 只能按照普通方式加载
           if (NinePatch.isNinePatchChunk(chunk))
-            return new NinePatchDrawable(bitmap, chunk, new Rect(), null);
+            return new NinePatchDrawable(Resources.getSystem(), bitmap, chunk, new Rect(), null);
         }
         return Drawable.createFromPath(name);
       }
@@ -762,7 +748,7 @@ public Drawable getDrawableBitmap_(String key) {
         final Bitmap bitmap = BitmapFactory.decodeFile(path);
         final byte[] chunk = bitmap.getNinePatchChunk();
         if (NinePatch.isNinePatchChunk(chunk))
-          return new NinePatchDrawable(bitmap, chunk, new Rect(), null);
+          return new NinePatchDrawable(Resources.getSystem(), bitmap, chunk, new Rect(), null);
       }
       return Drawable.createFromPath(path);
     }
@@ -777,10 +763,10 @@ public void initCurrentColors() {
     currentColors.clear();
     currentColorSchemeId = getColorSchemeName();
     backgroundFolder = style.getString("background_folder");
-    Timber.d("Initializing currentColors ...");
+    Timber.d("Caching color values ...");
     Timber.d(
-        "currentColorSchemeId = %s, currentThemeName = %s, currentSchemaId = %s",
-        currentColorSchemeId, ThemeManager.getActiveTheme(), currentSchemaId);
+        "currentColorSchemeId = %s, currentThemeName = %s",
+        currentColorSchemeId, ThemeManager.getActiveTheme());
     final Map<String, String> colorMap = presetColorSchemes.get(currentColorSchemeId);
     if (colorMap == null) {
       Timber.d("Color scheme id not found: %s", currentColorSchemeId);
@@ -812,13 +798,12 @@ public void initCurrentColors(boolean darkMode) {
     currentColors.clear();
     currentColorSchemeId = getColorSchemeName(darkMode);
     backgroundFolder = style.getString("background_folder");
-    Timber.d("Initializing currentColors ...");
-    Timber.d(
-        "currentColorSchemeId = %s, currentThemeName = %s, currentSchemaId = %s, isDarkMode = %s",
-        currentColorSchemeId, ThemeManager.getActiveTheme(), currentSchemaId, darkMode);
+    Timber.i(
+        "Caching currentColors (currentColorSchemeId=%s, isDarkMode=%s) ...",
+        currentColorSchemeId, darkMode);
     final Map<String, String> colorMap = presetColorSchemes.get(currentColorSchemeId);
     if (colorMap == null) {
-      Timber.i("Color scheme id not found: %s", currentColorSchemeId);
+      Timber.w("Color scheme id not found: %s", currentColorSchemeId);
       return;
     }
     appPrefs.getThemeAndColor().setSelectedColor(currentColorSchemeId);

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

@@ -553,7 +553,6 @@ private void reset() {
     if (inputRootBinding == null) return;
     inputRootBinding.symbol.symbolInput.setVisibility(View.GONE);
     inputRootBinding.main.mainInput.setVisibility(View.VISIBLE);
-    getImeConfig().reloadSchemaId();
     loadConfig();
     getImeConfig().initCurrentColors();
     getImeConfig().setSoundFromColor();
@@ -575,7 +574,6 @@ public void initKeyboard() {
 
   public void initKeyboardDarkMode(boolean darkMode) {
     if (getImeConfig().hasDarkLight()) {
-      getImeConfig().reloadSchemaId();
       loadConfig();
       getImeConfig().initCurrentColors(darkMode);
       getImeConfig().setSoundFromColor();

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

@@ -33,7 +33,7 @@ object KeyboardSwitcher {
         theme.getKeyboardPadding(ScreenUtils.isLandscape())
         Timber.d("Switching keyboard back to .default ...")
         availableKeyboardIds = (theme.style.getObject("keyboards") as? List<String>)
-                ?.map { theme.keyboards.remapKeyboardId(it) }?.distinct() ?: listOf()
+            ?.map { theme.keyboards.remapKeyboardId(it) }?.distinct() ?: listOf()
         availableKeyboards = availableKeyboardIds.map { Keyboard(theme.keyboards.remapKeyboardId(it)) }
     }
 
@@ -72,8 +72,10 @@ object KeyboardSwitcher {
         }
         lastId = currentId
         currentId = if (mini >= 0) mini else i
-        Timber.i("Switched keyboard from ${availableKeyboardIds[lastId]} " +
-                "to ${availableKeyboardIds[currentId]} (deviceKeyboard=$deviceKeyboard).")
+        Timber.i(
+            "Switched keyboard from ${availableKeyboardIds[lastId]} " +
+                "to ${availableKeyboardIds[currentId]} (deviceKeyboard=$deviceKeyboard)."
+        )
     }
 
     /**

app/src/main/java/com/osfans/trime/ui/main/Pickers.kt

@@ -30,7 +30,7 @@ suspend fun Context.themePicker(
         onOKButton {
             with(items[checkedItem].toString()) {
                 ThemeManager.switchTheme(if (this == "trime") this else "$this.trime")
-                Config.get().init(false)
+                Config.get().init()
             }
             Trime.getServiceOrNull()?.initKeyboard()
         }