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 #6931 from Bnyro/master

Browse Source 
fix: wrong back order when new fragment opened from audio/video player
This commit is contained in:
Bnyro 2025-01-08 15:07:35 +01:00 committed by GitHub
commit b65f81433d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
View File

@ -262,6 +262,13 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
setOnBackPressed(onBackPressedCallback) setOnBackPressed(onBackPressedCallback)
viewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { isMiniPlayerVisible -> viewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { isMiniPlayerVisible ->
// re-add the callback on top of the back pressed dispatcher listeners stack,
// so that it's the first one to become called while the full player is visible
if (!isMiniPlayerVisible) {
onBackPressedCallback.remove()
setOnBackPressed(onBackPressedCallback)
}
// if the player is minimized, the fragment behind the player should handle the event // if the player is minimized, the fragment behind the player should handle the event
onBackPressedCallback.isEnabled = isMiniPlayerVisible != true onBackPressedCallback.isEnabled = isMiniPlayerVisible != true
} }

7
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -486,6 +486,13 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
setOnBackPressed(onBackPressedCallback) setOnBackPressed(onBackPressedCallback)
commonPlayerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { isMiniPlayerVisible -> commonPlayerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { isMiniPlayerVisible ->
// re-add the callback on top of the back pressed dispatcher listeners stack,
// so that it's the first one to become called while the full player is visible
if (!isMiniPlayerVisible) {
onBackPressedCallback.remove()
setOnBackPressed(onBackPressedCallback)
}
// if the player is minimized, the fragment behind the player should handle the event // if the player is minimized, the fragment behind the player should handle the event
onBackPressedCallback.isEnabled = isMiniPlayerVisible != true onBackPressedCallback.isEnabled = isMiniPlayerVisible != true
} }