Merge pull request #6955 from ktprograms/queue-long-press-menu

Show popup menu when long pressing in play queue (Full screen player)

app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java

@@ -0,0 +1,70 @@
+package org.schabi.newpipe;
+
+import static org.schabi.newpipe.util.external_communication.ShareUtils.shareText;
+
+import android.content.Context;
+import android.view.ContextThemeWrapper;
+import android.view.View;
+import android.widget.PopupMenu;
+
+import androidx.fragment.app.FragmentManager;
+
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.player.playqueue.PlayQueueItem;
+import org.schabi.newpipe.util.NavigationHelper;
+
+import java.util.Collections;
+
+public final class QueueItemMenuUtil {
+    public static void openPopupMenu(final PlayQueue playQueue,
+                                     final PlayQueueItem item,
+                                     final View view,
+                                     final boolean hideDetails,
+                                     final FragmentManager fragmentManager,
+                                     final Context context) {
+        final ContextThemeWrapper themeWrapper =
+                new ContextThemeWrapper(context, R.style.DarkPopupMenu);
+
+        final PopupMenu popupMenu = new PopupMenu(themeWrapper, view);
+        popupMenu.inflate(R.menu.menu_play_queue_item);
+
+        if (hideDetails) {
+            popupMenu.getMenu().findItem(R.id.menu_item_details).setVisible(false);
+        }
+
+        popupMenu.setOnMenuItemClickListener(menuItem -> {
+            switch (menuItem.getItemId()) {
+                case R.id.menu_item_remove:
+                    final int index = playQueue.indexOf(item);
+                    playQueue.remove(index);
+                    return true;
+                case R.id.menu_item_details:
+                    // playQueue is null since we don't want any queue change
+                    NavigationHelper.openVideoDetail(context, item.getServiceId(),
+                            item.getUrl(), item.getTitle(), null,
+                            false);
+                    return true;
+                case R.id.menu_item_append_playlist:
+                    final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(
+                            Collections.singletonList(item)
+                    );
+                    PlaylistAppendDialog.onPlaylistFound(context,
+                            () -> d.show(fragmentManager, "QueueItemMenuUtil@append_playlist"),
+                            () -> PlaylistCreationDialog.newInstance(d)
+                                    .show(fragmentManager, "QueueItemMenuUtil@append_playlist"));
+                    return true;
+                case R.id.menu_item_share:
+                    shareText(context, item.getTitle(), item.getUrl(),
+                            item.getThumbnailUrl());
+                    return true;
+            }
+            return false;
+        });
+
+        popupMenu.show();
+    }
+
+    private QueueItemMenuUtil() { }
+}

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

@@ -1,9 +1,5 @@
 package org.schabi.newpipe.player;
 
-import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
-import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
-import static org.schabi.newpipe.util.external_communication.ShareUtils.shareText;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -16,7 +12,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.PopupMenu;
 import android.widget.SeekBar;
 
 import androidx.annotation.Nullable;
@@ -47,16 +42,18 @@ import org.schabi.newpipe.util.PermissionHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.util.Collections;
 import java.util.List;
 
+import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
+import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
+import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
+
 public final class PlayQueueActivity extends AppCompatActivity
         implements PlayerEventListener, SeekBar.OnSeekBarChangeListener,
         View.OnClickListener, PlaybackParameterDialog.Callback {
 
     private static final String TAG = PlayQueueActivity.class.getSimpleName();
 
-    private static final int RECYCLER_ITEM_POPUP_MENU_GROUP_ID = 47;
     private static final int SMOOTH_SCROLL_MAXIMUM_DISTANCE = 80;
 
     protected Player player;
@@ -279,49 +276,6 @@ public final class PlayQueueActivity extends AppCompatActivity
         queueControlBinding.controlShuffle.setOnClickListener(this);
     }
 
-    private void buildItemPopupMenu(final PlayQueueItem item, final View view) {
-        final PopupMenu popupMenu = new PopupMenu(this, view);
-        final MenuItem remove = popupMenu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 0,
-                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;
-        });
-
-        final MenuItem detail = popupMenu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 1,
-                Menu.NONE, R.string.play_queue_stream_detail);
-        detail.setOnMenuItemClickListener(menuItem -> {
-            // playQueue is null since we don't want any queue change
-            NavigationHelper.openVideoDetail(this, item.getServiceId(), item.getUrl(),
-                    item.getTitle(), null, false);
-            return true;
-        });
-
-        final MenuItem append = popupMenu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 2,
-                Menu.NONE, R.string.append_playlist);
-        append.setOnMenuItemClickListener(menuItem -> {
-            openPlaylistAppendDialog(Collections.singletonList(item));
-            return true;
-        });
-
-        final MenuItem share = popupMenu.getMenu().add(RECYCLER_ITEM_POPUP_MENU_GROUP_ID, 3,
-                Menu.NONE, R.string.share);
-        share.setOnMenuItemClickListener(menuItem -> {
-            shareText(getApplicationContext(), item.getTitle(), item.getUrl(),
-                    item.getThumbnailUrl());
-            return true;
-        });
-
-        popupMenu.show();
-    }
-
     ////////////////////////////////////////////////////////////////////////////
     // Component Helpers
     ////////////////////////////////////////////////////////////////////////////
@@ -369,13 +323,9 @@ public final class PlayQueueActivity extends AppCompatActivity
 
             @Override
             public void held(final PlayQueueItem item, final View view) {
-                if (player == null) {
+                if (player != null && player.getPlayQueue().indexOf(item) != -1) {
-                    return;
+                    openPopupMenu(player.getPlayQueue(), item, view, false,
-                }
+                            getSupportFragmentManager(), PlayQueueActivity.this);
-
-                final int index = player.getPlayQueue().indexOf(item);
-                if (index != -1) {
-                    buildItemPopupMenu(item, view);
                 }
             }
 

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

@@ -159,6 +159,7 @@ import static com.google.android.exoplayer2.Player.REPEAT_MODE_OFF;
 import static com.google.android.exoplayer2.Player.REPEAT_MODE_ONE;
 import static com.google.android.exoplayer2.Player.RepeatMode;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
 import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
@@ -3213,9 +3214,9 @@ public final class Player implements
 
             @Override
             public void held(final PlayQueueItem item, final View view) {
-                final int index = playQueue.indexOf(item);
+                if (playQueue.indexOf(item) != -1) {
-                if (index != -1) {
+                    openPopupMenu(playQueue, item, view, true,
-                    playQueue.remove(index);
+                            getParentActivity().getSupportFragmentManager(), context);
                 }
             }
 

app/src/main/res/menu/menu_play_queue_item.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_item_remove"
+        android:title="@string/play_queue_remove" />
+    <item
+        android:id="@+id/menu_item_details"
+        android:title="@string/play_queue_stream_detail" />
+    <item
+        android:id="@+id/menu_item_append_playlist"
+        android:title="@string/append_playlist" />
+    <item
+        android:id="@+id/menu_item_share"
+        android:title="@string/share" />
+</menu>