Added a play next button to the long press menu

app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java

@@ -350,11 +350,11 @@ protected void showStreamDialog(final StreamInfoItem item) {
         if (context == null || context.getResources() == null || activity == null) {
             return;
         }
-
         final List<StreamDialogEntry> entries = new ArrayList<>();
 
         if (PlayerHolder.getInstance().getType() != null) {
             entries.add(StreamDialogEntry.enqueue);
+            entries.add(StreamDialogEntry.next);
         }
         if (item.getStreamType() == StreamType.AUDIO_STREAM) {
             entries.addAll(Arrays.asList(

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -608,13 +608,30 @@ public void handleIntent(@NonNull final Intent intent) {
         }
 
         // Resolve append intents
-        if (intent.getBooleanExtra(APPEND_ONLY, false) && playQueue != null) {
+        if (intent.getBooleanExtra(APPEND_ONLY, false)
+                && playQueue != null) { /* Append Only = true && playQueue not empty*/
             final int sizeBeforeAppend = playQueue.size();
             playQueue.append(newQueue.getStreams());
 
+
+            if ((intent.getBooleanExtra(SELECT_ON_APPEND, false)
+                    || currentState == STATE_COMPLETED) && newQueue.getStreams().size() > 0) {
+                playQueue.setIndex(sizeBeforeAppend); // zero index => play appended
+            }
+
+            return;
+//TODO reduce code duplication
+        } else if (!(intent.getBooleanExtra(APPEND_ONLY, false))
+                && playQueue != null) { /* Append Only = false && playQueue not empty*/
+
+            final int currentIndex = playQueue.getIndex();
+            Log.e(TAG, "handleIntent: PLAYING NEXT" + currentIndex, null); //DEBUG
+            playQueue.append(newQueue.getStreams());
+            playQueue.move(playQueue.size() - 1, currentIndex + 1);
+
             if ((intent.getBooleanExtra(SELECT_ON_APPEND, false)
                     || currentState == STATE_COMPLETED) && newQueue.getStreams().size() > 0) {
-                playQueue.setIndex(sizeBeforeAppend);
+                playQueue.setIndex(currentIndex + 1); // play the nexted
             }
 
             return;

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -111,6 +111,17 @@ public static <T> Intent getPlayerEnqueueIntent(@NonNull final Context context,
                 .putExtra(Player.SELECT_ON_APPEND, selectOnAppend);
     }
 
+    @NonNull
+    public static <T> Intent getPlayerNextIntent(@NonNull final Context context,
+                                                    @NonNull final Class<T> targetClazz,
+                                                    @Nullable final PlayQueue playQueue,
+                                                    final boolean selectOnAppend,
+                                                    final boolean resumePlayback) {
+        return getPlayerIntent(context, targetClazz, playQueue, resumePlayback)
+                .putExtra(Player.APPEND_ONLY, false)
+                .putExtra(Player.SELECT_ON_APPEND, selectOnAppend);
+    }
+
     public static void playOnMainPlayer(final AppCompatActivity activity,
                                         @NonNull final PlayQueue playQueue) {
         final PlayQueueItem item = playQueue.getItem();
@@ -209,6 +220,73 @@ public static void enqueueOnBackgroundPlayer(final Context context,
         ContextCompat.startForegroundService(context, intent);
     }
 
+//    TODO reduce code duplication
+    /**
+     * @param context          Context
+     * @param queue            a single video
+     * @param resumePlayback   ?
+     */
+    public static void nextOnVideoPlayer(final Context context,
+                                         final PlayQueue queue,
+                                         final boolean resumePlayback) {
+        nextOnVideoPlayer(context, queue, false, resumePlayback);
+    }
+
+    /**
+     * @param context          Context
+     * @param queue            a single video
+     * @param selectOnAppend   play when video is "play nexted"
+     * @param resumePlayback   ?
+     */
+    public static void nextOnVideoPlayer(final Context context,
+                                         final PlayQueue queue,
+                                         final boolean selectOnAppend,
+                                         final boolean resumePlayback) {
+        Toast.makeText(context, R.string.playing_next, Toast.LENGTH_SHORT).show(); //Toast
+        final Intent intent = getPlayerNextIntent(
+                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
+
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.VIDEO.ordinal());
+        ContextCompat.startForegroundService(context, intent);
+    }
+
+    public static void nextOnPopupPlayer(final Context context,
+                                         final PlayQueue queue,
+                                         final boolean resumePlayback) {
+        nextOnPopupPlayer(context, queue, false, resumePlayback);
+    }
+
+    public static void nextOnPopupPlayer(final Context context,
+                                         final PlayQueue queue,
+                                         final boolean selectOnAppend,
+                                         final boolean resumePlayback) {
+        if (!PermissionHelper.isPopupEnabled(context)) {
+            PermissionHelper.showPopupEnablementToast(context);
+            return;
+        }
+        Toast.makeText(context, R.string.playing_next, Toast.LENGTH_SHORT).show();
+        final Intent intent = getPlayerNextIntent(
+                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.POPUP.ordinal());
+        ContextCompat.startForegroundService(context, intent);
+    }
+
+    public static void nextOnBackgroundPlayer(final Context context,
+                                              final PlayQueue queue,
+                                              final boolean resumePlayback) {
+        nextOnBackgroundPlayer(context, queue, false, resumePlayback);
+    }
+
+    public static void nextOnBackgroundPlayer(final Context context,
+                                              final PlayQueue queue,
+                                              final boolean selectOnAppend,
+                                              final boolean resumePlayback) {
+        Toast.makeText(context, R.string.playing_next, Toast.LENGTH_SHORT).show();
+        final Intent intent = getPlayerNextIntent(
+                context, MainPlayer.class, queue, selectOnAppend, resumePlayback);
+        intent.putExtra(Player.PLAYER_TYPE, MainPlayer.PlayerType.AUDIO.ordinal());
+        ContextCompat.startForegroundService(context, intent);
+    }
     /*//////////////////////////////////////////////////////////////////////////
     // External Players
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java

@@ -55,6 +55,21 @@ public enum StreamDialogEntry {
                     new SinglePlayQueue(item), false);
         }
     }),
+    //TODO reduce duplication
+    next(R.string.play_next_stream, (fragment, item) -> {
+        final MainPlayer.PlayerType type = PlayerHolder.getInstance().getType();
+
+        if (type == AUDIO) {
+            NavigationHelper.nextOnVideoPlayer(fragment.getContext(),
+                    new SinglePlayQueue(item), false);
+        } else if (type == POPUP) {
+            NavigationHelper.nextOnPopupPlayer(fragment.getContext(),
+                    new SinglePlayQueue(item), false);
+        } else /* type == VIDEO */ {
+            NavigationHelper.nextOnVideoPlayer(fragment.getContext(),
+                    new SinglePlayQueue(item), false);
+        }
+    }),
 
     start_here_on_background(R.string.start_here_on_background, (fragment, item) ->
             NavigationHelper.playOnBackgroundPlayer(fragment.getContext(),

app/src/main/res/values/strings.xml

@@ -471,6 +471,8 @@
     <string name="hold_to_append">Hold to enqueue</string>
     <string name="show_channel_details">Show channel details</string>
     <string name="enqueue_stream">Enqueue</string>
+    <string name="play_next_stream">Next</string>
+    <string name="playing_next">Playing Next</string>
     <string name="enqueued">Enqueued</string>
     <string name="start_here_on_main">Start playing here</string>
     <string name="start_here_on_background">Start playing in the background</string>