tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SuperMonster003
2025-04-19 17:36:33 +08:00
parent d0b5a8fbad
commit 0867e9976b
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/autojs/autojs/theme/app/ColorSelectBaseActivity.kt
View File

@@ -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)
}