refactor(ui): improve code logic in ColorPickerDialog

Author: WhiredPlanck

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

@@ -30,18 +30,15 @@
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.util.TypedValue;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.osfans.trime.core.Rime;
 import com.osfans.trime.ime.enums.PositionType;
 import com.osfans.trime.ime.enums.SymbolKeyboardType;
 import com.osfans.trime.ime.keyboard.Key;
 import com.osfans.trime.ime.keyboard.Sound;
 import com.osfans.trime.ime.symbol.TabManager;
 import com.osfans.trime.util.ConfigGetter;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -55,7 +52,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.regex.Pattern;
-
+import java.util.stream.Collectors;
 import timber.log.Timber;
 
 /** 解析 YAML 配置文件 */
@@ -734,24 +731,12 @@ public Integer getCurrentColor(String key) {
     return parseColor(o);
   }
 
-  public String[] getColorKeys() {
-    if (presetColorSchemes == null) return null;
-    final Object[] keys = new String[presetColorSchemes.size()];
-    presetColorSchemes.keySet().toArray(keys);
-    return (String[]) keys;
-  }
-
-  @Nullable
-  public String[] getColorNames(String[] keys) {
-    if (keys == null) return null;
-    final int n = keys.length;
-    final String[] names = new String[n];
-    for (int i = 0; i < n; i++) {
-      final Map<?, ?> m = (Map<?, ?>) presetColorSchemes.get(keys[i]);
-      assert m != null;
-      names[i] = Objects.requireNonNull(m.get("name")).toString();
-    }
-    return names;
+  @NonNull
+  public List<String[]> getPresetColorSchemes() {
+    if (presetColorSchemes == null) return new ArrayList<>();
+    return presetColorSchemes.entrySet().stream()
+        .map(e -> new String[] {e.getKey(), Objects.requireNonNull(e.getValue().get("name"))})
+        .collect(Collectors.toList());
   }
 
   private Map<String, String> mEnterLabels;

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

@@ -1,60 +1,62 @@
 package com.osfans.trime.ui.components
 
 import android.content.Context
-import android.os.Build
-import android.view.WindowManager
 import androidx.appcompat.app.AlertDialog
 import com.osfans.trime.R
 import com.osfans.trime.data.AppPrefs
 import com.osfans.trime.data.Config
 import com.osfans.trime.ime.core.Trime
 import com.osfans.trime.util.popup
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 /** 顯示配色方案列表
  *  Show Color Scheme List
  * **/
 class ColorPickerDialog(
-    context: Context
-) {
-    val config: Config = Config.get(context)
-    private val prefs get() = AppPrefs.defaultInstance()
-    private var colorKeys: Array<String>
-    private var checkedColorKey: Int = 0
-    val pickerDialog: AlertDialog
+    private val context: Context
+) : CoroutineScope by MainScope() {
 
-    init {
-        val colorScheme = prefs.looks.selectedColor
-        colorKeys = config.colorKeys
-        colorKeys.sort()
-        val colorNames = config.getColorNames(colorKeys)
-        checkedColorKey = colorKeys.binarySearch(colorScheme)
+    private val prefs get() = AppPrefs.defaultInstance()
+    private lateinit var allColorKeys: Array<String>
+    private lateinit var allColorNames: Array<String>
+    private var checkedItem: Int = -1
 
-        pickerDialog = AlertDialog.Builder(context, R.style.Theme_AppCompat_DayNight_Dialog_Alert).apply {
-            setTitle(R.string.looks__selected_color_title)
-            setCancelable(true)
-            setNegativeButton(android.R.string.cancel, null)
-            setPositiveButton(android.R.string.ok) { _, _ ->
-                selectColor()
+    private fun buildAndShowDialog() {
+        AlertDialog.Builder(context, R.style.Theme_AppCompat_DayNight_Dialog_Alert)
+            .setTitle(R.string.looks__selected_color_title)
+            .setNegativeButton(android.R.string.cancel, null)
+            .setSingleChoiceItems(
+                allColorNames, checkedItem
+            ) { _, id -> checkedItem = id }
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                if (checkedItem in allColorKeys.indices) {
+                    launch {
+                        Timber.i("Applying color scheme ...")
+                        prefs.looks.selectedColor = allColorKeys[checkedItem]
+                        Timber.i("Initializing keyboard ...")
+                        Trime.getServiceOrNull()?.initKeyboard() // 立刻重初始化键盘生效
+                        Timber.i("Applying done")
+                    }
+                }
             }
-            setSingleChoiceItems(
-                colorNames, checkedColorKey
-            ) { _, id -> checkedColorKey = id }
-        }.create()
+            .create().popup()
     }
 
-    private fun selectColor() {
-        Timber.i("select")
-        if (checkedColorKey !in colorKeys.indices) return
-        val colorKey = colorKeys[checkedColorKey]
-        prefs.looks.selectedColor = colorKey
-        Timber.i("initKeyboard")
-        Trime.getServiceOrNull()?.initKeyboard() // 立刻重初始化键盘生效
-        Timber.i("done")
+    private fun init() {
+        val allColors = Config.get(context).presetColorSchemes.toTypedArray()
+        allColorKeys = allColors.map { a -> a[0] }.toTypedArray()
+        allColorNames = allColors.map { a -> a[1] }.toTypedArray()
+        val activeColor = prefs.looks.selectedColor
+        Timber.d("activeColor = $activeColor")
+        checkedItem = allColorKeys.indexOf(activeColor)
     }
 
     /** 调用该方法显示对话框 **/
-    fun show() {
-        pickerDialog.popup()
+    fun show() = launch {
+        init()
+        buildAndShowDialog()
     }
 }