Remove type images

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 -   Light theme is now a consistent white across the board with ample contrast
 -   XkPassword generator is now easier to use with less configuration options
 -   Edit screen now has better protection and guidance for invalid names
+-   Improve password list UI
 
 ### Fixed
 

app/src/main/java/com/zeapo/pwdstore/ui/adapters/PasswordItemRecyclerAdapter.kt

@@ -43,7 +43,6 @@ open class PasswordItemRecyclerAdapter :
     class PasswordItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
         private val name: AppCompatTextView = itemView.findViewById(R.id.label)
-        private val typeImage: AppCompatImageView = itemView.findViewById(R.id.type_image)
         private val childCount: AppCompatTextView = itemView.findViewById(R.id.child_count)
         private val folderIndicator: AppCompatImageView =
             itemView.findViewById(R.id.folder_indicator)
@@ -55,7 +54,6 @@ open class PasswordItemRecyclerAdapter :
             val showHidden = settings.getBoolean(PreferenceKeys.SHOW_HIDDEN_FOLDERS, false)
             name.text = item.toString()
             if (item.type == PasswordItem.TYPE_CATEGORY) {
-                typeImage.setImageResource(R.drawable.ic_multiple_files_24dp)
                 folderIndicator.visibility = View.VISIBLE
                 val children = item.file.listFiles { pathname ->
                     !(!showHidden && (pathname.isDirectory && pathname.isHidden))
@@ -64,7 +62,6 @@ open class PasswordItemRecyclerAdapter :
                 childCount.visibility = if (count > 0) View.VISIBLE else View.GONE
                 childCount.text = "$count"
             } else {
-                typeImage.setImageResource(R.drawable.ic_action_secure_24dp)
                 val parentPath = item.fullPathToParent.replace("(^/)|(/$)".toRegex(), "")
                 val source = if (parentPath.isNotEmpty()) {
                     "$parentPath\n$item"

app/src/main/res/layout/password_row_layout.xml

@@ -12,46 +12,36 @@
     android:paddingTop="12dp"
     android:paddingBottom="12dp">
 
-    <ImageView
-        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_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_multiple_files_24dp" />
-
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/label"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/child_count"
-        app:layout_constraintStart_toEndOf="@id/type_image"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="FILE_NAME" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/child_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="12dp"
+        android:layout_marginEnd="8dp"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/folder_indicator"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="12" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/folder_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:contentDescription="@null"
         android:src="@drawable/ic_keyboard_arrow_right_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"