Merge pull request #60 from emreesen27/develop

v1.0.0-beta10 is completed
emreesen27 · Dec 24, 2024 · 217bc71 · 217bc71
2 parents fcd353c + 3b0a1f3
commit 217bc71
Show file tree

Hide file tree

Showing 17 changed files with 232 additions and 140 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,15 @@
+## v1.0.0-beta10 (24.12.2024)
+
+* The Details dialog now displays file information instantly, while continuing to calculate total sizes in the background.
+* Added the ability to sort files by extension in the sorting options.
+
 ## v1.0.0-beta9 (31.05.2024)
+
 * The issue of the screen not refreshing when a single file is deleted has been resolved
 * The sorting feature is hidden while the search is active
 
 ## v1.0.0-beta-8 (25.05.2024)
+
 * Sorting feature added for file and media items
 * The synchronization issue with the show hidden files setting button has been fixed
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -39,8 +39,8 @@ android {
         applicationId "com.sn.snfilemanager"
         minSdk 26
         targetSdk 34
-        versionCode 9
-        versionName "1.0.0-beta9"
+        versionCode 10
+        versionName "1.0.0-beta10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/sn/snfilemanager/LoadingFragment.kt b/app/src/main/java/com/sn/snfilemanager/LoadingFragment.kt
@@ -11,7 +11,5 @@ class LoadingFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return inflater.inflate(R.layout.fragment_loading, container, false)
-    }
+    ): View = inflater.inflate(R.layout.fragment_loading, container, false)
 }
diff --git a/app/src/main/java/com/sn/snfilemanager/core/base/BaseDialog.kt b/app/src/main/java/com/sn/snfilemanager/core/base/BaseDialog.kt
@@ -45,9 +45,7 @@ abstract class BaseDialog<VBinding : ViewBinding> : DialogFragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
-        return binding.root
-    }
+    ): View = binding.root
 
     override fun onViewCreated(
         view: View,

diff --git a/app/src/main/java/com/sn/snfilemanager/core/base/BaseFragment.kt b/app/src/main/java/com/sn/snfilemanager/core/base/BaseFragment.kt
@@ -38,7 +38,7 @@ abstract class BaseFragment<VBinding : ViewBinding, VModel : ViewModel> : Fragme
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
+    ) = binding.root.also {
         getToolbar()?.let { toolbar ->
             getMenuResId()?.let { menuId ->
                 initMenu(menuId, toolbar)
@@ -47,7 +47,6 @@ abstract class BaseFragment<VBinding : ViewBinding, VModel : ViewModel> : Fragme
                 findNavController().popBackStack()
             }
         }
-        return binding.root
     }
 
     override fun onViewCreated(
@@ -63,17 +62,11 @@ abstract class BaseFragment<VBinding : ViewBinding, VModel : ViewModel> : Fragme
 
     open fun observeData() {}
 
-    open fun getMenuResId(): Int? {
-        return null
-    }
+    open fun getMenuResId(): Int? = null
 
-    open fun getToolbar(): Toolbar? {
-        return null
-    }
+    open fun getToolbar(): Toolbar? = null
 
-    open fun onMenuItemSelected(menuItemId: Int): Boolean {
-        return false
-    }
+    open fun onMenuItemSelected(menuItemId: Int): Boolean = false
 
     fun navigate(directions: NavDirections) {
         findNavController().navigate(directions)

diff --git a/app/src/main/java/com/sn/snfilemanager/core/util/Config.kt b/app/src/main/java/com/sn/snfilemanager/core/util/Config.kt
@@ -2,8 +2,8 @@ package com.sn.snfilemanager.core.util
 
 object Config {
     var hiddenFile: Boolean = false
-    var sortCriterion: SortCriterion = SortCriterion.NAME
-    var sortOrder: SortOrder = SortOrder.ASCENDING
-    var mediaSortCriterion: SortCriterion = SortCriterion.NAME
-    var mediaSortOrder: SortOrder = SortOrder.ASCENDING
+    var sortCriterion: SortCriterion = SortCriterion.LAST_MODIFIED
+    var sortOrder: SortOrder = SortOrder.DESCENDING
+    var mediaSortCriterion: SortCriterion = SortCriterion.LAST_MODIFIED
+    var mediaSortOrder: SortOrder = SortOrder.DESCENDING
 }
diff --git a/app/src/main/java/com/sn/snfilemanager/core/util/DirectoryType.kt b/app/src/main/java/com/sn/snfilemanager/core/util/DirectoryType.kt
@@ -1,6 +1,8 @@
 package com.sn.snfilemanager.core.util
 
-enum class DirectoryType(val type: String) {
+enum class DirectoryType(
+    val type: String,
+) {
     ANDROID("Android"),
     DOWNLOAD("Download"),
     MUSIC("Music"),

diff --git a/app/src/main/java/com/sn/snfilemanager/core/util/SortCriterion.kt b/app/src/main/java/com/sn/snfilemanager/core/util/SortCriterion.kt
@@ -3,4 +3,5 @@ package com.sn.snfilemanager.core.util
 enum class SortCriterion {
     NAME,
     LAST_MODIFIED,
+    EXTENSION,
 }
diff --git a/app/src/main/java/com/sn/snfilemanager/feature/files/presentation/FilesListViewModel.kt b/app/src/main/java/com/sn/snfilemanager/feature/files/presentation/FilesListViewModel.kt
@@ -271,6 +271,14 @@ class FilesListViewModel
                         fileList.sortByDescending { it.lastModified.toDate() }
                     }
                 }
+
+                SortCriterion.EXTENSION -> {
+                    if (sortOrder == SortOrder.ASCENDING) {
+                        fileList.sortBy { it.extension.lowercase(Locale.getDefault()) }
+                    } else {
+                        fileList.sortByDescending { it.extension.lowercase(Locale.getDefault()) }
+                    }
+                }
             }
         }
 

diff --git a/app/src/main/java/com/sn/snfilemanager/feature/media/presentation/MediaViewModel.kt b/app/src/main/java/com/sn/snfilemanager/feature/media/presentation/MediaViewModel.kt
@@ -105,6 +105,14 @@ class MediaViewModel
                         OrderStrategy.dateModified(OrderStrategy.DESC)
                     }
                 }
+
+                SortCriterion.EXTENSION -> {
+                    if (mediaSortOrder == SortOrder.ASCENDING) {
+                        OrderStrategy.extension(OrderStrategy.ASC)
+                    } else {
+                        OrderStrategy.extension(OrderStrategy.DESC)
+                    }
+                }
             }
         }