diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt b/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt index bd57e81..23a8e5b 100644 --- a/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt +++ b/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt @@ -59,7 +59,7 @@ class ChipSelectDialog(context: Context) : Dialog(context, R.style.DialogTheme) binding.btnConfirm.setOnClickListener { if (binding.chipGroup.checkedChipId == -1) { - context.toast("请选择净菜分类") + context.toast("请选择$dialogTitle") return@setOnClickListener } onItemSelected?.invoke(selectedIndex) @@ -99,13 +99,10 @@ class ChipSelectDialog(context: Context) : Dialog(context, R.style.DialogTheme) selectedIndex = index } } - val params = ChipGroup.LayoutParams( - ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT - ).apply { - setMargins(8, 5.dp, 8.dp, 5.dp) // left, top, right, bottom + binding.chipGroup.apply { + isSingleLine = false + addView(chip) } - binding.chipGroup.addView(chip, params) } } } diff --git a/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt b/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt index 4a0bf6c..71a4b04 100644 --- a/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt +++ b/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt @@ -358,7 +358,7 @@ class ShelfV3Activity : BaseActivity() { private fun showChipSelectDialog(categoryList: List, callback: (Int) -> Unit) { ChipSelectDialog(this).apply { - dialogTitle = "请选择净菜分类" + dialogTitle = "净菜分类" items = categoryList onItemSelected = callback show() diff --git a/app/src/main/res/layout/dialog_chip_select.xml b/app/src/main/res/layout/dialog_chip_select.xml index 9765709..494bc27 100644 --- a/app/src/main/res/layout/dialog_chip_select.xml +++ b/app/src/main/res/layout/dialog_chip_select.xml @@ -27,10 +27,13 @@