From 84b5da3ada3b3859153c8a8e709f5c7adc8a7bd0 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Wed, 1 Jul 2015 01:49:02 -0400
Subject: [PATCH 1/4] Implement multi-select with actionbar

---
 .../utils/PasswordRecyclerAdapter.java        | 88 +++++++++++++++----
 1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
index 2bcfd7ef6..e72b9e077 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -1,10 +1,14 @@
 package com.zeapo.pwdstore.utils;
 
 import android.graphics.Color;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.view.ActionMode;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,6 +24,8 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
     private final PasswordStore activity;
     private final ArrayList<PasswordItem> values;
     private final PasswordFragment.OnFragmentInteractionListener listener;
+    private final SparseBooleanArray selectedItems;
+    private ActionMode mActionMode;
 
     // Provide a reference to the views for each data item
     // Complex data items may need more than one view per item, and
@@ -44,6 +50,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         this.values = values;
         this.activity = activity;
         this.listener = listener;
+        selectedItems = new SparseBooleanArray();
     }
 
     // Create new views (invoked by the layout manager)
@@ -89,33 +96,74 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         holder.view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                listener.onFragmentInteraction(pass);
+                if (mActionMode != null) {
+                    toggleSelection(holder.position);
+                } else {
+                    listener.onFragmentInteraction(pass);
+                }
             }
         });
 
         holder.view.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                PopupMenu p = new PopupMenu(activity, v);
-                p.getMenuInflater().inflate(
-                        R.menu.context_pass, p.getMenu());
-                p.show();
-                p.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem menuItem) {
-                        if (menuItem.getItemId() == R.id.menu_delete_password) {
-                            activity.deletePassword(PasswordRecyclerAdapter.this, holder.position);
-                        }
-                        return false;
-                    }
-                });
-                return false;
+                if (mActionMode != null) {
+                    return false;
+                }
+                toggleSelection(holder.position);
+                // Start the CAB using the ActionMode.Callback defined above
+                mActionMode = activity.startSupportActionMode(mActionModeCallback);
+                return true;
             }
         });
 
+        holder.view.setSelected(selectedItems.get(position));
 
     }
 
+    private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
+
+        // Called when the action mode is created; startActionMode() was called
+        @Override
+        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            // Inflate a menu resource providing context menu items
+            mode.getMenuInflater().inflate(R.menu.context_pass, menu);
+            return true;
+        }
+
+        // Called each time the action mode is shown. Always called after onCreateActionMode, but
+        // may be called multiple times if the mode is invalidated.
+        @Override
+        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+            return false; // Return false if nothing is done
+        }
+
+        // Called when the user selects a contextual menu item
+        @Override
+        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+            switch (item.getItemId()) {
+                case R.id.menu_delete_password:
+                    for (int i = 0; i < selectedItems.size(); i++) {
+                        if (selectedItems.valueAt(i)) {
+                            activity.deletePassword(PasswordRecyclerAdapter.this, selectedItems.keyAt(i));
+                        }
+                    }
+                    mode.finish(); // Action picked, so close the CAB
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        // Called when the user exits the action mode
+        @Override
+        public void onDestroyActionMode(ActionMode mode) {
+            selectedItems.clear();
+            mActionMode = null;
+            notifyDataSetChanged();
+        }
+    };
+
     // Return the size of your dataset (invoked by the layout manager)
     @Override
     public int getItemCount() {
@@ -146,4 +194,14 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         this.notifyItemRemoved(position);
     }
 
+    public void toggleSelection(int pos) {
+        if (selectedItems.get(pos, false)) {
+            selectedItems.delete(pos);
+        }
+        else {
+            selectedItems.put(pos, true);
+        }
+        notifyItemChanged(pos);
+    }
+
 }
\ No newline at end of file

From 1fa1f4a553cdef7c22570f5449d5793b82442700 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Wed, 1 Jul 2015 01:50:12 -0400
Subject: [PATCH 2/4] Selected rows color

---
 .../res/drawable/password_row_background.xml  |  5 +++++
 .../main/res/drawable/selected_rectangle.xml  | 21 +++++++++++++++++++
 .../main/res/layout/password_row_layout.xml   |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/password_row_background.xml
 create mode 100644 app/src/main/res/drawable/selected_rectangle.xml

diff --git a/app/src/main/res/drawable/password_row_background.xml b/app/src/main/res/drawable/password_row_background.xml
new file mode 100644
index 000000000..8f39b0562
--- /dev/null
+++ b/app/src/main/res/drawable/password_row_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/selected_rectangle" />
+    <item android:drawable="@drawable/rectangle" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selected_rectangle.xml b/app/src/main/res/drawable/selected_rectangle.xml
new file mode 100644
index 000000000..bd3c40aee
--- /dev/null
+++ b/app/src/main/res/drawable/selected_rectangle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle"
+            android:dither="true">
+            <corners android:radius="2dp"/>
+            <solid android:color="@color/blue_grey_200" />
+
+        </shape>
+    </item>
+
+    <item android:bottom="2dp" android:left="1dp" android:right="1dp">
+        <shape android:shape="rectangle"   android:dither="true">
+            <corners android:radius="2dp" />
+            <solid android:color="@color/grey_100" />
+
+            <padding android:bottom="2dp" android:left="1dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index ab6f31af6..99ee58ebf 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/rectangle"
+    android:background="@drawable/password_row_background"
     android:layout_marginTop="4dp"
     android:layout_marginBottom="4dp"
     android:layout_gravity="start|center_vertical">

From 6d0abdcad2288ff751c6b5ad195a314c812491c0 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Wed, 1 Jul 2015 02:33:23 -0400
Subject: [PATCH 3/4] Finish action bar mode when all items are deselected

---
 .../java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
index e72b9e077..5ad1b890c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -98,6 +98,9 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
             public void onClick(View v) {
                 if (mActionMode != null) {
                     toggleSelection(holder.position);
+                    if (selectedItems.size() == 0) {
+                        mActionMode.finish();
+                    }
                 } else {
                     listener.onFragmentInteraction(pass);
                 }

From 8c885882dc0642f2dbf313980441911edd9f9cc7 Mon Sep 17 00:00:00 2001
From: Matthew Wong <wongma@protonmail.ch>
Date: Wed, 1 Jul 2015 19:31:11 -0400
Subject: [PATCH 4/4] Make selectedItems Set instead of SparseBooleanArray

---
 .../utils/PasswordRecyclerAdapter.java        | 32 ++++++++-----------
 .../main/res/drawable/selected_rectangle.xml  |  2 +-
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
index 5ad1b890c..857c8276d 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -1,12 +1,9 @@
 package com.zeapo.pwdstore.utils;
 
 import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ActionMode;
-import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
-import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -19,12 +16,14 @@ import com.zeapo.pwdstore.PasswordStore;
 import com.zeapo.pwdstore.R;
 
 import java.util.ArrayList;
+import java.util.Set;
+import java.util.TreeSet;
 
 public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecyclerAdapter.ViewHolder> {
     private final PasswordStore activity;
     private final ArrayList<PasswordItem> values;
     private final PasswordFragment.OnFragmentInteractionListener listener;
-    private final SparseBooleanArray selectedItems;
+    private final Set<Integer> selectedItems;
     private ActionMode mActionMode;
 
     // Provide a reference to the views for each data item
@@ -50,7 +49,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         this.values = values;
         this.activity = activity;
         this.listener = listener;
-        selectedItems = new SparseBooleanArray();
+        selectedItems = new TreeSet<>();
     }
 
     // Create new views (invoked by the layout manager)
@@ -98,7 +97,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
             public void onClick(View v) {
                 if (mActionMode != null) {
                     toggleSelection(holder.position);
-                    if (selectedItems.size() == 0) {
+                    if (selectedItems.isEmpty()) {
                         mActionMode.finish();
                     }
                 } else {
@@ -114,13 +113,13 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
                     return false;
                 }
                 toggleSelection(holder.position);
-                // Start the CAB using the ActionMode.Callback defined above
+                // Start the CAB using the ActionMode.Callback
                 mActionMode = activity.startSupportActionMode(mActionModeCallback);
                 return true;
             }
         });
 
-        holder.view.setSelected(selectedItems.get(position));
+        holder.view.setSelected(selectedItems.contains(position));
 
     }
 
@@ -146,10 +145,8 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.menu_delete_password:
-                    for (int i = 0; i < selectedItems.size(); i++) {
-                        if (selectedItems.valueAt(i)) {
-                            activity.deletePassword(PasswordRecyclerAdapter.this, selectedItems.keyAt(i));
-                        }
+                    for (int position : selectedItems) {
+                        activity.deletePassword(PasswordRecyclerAdapter.this, position);
                     }
                     mode.finish(); // Action picked, so close the CAB
                     return true;
@@ -197,14 +194,11 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         this.notifyItemRemoved(position);
     }
 
-    public void toggleSelection(int pos) {
-        if (selectedItems.get(pos, false)) {
-            selectedItems.delete(pos);
+    public void toggleSelection(int position) {
+        if (!selectedItems.remove(position)) {
+            selectedItems.add(position);
         }
-        else {
-            selectedItems.put(pos, true);
-        }
-        notifyItemChanged(pos);
+        notifyItemChanged(position);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selected_rectangle.xml b/app/src/main/res/drawable/selected_rectangle.xml
index bd3c40aee..ec8d2ad86 100644
--- a/app/src/main/res/drawable/selected_rectangle.xml
+++ b/app/src/main/res/drawable/selected_rectangle.xml
@@ -13,7 +13,7 @@
     <item android:bottom="2dp" android:left="1dp" android:right="1dp">
         <shape android:shape="rectangle"   android:dither="true">
             <corners android:radius="2dp" />
-            <solid android:color="@color/grey_100" />
+            <solid android:color="@color/blue_grey_100" />
 
             <padding android:bottom="2dp" android:left="1dp"/>
         </shape>