From e42866de7c176a21f9d11fb3fade95230abd5239 Mon Sep 17 00:00:00 2001
From: "Thomas W." <thomasdewitt@outlook.com>
Date: Fri, 24 Jan 2025 18:58:29 +0100
Subject: [PATCH] fix: backstack when opening search fragment (#7010)

---
 .../java/com/github/libretube/ui/activities/MainActivity.kt | 2 +-
 app/src/main/res/navigation/nav.xml                         | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 7c5ed650d..9382cf56f 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
@@ -356,7 +356,7 @@ class MainActivity : BaseActivity() {
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                 if (navController.currentDestination?.id != R.id.searchResultFragment) {
                     searchViewModel.setQuery(null)
-                    navController.navigate(R.id.searchFragment)
+                    navController.navigate(R.id.openSearch)
                 }
                 item.setShowAsAction(
                     MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml
index efbb0c960..fb6445c06 100644
--- a/app/src/main/res/navigation/nav.xml
+++ b/app/src/main/res/navigation/nav.xml
@@ -119,4 +119,10 @@
     <action
         android:id="@+id/showSearchResults"
         app:destination="@id/searchResultFragment" />
+    <action
+        android:id="@+id/openSearch"
+        app:destination="@id/searchFragment"
+        app:popUpTo="@id/homeFragment"
+        app:popUpToSaveState="true"
+        app:restoreState="false" />
 </navigation>
\ No newline at end of file