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 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kunfei
2022-10-18 20:09:22 +08:00
parent f1013e2f7f ee22da4055
commit 264d74b343
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
View File

@@ -109,7 +109,6 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.book_search, menu)
this.menu = menu
upSearchScopeMenu()
precisionSearchMenuItem = menu.findItem(R.id.menu_precision_search)
precisionSearchMenuItem?.isChecked = getPrefBoolean(PreferKey.precisionSearch)
return super.onCompatCreateOptionsMenu(menu)
@@ -220,7 +219,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
private fun initData() {
viewModel.searchScope.stateLiveData.observe(this) {
upSearchScopeMenu()
upSearchScope()
}
viewModel.isSearchLiveData.observe(this) {
if (it) {
@@ -237,9 +236,8 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
}
}
private fun upSearchScopeMenu() {
menu?.findItem(R.id.menu_search_scope)?.title =
"${getString(R.string.search_scope)}-${viewModel.searchScope.display}"
private fun upSearchScope() {
binding.tvSearchScope.text = viewModel.searchScope.display
}
/**
@@ -249,7 +247,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
val searchScope = intent?.getStringExtra("searchScope")
searchScope?.let {
viewModel.searchScope.update(searchScope)
upSearchScopeMenu()
upSearchScope()
}
val key = intent?.getStringExtra("key")
if (key.isNullOrBlank()) {

9
app/src/main/res/layout/activity_book_search.xml
View File

@@ -48,6 +48,15 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar">
<TextView
android:id="@+id/tv_searchScope"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="6dp"
android:text="@string/all_source"
android:singleLine="true"
android:gravity="center" />
<TextView
android:id="@+id/tv_book_show"
android:layout_width="match_parent"