mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Correct exit from fullscreen in case of error or close from notification,
This commit is contained in:
parent
c9be812330
commit
92e13dafe5
@ -1902,10 +1902,11 @@ public class VideoDetailFragment
|
|||||||
public void onPlayerError(final ExoPlaybackException error) {
|
public void onPlayerError(final ExoPlaybackException error) {
|
||||||
if (error.type == ExoPlaybackException.TYPE_SOURCE
|
if (error.type == ExoPlaybackException.TYPE_SOURCE
|
||||||
|| error.type == ExoPlaybackException.TYPE_UNEXPECTED) {
|
|| error.type == ExoPlaybackException.TYPE_UNEXPECTED) {
|
||||||
hideMainPlayer();
|
// Properly exit from fullscreen
|
||||||
if (playerService != null && player.isFullscreen()) {
|
if (playerService != null && player.isFullscreen()) {
|
||||||
player.toggleFullscreen();
|
player.toggleFullscreen();
|
||||||
}
|
}
|
||||||
|
hideMainPlayer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2307,6 +2308,7 @@ public class VideoDetailFragment
|
|||||||
&& player.videoPlayerSelected()) {
|
&& player.videoPlayerSelected()) {
|
||||||
player.toggleFullscreen();
|
player.toggleFullscreen();
|
||||||
}
|
}
|
||||||
|
setOverlayLook(appBarLayout, behavior, 1);
|
||||||
break;
|
break;
|
||||||
case BottomSheetBehavior.STATE_COLLAPSED:
|
case BottomSheetBehavior.STATE_COLLAPSED:
|
||||||
moveFocusToMainFragment(true);
|
moveFocusToMainFragment(true);
|
||||||
@ -2316,6 +2318,7 @@ public class VideoDetailFragment
|
|||||||
if (player != null) {
|
if (player != null) {
|
||||||
player.onQueueClosed();
|
player.onQueueClosed();
|
||||||
}
|
}
|
||||||
|
setOverlayLook(appBarLayout, behavior, 0);
|
||||||
break;
|
break;
|
||||||
case BottomSheetBehavior.STATE_DRAGGING:
|
case BottomSheetBehavior.STATE_DRAGGING:
|
||||||
case BottomSheetBehavior.STATE_SETTLING:
|
case BottomSheetBehavior.STATE_SETTLING:
|
||||||
|
@ -220,6 +220,10 @@ public final class MainPlayer extends Service {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (playerImpl != null) {
|
if (playerImpl != null) {
|
||||||
|
// Exit from fullscreen when user closes the player via notification
|
||||||
|
if (playerImpl.isFullscreen()) {
|
||||||
|
playerImpl.toggleFullscreen();
|
||||||
|
}
|
||||||
removeViewFromParent();
|
removeViewFromParent();
|
||||||
|
|
||||||
playerImpl.setRecovery();
|
playerImpl.setRecovery();
|
||||||
|
@ -39,7 +39,7 @@ public class CustomBottomSheetBehavior extends BottomSheetBehavior<FrameLayout>
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Found that user still swiping, continue following
|
// Found that user still swiping, continue following
|
||||||
if (skippingInterception) {
|
if (skippingInterception || getState() == BottomSheetBehavior.STATE_SETTLING) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user