pull/328/head
AndyBernie 5 years ago
parent 33a7255928
commit b87ff54a85
  1. 2
      app/src/main/assets/updateLog.md
  2. 12
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
  3. 8
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt

@ -7,7 +7,7 @@
* 应用被杀死时停止朗读
* 默认封面添加删除操作
* 备份阅读记录
* 书源添加移除分组支持多选
* 书源添加移除分组支持多选,多个分组以逗号(中英均可)隔开
**2020/08/22**
* 添加阅读时间记录

@ -227,8 +227,8 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(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<BookSourceViewModel>(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<BookSourceViewModel>(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<BookSourceViewModel>(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<BookSourceViewModel>(R.layout.activity
okButton {
editText?.text?.toString()?.let {
if (it.isNotEmpty()) {
viewModel.selectionRemoveFromGroup(adapter.getSelection(), it)
viewModel.selectionRemoveFromGroups(adapter.getSelection(), it)
}
}
}

@ -93,7 +93,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
}
}
fun selectionAddToGroup(sources: List<BookSource>, group: String) {
fun selectionAddToGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
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<BookSource>, group: String) {
fun selectionRemoveFromGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
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)

Loading…
Cancel
Save