6.6.3 - Alpha - 修复调色盘对话框可能无限叠加的问题

.changelog/lang_zh-Hans.json

@@ -9,6 +9,7 @@
       "fix": [
         "主页文档标签显示在线文档时部分内容被系统导航栏遮挡的问题",
         "部分设备代码编辑器空行显示方框字符的问题",
+        "主题色设置页面调色盘对话框可能无限叠加的问题",
         "APK 文件类型信息对话框可能无法获取应用名称及 SDK 信息的问题",
         "dialogs 模块无法正常使用 customView 属性的问题 _[`issue #364`](http://issues.autojs6.com/364)_",
         "console.setContentTextColor 方法导致日志字体颜色丢失默认值的问题 _[`issue #346`](http://issues.autojs6.com/346)_"

app/src/main/java/org/autojs/autojs/theme/app/ColorSelectBaseActivity.kt

@@ -11,6 +11,7 @@ import android.view.ViewAnimationUtils
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -253,8 +254,8 @@ abstract class ColorSelectBaseActivity : BaseActivity() {
             .setShowAlphaSlider(false)
             .setDialogTitle(R.string.dialog_title_color_palette)
             .setColor(initialColor ?: customColor)
-            .setOldColorPanelOnClickListener { showColorDetails(it.tag as? Int) }
-            .setNewColorPanelOnClickListener { showColorDetails(it.tag as? Int) }
+            .setOldColorPanelOnClickListener { v, dialog -> showColorDetails(v.tag as? Int, parentDialog = dialog) }
+            .setNewColorPanelOnClickListener { v, dialog -> showColorDetails(v.tag as? Int, parentDialog = dialog) }
             .setColorHistoriesHandler { showColorPickerHistories(it) }
             .create()
             .setColorPickerDialogListener { _, color: Int ->
@@ -494,12 +495,13 @@ abstract class ColorSelectBaseActivity : BaseActivity() {
         }
     }
 
-    protected fun showColorDetails(color: Int?, title: String? = null) {
+    protected fun showColorDetails(color: Int?, title: String? = null, parentDialog: DialogFragment? = null) {
         val customNeutral = ColorInfoDialogManager.CustomColorInfoDialogNeutral(
             textRes = R.string.dialog_button_use_palette,
             colorRes = R.color.dialog_button_hint,
             onNeutralCallback = object: NeutralButtonCallback{
                 override fun onClick(dialog: MaterialDialog, which: DialogAction, color: Int) {
+                    parentDialog?.dismiss()
                     dialog.dismiss()
                     showColorPicker(color)
                 }

modules/color-picker/src/main/java/com/jaredrummler/android/colorpicker/ColorPickerDialog.java

@@ -125,8 +125,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
     private static final String ARG_USE_LEGACY_MODE = "useLegacyMode";
 
     ColorPickerDialogListener colorPickerDialogListener;
-    View.OnClickListener oldColorPanelOnClickListener;
-    View.OnClickListener newColorPanelOnClickListener;
+    OnClickListener oldColorPanelOnClickListener;
+    OnClickListener newColorPanelOnClickListener;
     Consumer<ColorPickerDialog> colorHistoriesHandler;
 
     FrameLayout rootView;
@@ -361,7 +361,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         if (!useLegacyMode) {
             oldColorPanel.setOnClickListener(v -> {
                 v.setTag(oldColorPanel.getColor());
-                oldColorPanelOnClickListener.onClick(v);
+                oldColorPanelOnClickListener.onClick(v, this);
             });
             oldColorPanel.setOnLongClickListener(v -> {
                 resetColorPanel();
@@ -369,7 +369,7 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
             });
             newColorPanel.setOnClickListener(v -> {
                 v.setTag(newColorPanel.getColor());
-                newColorPanelOnClickListener.onClick(v);
+                newColorPanelOnClickListener.onClick(v, this);
             });
             newColorPanel.setOnLongClickListener(v -> {
                 int aimColor = colorPicker.lastColor;
@@ -861,8 +861,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
         int colorShape = ColorShape.CIRCLE;
         boolean useLegacyMode = false;
 
-        View.OnClickListener oldColorPanelOnClickListener;
-        View.OnClickListener newColorPanelOnClickListener;
+        OnClickListener oldColorPanelOnClickListener;
+        OnClickListener newColorPanelOnClickListener;
         Consumer<ColorPickerDialog> colorHistoriesHandler;
 
         /*package*/ Builder() {
@@ -1018,12 +1018,12 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
             return this;
         }
 
-        public Builder setOldColorPanelOnClickListener(View.OnClickListener onClickListener) {
+        public Builder setOldColorPanelOnClickListener(OnClickListener onClickListener) {
             this.oldColorPanelOnClickListener = onClickListener;
             return this;
         }
 
-        public Builder setNewColorPanelOnClickListener(View.OnClickListener onClickListener) {
+        public Builder setNewColorPanelOnClickListener(OnClickListener onClickListener) {
             this.newColorPanelOnClickListener = onClickListener;
             return this;
         }
@@ -1074,4 +1074,8 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerView
     }
 
     // endregion
+
+    public static interface OnClickListener {
+        void onClick(View view, ColorPickerDialog dialog);
+    }
 }

version.properties

@@ -1,5 +1,5 @@
-#Sat Apr 19 16:35:05 CST 2025
-BUILD_TIME=1745051705674
+#Sat Apr 19 17:34:08 CST 2025
+BUILD_TIME=1745055248865
 COMPILE_SDK_VERSION=35
 JAVA_VERSION=23
 JAVA_VERSION_MIN_RADICAL=0
@@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13
 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3
 TARGET_SDK_VERSION=35
 TARGET_SDK_VERSION_INRT=29
-VERSION_BUILD=3152
+VERSION_BUILD=3153
 VERSION_NAME=6.6.3 Alpha
 VSCODE_EXT_REQUIRED_VERSION=1.0.8