Merge pull request #7000 from Bnyro/master

fix: missing predictive back support in search fragments
libre-tube · Jan 22, 2025 · b9123f7 · b9123f7
2 parents 13c2ad3 + e156a3d
commit b9123f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
@@ -25,7 +25,7 @@ import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.adapters.SearchResultsAdapter
 import com.github.libretube.ui.base.DynamicLayoutManagerFragment
-import com.github.libretube.ui.extensions.setOnBackPressed
+import com.github.libretube.ui.extensions.setupFragmentAnimation
 import com.github.libretube.ui.models.SearchResultViewModel
 import com.github.libretube.util.TextUtils.toTimeInSeconds
 import kotlinx.coroutines.Dispatchers
@@ -105,7 +105,7 @@ class SearchResultFragment : DynamicLayoutManagerFragment(R.layout.fragment_sear
             }
         }
 
-        setOnBackPressed {
+        setupFragmentAnimation(binding.root) {
             findNavController().popBackStack(R.id.searchFragment, true) ||
                     findNavController().popBackStack()
         }

diff --git a/app/src/main/java/com/github/libretube/ui/fragments/SearchSuggestionsFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/SearchSuggestionsFragment.kt
@@ -22,7 +22,7 @@ import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.MainActivity
 import com.github.libretube.ui.adapters.SearchHistoryAdapter
 import com.github.libretube.ui.adapters.SearchSuggestionsAdapter
-import com.github.libretube.ui.extensions.setOnBackPressed
+import com.github.libretube.ui.extensions.setupFragmentAnimation
 import com.github.libretube.ui.models.SearchViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -53,7 +53,7 @@ class SearchSuggestionsFragment : Fragment(R.layout.fragment_search_suggestions)
             showData(it)
         }
 
-        setOnBackPressed {
+        setupFragmentAnimation(binding.root) {
             if (mainActivity.searchView.anyChildFocused()) mainActivity.searchView.clearFocus()
             else findNavController().popBackStack()
         }