kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

fix: backstack when opening search fragment (#7010)

Browse Source
This commit is contained in:
Thomas W. 2025-01-24 18:58:29 +01:00 committed by GitHub
parent 7c7e69d369
commit e42866de7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View File

@ -356,7 +356,7 @@ class MainActivity : BaseActivity() {
override fun onMenuItemActionExpand(item: MenuItem): Boolean { override fun onMenuItemActionExpand(item: MenuItem): Boolean {
if (navController.currentDestination?.id != R.id.searchResultFragment) { if (navController.currentDestination?.id != R.id.searchResultFragment) {
searchViewModel.setQuery(null) searchViewModel.setQuery(null)
navController.navigate(R.id.searchFragment) navController.navigate(R.id.openSearch)
} }
item.setShowAsAction( item.setShowAsAction(
MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW MenuItem.SHOW_AS_ACTION_ALWAYS or MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW

6
app/src/main/res/navigation/nav.xml
View File

@ -119,4 +119,10 @@
<action <action
android:id="@+id/showSearchResults" android:id="@+id/showSearchResults"
app:destination="@id/searchResultFragment" /> app:destination="@id/searchResultFragment" />
<action
android:id="@+id/openSearch"
app:destination="@id/searchFragment"
app:popUpTo="@id/homeFragment"
app:popUpToSaveState="true"
app:restoreState="false" />
</navigation> </navigation>