Merge pull request #562 from android-password-store/msf/ui-rework

Redesign some UI elements

1 files changed, 57 insertions, 41 deletions

diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 462df815..bf7763ae 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -1,52 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.zeapo.pwdstore.widget.MultiselectableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.zeapo.pwdstore.widget.MultiselectableConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/password_row_background">
+    android:background="@drawable/password_row_background"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp">
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/type_image"
+        android:layout_width="60dp"
+        android:layout_height="32dp"
+        android:layout_gravity="bottom"
+        android:alpha="0.5"
+        android:contentDescription="@string/folder_icon_hint"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:src="@drawable/ic_multiple_files_tinted_24dp" />
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/type_image"
-            android:layout_width="60dp"
-            android:layout_height="32dp"
-            android:layout_gravity="bottom"
-            android:alpha="0.5"
-            android:contentDescription="@string/folder_icon_hint"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:src="@drawable/ic_folder_tinted_24dp" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="start"
+        android:singleLine="true"
+        android:textColor="?android:attr/textColor"
+        android:textSize="14sp"
+        app:layout_constraintStart_toEndOf="@id/type_image"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="TYPE" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/type"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="start"
-            android:singleLine="true"
-            android:textColor="?android:attr/textColor"
-            android:textSize="14sp"
-            app:layout_constraintStart_toEndOf="@id/type_image"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="TYPE" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:textColor="?android:attr/textColor"
+        android:textSize="18sp"
+        app:layout_constraintStart_toEndOf="@id/type_image"
+        app:layout_constraintTop_toBottomOf="@id/type"
+        app:layout_constraintBottom_toBottomOf="@id/type_image"
+        tools:text="FILE_NAME" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:textColor="?android:attr/textColor"
-            android:textSize="18sp"
-            app:layout_constraintStart_toEndOf="@id/type_image"
-            app:layout_constraintTop_toBottomOf="@id/type"
-            tools:text="FILE_NAME" />
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/child_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/folder_indicator"
+        android:layout_marginEnd="12dp"
+        tools:text="12" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/folder_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/ic_keyboard_arrow_right_24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
-</com.zeapo.pwdstore.widget.MultiselectableLinearLayout>
\ No newline at end of file
+</com.zeapo.pwdstore.widget.MultiselectableConstraintLayout>