From 89a85bbc24a9979d0570585ed541f734f3ab00e3 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 27 May 2023 23:46:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../changesource/ChangeBookSourceDialog.kt | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt index 5b192c30a..7d1ac18f5 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt @@ -248,6 +248,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_ } else { AppConfig.searchGroup = item.title.toString() } + upGroupMenu() viewModel.startOrStopSearch() viewModel.refresh() } @@ -345,24 +346,29 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_ * 更新分组菜单 */ private fun upGroupMenu() { - binding.toolBar.menu.findItem(R.id.menu_group)?.subMenu?.let { menu -> - val selectedGroup = AppConfig.searchGroup - menu.removeGroup(R.id.source_group) - val allItem = menu.add(R.id.source_group, Menu.NONE, Menu.NONE, R.string.all_source) - var hasSelectedGroup = false - groups.sortedWith { o1, o2 -> - o1.cnCompare(o2) - }.forEach { group -> - menu.add(R.id.source_group, Menu.NONE, Menu.NONE, group)?.let { - if (group == selectedGroup) { - it.isChecked = true - hasSelectedGroup = true + binding.toolBar.menu.findItem(R.id.menu_group)?.run { + subMenu?.let { menu -> + val selectedGroup = AppConfig.searchGroup + menu.removeGroup(R.id.source_group) + val allItem = menu.add(R.id.source_group, Menu.NONE, Menu.NONE, R.string.all_source) + var hasSelectedGroup = false + groups.sortedWith { o1, o2 -> + o1.cnCompare(o2) + }.forEach { group -> + menu.add(R.id.source_group, Menu.NONE, Menu.NONE, group)?.let { + if (group == selectedGroup) { + it.isChecked = true + hasSelectedGroup = true + } } } - } - menu.setGroupCheckable(R.id.source_group, true, true) - if (!hasSelectedGroup) { - allItem.isChecked = true + menu.setGroupCheckable(R.id.source_group, true, true) + if (hasSelectedGroup) { + title = getString(R.string.group) + "(" + AppConfig.searchGroup + ")" + } else { + allItem.isChecked = true + title = getString(R.string.group) + } } } }