be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8883 from Douile/dev-enqueue-next-hide 

Only show "Enqueue next" when in the middle of the queue
This commit is contained in:
Stypox 2022-12-04 18:43:45 +01:00 committed by GitHub
parent 9c4d5526f4 e5f30a07bf
commit 281ac13eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/info_list/dialog/InfoItemDialog.java
View File

@ -252,10 +252,11 @@ public final class InfoItemDialog {
* @return the current {@link Builder} instance * @return the current {@link Builder} instance
*/ */
public Builder addEnqueueEntriesIfNeeded() { public Builder addEnqueueEntriesIfNeeded() {
if (PlayerHolder.getInstance().isPlayQueueReady()) { final PlayerHolder holder = PlayerHolder.getInstance();
if (holder.isPlayQueueReady()) {
addEntry(StreamDialogDefaultEntry.ENQUEUE); addEntry(StreamDialogDefaultEntry.ENQUEUE);
if (PlayerHolder.getInstance().getQueueSize() > 1) { if (holder.getQueuePosition() < holder.getQueueSize() - 1) {
addEntry(StreamDialogDefaultEntry.ENQUEUE_NEXT); addEntry(StreamDialogDefaultEntry.ENQUEUE_NEXT);
} }
} }

7
app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
View File

@ -92,6 +92,13 @@ public final class PlayerHolder {
return player.getPlayQueue().size(); return player.getPlayQueue().size();
} }
public int getQueuePosition() {
if (player == null || player.getPlayQueue() == null) {
return 0;
}
return player.getPlayQueue().getIndex();
}
public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) { public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) {
listener = newListener; listener = newListener;