This commit is contained in:
kunfei
2022-10-17 11:05:04 +08:00
parent a3839ecb9c
commit d75e4509e5
2 changed files with 12 additions and 0 deletions
@@ -10,6 +10,7 @@ import android.view.View.VISIBLE
import android.widget.TextView import android.widget.TextView
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@@ -126,6 +127,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
searchView.setQuery(it, true) searchView.setQuery(it, true)
} }
} }
R.id.menu_search_scope -> alertSearchScope()
R.id.menu_source_manage -> startActivity<BookSourceActivity>() R.id.menu_source_manage -> startActivity<BookSourceActivity>()
R.id.menu_log -> showDialogFragment(AppLogDialog()) R.id.menu_log -> showDialogFragment(AppLogDialog())
} }
@@ -387,6 +389,11 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
searchScope.save() searchScope.save()
viewModel.searchScope.update(searchScope.toString()) viewModel.searchScope.update(searchScope.toString())
searchScopeAdapter.setItems(searchScope.displayNames) searchScopeAdapter.setItems(searchScope.displayNames)
if (!binding.llInputHelp.isVisible) {
searchView.query?.toString()?.trim()?.let {
searchView.setQuery(it, true)
}
}
} }
private fun alertSearchScope() { private fun alertSearchScope() {
+5
View File
@@ -3,6 +3,11 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction"> tools:ignore="AlwaysShowAction">
<item
android:id="@+id/menu_search_scope"
android:title="@string/search_scope"
app:showAsAction="never" />
<item <item
android:id="@+id/menu_precision_search" android:id="@+id/menu_precision_search"
android:checkable="true" android:checkable="true"