From 0db66359980f050841aba00573cb69244bc77a93 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Fri, 24 Jan 2025 19:04:15 +0100
Subject: [PATCH] fix: search action view not properly collapsed when pressing
 navbar item

---
 .../libretube/ui/activities/MainActivity.kt       | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
index 9382cf56f..17df88657 100644
--- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -254,17 +254,6 @@ class MainActivity : BaseActivity() {
         }
     }
 
-    /**
-     * Remove the focus of the search view in the toolbar
-     */
-    private fun removeSearchFocus() {
-        searchView.setQuery("", false)
-        searchView.clearFocus()
-        searchView.isIconified = true
-        searchItem.collapseActionView()
-        searchView.onActionViewCollapsed()
-    }
-
     private fun isSearchInProgress(): Boolean {
         if (!this::navController.isInitialized) return false
         val id = navController.currentDestination?.id ?: return false
@@ -560,9 +549,7 @@ class MainActivity : BaseActivity() {
         }
 
         // Remove focus from search view when navigating to bottom view.
-        // Call only after navigate to destination, so it can be used in
-        // onMenuItemActionCollapse for backstack management
-        removeSearchFocus()
+        searchItem.collapseActionView()
 
         return item.onNavDestinationSelected(navController)
     }