Add possibility to remove items using long press,

from tab list and Peertube instance list,
for devices that do not support drag and drop, e.g. Android TV.

Author: rubeno9a

app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java

@@ -199,6 +199,24 @@ private void showAddItemDialog(final Context c) {
                 .show();
     }
 
+    private void showDeleteInstanceDialog(final PeertubeInstance instance, final int position) {
+        new AlertDialog.Builder(requireContext())
+                .setTitle(instance.getName())
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.delete, (dialog, which) -> {
+                    final var list = new ArrayList<>(instanceListAdapter.getCurrentList());
+                    list.remove(position);
+
+                    if (list.isEmpty()) {
+                        list.add(selectedInstance);
+                    }
+
+                    instanceListAdapter.submitList(list);
+                })
+                .show();
+    }
+
     private void addInstance(final String url) {
         final String cleanUrl = cleanUrl(url);
         if (cleanUrl == null) {
@@ -357,6 +375,22 @@ class TabViewHolder extends RecyclerView.ViewHolder {
             TabViewHolder(final ItemInstanceBinding binding) {
                 super(binding.getRoot());
                 this.itemBinding = binding;
+
+                itemView.setOnLongClickListener(this::onInstanceLongClick);
+            }
+
+            private boolean onInstanceLongClick(final View view) {
+                final int position = getBindingAdapterPosition();
+                if (position != RecyclerView.NO_POSITION) {
+                    final PeertubeInstance instance = getItem(position);
+                    // do not allow removing the selected instance
+                    if (instance.getUrl().equals(selectedInstance.getUrl())) {
+                        return true;
+                    }
+
+                    showDeleteInstanceDialog(instance, position);
+                }
+                return true;
             }
 
             @SuppressLint("ClickableViewAccessibility")

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

@@ -139,6 +139,23 @@ private void restoreDefaults() {
                 .show();
     }
 
+    private void showDeleteTabDialog(final int position, final String tabName) {
+        new AlertDialog.Builder(requireContext())
+                .setTitle(tabName)
+                .setCancelable(true)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(R.string.delete, (dialog, which) -> {
+                    tabList.remove(position);
+                    selectedTabsAdapter.notifyItemRemoved(position);
+
+                    if (tabList.isEmpty()) {
+                        tabList.add(Tab.Type.BLANK.getTab());
+                        selectedTabsAdapter.notifyItemInserted(0);
+                    }
+                })
+                .show();
+    }
+
     private void initButton(final View rootView) {
         final FloatingActionButton fab = rootView.findViewById(R.id.addTabsButton);
         fab.setOnClickListener(v -> {
@@ -375,6 +392,16 @@ class TabViewHolder extends RecyclerView.ViewHolder {
                 tabNameView = itemView.findViewById(R.id.tabName);
                 tabIconView = itemView.findViewById(R.id.tabIcon);
                 handle = itemView.findViewById(R.id.handle);
+
+                itemView.setOnLongClickListener(this::onTabLongClick);
+            }
+
+            private boolean onTabLongClick(final View view) {
+                final int position = getBindingAdapterPosition();
+                if (position != RecyclerView.NO_POSITION) {
+                    showDeleteTabDialog(position, tabNameView.getText().toString());
+                }
+                return true;
             }
 
             @SuppressLint("ClickableViewAccessibility")