Skip to content

Commit

Permalink
Hide play queue button in VideoDetailsFragment mini player when the p…
Browse files Browse the repository at this point in the history
…lay queue is empty

Related PR introducing the button: #8946
  • Loading branch information
TobiGr committed Oct 11, 2022
1 parent 7ab8f9f commit 4a278ef
Showing 1 changed file with 24 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ && isAutoplayEnabled()
autoPlayEnabled = true; // forcefully start playing
openVideoPlayerAutoFullscreen();
}
updateOverlayPlayQueueButtonVisibility();
}

@Override
Expand Down Expand Up @@ -337,6 +338,8 @@ public void onResume() {

activity.sendBroadcast(new Intent(ACTION_VIDEO_FRAGMENT_RESUMED));

updateOverlayPlayQueueButtonVisibility();

setupBrightness();

if (tabSettingsChanged) {
Expand Down Expand Up @@ -1820,6 +1823,14 @@ public void onQueueUpdate(final PlayQueue queue) {
+ title + "], playQueue = [" + playQueue + "]");
}

// Register broadcast receiver to listen to playQueue changes
// and hide the overlayPlayQueueButton when the playQueue is empty / destroyed.
if (playQueue != null && playQueue.getBroadcastReceiver() != null) {
playQueue.getBroadcastReceiver().subscribe(
event -> updateOverlayPlayQueueButtonVisibility()
);
}

// This should be the only place where we push data to stack.
// It will allow to have live instance of PlayQueue with actual information about
// deleted/added items inside Channel/Playlist queue and makes possible to have
Expand Down Expand Up @@ -1926,6 +1937,7 @@ public void onServiceStopped() {
currentInfo.getUploaderName(),
currentInfo.getThumbnailUrl());
}
updateOverlayPlayQueueButtonVisibility();
}

@Override
Expand Down Expand Up @@ -2392,6 +2404,18 @@ public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
});
}

private void updateOverlayPlayQueueButtonVisibility() {
final boolean isPlayQueueEmpty =
player == null // no player => no play queue :)
|| player.getPlayQueue() == null
|| player.getPlayQueue().isEmpty();
if (binding != null) {
// binding is null when rotating the device...
binding.overlayPlayQueueButton.setVisibility(
isPlayQueueEmpty ? View.GONE : View.VISIBLE);
}
}

private void updateOverlayData(@Nullable final String overlayTitle,
@Nullable final String uploader,
@Nullable final String thumbnailUrl) {
Expand Down

0 comments on commit 4a278ef

Please sign in to comment.