Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove uses of setBottomSheetCallback(). #8669

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Remove uses of setBottomSheetCallback(). #8669

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81fb44c
Remove uses of setBottomSheetCallback().
Isira-Seneviratne Jul 21, 2022
8a89611
Apply code review change.
Isira-Seneviratne Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ public final class VideoDetailFragment
private Disposable positionSubscriber = null;

private BottomSheetBehavior<FrameLayout> bottomSheetBehavior;
private BottomSheetBehavior.BottomSheetCallback bottomSheetCallback;
private BroadcastReceiver broadcastReceiver;

/*//////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -386,7 +387,7 @@ public void onDestroy() {
disposables.clear();
positionSubscriber = null;
currentWorker = null;
bottomSheetBehavior.setBottomSheetCallback(null);
bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallback);
Stypox marked this conversation as resolved.
Show resolved Hide resolved

if (activity.isFinishing()) {
playQueue = null;
Expand Down Expand Up @@ -2289,7 +2290,7 @@ private void setupBottomPlayer() {
}
}

bottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
bottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback() {
@Override
public void onStateChanged(@NonNull final View bottomSheet, final int newState) {
bottomSheetState = newState;
Expand Down Expand Up @@ -2343,20 +2344,24 @@ && isPlayerAvailable()
}
if (isPlayerAvailable()) {
player.UIs().get(MainPlayerUi.class).ifPresent(ui -> {
if (ui.isControlsVisible()) {
ui.hideControls(0, 0);
}
if (ui.isControlsVisible()) {
ui.hideControls(0, 0);
}
});
}
break;
case BottomSheetBehavior.STATE_HALF_EXPANDED:
break;
}
}

@Override
public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
setOverlayLook(binding.appBarLayout, behavior, slideOffset);
}
});
};

bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);

// User opened a new page and the player will hide itself
activity.getSupportFragmentManager().addOnBackStackChangedListener(() -> {
Expand Down