YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-09-12 19:47:22 +08:00
parent c4a6151e60
commit 9fee4f4025
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
+7 -1
View File
@@ -89,7 +89,7 @@ interface BookSourceDao {
fun flowGroupsUnProcessed(): Flow<List<String>>
@Query("select distinct bookSourceGroup from book_sources where enabled = 1 and trim(bookSourceGroup) <> ''")
fun flowGroupEnabled(): Flow<List<String>>
fun flowEnabledGroupsUnProcessed(): Flow<List<String>>
@Query(
"""select distinct bookSourceGroup from book_sources
@@ -186,4 +186,10 @@ interface BookSourceDao {
dealGroups(list)
}
}
fun flowEnabledGroups(): Flow<List<String>> {
return flowEnabledGroupsUnProcessed().map { list ->
dealGroups(list)
}
}
}
app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt
+2 -5
View File
@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
import io.legado.app.constant.AppPattern
import io.legado.app.constant.EventBus
import io.legado.app.data.appDb
import io.legado.app.data.entities.Book
@@ -188,11 +187,9 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
}
}
launch {
appDb.bookSourceDao.flowGroupEnabled().conflate().collect {
appDb.bookSourceDao.flowEnabledGroups().conflate().collect {
groups.clear()
it.map { group ->
groups.addAll(group.splitNotBlank(AppPattern.splitGroupRegex))
}
groups.addAll(it)
upGroupMenu()
}
}
app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt
+2 -5
View File
@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import io.legado.app.R
import io.legado.app.base.BaseDialogFragment
import io.legado.app.constant.AppPattern
import io.legado.app.constant.EventBus
import io.legado.app.data.appDb
import io.legado.app.data.entities.Book
@@ -210,11 +209,9 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
}
}
launch {
appDb.bookSourceDao.flowGroupEnabled().conflate().collect {
appDb.bookSourceDao.flowEnabledGroups().conflate().collect {
groups.clear()
it.map { group ->
groups.addAll(group.splitNotBlank(AppPattern.splitGroupRegex))
}
groups.addAll(it)
upGroupMenu()
}
}
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+2 -5
View File
@@ -16,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.flexbox.FlexboxLayoutManager
import io.legado.app.R
import io.legado.app.base.VMBaseActivity
import io.legado.app.constant.AppPattern
import io.legado.app.constant.PreferKey
import io.legado.app.data.appDb
import io.legado.app.data.entities.Book
@@ -245,11 +244,9 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
}
}
launch {
appDb.bookSourceDao.flowGroupEnabled().conflate().collect {
appDb.bookSourceDao.flowEnabledGroups().conflate().collect {
groups.clear()
it.map { group ->
groups.addAll(group.splitNotBlank(AppPattern.splitGroupRegex))
}
groups.addAll(it)
upGroupMenu()
}
}