Simplify password row layout and resolve icon tints

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>

3 files changed, 42 insertions, 47 deletions

diff --git a/app/src/main/res/drawable/ic_action_secure.xml b/app/src/main/res/drawable/ic_action_secure.xml
index 6ce2f46f..8f7b7539 100644
--- a/app/src/main/res/drawable/ic_action_secure.xml
+++ b/app/src/main/res/drawable/ic_action_secure.xml
@@ -2,8 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/grey_600">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_grey600_24dp.xml b/app/src/main/res/drawable/ic_folder_grey600_24dp.xml
index 9917ca25..dbd73db5 100644
--- a/app/src/main/res/drawable/ic_folder_grey600_24dp.xml
+++ b/app/src/main/res/drawable/ic_folder_grey600_24dp.xml
@@ -2,8 +2,9 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="@color/grey_600">
   <path
-      android:fillColor="@color/grey_600"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 824366e7..66616cc3 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -5,65 +5,58 @@
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator">
 
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:gravity="start">
 
+        <ImageView
+            android:id="@+id/type_image"
+            android:layout_width="80dp"
+            android:layout_height="32dp"
+            android:layout_gravity="bottom"
+            android:layout_weight="1"
+            android:alpha="0.5"
+            android:contentDescription="@string/folder_icon_hint"
+            android:paddingEnd="8dp"
+            android:src="@drawable/ic_folder_grey600_24dp"
+            tools:ignore="RtlSymmetry" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/type_image"
-                android:layout_width="80dp"
-                android:layout_height="32dp"
-                android:layout_gravity="bottom"
-                android:layout_weight="1"
-                android:alpha="0.5"
-                android:contentDescription="@string/folder_icon_hint"
-                android:paddingEnd="8dp"
-                android:paddingRight="8dp"
-                android:src="@drawable/ic_folder_grey600_24dp"
-                tools:ignore="RtlSymmetry" />
+            android:layout_weight="1"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="start"
+                android:singleLine="true"
+                android:text="TYPE"
+                android:textColor="@color/grey_500"
+                android:textSize="14sp"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_gravity="bottom"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/type"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="start"
-                    android:singleLine="true"
-                    android:text="TYPE"
-                    android:textColor="@color/grey_500"
-                    android:textSize="14sp"
-                    tools:ignore="HardcodedText" />
-
-                <TextView
-                    android:id="@+id/label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:text="FILE_NAME"
-                    android:textColor="@android:color/black"
-                    android:textSize="18sp"
-                    tools:ignore="HardcodedText" />
-
-            </LinearLayout>
+                android:text="FILE_NAME"
+                android:textColor="@android:color/black"
+                android:textSize="18sp"
+                tools:ignore="HardcodedText" />
 
         </LinearLayout>
 
-    </RelativeLayout>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file