yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Xwite
2022-01-23 16:54:45 +08:00
committed by GitHub
parent b8536a46a7 ede37498ce
commit acba50cbf6
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/data/entities/BookSource.kt
+4 -2
View File
@@ -118,18 +118,20 @@ data class BookSource(
fun getContentRule() = ruleContent ?: ContentRule()
fun addGroup(group: String) {
fun addGroup(group: String): BookSource {
bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
it.add(group)
bookSourceGroup = TextUtils.join(",", it)
}
return this
}
fun removeGroup(group: String) {
fun removeGroup(group: String): BookSource {
bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
it.remove(group)
bookSourceGroup = TextUtils.join(",", it)
}
return this
}
fun equal(source: BookSource) =
app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt
+2 -7
View File
@@ -3,7 +3,6 @@ package io.legado.app.ui.book.source.manage
import android.app.Application
import android.text.TextUtils
import io.legado.app.base.BaseViewModel
import io.legado.app.constant.AppPattern
import io.legado.app.data.appDb
import io.legado.app.data.entities.BookSource
import io.legado.app.utils.*
@@ -92,23 +91,19 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
fun selectionAddToGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
sources.forEach { source ->
source.addGroup(groups)
list.add(source)
}
appDb.bookSourceDao.update(*list.toTypedArray())
appDb.bookSourceDao.update(*sources.toTypedArray())
}
}
fun selectionRemoveFromGroups(sources: List<BookSource>, groups: String) {
execute {
val list = arrayListOf<BookSource>()
sources.forEach { source ->
source.removeGroup(groups)
list.add(source)
}
appDb.bookSourceDao.update(*list.toTypedArray())
appDb.bookSourceDao.update(*sources.toTypedArray())
}
}