diff --git a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt index 49eac85a3..bb6d5724d 100644 --- a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt @@ -111,6 +111,20 @@ interface BookSourceDao { ) fun flowNoGroup(): Flow> + @Query( + """select bookSourceUrl, bookSourceName, bookSourceGroup, customOrder, enabled, enabledExplore, + trim(loginUrl) <> '' hasLoginUrl, lastUpdateTime, respondTime, weight, trim(exploreUrl) <> '' hasExploreUrl + from book_sources where enabledExplore = 1 order by customOrder asc""" + ) + fun flowEnabledExplore(): Flow> + + @Query( + """select bookSourceUrl, bookSourceName, bookSourceGroup, customOrder, enabled, enabledExplore, + trim(loginUrl) <> '' hasLoginUrl, lastUpdateTime, respondTime, weight, trim(exploreUrl) <> '' hasExploreUrl + from book_sources where enabledExplore = 0 order by customOrder asc""" + ) + fun flowDisabledExplore(): Flow> + @Query( """select * from book_sources where enabledExplore = 1 @@ -193,6 +207,12 @@ interface BookSourceDao { @get:Query("select * from book_sources where bookSourceGroup is null or bookSourceGroup = '' or bookSourceGroup like '%未分组%'") val allNoGroup: List + @get:Query("select * from book_sources where enabledExplore = 1 order by customOrder") + val allEnabledExplore: List + + @get:Query("select * from book_sources where enabledExplore = 0 order by customOrder") + val allDisabledExplore: List + @get:Query("select * from book_sources where loginUrl is not null and loginUrl != ''") val allLogin: List 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 ea6c08960..37d3c81cb 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 @@ -217,6 +217,14 @@ class BookSourceActivity : VMBaseActivity { + searchView.setQuery(getString(R.string.enabled_explore), true) + } + + R.id.menu_disabled_explore_group -> { + searchView.setQuery(getString(R.string.disabled_explore), true) + } + R.id.menu_help -> showHelp() } if (item.groupId == R.id.source_group) { @@ -272,6 +280,14 @@ class BookSourceActivity : VMBaseActivity { + appDb.bookSourceDao.flowEnabledExplore() + } + + searchKey == getString(R.string.disabled_explore) -> { + appDb.bookSourceDao.flowDisabledExplore() + } + searchKey.startsWith("group:") -> { val key = searchKey.substringAfter("group:") appDb.bookSourceDao.flowGroupSearch(key) 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 6d4824667..3179e9371 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 @@ -191,6 +191,14 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) appDb.bookSourceDao.allNoGroup } + searchKey == appCtx.getString(R.string.enabled_explore) -> { + appDb.bookSourceDao.allEnabledExplore + } + + searchKey == appCtx.getString(R.string.disabled_explore) -> { + appDb.bookSourceDao.allDisabledExplore + } + searchKey.startsWith("group:") -> { val key = searchKey.substringAfter("group:") appDb.bookSourceDao.groupSearch(key) diff --git a/app/src/main/res/menu/book_source.xml b/app/src/main/res/menu/book_source.xml index 3b4192d22..64421ae41 100644 --- a/app/src/main/res/menu/book_source.xml +++ b/app/src/main/res/menu/book_source.xml @@ -92,6 +92,14 @@ android:id="@+id/menu_group_null" android:title="@string/no_group" /> + + + + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index e44a97a2a..0b8b2a7e7 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -729,6 +729,8 @@ Seleccione una carpeta de respaldo heredada Activado Desactivado + Discovery Enabled + Discovery Disabled Iniciando descarga Este libro ya está en la lista de descargas Haga clic para abrir diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index e8e131884..1f22af517 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -732,6 +732,8 @@ Select a legacy backup folder Enabled Disabled + Discovery Enabled + Discovery Disabled Starting download This book is already in Download list Click to open diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3cb4b18aa..f7441199b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -730,6 +730,8 @@ Selecione uma pasta Legado de Backup Ativado Desativado + Discovery Enabled + Discovery Disabled Iniciando o download Este livro já está na lista de download Clique para abrir diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index d5162fca5..350fc503f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -730,6 +730,8 @@ Còn Chọn thư mục sao lưu kế thừa Đã bật Đã tắt + Discovery Enabled + Discovery Disabled Bắt đầu tải xuống Cuốn sách này đã có trong danh sách Download Nhấp để mở diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 900603145..50e60182e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -723,6 +723,8 @@ 選擇舊版備份文件夾 已啓用 已禁用 + 已啟用發現 + 已禁用發現 文字底部對齊 正在啟動下載 該書已在下載列表 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7e899fbfe..014152f91 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -731,6 +731,8 @@ 選擇舊版備份資料夾 已啟用 已禁用 + 已啟用發現 + 已禁用發現 正在啟動下載 該書已在下載列表 點擊打開 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 5ca353c9d..bc62f321b 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -732,6 +732,8 @@ 选择旧版备份文件夹 已启用 已禁用 + 已启用发现 + 已禁用发现 正在启动下载 该书已在下载列表 点击打开 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 44f1a448d..f71bd2839 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -734,6 +734,8 @@ Select a legacy backup folder Enabled Disabled + Discovery Enabled + Discovery Disabled Starting download This book is already in Download list Click to open