Skip to content

Add move to next feature in play queue #2413

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

Closed
josephoneill wants to merge 2 commits into from
Closed

Add move to next feature in play queue #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ec7a8a
Add move to next feature in play queue
josephoneill Jun 21, 2019
d8fc2a1
Merge branch 'dev' into feat-playqueue-movenext
josephoneill Jun 24, 2019
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
21 changes: 19 additions & 2 deletions app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueueAdapter;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
import org.schabi.newpipe.player.playqueue.PlayQueueItemBuilder;
Expand Down Expand Up @@ -322,7 +323,6 @@ private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
Menu.NONE, R.string.play_queue_remove);
remove.setOnMenuItemClickListener(menuItem -> {
if (player == null) return false;

final int index = player.getPlayQueue().indexOf(item);
if (index != -1) player.getPlayQueue().remove(index);
return true;
Expand All @@ -349,6 +349,13 @@ private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
return true;
});

final MenuItem moveToNext = menu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 4,
Menu.NONE, R.string.moveToNext);
moveToNext.setOnMenuItemClickListener(menuItem -> {
moveToNext(item);
return true;
});

menu.show();
}

Expand Down Expand Up @@ -538,6 +545,16 @@ private void shareUrl(String subject, String url) {
startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
}

////////////////////////////////////////////////////////////////////////////
// Move to Next
////////////////////////////////////////////////////////////////////////////
private void moveToNext(PlayQueueItem item) {
int fromIndex = player.getPlayQueue().indexOf(item);
int toIndex = player.getPlayQueue().getIndex() + 1;

player.getPlayQueue().move(fromIndex, toIndex);
}

////////////////////////////////////////////////////////////////////////////
// Binding Service Listener
////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -670,4 +687,4 @@ private void onMaybePlaybackAdapterChanged() {
itemsList.setAdapter(maybeNewAdapter);
}
}
}
}
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,5 +560,6 @@
<string name="downloads_storage_ask_title">Ask where to download</string>
<string name="downloads_storage_ask_summary">You will be asked where to save each download</string>
<string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nEnable this option if you want download to the external SD Card</string>
<string name="moveToNext">Move to next</string>

</resources>