2 files changed, 31 insertions, 114 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordAdapter.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordAdapter.java
index fbc7d817..2aaa0bf5 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordAdapter.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordAdapter.java
@@ -9,9 +9,11 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ExpandableListAdapter;
+import android.widget.GridLayout;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
@@ -23,13 +25,14 @@ import org.apache.commons.io.FileUtils;
 
 import java.util.ArrayList;
 
-public class PasswordAdapter extends ArrayAdapter<PasswordItem>  implements  ExpandableListAdapter{
+public class PasswordAdapter extends ArrayAdapter<PasswordItem>{
     private final PasswordStore activity;
     private final ArrayList<PasswordItem> values;
 
     static class ViewHolder {
         public TextView name;
         public TextView type;
+        public TextView back_name;
     }
 
     public PasswordAdapter(PasswordStore activity, ArrayList<PasswordItem> values) {
@@ -38,74 +41,47 @@ public class PasswordAdapter extends ArrayAdapter<PasswordItem>  implements  Exp
         this.activity = activity;
     }
 
-    @Override
-    public void registerDataSetObserver(DataSetObserver dataSetObserver) {
-
-    }
 
     @Override
-    public void unregisterDataSetObserver(DataSetObserver dataSetObserver) {
-
-    }
-
-    @Override
-    public int getGroupCount() {
-        return values.size();
-    }
-
-    @Override
-    public int getChildrenCount(int i) {
-        if (values.get(i).getType() == PasswordItem.TYPE_CATEGORY)
-            return 0;
-        else
-            return 1;
-    }
-
-    @Override
-    public Object getGroup(int i) {
-        return values.get(i);
-    }
-
-    @Override
-    public Object getChild(int i, int i2) {
-        return null;
-    }
-
-    @Override
-    public long getGroupId(int i) {
-        return 0;
-    }
-
-    @Override
-    public long getChildId(int i, int i2) {
-        return 0;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return false;
-    }
-
-    @Override
-    public View getGroupView(int i, boolean b, View convertView, ViewGroup viewGroup) {
+    public View getView(int i, View convertView, ViewGroup viewGroup) {
         View rowView = convertView;
-        PasswordItem pass = values.get(i);
+        final PasswordItem pass = values.get(i);
 
         // reuse for performance, holder pattern!
         if (rowView == null) {
             LayoutInflater inflater = (LayoutInflater) activity
                     .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            rowView = inflater.inflate(R.layout.password_row_layout, null);
+            rowView = inflater.inflate(R.layout.password_row_layout, viewGroup, false);
 
             ViewHolder viewHolder = new ViewHolder();
             viewHolder.name = (TextView) rowView.findViewById(R.id.label);
+            viewHolder.back_name = (TextView) rowView.findViewById(R.id.label_back);
             viewHolder.type = (TextView) rowView.findViewById(R.id.type);
             rowView.setTag(viewHolder);
+
+
+            View.OnClickListener onClickListener = new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    switch (view.getId()) {
+                        case R.id.crypto_show_button:
+                            activity.decryptPassword(pass);
+                            break;
+                        case R.id.crypto_delete_button:
+                            activity.deletePassword(pass);
+                            break;
+                    }
+                }
+            };
+
+            ((ImageButton) rowView.findViewById(R.id.crypto_show_button)).setOnClickListener(onClickListener);
+            ((ImageButton) rowView.findViewById(R.id.crypto_delete_button)).setOnClickListener(onClickListener);
         }
 
         ViewHolder holder = (ViewHolder) rowView.getTag();
 
         holder.name.setText(pass.toString());
+        holder.back_name.setText(pass.toString());
 
         if (pass.getType() == PasswordItem.TYPE_CATEGORY) {
             holder.name.setTextColor(this.activity.getResources().getColor(android.R.color.holo_blue_dark));
@@ -115,71 +91,11 @@ public class PasswordAdapter extends ArrayAdapter<PasswordItem>  implements  Exp
             holder.type.setText("Password: ");
             holder.name.setTextColor(this.activity.getResources().getColor(android.R.color.holo_orange_dark));
             holder.name.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.NORMAL));
+
+            holder.back_name.setTextColor(this.activity.getResources().getColor(android.R.color.white));
+            holder.back_name.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD_ITALIC));
         }
 
         return rowView;
     }
-
-    @Override
-    public View getChildView(int i, int i2, boolean b, View view, ViewGroup viewGroup) {
-        final PasswordItem pass = values.get(i);
-
-        LayoutInflater inflater = (LayoutInflater) this.activity
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        view = inflater.inflate(R.layout.child_row_layout, null);
-
-        View.OnClickListener onClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                switch (view.getId()) {
-                    case R.id.crypto_show_button:
-                        activity.decryptPassword(pass);
-                        break;
-                    case R.id.crypto_delete_button:
-                        activity.deletePassword(pass);
-                        break;
-                }
-            }
-        };
-
-        ((ImageButton) view.findViewById(R.id.crypto_show_button)).setOnClickListener(onClickListener);
-        ((ImageButton) view.findViewById(R.id.crypto_delete_button)).setOnClickListener(onClickListener);
-
-        return view;
-    }
-
-    @Override
-    public boolean isChildSelectable(int i, int i2) {
-        return false;
-    }
-
-    @Override
-    public boolean areAllItemsEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return false;
-    }
-
-    @Override
-    public void onGroupExpanded(int i) {
-
-    }
-
-    @Override
-    public void onGroupCollapsed(int i) {
-
-    }
-
-    @Override
-    public long getCombinedChildId(long l, long l2) {
-        return 0;
-    }
-
-    @Override
-    public long getCombinedGroupId(long l) {
-        return 0;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java
index 4403d16b..75d0838c 100644
--- a/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java
+++ b/app/src/main/java/com/zeapo/pwdstore/utils/PasswordItem.java
@@ -11,6 +11,7 @@ public class PasswordItem implements Comparable{
     private String name;
     private PasswordItem parent;
     private File file;
+    public boolean selected = false;
 
     /** Create a password item
      *