From b7ffeb930b5248b580c336d89b1d15dcf9d7954d Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 17 Oct 2022 21:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/search/SearchActivity.kt | 21 +++++++------- .../legado/app/ui/book/search/SearchScope.kt | 12 ++++++-- .../main/res/layout/activity_book_search.xml | 29 ------------------- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt index e8e20e379..33a4da5bf 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt @@ -52,9 +52,6 @@ class SearchActivity : VMBaseActivity) { @@ -41,6 +44,9 @@ data class SearchScope(private var scope: String) { if (scope.contains("::")) { return scope.substringBefore("::") } + if (scope.isEmpty()) { + return appCtx.getString(R.string.all_source) + } return scope } @@ -58,7 +64,7 @@ data class SearchScope(private var scope: String) { } } if (list.isEmpty()) { - list.add("全部书源") + list.add(appCtx.getString(R.string.all_source)) } return list } @@ -83,12 +89,12 @@ data class SearchScope(private var scope: String) { } if (oldScope.size != newScope.size) { update(newScope) - stateLiveData.postValue("") + stateLiveData.postValue(scope) } } if (list.isEmpty()) { scope = "" - stateLiveData.postValue("") + stateLiveData.postValue(scope) return appDb.bookSourceDao.allEnabled } return list.sortedBy { it.customOrder } diff --git a/app/src/main/res/layout/activity_book_search.xml b/app/src/main/res/layout/activity_book_search.xml index 8953199e9..c4f6bc74c 100644 --- a/app/src/main/res/layout/activity_book_search.xml +++ b/app/src/main/res/layout/activity_book_search.xml @@ -48,35 +48,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/title_bar"> - - - - - - - - - -