summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/utils/PasswordRecyclerAdapter.java13
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_secure.pngbin0 -> 394 bytes
-rw-r--r--app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.pngbin0 -> 140 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_secure.pngbin0 -> 317 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.pngbin0 -> 123 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_secure.pngbin0 -> 510 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.pngbin0 -> 194 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_secure.pngbin0 -> 624 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.pngbin0 -> 259 bytes
-rw-r--r--app/src/main/res/layout/password_row_layout.xml34
10 files changed, 34 insertions, 13 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 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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_secure.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_folder_grey600_24dp.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_secure.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_folder_grey600_24dp.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_secure.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_folder_grey600_24dp.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_secure.png
Binary files 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
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_folder_grey600_24dp.png
Binary files 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