diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 64f6871a4..159dcf354 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -7,7 +7,7 @@ * 应用被杀死时停止朗读 * 默认封面添加删除操作 * 备份阅读记录 -* 书源添加移除分组支持多选 +* 书源添加移除分组支持多选,多个分组以逗号(中英均可)隔开 **2020/08/22** * 添加阅读时间记录 diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 6e0552724..da57654f4 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -227,8 +227,8 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity R.id.menu_check_source -> checkSource() R.id.menu_top_sel -> viewModel.topSource(*adapter.getSelection().toTypedArray()) R.id.menu_bottom_sel -> viewModel.bottomSource(*adapter.getSelection().toTypedArray()) - R.id.menu_add_group -> selectionAddToGroup() - R.id.menu_remove_group -> selectionRemoveFromGroup() + R.id.menu_add_group -> selectionAddToGroups() + R.id.menu_remove_group -> selectionRemoveFromGroups() } return true } @@ -256,7 +256,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } @SuppressLint("InflateParams") - private fun selectionAddToGroup() { + private fun selectionAddToGroups() { alert(titleResource = R.string.add_group) { var editText: AutoCompleteTextView? = null customView { @@ -268,7 +268,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity okButton { editText?.text?.toString()?.let { if (it.isNotEmpty()) { - viewModel.selectionAddToGroup(adapter.getSelection(), it) + viewModel.selectionAddToGroups(adapter.getSelection(), it) } } } @@ -277,7 +277,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity } @SuppressLint("InflateParams") - private fun selectionRemoveFromGroup() { + private fun selectionRemoveFromGroups() { alert(titleResource = R.string.remove_group) { var editText: AutoCompleteTextView? = null customView { @@ -289,7 +289,7 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity okButton { editText?.text?.toString()?.let { if (it.isNotEmpty()) { - viewModel.selectionRemoveFromGroup(adapter.getSelection(), it) + viewModel.selectionRemoveFromGroups(adapter.getSelection(), it) } } } diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt index ca81c50aa..8038cf0db 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt @@ -93,7 +93,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) } } - fun selectionAddToGroup(sources: List, group: String) { + fun selectionAddToGroups(sources: List, groups: String) { execute { val list = arrayListOf() sources.forEach { @@ -101,7 +101,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) it.bookSourceGroup?.splitNotBlank(",", ";")?.forEach { newGroupList.add(it) } - group.splitNotBlank(",", ";").forEach { + groups.splitNotBlank(",", ";", ",").forEach { newGroupList.add(it) } val lh = LinkedHashSet(newGroupList) @@ -112,7 +112,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) } } - fun selectionRemoveFromGroup(sources: List, group: String) { + fun selectionRemoveFromGroups(sources: List, groups: String) { execute { val list = arrayListOf() sources.forEach { @@ -120,7 +120,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) it.bookSourceGroup?.splitNotBlank(",", ";")?.forEach { newGroupList.add(it) } - group.splitNotBlank(",", ";").forEach { + groups.splitNotBlank(",", ";", ",").forEach { newGroupList.remove(it) } val lh = LinkedHashSet(newGroupList)