atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Always show search view

Browse Source
This commit is contained in:
Kirill Kamakin
2022-11-20 12:15:29 +01:00
parent 451b8368c5
commit c219ba4f53
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
View File

@@ -125,9 +125,7 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
searchView.queryHint = getString(R.string.search_recipes_hint) searchView.queryHint = getString(R.string.search_recipes_hint)
searchView.isSubmitButtonEnabled = false searchView.isSubmitButtonEnabled = false
searchView.setIconifiedByDefault(false)
searchView.setQuery(viewModel.lastSearchQuery, false)
searchView.isIconified = viewModel.lastSearchQuery.isNullOrBlank()
searchView.setOnCloseListener { searchView.setOnCloseListener {
logger.v { "onClose() called" } logger.v { "onClose() called" }

6
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
View File

@@ -32,9 +32,6 @@ class MainActivityViewModel @Inject constructor(
private val _startDestination = MutableLiveData<Int>() private val _startDestination = MutableLiveData<Int>()
val startDestination: LiveData<Int> = _startDestination val startDestination: LiveData<Int> = _startDestination
var lastSearchQuery: String? = null
private set
init { init {
authRepo.isAuthorizedFlow authRepo.isAuthorizedFlow
.onEach { isAuthorized -> updateUiState { it.copy(isAuthorized = isAuthorized) } } .onEach { isAuthorized -> updateUiState { it.copy(isAuthorized = isAuthorized) } }
@@ -60,9 +57,6 @@ class MainActivityViewModel @Inject constructor(
fun onSearchQuery(query: String?) { fun onSearchQuery(query: String?) {
logger.v { "onSearchQuery() called with: query = $query" } logger.v { "onSearchQuery() called with: query = $query" }
if (lastSearchQuery != query) {
lastSearchQuery = query
recipeRepo.updateNameQuery(query) recipeRepo.updateNameQuery(query)
} }
}
} }

3
app/src/main/res/menu/main_toolbar.xml
View File

@@ -4,9 +4,8 @@
<item <item
android:id="@+id/search_recipe_action" android:id="@+id/search_recipe_action"
android:icon="@drawable/ic_search"
android:title="@string/search_recipes_hint" android:title="@string/search_recipes_hint"
app:actionViewClass="androidx.appcompat.widget.SearchView" app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom" /> app:showAsAction="always" />
</menu> </menu>