Don't display subFolders indent in MoveFragment when searching for a …

…folder
Infomaniak · Jun 7, 2024 · b83fdcc · b83fdcc
1 parent 0b1bcc4
commit b83fdcc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/Folder.kt b/app/src/main/java/com/infomaniak/mail/data/models/Folder.kt
@@ -90,6 +90,9 @@ class Folder : RealmObject, Cloneable {
     @Transient
     @Ignore
     var shouldDisplayDivider: Boolean = false
+    @Transient
+    @Ignore
+    var shouldDisplayIndent: Boolean = true
     //endregion
 
     private val _parents by backlinks(Folder::children)

diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/move/FolderAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/move/FolderAdapter.kt
@@ -179,9 +179,9 @@ class FolderAdapter @Inject constructor(
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    fun setFolders(newFolders: List<Folder>, newCurrentFolderId: String? = null) = runCatchingRealm {
+    fun setFolders(newFolders: List<Folder>, newCurrentFolderId: String? = null, isSearching: Boolean) = runCatchingRealm {
 
-        fun foldersWithDivider(): List<Folder> {
+        fun foldersWithDividersAndIndents(): List<Folder> {
             var isFirstCustomFolder = true
             return newFolders.map { folder ->
                 folder.clone().apply {
@@ -191,6 +191,7 @@ class FolderAdapter @Inject constructor(
                     } else {
                         false
                     }
+                    shouldDisplayIndent = folder.isRoot || !isSearching
                 }
             }
         }
@@ -211,7 +212,7 @@ class FolderAdapter @Inject constructor(
         }
 
         newCurrentFolderId?.let { currentFolderId = it }
-        submitList(foldersWithDivider())
+        submitList(foldersWithDividersAndIndents())
         if (isInMenuDrawer) notifyCollapsableFolders()
     }
 
@@ -252,7 +253,8 @@ class FolderAdapter @Inject constructor(
                     oldFolder.threads.count() == newFolder.threads.count() &&
                     oldFolder.isHidden == newFolder.isHidden &&
                     oldFolder.canBeCollapsed == newFolder.canBeCollapsed &&
-                    oldFolder.shouldDisplayDivider == newFolder.shouldDisplayDivider
+                    oldFolder.shouldDisplayDivider == newFolder.shouldDisplayDivider &&
+                    oldFolder.shouldDisplayIndent == newFolder.shouldDisplayIndent
         }.getOrDefault(false)
     }
 }
diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/move/MoveFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/main/move/MoveFragment.kt
@@ -164,12 +164,12 @@ class MoveFragment : Fragment() {
 
     private fun toggleFolderListsVisibility(query: String?, allFolders: List<Folder>) {
         isSearching = !query.isNullOrBlank()
-        if (!isSearching) folderAdapter.setFolders(allFolders, moveViewModel.currentFolderId)
+        if (!isSearching) folderAdapter.setFolders(allFolders, moveViewModel.currentFolderId, isSearching)
     }
 
     private fun observeSearchResults() = with(moveViewModel) {
         filterResults.observe(viewLifecycleOwner) { folders ->
-            if (isSearching) folderAdapter.setFolders(folders, currentFolderId)
+            if (isSearching) folderAdapter.setFolders(folders, currentFolderId, isSearching)
         }
     }