From 3a163c1de5e0879716b92f98abb82667a65db82b Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Sat, 18 May 2019 16:32:56 +0200
Subject: [PATCH] Fix select all menu item behaviour and add icon

---
 .../java/com/readrops/app/activities/MainActivity.java | 10 ++++++++--
 .../com/readrops/app/views/MainItemListAdapter.java    |  5 +++++
 app/src/main/res/drawable/ic_select_all_white.xml      |  5 +++++
 app/src/main/res/menu/item_list_contextual_menu.xml    |  3 ++-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_select_all_white.xml

diff --git a/app/src/main/java/com/readrops/app/activities/MainActivity.java b/app/src/main/java/com/readrops/app/activities/MainActivity.java
index 757797e4..455baae6 100644
--- a/app/src/main/java/com/readrops/app/activities/MainActivity.java
+++ b/app/src/main/java/com/readrops/app/activities/MainActivity.java
@@ -265,8 +265,14 @@ public class MainActivity extends AppCompatActivity implements SwipeRefreshLayou
                                 setReadState(false);
                                 break;
                             case R.id.item_select_all:
-                                adapter.selectAll();
-                                allItemsSelected = true;
+                                if (allItemsSelected) {
+                                    adapter.unselectAll();
+                                    allItemsSelected = false;
+                                    actionMode.finish();
+                                } else {
+                                    adapter.selectAll();
+                                    allItemsSelected = true;
+                                }
                                 break;
                         }
 
diff --git a/app/src/main/java/com/readrops/app/views/MainItemListAdapter.java b/app/src/main/java/com/readrops/app/views/MainItemListAdapter.java
index 04c56cbd..0c8e9e8c 100644
--- a/app/src/main/java/com/readrops/app/views/MainItemListAdapter.java
+++ b/app/src/main/java/com/readrops/app/views/MainItemListAdapter.java
@@ -205,6 +205,11 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
         notifyDataSetChanged();
     }
 
+    public void unselectAll() {
+        selection.clear();
+        notifyDataSetChanged();
+    }
+
     public List<ItemWithFeed> getSelectedItems() {
         List<ItemWithFeed> items = new ArrayList<>();
 
diff --git a/app/src/main/res/drawable/ic_select_all_white.xml b/app/src/main/res/drawable/ic_select_all_white.xml
new file mode 100644
index 00000000..bc75904c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_select_all_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" 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/app/src/main/res/menu/item_list_contextual_menu.xml b/app/src/main/res/menu/item_list_contextual_menu.xml
index 7965dcb7..f3af16ea 100644
--- a/app/src/main/res/menu/item_list_contextual_menu.xml
+++ b/app/src/main/res/menu/item_list_contextual_menu.xml
@@ -17,6 +17,7 @@
     <item
         android:id="@+id/item_select_all"
         android:title="@string/select_all"
-        app:showAsAction="never" />
+        android:icon="@drawable/ic_select_all_white"
+        app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file