Merge pull request #82 from aashishksahu/camera-crash

Fixed smooth scrolling and sorting

Author: aashishksahu

.idea/deploymentTargetSelector.xml

@@ -16,8 +16,8 @@ android {
 
         minSdk 29
         targetSdk 34
-        versionCode 34
-        versionName "2.0.3"
+        versionCode 35
+        versionName "2.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -69,27 +69,27 @@ dependencies {
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.activity:activity-ktx:1.9.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-compose-android:2.8.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3'
+    implementation 'androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
 //  Compose
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.3'
     implementation 'androidx.activity:activity-compose:1.9.0'
-    implementation platform('androidx.compose:compose-bom:2024.05.00')
+    implementation platform('androidx.compose:compose-bom:2024.06.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     debugImplementation 'androidx.compose.ui:ui-tooling'
-    implementation "androidx.compose.runtime:runtime-livedata:1.6.7"
+    implementation "androidx.compose.runtime:runtime-livedata:1.6.8"
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
-    androidTestImplementation platform('androidx.compose:compose-bom:2024.05.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.06.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
 
 //  For Camera
-    def camerax_version = "1.3.3"
+    def camerax_version = "1.3.4"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
@@ -104,7 +104,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.fragment:fragment-ktx:1.7.1"
+    implementation "androidx.fragment:fragment-ktx:1.8.1"
     implementation "androidx.preference:preference-ktx:1.2.1"
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'

.idea/misc.xml

@@ -109,10 +109,10 @@ object DataManager {
                     Item(
                         id = UUID.randomUUID(),
                         name = content.name,
-                        size = Utils.getSize(content.length()),
+                        size = content.length(),
                         isDir = content.isDirectory,
                         itemCount = fileCount,
-                        lastModified = Utils.convertLongToDate(content.lastModified()),
+                        lastModified = content.lastModified(),
                         isSelected = false
                     )
                 )
@@ -133,7 +133,7 @@ object DataManager {
                 // name, date or size
                 tempItemList = when (sortBy) {
                     Constants.SIZE -> tempItemList.sortedWith(compareByDescending<Item> { it.isDir }
-                        .thenByDescending { it.size })
+                        .thenBy { it.size })
 
                     Constants.DATE -> tempItemList.sortedWith(compareByDescending<Item> { it.isDir }
                         .thenBy { it.lastModified })
@@ -149,10 +149,10 @@ object DataManager {
                 // name, date or size
                 tempItemList = when (sortBy) {
                     Constants.SIZE -> tempItemList.sortedWith(compareByDescending<Item> { it.isDir }
-                        .thenBy { it.size })
+                        .thenByDescending { it.size })
 
                     Constants.DATE -> tempItemList.sortedWith(compareByDescending<Item> { it.isDir }
-                        .thenBy { it.lastModified })
+                        .thenByDescending { it.lastModified })
 
                     else -> tempItemList.sortedWith(compareByDescending<Item> { it.isDir }
                         .thenComparing { o1, o2 ->
@@ -164,9 +164,6 @@ object DataManager {
         }
 
         privateItemList.value = tempItemList
-
-//        itemStateList.clear()
-//        itemStateList.addAll(tempItemList)
     }
 
     @Throws(SecurityException::class)

.idea/other.xml

@@ -5,9 +5,9 @@ import java.util.UUID
 data class Item(
     val id : UUID,
     val name: String,
-    val size: String,
+    val size: Long,
     val isDir: Boolean,
     val itemCount: String,
-    val lastModified: String,
+    val lastModified: Long,
     val isSelected: Boolean,
 )