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

Merge pull request #7000 from Bnyro/master

Browse Source 
fix: missing predictive back support in search fragments
This commit is contained in:
Bnyro 2025-01-22 16:59:48 +01:00 committed by GitHub
commit b9123f7042
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
View File

@ -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()
}

4
app/src/main/java/com/github/libretube/ui/fragments/SearchSuggestionsFragment.kt
View File

@ -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()
}