renun/legado
1
0
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2025-08-10 00:52:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-09-12 19:07:05 +08:00
parent 1ba3d30785
commit 8e5d9960b7
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt
View File

@@ -86,7 +86,7 @@ interface BookSourceDao {
fun flowGroupExplore(key: String): Flow<List<BookSource>>
@Query("select distinct bookSourceGroup from book_sources where trim(bookSourceGroup) <> ''")
fun flowGroupsUnDeal(): Flow<List<String>>
fun flowGroupsUnProcessed(): Flow<List<String>>
@Query("select distinct bookSourceGroup from book_sources where enabled = 1 and trim(bookSourceGroup) <> ''")
fun flowGroupEnabled(): Flow<List<String>>
@@ -132,7 +132,7 @@ interface BookSourceDao {
val allTextEnabled: List<BookSource>
@Query("select distinct bookSourceGroup from book_sources where trim(bookSourceGroup) <> ''")
fun getAllGroupsUnDeal(): List<String>
fun getAllGroupsUnProcessed(): List<String>
@Query("select * from book_sources where bookSourceUrl = :key")
fun getBookSource(key: String): BookSource?
@@ -172,11 +172,11 @@ interface BookSourceDao {
val allGroups: List<String>
get() {
return dealGroups(getAllGroupsUnDeal())
return dealGroups(getAllGroupsUnProcessed())
}
fun flowGroups(): Flow<List<String>> {
return flowGroupsUnDeal().map { list ->
return flowGroupsUnProcessed().map { list ->
dealGroups(list)
}
}

18
app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
View File

@@ -506,13 +506,21 @@ class BookSourceEditActivity :
SelectItem("书源教程", "ruleHelp"),
SelectItem("js教程", "jsHelp"),
SelectItem("正则教程", "regexHelp"),
SelectItem("选择文件", "selectFile"),
)
val view = window.decorView.findFocus()
if (view is EditText && view.getTag(R.id.tag) == "bookSourceGroup") {
helpActions.add(
SelectItem("插入分组", "addGroup")
)
if (view is EditText) {
when (view.getTag(R.id.tag)) {
"bookSourceGroup" -> {
helpActions.add(
SelectItem("插入分组", "addGroup")
)
}
else -> {
helpActions.add(
SelectItem("选择文件", "selectFile")
)
}
}
}
return helpActions
}