Merge pull request #1977 from Infomaniak/folder-sorting

Improve Folder sorting

Author: TommyDL-Infomaniak

app/src/main/java/com/infomaniak/mail/data/models/Folder.kt

@@ -23,6 +23,7 @@ import android.content.Context
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.infomaniak.lib.core.utils.Utils.enumValueOfOrNull
+import com.infomaniak.lib.core.utils.removeAccents
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.thread.Thread
@@ -81,6 +82,8 @@ class Folder : RealmObject, Cloneable {
     var isCollapsed: Boolean = false // For parents only (collapsing a parent Folder will hide its children)
     @Transient
     var roleOrder: Int = role?.order ?: CUSTOM_FOLDER_ROLE_ORDER
+    @Transient
+    var sortedName: String = name
     //endregion
 
     private val _parents by backlinks(Folder::children)
@@ -125,6 +128,8 @@ class Folder : RealmObject, Cloneable {
         this.isHistoryComplete = isHistoryComplete
         this.isHidden = isHidden
         this.isCollapsed = isCollapsed
+
+        this.sortedName = this.name.lowercase().removeAccents()
     }
 
     fun resetLocalValues() {

app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt

@@ -339,14 +339,14 @@ fun List<Folder>.flattenFolderChildren(dismissHiddenChildren: Boolean = false):
 /**
  * These 2 `sortFolders()` functions should always implement the same sort logic.
  */
-fun RealmQuery<Folder>.sortFolders() = sort(Folder::name.name, Sort.ASCENDING)
+fun RealmQuery<Folder>.sortFolders() = sort(Folder::sortedName.name, Sort.ASCENDING)
     .sort(Folder::isFavorite.name, Sort.DESCENDING)
     .sort(Folder::roleOrder.name, Sort.DESCENDING)
 
 /**
  * These 2 `sortFolders()` functions should always implement the same sort logic.
  */
-fun List<Folder>.sortFolders() = sortedBy { it.name }
+fun List<Folder>.sortFolders() = sortedBy { it.sortedName }
     .sortedByDescending { it.isFavorite }
     .sortedByDescending { it.roleOrder }