add sorting to FileDirItem

build.gradle

@@ -29,5 +29,5 @@ ext {
     propMinSdkVersion = 16
     propTargetSdkVersion = propCompileSdkVersion
     propVersionCode = 1
-    propVersionName = '2.13.5'
+    propVersionName = '2.13.6'
 }

commons/src/main/kotlin/com/simplemobiletools/commons/models/FileDirItem.kt

@@ -1,14 +1,52 @@
 package com.simplemobiletools.commons.models
 
+import com.simplemobiletools.commons.helpers.SORT_BY_DATE_MODIFIED
+import com.simplemobiletools.commons.helpers.SORT_BY_NAME
+import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
+import com.simplemobiletools.commons.helpers.SORT_DESCENDING
+import java.io.File
+
 data class FileDirItem(val path: String, val name: String, val isDirectory: Boolean, val children: Int, val size: Long) :
         Comparable<FileDirItem> {
+    companion object {
+        var sorting: Int = 0
+    }
 
     override fun compareTo(other: FileDirItem): Int {
         return if (isDirectory && !other.isDirectory) {
             -1
         } else if (!isDirectory && other.isDirectory) {
             1
-        } else
-            name.toLowerCase().compareTo(other.name.toLowerCase())
+        } else {
+            var result: Int
+            if (sorting and SORT_BY_NAME != 0) {
+                result = name.toLowerCase().compareTo(other.name.toLowerCase())
+            } else if (sorting and SORT_BY_SIZE != 0) {
+                result = if (size == other.size)
+                    0
+                else if (size > other.size)
+                    1
+                else
+                    -1
+            } else if (sorting and SORT_BY_DATE_MODIFIED != 0) {
+                val file = File(path)
+                val otherFile = File(other.path)
+                result = if (file.lastModified() == otherFile.lastModified())
+                    0
+                else if (file.lastModified() > otherFile.lastModified())
+                    1
+                else
+                    -1
+            } else {
+                val extension = if (isDirectory) name else path.substringAfterLast('.', "")
+                val otherExtension = if (other.isDirectory) other.name else other.path.substringAfterLast('.', "")
+                result = extension.toLowerCase().compareTo(otherExtension.toLowerCase())
+            }
+
+            if (sorting and SORT_DESCENDING != 0) {
+                result *= -1
+            }
+            result
+        }
     }
 }