baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge pull request #8669 from Isira-Seneviratne/Remove_setBottomSheetCallback

Browse source 
Remove uses of setBottomSheetCallback().
This commit is contained in:
Stypox 2022-08-04 11:03:57 +02:00 committed by GitHub
commit 24ec642181
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file

@ -191,6 +191,7 @@ public final class VideoDetailFragment
private Disposable positionSubscriber = null; private Disposable positionSubscriber = null;
private BottomSheetBehavior<FrameLayout> bottomSheetBehavior; private BottomSheetBehavior<FrameLayout> bottomSheetBehavior;
private BottomSheetBehavior.BottomSheetCallback bottomSheetCallback;
private BroadcastReceiver broadcastReceiver; private BroadcastReceiver broadcastReceiver;
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
@ -385,7 +386,7 @@ public final class VideoDetailFragment
disposables.clear(); disposables.clear();
positionSubscriber = null; positionSubscriber = null;
currentWorker = null; currentWorker = null;
bottomSheetBehavior.setBottomSheetCallback(null); bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback);
if (activity.isFinishing()) { if (activity.isFinishing()) {
playQueue = null; playQueue = null;
@ -2288,7 +2289,7 @@ public final class VideoDetailFragment
} }
} }
bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { bottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback() {
@Override @Override
public void onStateChanged(@NonNull final View bottomSheet, final int newState) { public void onStateChanged(@NonNull final View bottomSheet, final int newState) {
bottomSheetState = newState; bottomSheetState = newState;
@ -2342,12 +2343,14 @@ public final class VideoDetailFragment
} }
if (isPlayerAvailable()) { if (isPlayerAvailable()) {
player.UIs().get(MainPlayerUi.class).ifPresent(ui -> { player.UIs().get(MainPlayerUi.class).ifPresent(ui -> {
if (ui.isControlsVisible()) { if (ui.isControlsVisible()) {
ui.hideControls(0, 0); ui.hideControls(0, 0);
} }
}); });
} }
break; break;
case BottomSheetBehavior.STATE_HALF_EXPANDED:
break;
} }
} }
@ -2355,7 +2358,9 @@ public final class VideoDetailFragment
public void onSlide(@NonNull final View bottomSheet, final float slideOffset) { public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
setOverlayLook(binding.appBarLayout, behavior, slideOffset); setOverlayLook(binding.appBarLayout, behavior, slideOffset);
} }
}); };
bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
// User opened a new page and the player will hide itself // User opened a new page and the player will hide itself
activity.getSupportFragmentManager().addOnBackStackChangedListener(() -> { activity.getSupportFragmentManager().addOnBackStackChangedListener(() -> {