From a21353cb063902dff73d5a371f17978f177910f5 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <msfjarvis@gmail.com>
Date: Mon, 4 Nov 2019 18:20:49 +0530
Subject: Add child count to folders

Fixes #559

Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
---
 .../com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt    |  8 ++++++++
 app/src/main/res/layout/password_row_layout.xml               | 11 +++++++++++
 2 files changed, 19 insertions(+)

(limited to 'app')

diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt
index 211394fb..ba66ed6f 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.zeapo.pwdstore.R
 import com.zeapo.pwdstore.utils.PasswordItem
 import com.zeapo.pwdstore.widget.MultiselectableLinearLayout
+import java.io.File
 import java.util.ArrayList
 import java.util.TreeSet
 
@@ -81,11 +82,17 @@ abstract class EntryRecyclerAdapter internal constructor(val values: ArrayList<P
             holder.type.visibility = View.GONE
             holder.typeImage.setImageResource(R.drawable.ic_folder_tinted_24dp)
             holder.folderIndicator.visibility = View.VISIBLE
+            val childCount = (pass.file.list { current, name -> File(current, name).isFile } ?: emptyArray<File>()).size
+            if (childCount > 0) {
+                holder.childCount.visibility = View.VISIBLE
+                holder.childCount.text = "$childCount"
+            }
         } else {
             holder.typeImage.setImageResource(R.drawable.ic_action_secure)
             holder.name.text = pass.toString()
             holder.type.visibility = View.VISIBLE
             holder.type.text = pass.fullPathToParent.replace("(^/)|(/$)".toRegex(), "")
+            holder.childCount.visibility = View.GONE
             holder.folderIndicator.visibility = View.GONE
         }
 
@@ -122,6 +129,7 @@ abstract class EntryRecyclerAdapter internal constructor(val values: ArrayList<P
         val name: AppCompatTextView = view.findViewById(R.id.label)
         val type: AppCompatTextView = view.findViewById(R.id.type)
         val typeImage: AppCompatImageView = view.findViewById(R.id.type_image)
+        val childCount: AppCompatTextView = view.findViewById(R.id.child_count)
         val folderIndicator: AppCompatImageView = view.findViewById(R.id.folder_indicator)
     }
 }
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 689898c2..e5e8e0b6 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -47,6 +47,17 @@
             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.appcompat.widget.AppCompatImageView
             android:id="@+id/folder_indicator"
             android:layout_width="wrap_content"
-- 
cgit v1.2.3