From 7bba2dea979e9c86542ec8ebd55f6c0950d3025e Mon Sep 17 00:00:00 2001
From: Hans-Peter Lehmann <ByteHamster@users.noreply.github.com>
Date: Wed, 10 Dec 2025 22:47:30 +0100
Subject: [PATCH] Move "select all" to overflow menu (#8147)

No app seems to use the standard select all icon anymore, and users
in my tests were confused.
---
 .../antennapod/ui/SelectableAdapter.java      | 39 +++++++++++++------
 .../episodeslist/EpisodeItemListAdapter.java  | 22 ++++-------
 .../res/menu/multi_select_context_popup.xml   | 11 ------
 .../main/res/menu/multi_select_options.xml    | 24 ++++++++++--
 .../main/res/menu/opml_selection_options.xml  |  6 +--
 app/src/main/res/menu/transcript.xml          |  3 +-
 .../src/main/res/drawable/ic_select_all.xml   |  9 -----
 .../src/main/res/drawable/ic_select_none.xml  | 11 ------
 8 files changed, 59 insertions(+), 66 deletions(-)
 delete mode 100644 app/src/main/res/menu/multi_select_context_popup.xml
 delete mode 100644 ui/common/src/main/res/drawable/ic_select_all.xml
 delete mode 100644 ui/common/src/main/res/drawable/ic_select_none.xml

diff --git a/app/src/main/java/de/danoeh/antennapod/ui/SelectableAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/SelectableAdapter.java
index 2f3ed6ab7..245d31376 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/SelectableAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/SelectableAdapter.java
@@ -60,8 +60,8 @@ public abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> exten
             @Override
             public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
                 onSelectedItemsUpdated();
-                toggleSelectAllIcon(menu.findItem(R.id.select_toggle), false);
-                return false;
+                toggleSelectAllIcon(menu);
+                return true;
             }
 
             @Override
@@ -70,9 +70,30 @@ public abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> exten
                     boolean selectAll = selectedIds.size() != getItemCount();
                     shouldSelectLazyLoadedItems = selectAll;
                     setSelected(0, getItemCount(), selectAll);
-                    toggleSelectAllIcon(item, selectAll);
+                    toggleSelectAllIcon(mode.getMenu());
                     onSelectedItemsUpdated();
                     return true;
+                } else if (item.getItemId() == R.id.select_all_above) {
+                    int firstSelectedPosition = 0;
+                    for (int i = 0; i < getItemCount(); i++) {
+                        if (isSelected(i)) {
+                            firstSelectedPosition = i;
+                            break;
+                        }
+                    }
+                    setSelected(0, firstSelectedPosition, true);
+                    return true;
+                } else if (item.getItemId() == R.id.select_all_below) {
+                    shouldSelectLazyLoadedItems = true;
+                    int lastSelectedPosition = 0;
+                    for (int i = getItemCount() - 1; i >= 0; i--) {
+                        if (isSelected(i)) {
+                            lastSelectedPosition = i;
+                            break;
+                        }
+                    }
+                    setSelected(lastSelectedPosition + 1, getItemCount(), true);
+                    return true;
                 }
                 return false;
             }
@@ -158,14 +179,10 @@ public abstract class SelectableAdapter<T extends RecyclerView.ViewHolder> exten
         return selectedIds.size();
     }
 
-    private void toggleSelectAllIcon(MenuItem selectAllItem, boolean allSelected) {
-        if (allSelected) {
-            selectAllItem.setIcon(R.drawable.ic_select_none);
-            selectAllItem.setTitle(R.string.deselect_all_label);
-        } else {
-            selectAllItem.setIcon(R.drawable.ic_select_all);
-            selectAllItem.setTitle(R.string.select_all_label);
-        }
+    private void toggleSelectAllIcon(Menu menu) {
+        boolean allSelected = selectedIds.size() == getItemCount();
+        menu.findItem(R.id.select_toggle).setTitle(allSelected
+                ? R.string.deselect_all_label : R.string.select_all_label);
     }
 
     protected void onSelectedItemsUpdated() {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java
index 39d732153..50e3505f9 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/episodeslist/EpisodeItemListAdapter.java
@@ -204,28 +204,20 @@ public class EpisodeItemListAdapter extends SelectableAdapter<EpisodeItemViewHol
     public void onCreateContextMenu(final ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
         MenuInflater inflater = mainActivityRef.get().getMenuInflater();
         if (inActionMode()) {
-            inflater.inflate(R.menu.multi_select_context_popup, menu);
-        } else {
-            if (longPressedItem == null) {
-                return;
-            }
-            inflater.inflate(R.menu.feeditemlist_context, menu);
-            menu.setHeaderTitle(longPressedItem.getTitle());
-            FeedItemMenuHandler.onPrepareMenu(menu, Collections.singletonList(longPressedItem), R.id.skip_episode_item);
+            return;
         }
+        if (longPressedItem == null) {
+            return;
+        }
+        inflater.inflate(R.menu.feeditemlist_context, menu);
+        menu.setHeaderTitle(longPressedItem.getTitle());
+        FeedItemMenuHandler.onPrepareMenu(menu, Collections.singletonList(longPressedItem), R.id.skip_episode_item);
     }
 
     public boolean onContextItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.multi_select) {
             startSelectMode(longPressedPosition);
             return true;
-        } else if (item.getItemId() == R.id.select_all_above) {
-            setSelected(0, longPressedPosition, true);
-            return true;
-        } else if (item.getItemId() == R.id.select_all_below) {
-            shouldSelectLazyLoadedItems = true;
-            setSelected(longPressedPosition + 1, getItemCount(), true);
-            return true;
         }
         return false;
     }
diff --git a/app/src/main/res/menu/multi_select_context_popup.xml b/app/src/main/res/menu/multi_select_context_popup.xml
deleted file mode 100644
index 730b01016..000000000
--- a/app/src/main/res/menu/multi_select_context_popup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/select_all_above"
-        android:title="@string/select_all_above">
-    </item>
-    <item
-        android:id="@+id/select_all_below"
-        android:title="@string/select_all_below">
-    </item>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/multi_select_options.xml b/app/src/main/res/menu/multi_select_options.xml
index 5cb2b7602..656b68394 100644
--- a/app/src/main/res/menu/multi_select_options.xml
+++ b/app/src/main/res/menu/multi_select_options.xml
@@ -1,8 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AppCompatResource">
+
     <item
         android:id="@+id/select_toggle"
         android:title="@string/select_all_label"
-        app:showAsAction="always"/>
+        android:showAsAction="never"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/select_all_above"
+        android:title="@string/select_all_above"
+        android:showAsAction="never"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/select_all_below"
+        android:title="@string/select_all_below"
+        android:showAsAction="never"
+        app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/menu/opml_selection_options.xml b/app/src/main/res/menu/opml_selection_options.xml
index 1b7bc9331..17bd75cd9 100644
--- a/app/src/main/res/menu/opml_selection_options.xml
+++ b/app/src/main/res/menu/opml_selection_options.xml
@@ -4,16 +4,14 @@
 
     <item
         android:id="@id/select_all_item"
-        android:icon="@drawable/ic_select_all"
         android:title="@string/select_all_label"
-        custom:showAsAction="ifRoom">
+        custom:showAsAction="never">
     </item>
 
     <item
         android:id="@id/deselect_all_item"
-        android:icon="@drawable/ic_select_none"
         android:title="@string/deselect_all_label"
-        custom:showAsAction="ifRoom">
+        custom:showAsAction="never">
     </item>
 
 </menu>
diff --git a/app/src/main/res/menu/transcript.xml b/app/src/main/res/menu/transcript.xml
index d4d92bbda..1beb6faba 100644
--- a/app/src/main/res/menu/transcript.xml
+++ b/app/src/main/res/menu/transcript.xml
@@ -13,8 +13,7 @@
     <item
         android:id="@+id/action_select_all"
         android:title="@string/select_all_label"
-        android:icon="@drawable/ic_select_all"
-        app:showAsAction="always" />
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_cancel_copy"
         android:title="@string/cancel_label"
diff --git a/ui/common/src/main/res/drawable/ic_select_all.xml b/ui/common/src/main/res/drawable/ic_select_all.xml
deleted file mode 100644
index 29e4dbfff..000000000
--- a/ui/common/src/main/res/drawable/ic_select_all.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?attr/action_icon_color"
-        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
-</vector>
diff --git a/ui/common/src/main/res/drawable/ic_select_none.xml b/ui/common/src/main/res/drawable/ic_select_none.xml
deleted file mode 100644
index c2b3cd481..000000000
--- a/ui/common/src/main/res/drawable/ic_select_none.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="?attr/action_icon_color"
-        android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/>
-    <path android:fillColor="?attr/action_icon_color"
-        android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/>
-</vector>