From c219ba4f53f370f0567b63a9c8f182e5c185ada6 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sun, 20 Nov 2022 12:15:29 +0100
Subject: [PATCH] Always show search view

---
 .../java/gq/kirmanak/mealient/ui/activity/MainActivity.kt | 4 +---
 .../mealient/ui/activity/MainActivityViewModel.kt         | 8 +-------
 app/src/main/res/menu/main_toolbar.xml                    | 3 +--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
index b5af988..19f31ad 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
@@ -125,9 +125,7 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
 
         searchView.queryHint = getString(R.string.search_recipes_hint)
         searchView.isSubmitButtonEnabled = false
-
-        searchView.setQuery(viewModel.lastSearchQuery, false)
-        searchView.isIconified = viewModel.lastSearchQuery.isNullOrBlank()
+        searchView.setIconifiedByDefault(false)
 
         searchView.setOnCloseListener {
             logger.v { "onClose() called" }
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
index cb910bb..73ab467 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
@@ -32,9 +32,6 @@ class MainActivityViewModel @Inject constructor(
     private val _startDestination = MutableLiveData<Int>()
     val startDestination: LiveData<Int> = _startDestination
 
-    var lastSearchQuery: String? = null
-        private set
-
     init {
         authRepo.isAuthorizedFlow
             .onEach { isAuthorized -> updateUiState { it.copy(isAuthorized = isAuthorized) } }
@@ -60,9 +57,6 @@ class MainActivityViewModel @Inject constructor(
 
     fun onSearchQuery(query: String?) {
         logger.v { "onSearchQuery() called with: query = $query" }
-        if (lastSearchQuery != query) {
-            lastSearchQuery = query
-            recipeRepo.updateNameQuery(query)
-        }
+        recipeRepo.updateNameQuery(query)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_toolbar.xml b/app/src/main/res/menu/main_toolbar.xml
index 31e0dfc..1f07637 100644
--- a/app/src/main/res/menu/main_toolbar.xml
+++ b/app/src/main/res/menu/main_toolbar.xml
@@ -4,9 +4,8 @@
 
 	<item
 		android:id="@+id/search_recipe_action"
-		android:icon="@drawable/ic_search"
 		android:title="@string/search_recipes_hint"
 		app:actionViewClass="androidx.appcompat.widget.SearchView"
-		app:showAsAction="ifRoom" />
+		app:showAsAction="always" />
 
 </menu>
\ No newline at end of file