Redesigned long press menu

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt

@@ -1379,14 +1379,9 @@ class VideoDetailFragment :
         }
 
         if (info.viewCount >= 0) {
-            binding.detailViewCountView.text =
-                if (info.streamType == StreamType.AUDIO_LIVE_STREAM) {
-                    Localization.listeningCount(activity, info.viewCount)
-                } else if (info.streamType == StreamType.LIVE_STREAM) {
-                    Localization.localizeWatchingCount(activity, info.viewCount)
-                } else {
-                    Localization.localizeViewCount(activity, info.viewCount)
-                }
+            binding.detailViewCountView.text = Localization.localizeViewCount(
+                activity, false, info.streamType, info.viewCount
+            )
             binding.detailViewCountView.visibility = View.VISIBLE
         } else {
             binding.detailViewCountView.visibility = View.GONE

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

@@ -2,6 +2,7 @@
 
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+import static org.schabi.newpipe.ui.components.menu.LongPressMenuKt.openLongPressMenuInActivity;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,12 +23,15 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.extractor.InfoItem;
+import org.schabi.newpipe.extractor.channel.ChannelInfoItem;
+import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.info_list.ItemViewMode;
-import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
+import org.schabi.newpipe.ui.components.menu.LongPressAction;
+import org.schabi.newpipe.ui.components.menu.LongPressable;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
 import org.schabi.newpipe.util.StateSaver;
@@ -256,7 +260,10 @@ protected void initListeners() {
         infoListAdapter.setOnStreamSelectedListener(new OnClickGesture<>() {
             @Override
             public void selected(final StreamInfoItem selectedItem) {
-                onStreamSelected(selectedItem);
+                onItemSelected(selectedItem);
+                NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
+                        selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName(),
+                        null, false);
             }
 
             @Override
@@ -265,23 +272,50 @@ public void held(final StreamInfoItem selectedItem) {
             }
         });
 
-        infoListAdapter.setOnChannelSelectedListener(selectedItem -> {
-            try {
-                onItemSelected(selectedItem);
-                NavigationHelper.openChannelFragment(getFM(), selectedItem.getServiceId(),
-                        selectedItem.getUrl(), selectedItem.getName());
-            } catch (final Exception e) {
-                ErrorUtil.showUiErrorSnackbar(this, "Opening channel fragment", e);
+        infoListAdapter.setOnChannelSelectedListener(new OnClickGesture<>() {
+            @Override
+            public void selected(final ChannelInfoItem selectedItem) {
+                try {
+                    onItemSelected(selectedItem);
+                    NavigationHelper.openChannelFragment(getFM(), selectedItem.getServiceId(),
+                            selectedItem.getUrl(), selectedItem.getName());
+                } catch (final Exception e) {
+                    ErrorUtil.showUiErrorSnackbar(BaseListFragment.this, "Opening channel fragment",
+                            e);
+                }
+            }
+
+            @Override
+            public void held(final ChannelInfoItem selectedItem) {
+                openLongPressMenuInActivity(
+                        requireActivity(),
+                        LongPressable.fromChannelInfoItem(selectedItem),
+                        LongPressAction.fromChannelInfoItem(selectedItem, null)
+                );
             }
         });
 
-        infoListAdapter.setOnPlaylistSelectedListener(selectedItem -> {
-            try {
-                onItemSelected(selectedItem);
-                NavigationHelper.openPlaylistFragment(getFM(), selectedItem.getServiceId(),
-                        selectedItem.getUrl(), selectedItem.getName());
-            } catch (final Exception e) {
-                ErrorUtil.showUiErrorSnackbar(this, "Opening playlist fragment", e);
+        infoListAdapter.setOnPlaylistSelectedListener(new OnClickGesture<>() {
+            @Override
+            public void selected(final PlaylistInfoItem selectedItem) {
+                try {
+                    BaseListFragment.this.onItemSelected(selectedItem);
+                    NavigationHelper.openPlaylistFragment(BaseListFragment.this.getFM(),
+                            selectedItem.getServiceId(),
+                            selectedItem.getUrl(), selectedItem.getName());
+                } catch (final Exception e) {
+                    ErrorUtil.showUiErrorSnackbar(BaseListFragment.this,
+                            "Opening playlist fragment", e);
+                }
+            }
+
+            @Override
+            public void held(final PlaylistInfoItem selectedItem) {
+                openLongPressMenuInActivity(
+                        requireActivity(),
+                        LongPressable.fromPlaylistInfoItem(selectedItem),
+                        LongPressAction.fromPlaylistInfoItem(selectedItem)
+                );
             }
         });
 
@@ -291,6 +325,15 @@ public void held(final StreamInfoItem selectedItem) {
         useNormalItemListScrollListener();
     }
 
+    protected void showInfoItemDialog(final StreamInfoItem item) {
+        openLongPressMenuInActivity(
+                requireActivity(),
+                LongPressable.fromStreamInfoItem(item),
+                // TODO generalize obtaining queue from here when fully migrating to Compose
+                LongPressAction.fromStreamInfoItem(item, null)
+        );
+    }
+
     /**
      * Removes all listeners and adds the normal scroll listener to the {@link #itemsList}.
      */
@@ -373,27 +416,12 @@ public void onScrolledDown(final RecyclerView recyclerView) {
         }
     }
 
-    private void onStreamSelected(final StreamInfoItem selectedItem) {
-        onItemSelected(selectedItem);
-        NavigationHelper.openVideoDetailFragment(requireContext(), getFM(),
-                selectedItem.getServiceId(), selectedItem.getUrl(), selectedItem.getName(),
-                null, false);
-    }
-
     protected void onScrollToBottom() {
         if (hasMoreItems() && !isLoading.get()) {
             loadMoreItems();
         }
     }
 
-    protected void showInfoItemDialog(final StreamInfoItem item) {
-        try {
-            new InfoItemDialog.Builder(getActivity(), getContext(), this, item).create().show();
-        } catch (final IllegalArgumentException e) {
-            InfoItemDialog.Builder.reportErrorDuringInitialization(e, item);
-        }
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Menu
     //////////////////////////////////////////////////////////////////////////*/

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelTabFragment.java

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.fragments.list.channel;
 
+import static org.schabi.newpipe.ui.components.menu.LongPressMenuKt.openLongPressMenuInActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -26,12 +28,15 @@
 import org.schabi.newpipe.fragments.list.playlist.PlaylistControlViewHolder;
 import org.schabi.newpipe.player.playqueue.ChannelTabPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
+import org.schabi.newpipe.ui.components.menu.LongPressAction;
+import org.schabi.newpipe.ui.components.menu.LongPressable;
 import org.schabi.newpipe.ui.emptystate.EmptyStateUtil;
 import org.schabi.newpipe.util.ChannelTabHelper;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.PlayButtonHelper;
 
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -165,13 +170,30 @@ public void handleResult(@NonNull final ChannelTabInfo result) {
     }
 
     @Override
-    public PlayQueue getPlayQueue() {
+    protected void showInfoItemDialog(final StreamInfoItem item) {
+        openLongPressMenuInActivity(
+                requireActivity(),
+                LongPressable.fromStreamInfoItem(item),
+                LongPressAction.fromStreamInfoItem(item, () -> getPlayQueueStartingAt(item))
+        );
+    }
+
+    private PlayQueue getPlayQueueStartingAt(final StreamInfoItem infoItem) {
+        return getPlayQueue(streamItems -> Math.max(streamItems.indexOf(infoItem), 0));
+    }
+
+    public PlayQueue getPlayQueue(final Function<List<StreamInfoItem>, Integer> index) {
         final List<StreamInfoItem> streamItems = infoListAdapter.getItemsList().stream()
                 .filter(StreamInfoItem.class::isInstance)
                 .map(StreamInfoItem.class::cast)
                 .collect(Collectors.toList());
 
         return new ChannelTabPlayQueue(currentInfo.getServiceId(), tabHandler,
-                currentInfo.getNextPage(), streamItems, 0);
+                currentInfo.getNextPage(), streamItems, index.apply(streamItems));
+    }
+
+    @Override
+    public PlayQueue getPlayQueue() {
+        return getPlayQueue(streamItems -> 0);
     }
 }

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -3,9 +3,9 @@
 import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+import static org.schabi.newpipe.ui.components.menu.LongPressMenuKt.openLongPressMenuInActivity;
 import static org.schabi.newpipe.util.ServiceHelper.getServiceById;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -42,12 +42,12 @@
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
-import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
+import org.schabi.newpipe.ui.components.menu.LongPressAction;
+import org.schabi.newpipe.ui.components.menu.LongPressable;
 import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -150,21 +150,11 @@ private PlayQueue getPlayQueueStartingAt(final StreamInfoItem infoItem) {
 
     @Override
     protected void showInfoItemDialog(final StreamInfoItem item) {
-        final Context context = getContext();
-        try {
-            final InfoItemDialog.Builder dialogBuilder =
-                    new InfoItemDialog.Builder(getActivity(), context, this, item);
-
-            dialogBuilder
-                    .setAction(
-                            StreamDialogDefaultEntry.START_HERE_ON_BACKGROUND,
-                            (f, infoItem) -> NavigationHelper.playOnBackgroundPlayer(
-                                    context, getPlayQueueStartingAt(infoItem), true))
-                    .create()
-                    .show();
-        } catch (final IllegalArgumentException e) {
-            InfoItemDialog.Builder.reportErrorDuringInitialization(e, item);
-        }
+        openLongPressMenuInActivity(
+            activity,
+            LongPressable.fromStreamInfoItem(item),
+            LongPressAction.fromStreamInfoItem(item, () -> getPlayQueueStartingAt(item))
+        );
     }
 
     @Override