From 9488795de84dd8d0a0195b4a972e1773512cb048 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 14 Dec 2018 22:39:42 +0100
Subject: [PATCH] show subfolders count at the main screen, if grouping is
 enabled

---
 .../gallery/pro/activities/MainActivity.kt                 | 7 ++++++-
 .../gallery/pro/adapters/DirectoryAdapter.kt               | 3 ++-
 .../com/simplemobiletools/gallery/pro/models/Directory.kt  | 7 +++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
index db11c197b..39d5a7b85 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
@@ -957,7 +957,11 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
 
     private fun getDirsToShow(dirs: ArrayList<Directory>): ArrayList<Directory> {
         return if (config.groupDirectSubfolders) {
-            dirs.forEach { it.subfoldersMediaCount = it.mediaCnt }
+            dirs.forEach {
+                it.subfoldersCount = 1
+                it.subfoldersMediaCount = it.mediaCnt
+            }
+
             val dirFolders = dirs.map { it.path }.sorted().toMutableSet() as HashSet<String>
             val foldersToShow = getDirectParentSubfolders(dirFolders)
             val newDirs = dirs.filter { foldersToShow.contains(it.path) } as ArrayList<Directory>
@@ -968,6 +972,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
                 var longestSharedPath = ""
                 newDirs.forEach {
                     if (it.path != mainDir.path && mainDir.path.startsWith(it.path, true) && it.path.length > longestSharedPath.length) {
+                        it.subfoldersCount += 1
                         longestSharedPath = it.path
                     }
                 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
index 61b53d188..bab6956e0 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
@@ -38,6 +38,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     private var showMediaCount = config.showMediaCount
     private var animateGifs = config.animateGifs
     private var cropThumbnails = config.cropThumbnails
+    private var groupDirectSubfolders = config.groupDirectSubfolders
     private var currentDirectoriesHash = dirs.hashCode()
 
     init {
@@ -501,7 +502,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     private fun setupView(view: View, directory: Directory) {
         val isSelected = selectedKeys.contains(directory.path.hashCode())
         view.apply {
-            dir_name.text = directory.name
+            dir_name.text = if (groupDirectSubfolders) "${directory.name} (${directory.subfoldersCount})" else directory.name
             dir_path?.text = "${directory.path.substringBeforeLast("/")}/"
             photo_cnt.text = directory.subfoldersMediaCount.toString()
             val thumbnailType = when {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt
index 7c968ce44..fd320050e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/models/Directory.kt
@@ -22,9 +22,12 @@ data class Directory(
         @ColumnInfo(name = "size") var size: Long,
         @ColumnInfo(name = "location") var location: Int,
         @ColumnInfo(name = "media_types") var types: Int,
-        @Ignore var subfoldersMediaCount: Int = 0) {        // used with "Group direct subfolders" enabled to count subfolder media counts
 
-    constructor() : this(null, "", "", "", 0, 0L, 0L, 0L, 0, 0, 0)
+        // used with "Group direct subfolders" enabled
+        @Ignore var subfoldersCount: Int = 0,
+        @Ignore var subfoldersMediaCount: Int = 0) {
+
+    constructor() : this(null, "", "", "", 0, 0L, 0L, 0L, 0, 0, 0, 0)
 
     fun getBubbleText(sorting: Int) = when {
         sorting and SORT_BY_NAME != 0 -> name