From b36d082b9f91c4fe6e9c360fe5e2fe914c88589b Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Fri, 10 Jun 2016 03:13:09 +0200
Subject: Restyle password cards

---
 .../pwdstore/utils/PasswordRecyclerAdapter.java    | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/utils')

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 45dd0d0b..3f240515 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -71,19 +71,18 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         holder.name.setText(pass.toString());
         int sdk = android.os.Build.VERSION.SDK_INT;
 
+        holder.type.setText(pass.getFullPathName());
         if (pass.getType() == PasswordItem.TYPE_CATEGORY) {
-            holder.type.setText(pass.getFullPathName());
-            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_400));
+            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
         } else {
-            holder.type.setText(pass.getFullPathName());
-            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_400));
+            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
         }
 
         holder.view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (mActionMode != null) {
-                    toggleSelection(holder.getAdapterPosition(), holder.card, pass.getType());
+                    toggleSelection(holder, holder.getAdapterPosition(), holder.card, pass.getType());
                     if (selectedItems.isEmpty()) {
                         mActionMode.finish();
                     } else if (selectedItems.size() == 1 && !canEdit) {
@@ -107,7 +106,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
                 if (mActionMode != null) {
                     return false;
                 }
-                toggleSelection(holder.getAdapterPosition(), holder.card, pass.getType());
+                toggleSelection(holder, holder.getAdapterPosition(), holder.card, pass.getType());
                 canEdit = pass.getType() == PasswordItem.TYPE_PASSWORD;
                 // Start the CAB using the ActionMode.Callback
                 mActionMode = activity.startSupportActionMode(mActionModeCallback);
@@ -205,21 +204,19 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         updateSelectedItems(position, selectedItems);
     }
 
-    public void toggleSelection(int position, CardView card, char type) {
+    public void toggleSelection(ViewHolder holder, int position, CardView card, char type) {
         if (!selectedItems.remove(position)) {
             selectedItems.add(position);
             if (type == PasswordItem.TYPE_CATEGORY) {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_200));
-            }
-            else {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
+                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
+            } else {
+                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
             }
         } else {
             if (type == PasswordItem.TYPE_CATEGORY) {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.deep_orange_400));
-            }
-            else {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_400));
+                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
+            } else {
+                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
             }
         }
     }
-- 
cgit v1.2.3


From 09f12c81c12ed1993446e98779661d25ced42ad3 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Fri, 10 Jun 2016 03:23:35 +0200
Subject: Remove CardView and use divider for separation

---
 .../com/zeapo/pwdstore/DividerItemDecoration.java  | 51 +++++++++++++++++
 .../java/com/zeapo/pwdstore/PasswordFragment.java  |  7 ++-
 .../pwdstore/utils/PasswordRecyclerAdapter.java    | 18 +++---
 app/src/main/res/drawable/divider.xml              |  6 ++
 app/src/main/res/layout/password_row_layout.xml    | 66 +++++++++-------------
 5 files changed, 97 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java
 create mode 100644 app/src/main/res/drawable/divider.xml

(limited to 'app/src/main/java/com/zeapo/pwdstore/utils')

diff --git a/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java b/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java
new file mode 100644
index 00000000..7bc66b62
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/DividerItemDecoration.java
@@ -0,0 +1,51 @@
+package com.zeapo.pwdstore;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class DividerItemDecoration extends RecyclerView.ItemDecoration {
+
+    private static final int[] ATTRS = new int[]{android.R.attr.listDivider};
+
+    private Drawable mDivider;
+
+    /**
+     * Default divider will be used
+     */
+    public DividerItemDecoration(Context context) {
+        final TypedArray styledAttributes = context.obtainStyledAttributes(ATTRS);
+        mDivider = styledAttributes.getDrawable(0);
+        styledAttributes.recycle();
+    }
+
+    /**
+     * Custom divider will be used
+     */
+    public DividerItemDecoration(Context context, int resId) {
+        mDivider = ContextCompat.getDrawable(context, resId);
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        int left = parent.getPaddingLeft();
+        int right = parent.getWidth() - parent.getPaddingRight();
+
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+
+            RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int top = child.getBottom() + params.bottomMargin;
+            int bottom = top + mDivider.getIntrinsicHeight();
+
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+}
diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
index 1daa4f90..79401fbd 100644
--- a/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
+++ b/app/src/main/java/com/zeapo/pwdstore/PasswordFragment.java
@@ -74,8 +74,11 @@ public class PasswordFragment extends Fragment{
 
         recyclerView = (RecyclerView) view.findViewById(R.id.pass_recycler);
         recyclerView.setLayoutManager(mLayoutManager);
-//
-//        // Set the adapter
+
+        // use divider
+        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), R.drawable.divider));
+
+        // Set the adapter
         recyclerView.setAdapter(recyclerAdapter);
 
         final FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
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 3f240515..af9a6776 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -33,14 +33,12 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
     public static class ViewHolder extends RecyclerView.ViewHolder {
         // each data item is just a string in this case
         public View view;
-        public CardView card;
         public TextView name;
         public TextView type;
 
         public ViewHolder(View v) {
             super(v);
             view = v;
-            card = (CardView) view.findViewById(R.id.password_card);
             name = (TextView) view.findViewById(R.id.label);
             type = (TextView) view.findViewById(R.id.type);
         }
@@ -73,16 +71,16 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
 
         holder.type.setText(pass.getFullPathName());
         if (pass.getType() == PasswordItem.TYPE_CATEGORY) {
-            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
+//            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
         } else {
-            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
+//            holder.card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
         }
 
         holder.view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (mActionMode != null) {
-                    toggleSelection(holder, holder.getAdapterPosition(), holder.card, pass.getType());
+                    toggleSelection(holder, holder.getAdapterPosition(), null, pass.getType());
                     if (selectedItems.isEmpty()) {
                         mActionMode.finish();
                     } else if (selectedItems.size() == 1 && !canEdit) {
@@ -106,7 +104,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
                 if (mActionMode != null) {
                     return false;
                 }
-                toggleSelection(holder, holder.getAdapterPosition(), holder.card, pass.getType());
+                toggleSelection(holder, holder.getAdapterPosition(), null, pass.getType());
                 canEdit = pass.getType() == PasswordItem.TYPE_PASSWORD;
                 // Start the CAB using the ActionMode.Callback
                 mActionMode = activity.startSupportActionMode(mActionModeCallback);
@@ -208,15 +206,15 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         if (!selectedItems.remove(position)) {
             selectedItems.add(position);
             if (type == PasswordItem.TYPE_CATEGORY) {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
+//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
             } else {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
+//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
             }
         } else {
             if (type == PasswordItem.TYPE_CATEGORY) {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
+//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
             } else {
-                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
+//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
             }
         }
     }
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 00000000..cf2134ff
--- /dev/null
+++ b/app/src/main/res/drawable/divider.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:height="1dp" />
+    <solid android:color="@color/grey_300" />
+</shape>
\ 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 61c089df..0b877934 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -8,49 +8,37 @@
     android:layout_marginRight="8dp"
     android:layout_marginTop="0dp">
 
-    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/password_card"
-        style="@style/CardView.Light"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        card_view:cardCornerRadius="4dp"
-        card_view:cardElevation="4dp"
-        card_view:cardUseCompatPadding="true"
-        card_view:contentPaddingLeft="4dp"
-        card_view:contentPaddingTop="4dp">
+        android:padding="8dp"
+        android:gravity="left">
 
-        <RelativeLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/type"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:gravity="left">
+            android:alpha="0.5"
+            android:maxLines="1"
+            android:ellipsize="start"
+            android:text="TYPE"
+            android:textSize="14dp"
+            android:textColor="@android:color/black"
+            android:layout_alignParentTop="true"
+            android:layout_alignLeft="@+id/label"
+            android:layout_alignStart="@+id/label" />
 
-            <TextView
-                android:id="@+id/type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:alpha="0.5"
-                android:maxLines="1"
-                android:ellipsize="start"
-                android:text="TYPE"
-                android:textSize="14dp"
-                android:textColor="@android:color/black"
-                android:layout_alignParentTop="true"
-                android:layout_alignLeft="@+id/label"
-                android:layout_alignStart="@+id/label" />
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="FILE_NAME"
+            android:textColor="@android:color/black"
+            android:textSize="18dp"
+            android:layout_below="@+id/type"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
+    </RelativeLayout>
 
-            <TextView
-                android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="FILE_NAME"
-                android:textColor="@android:color/black"
-                android:textSize="18dp"
-                android:layout_below="@+id/type"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 0e700ce21b042030f41d3c488807afb925461f08 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Fri, 10 Jun 2016 04:49:35 +0200
Subject: Add icons to list item

---
 .../pwdstore/utils/PasswordRecyclerAdapter.java    |  13 +++++++-
 .../main/res/drawable-hdpi/ic_action_secure.png    | Bin 0 -> 394 bytes
 .../res/drawable-hdpi/ic_folder_grey600_24dp.png   | Bin 0 -> 140 bytes
 .../main/res/drawable-mdpi/ic_action_secure.png    | Bin 0 -> 317 bytes
 .../res/drawable-mdpi/ic_folder_grey600_24dp.png   | Bin 0 -> 123 bytes
 .../main/res/drawable-xhdpi/ic_action_secure.png   | Bin 0 -> 510 bytes
 .../res/drawable-xhdpi/ic_folder_grey600_24dp.png  | Bin 0 -> 194 bytes
 .../main/res/drawable-xxhdpi/ic_action_secure.png  | Bin 0 -> 624 bytes
 .../res/drawable-xxhdpi/ic_folder_grey600_24dp.png | Bin 0 -> 259 bytes
 app/src/main/res/layout/password_row_layout.xml    |  34 +++++++++++++--------
 10 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_secure.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_secure.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_secure.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_secure.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png

(limited to 'app/src/main/java/com/zeapo/pwdstore/utils')

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 af9a6776..e1b33e2a 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -1,5 +1,6 @@
 package com.zeapo.pwdstore.utils;
 
+import android.os.Build;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
@@ -8,6 +9,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.zeapo.pwdstore.PasswordFragment;
@@ -35,12 +37,14 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         public View view;
         public TextView name;
         public TextView type;
+        public ImageView typeImage;
 
         public ViewHolder(View v) {
             super(v);
             view = v;
             name = (TextView) view.findViewById(R.id.label);
             type = (TextView) view.findViewById(R.id.type);
+            typeImage = (ImageView) view.findViewById(R.id.type_image);
         }
     }
 
@@ -67,7 +71,14 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
     public void onBindViewHolder(final ViewHolder holder, int position) {
         final PasswordItem pass = values.get(position);
         holder.name.setText(pass.toString());
-        int sdk = android.os.Build.VERSION.SDK_INT;
+        if (pass.getType() == PasswordItem.TYPE_CATEGORY) {
+            holder.typeImage.setImageResource(R.drawable.ic_folder_grey600_24dp);
+            holder.name.setText(pass.toString() + "/");
+        } else {
+            holder.typeImage.setImageResource(R.drawable.ic_action_secure);
+            holder.name.setText(pass.toString());
+        }
+        int sdk = Build.VERSION.SDK_INT;
 
         holder.type.setText(pass.getFullPathName());
         if (pass.getType() == PasswordItem.TYPE_CATEGORY) {
diff --git a/app/src/main/res/drawable-hdpi/ic_action_secure.png b/app/src/main/res/drawable-hdpi/ic_action_secure.png
new file mode 100644
index 00000000..287ae2fb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_secure.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
new file mode 100644
index 00000000..afb9b31e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_secure.png b/app/src/main/res/drawable-mdpi/ic_action_secure.png
new file mode 100644
index 00000000..d4921723
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_secure.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
new file mode 100644
index 00000000..88cb71c3
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_secure.png b/app/src/main/res/drawable-xhdpi/ic_action_secure.png
new file mode 100644
index 00000000..2a089838
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_secure.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
new file mode 100644
index 00000000..7f135821
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_secure.png b/app/src/main/res/drawable-xxhdpi/ic_action_secure.png
new file mode 100644
index 00000000..d8c094ed
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_secure.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
new file mode 100644
index 00000000..5ab94892
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png differ
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 0b877934..ce69051c 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -3,30 +3,40 @@
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="0dp"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
-    android:layout_marginTop="0dp">
+    android:layout_height="wrap_content">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:gravity="left">
 
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="32dp"
+            android:id="@+id/type_image"
+            android:src="@drawable/ic_folder_grey600_24dp"
+            android:alpha="0.5"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingRight="8dp" />
+
         <TextView
             android:id="@+id/type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:alpha="0.5"
             android:maxLines="1"
             android:ellipsize="start"
             android:text="TYPE"
             android:textSize="14dp"
-            android:textColor="@android:color/black"
-            android:layout_alignParentTop="true"
-            android:layout_alignLeft="@+id/label"
-            android:layout_alignStart="@+id/label" />
+            android:textColor="@color/grey_500"
+            android:layout_alignTop="@+id/type_image"
+            android:layout_toRightOf="@+id/type_image"
+            android:layout_toEndOf="@+id/type_image" />
 
         <TextView
             android:id="@+id/label"
@@ -37,8 +47,8 @@
             android:textColor="@android:color/black"
             android:textSize="18dp"
             android:layout_below="@+id/type"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
+            android:layout_alignLeft="@+id/type"
+            android:layout_alignStart="@+id/type" />
     </RelativeLayout>
 
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 7a25cbf1d69d74142e1f694481a8aebbb90ab466 Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Fri, 10 Jun 2016 04:50:24 +0200
Subject: Fix multiple selection with RecyclerView

---
 .../pwdstore/utils/PasswordRecyclerAdapter.java    | 33 +++++++++++-----------
 app/src/main/res/layout/password_recycler_view.xml |  2 +-
 app/src/main/res/layout/password_row_layout.xml    |  2 +-
 app/src/main/res/values/colors.xml                 |  2 ++
 4 files changed, 21 insertions(+), 18 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/utils')

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 e1b33e2a..e9109bce 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -1,8 +1,8 @@
 package com.zeapo.pwdstore.utils;
 
+import android.graphics.Color;
 import android.os.Build;
 import android.support.v7.view.ActionMode;
-import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -91,7 +91,8 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
             @Override
             public void onClick(View v) {
                 if (mActionMode != null) {
-                    toggleSelection(holder, holder.getAdapterPosition(), null, pass.getType());
+                    toggleSelection(holder.getAdapterPosition());
+                    mActionMode.setTitle("" + selectedItems.size());
                     if (selectedItems.isEmpty()) {
                         mActionMode.finish();
                     } else if (selectedItems.size() == 1 && !canEdit) {
@@ -106,6 +107,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
                 } else {
                     listener.onFragmentInteraction(pass);
                 }
+                notifyItemChanged(holder.getAdapterPosition());
             }
         });
 
@@ -115,17 +117,27 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
                 if (mActionMode != null) {
                     return false;
                 }
-                toggleSelection(holder, holder.getAdapterPosition(), null, pass.getType());
+                toggleSelection(holder.getAdapterPosition());
                 canEdit = pass.getType() == PasswordItem.TYPE_PASSWORD;
                 // Start the CAB using the ActionMode.Callback
                 mActionMode = activity.startSupportActionMode(mActionModeCallback);
+                mActionMode.setTitle("" + selectedItems.size());
                 mActionMode.invalidate();
+                notifyItemChanged(holder.getAdapterPosition());
                 return true;
             }
         });
 
         // after removal, everything is rebound for some reason; views are shuffled?
-        holder.view.setSelected(selectedItems.contains(position));
+        boolean selected = selectedItems.contains(position);
+        holder.view.setSelected(selected);
+        if (selected) {
+            holder.itemView.setBackgroundResource(R.color.orange_200);
+            holder.type.setTextColor(Color.BLACK);
+        } else {
+            holder.itemView.setBackgroundResource(Color.alpha(1));
+            holder.type.setTextColor(activity.getColor(R.color.grey_500));
+        }
     }
 
     private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
@@ -213,20 +225,9 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         updateSelectedItems(position, selectedItems);
     }
 
-    public void toggleSelection(ViewHolder holder, int position, CardView card, char type) {
+    public void toggleSelection(int position) {
         if (!selectedItems.remove(position)) {
             selectedItems.add(position);
-            if (type == PasswordItem.TYPE_CATEGORY) {
-//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
-            } else {
-//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_100));
-            }
-        } else {
-            if (type == PasswordItem.TYPE_CATEGORY) {
-//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_200));
-            } else {
-//                card.setCardBackgroundColor(activity.getResources().getColor(R.color.blue_grey_50));
-            }
         }
     }
 
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml
index 15a49597..14495ea9 100644
--- a/app/src/main/res/layout/password_recycler_view.xml
+++ b/app/src/main/res/layout/password_recycler_view.xml
@@ -21,7 +21,7 @@
         android:layout_gravity="bottom|end"
         app:elevation="6dp"
         app:pressedTranslationZ="12dp"
-        app:backgroundTint="@color/blue_grey_500"
+        app:backgroundTint="@color/accent"
         app:rippleColor="@color/blue_grey_50"
         app:borderWidth="0dp"
         android:layout_margin="@dimen/fab_compat_margin"
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index ce69051c..5fd62249 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:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_height="wrap_content">
+    android:background="?android:attr/activatedBackgroundIndicator">
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0a789153..96ebf1bb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="accent">#ff7043</color>
+
     <color name="red_50">#fde0dc</color>
     <color name="red_100">#f9bdbb</color>
     <color name="red_200">#f69988</color>
-- 
cgit v1.2.3


From 7c0062e24f0da036761c0e8b2ef60be74b165e1b Mon Sep 17 00:00:00 2001
From: DSIW <dsiw@dsiw-it.de>
Date: Sun, 19 Jun 2016 16:30:42 +0200
Subject: Fix background color for selected list items

---
 app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/utils')

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 e9109bce..cd64ecf7 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java
@@ -132,7 +132,7 @@ public class PasswordRecyclerAdapter extends RecyclerView.Adapter<PasswordRecycl
         boolean selected = selectedItems.contains(position);
         holder.view.setSelected(selected);
         if (selected) {
-            holder.itemView.setBackgroundResource(R.color.orange_200);
+            holder.itemView.setBackgroundResource(R.color.deep_orange_200);
             holder.type.setTextColor(Color.BLACK);
         } else {
             holder.itemView.setBackgroundResource(Color.alpha(1));
-- 
cgit v1.2.3