Start search implementation

app/src/main/AndroidManifest.xml

@@ -19,12 +19,21 @@
 		tools:ignore="UnusedAttribute">
 		<activity
 			android:name=".ui.activity.MainActivity"
+			android:launchMode="singleTop"
 			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
+
+			<intent-filter>
+				<action android:name="android.intent.action.SEARCH" />
+			</intent-filter>
+
+			<meta-data
+				android:name="android.app.searchable"
+				android:resource="@xml/searchable_recipe_main" />
 		</activity>
 	</application>
 

app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt

@@ -1,6 +1,5 @@
 package gq.kirmanak.mealient.extensions
 
-import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
@@ -18,10 +17,7 @@ fun <T> Fragment.collectWhenViewResumed(flow: Flow<T>, collector: FlowCollector<
     }
 }
 
-fun Fragment.showLongToast(@StringRes text: Int) = showLongToast(getString(text))
+fun Fragment.showLongToast(@StringRes text: Int) = context?.showLongToast(text) != null
 
-fun Fragment.showLongToast(text: String) = showToast(text, Toast.LENGTH_LONG)
+fun Fragment.showLongToast(text: String) = context?.showLongToast(text) != null
 
-private fun Fragment.showToast(text: String, length: Int): Boolean {
-    return context?.let { Toast.makeText(it, text, length).show() } != null
-}

app/src/main/java/gq/kirmanak/mealient/extensions/ViewExtensions.kt

@@ -1,8 +1,10 @@
 package gq.kirmanak.mealient.extensions
 
+import android.content.Context
 import android.content.SharedPreferences
 import android.widget.EditText
 import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.core.widget.doAfterTextChanged
 import androidx.lifecycle.LifecycleOwner
@@ -95,4 +97,13 @@ fun <T> LiveData<T>.observeOnce(lifecycleOwner: LifecycleOwner, observer: Observ
             observer.onChanged(value)
         }
     })
-}
+}
+
+
+fun Context.showLongToast(text: String) = showToast(text, Toast.LENGTH_LONG)
+
+fun Context.showLongToast(@StringRes text: Int) = showLongToast(getString(text))
+
+private fun Context.showToast(text: String, length: Int) {
+    Toast.makeText(this, text, length).show()
+}

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

@@ -1,10 +1,14 @@
 package gq.kirmanak.mealient.ui.activity
 
+import android.app.SearchManager
+import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.content.getSystemService
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.isVisible
 import androidx.navigation.NavController
@@ -46,6 +50,15 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
         binding.navigationView.setNavigationItemSelectedListener(::onNavigationItemSelected)
     }
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        if (Intent.ACTION_SEARCH == intent?.action) {
+            intent.getStringExtra(SearchManager.QUERY)?.also { query ->
+                viewModel.onSearchQuery(query)
+            }
+        }
+    }
+
     private fun configureNavGraph() {
         viewModel.startDestination.observeOnce(this) {
             logger.d { "configureNavGraph: received destination" }
@@ -104,6 +117,15 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
         menuInflater.inflate(R.menu.main_toolbar, menu)
         menu.findItem(R.id.logout).isVisible = uiState.canShowLogout
         menu.findItem(R.id.login).isVisible = uiState.canShowLogin
+        val searchItem = menu.findItem(R.id.search_recipe_action)
+        searchItem.isVisible = uiState.searchVisible
+        val searchManager: SearchManager? = getSystemService()
+        val searchView = searchItem.actionView as? SearchView
+        if (searchManager != null && searchView != null) {
+            searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName))
+        } else {
+            logger.e { "onCreateOptionsMenu: either search manager or search view is null" }
+        }
         return true
     }
 

app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityUiState.kt

@@ -5,6 +5,7 @@ data class MainActivityUiState(
     val titleVisible: Boolean = true,
     val isAuthorized: Boolean = false,
     val navigationVisible: Boolean = false,
+    val searchVisible: Boolean = false,
 ) {
     val canShowLogin: Boolean
         get() = !isAuthorized && loginButtonVisible

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

@@ -52,4 +52,8 @@ class MainActivityViewModel @Inject constructor(
         logger.v { "logout() called" }
         viewModelScope.launch { authRepo.logout() }
     }
+
+    fun onSearchQuery(query: String) {
+        logger.v { "onSearchQuery() called with: query = $query" }
+    }
 }

app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt

@@ -38,7 +38,12 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
         super.onViewCreated(view, savedInstanceState)
         logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
         activityViewModel.updateUiState {
-            it.copy(loginButtonVisible = true, titleVisible = false, navigationVisible = true)
+            it.copy(
+                loginButtonVisible = true,
+                titleVisible = false,
+                navigationVisible = true,
+                searchVisible = false,
+            )
         }
         viewModel.loadPreservedRequest()
         setupViews()

app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt

@@ -32,7 +32,12 @@ class AuthenticationFragment : Fragment(R.layout.fragment_authentication) {
         logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
         binding.button.setOnClickListener { onLoginClicked() }
         activityViewModel.updateUiState {
-            it.copy(loginButtonVisible = false, titleVisible = true, navigationVisible = false)
+            it.copy(
+                loginButtonVisible = false,
+                titleVisible = true,
+                navigationVisible = false,
+                searchVisible = false
+            )
         }
         viewModel.uiState.observe(viewLifecycleOwner, ::onUiStateChange)
     }

app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLFragment.kt

@@ -33,7 +33,12 @@ class BaseURLFragment : Fragment(R.layout.fragment_base_url) {
         binding.button.setOnClickListener(::onProceedClick)
         viewModel.uiState.observe(viewLifecycleOwner, ::onUiStateChange)
         activityViewModel.updateUiState {
-            it.copy(loginButtonVisible = false, titleVisible = true, navigationVisible = false)
+            it.copy(
+                loginButtonVisible = false,
+                titleVisible = true,
+                navigationVisible = false,
+                searchVisible = false
+            )
         }
     }
 

app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerFragment.kt

@@ -57,7 +57,12 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer) {
         }
         viewModel.startCountDown()
         activityViewModel.updateUiState {
-            it.copy(loginButtonVisible = false, titleVisible = true, navigationVisible = false)
+            it.copy(
+                loginButtonVisible = false,
+                titleVisible = true,
+                navigationVisible = false,
+                searchVisible = false
+            )
         }
     }
 }

app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt

@@ -50,7 +50,12 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         super.onViewCreated(view, savedInstanceState)
         logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
         activityViewModel.updateUiState {
-            it.copy(loginButtonVisible = true, titleVisible = false, navigationVisible = true)
+            it.copy(
+                loginButtonVisible = true,
+                titleVisible = false,
+                navigationVisible = true,
+                searchVisible = true,
+            )
         }
         setupRecipeAdapter()
     }

app/src/main/res/menu/main_toolbar.xml

@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
+	<item
-        android:id="@+id/login"
+		android:id="@+id/login"
-        android:contentDescription="@string/menu_main_toolbar_content_description_login"
+		android:contentDescription="@string/menu_main_toolbar_content_description_login"
-        android:title="@string/menu_main_toolbar_login"
+		android:title="@string/menu_main_toolbar_login"
-        app:showAsAction="ifRoom" />
+		app:showAsAction="ifRoom" />
 
-    <item
+	<item
-        android:id="@+id/logout"
+		android:id="@+id/logout"
-        android:contentDescription="@string/menu_main_toolbar_content_description_logout"
+		android:contentDescription="@string/menu_main_toolbar_content_description_logout"
-        android:title="@string/menu_main_toolbar_logout"
+		android:title="@string/menu_main_toolbar_logout"
-        app:showAsAction="never" />
+		app:showAsAction="never" />
+
+	<item
+		android:id="@+id/search_recipe_action"
+		android:icon="@android:drawable/ic_menu_search"
+		android:title="@string/searchable_recipe_main_hint"
+		app:actionViewClass="androidx.appcompat.widget.SearchView"
+		app:showAsAction="ifRoom" />
 
 </menu>

app/src/main/res/values-ru/strings.xml

@@ -48,4 +48,5 @@
 	<string name="fragment_recipes_load_failure_toast_no_connection">нет соединения</string>
 	<string name="fragment_recipes_load_failure_toast_no_reason">Ошибка загрузки.</string>
 	<string name="menu_bottom_navigation_change_url">Сменить URL</string>
+	<string name="searchable_recipe_main_hint">Найти рецепты</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -52,4 +52,5 @@
 	<string name="fragment_recipes_load_failure_toast_unexpected_response">unexpected response</string>
 	<string name="fragment_recipes_load_failure_toast_no_connection">no connection</string>
 	<string name="menu_bottom_navigation_change_url">Change URL</string>
+	<string name="searchable_recipe_main_hint">Search recipes</string>
 </resources>

app/src/main/res/xml/searchable_recipe_main.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+	android:hint="@string/searchable_recipe_main_hint"
+	android:label="@string/app_name" />