From 12346c196afe1d1af3504ec619beb643e695f2a7 Mon Sep 17 00:00:00 2001
From: Nguyen Hoang Lam <hoanglamvn90@gmail.com>
Date: Fri, 3 Nov 2023 09:31:31 +0700
Subject: [PATCH] feat: fix bug

---
 .idea/gradle.xml                               |  2 +-
 .idea/modules.xml                              | 18 ------------------
 build.gradle                                   |  2 +-
 example/build.gradle                           |  6 ++----
 .../com/imagepicker/example/MainActivity.kt    |  8 ++++----
 example/src/main/res/layout/activity_main.xml  |  8 ++++----
 imagepicker/build.gradle                       | 13 ++++++-------
 .../imagepicker/model/ImagePickerConfig.kt     |  2 +-
 .../ui/adapter/ImagePickerAdapter.kt           |  8 ++++----
 .../ui/imagepicker/ImagePickerActivity.kt      |  7 ++++++-
 .../ui/imagepicker/ImagePickerViewModel.kt     |  4 ++--
 11 files changed, 31 insertions(+), 47 deletions(-)
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e4a1f73..9dd1dfd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 7ba3a84..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/ImagePicker.iml" filepath="$PROJECT_DIR$/ImagePicker.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.iml" filepath="$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.main.iml" filepath="$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/example/ImagePicker.example.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.iml" filepath="$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.androidTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.main.iml" filepath="$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/imagepicker/ImagePicker.imagepicker.unitTest.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ImagePicker.main.iml" filepath="$PROJECT_DIR$/.idea/modules/ImagePicker.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ImagePicker.test.iml" filepath="$PROJECT_DIR$/.idea/modules/ImagePicker.test.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4e15b55..19859ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/build.gradle b/example/build.gradle
index 347db13..7247fea 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -2,12 +2,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "34.0.0"
-
     defaultConfig {
         applicationId "com.imagepicker.example"
         minSdkVersion 23
+        compileSdk 34
         targetSdkVersion 34
         versionCode 1
         versionName "1.0"
@@ -37,7 +35,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'com.github.bumptech.glide:glide:4.15.1'
     implementation project(path: ':imagepicker')
 }
diff --git a/example/src/main/java/com/imagepicker/example/MainActivity.kt b/example/src/main/java/com/imagepicker/example/MainActivity.kt
index cf2200a..3fdbe66 100644
--- a/example/src/main/java/com/imagepicker/example/MainActivity.kt
+++ b/example/src/main/java/com/imagepicker/example/MainActivity.kt
@@ -62,7 +62,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun start() {
         val folderMode = binding.folderModeSwitch.isChecked
-        val multiSelectMode = binding.multiSelectModeSwitch.isChecked
+        val singleSelectMode = binding.singleSelectModeSwitch.isChecked
         val cameraMode = binding.cameraModeSwitch.isChecked
         val showCamera = binding.showCameraSwitch.isChecked
         val selectAllEnabled = binding.showSelectAllSwitch.isChecked
@@ -72,7 +72,7 @@ class MainActivity : AppCompatActivity() {
 
         val config = ImagePickerConfig(
             isCameraMode = cameraMode,
-            isMultiSelectMode = multiSelectMode,
+            isSingleSelectMode = singleSelectMode,
             isFolderMode = folderMode,
             isShowCamera = showCamera,
             isSelectAllEnabled = selectAllEnabled,
@@ -120,7 +120,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun launchFragment() {
         val folderMode = binding.folderModeSwitch.isChecked
-        val multiSelectMode = binding.multiSelectModeSwitch.isChecked
+        val singleSelectMode = binding.singleSelectModeSwitch.isChecked
         val cameraMode = binding.cameraModeSwitch.isChecked
         val showCamera = binding.showCameraSwitch.isChecked
         val selectAllEnabled = binding.showSelectAllSwitch.isChecked
@@ -130,7 +130,7 @@ class MainActivity : AppCompatActivity() {
 
         val config = ImagePickerConfig(
             isCameraMode = cameraMode,
-            isMultiSelectMode = multiSelectMode,
+            isSingleSelectMode = singleSelectMode,
             isFolderMode = folderMode,
             isShowCamera = showCamera,
             isSelectAllEnabled = selectAllEnabled,
diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
index acac79c..0690c3a 100644
--- a/example/src/main/res/layout/activity_main.xml
+++ b/example/src/main/res/layout/activity_main.xml
@@ -29,13 +29,13 @@
                     android:text="Folder Mode" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/multiSelectModeSwitch"
+                    android:id="@+id/singleSelectModeSwitch"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:checked="true"
+                    android:checked="false"
                     android:gravity="right"
-                    android:text="Multiple Mode" />
+                    android:text="Single Mode" />
             </LinearLayout>
 
             <LinearLayout
@@ -117,7 +117,7 @@
                     android:layout_weight="1"
                     android:checked="true"
                     android:gravity="right"
-                    android:text="Enable Image Transition" />
+                    android:text="Image Transition" />
             </LinearLayout>
 
             <Button
diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
index 795a924..e6be955 100644
--- a/imagepicker/build.gradle
+++ b/imagepicker/build.gradle
@@ -4,10 +4,9 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion 34
-
     defaultConfig {
         minSdkVersion 21
+        compileSdk 34
         targetSdkVersion 34
     }
 
@@ -41,13 +40,13 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation "androidx.activity:activity-ktx:1.8.0-alpha06"
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation "androidx.activity:activity-ktx:1.8.0"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.github.bumptech.glide:glide:4.15.1'
 }
diff --git a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/model/ImagePickerConfig.kt b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/model/ImagePickerConfig.kt
index 6d3d0e0..c897317 100644
--- a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/model/ImagePickerConfig.kt
+++ b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/model/ImagePickerConfig.kt
@@ -37,7 +37,7 @@ fun Context.getHexColorFromResId(resId: Int): String {
 @Parcelize
 class ImagePickerConfig(
     var isCameraMode: Boolean = false,
-    var isMultiSelectMode: Boolean = true,
+    var isSingleSelectMode: Boolean = false,
     var isFolderMode: Boolean = true,
     var isShowCamera: Boolean = true,
     var isAlwaysShowDoneButton: Boolean = true,
diff --git a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/adapter/ImagePickerAdapter.kt b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/adapter/ImagePickerAdapter.kt
index 290cec9..7bd20ac 100644
--- a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/adapter/ImagePickerAdapter.kt
+++ b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/adapter/ImagePickerAdapter.kt
@@ -86,7 +86,7 @@ class ImagePickerAdapter(
     override fun onBindViewHolder(viewHolder: ImageViewHolder, position: Int) {
         val image = images[position]
         val selectedIndex = ImageHelper.findImageIndex(image, selectedImages)
-        val isSelected = config.isMultiSelectMode && selectedIndex != -1
+        val isSelected = !config.isSingleSelectMode && selectedIndex != -1
 
         GlideHelper.loadImage(viewHolder.image, image.uri)
         setupItemForeground(viewHolder.image, isSelected)
@@ -120,7 +120,9 @@ class ImagePickerAdapter(
     }
 
     private fun selectOrRemoveImage(image: Image, position: Int) {
-        if (config.isMultiSelectMode) {
+        if (config.isSingleSelectMode) {
+            imageSelectListener.onSingleModeImageSelected(image)
+        } else {
             val selectedIndex = ImageHelper.findImageIndex(image, selectedImages)
             if (selectedIndex != -1) {
                 selectedImages.removeAt(selectedIndex)
@@ -139,8 +141,6 @@ class ImagePickerAdapter(
                 }
             }
             imageSelectListener.onSelectedImagesChanged(selectedImages)
-        } else {
-            imageSelectListener.onSingleModeImageSelected(image)
         }
     }
 
diff --git a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerActivity.kt b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerActivity.kt
index e0dda50..bc32944 100644
--- a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerActivity.kt
+++ b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerActivity.kt
@@ -57,6 +57,11 @@ class ImagePickerActivity : AppCompatActivity(), OnFolderClickListener, OnImageS
                     config,
                     object : OnImageReadyListener {
                         override fun onImageReady(images: ArrayList<Image>) {
+                            if (config.isSingleSelectMode || images.isNotEmpty()) {
+                                onSingleModeImageSelected(images.first())
+                                return
+                            }
+
                             fetchDataWithPermission()
                         }
 
@@ -246,7 +251,7 @@ class ImagePickerActivity : AppCompatActivity(), OnFolderClickListener, OnImageS
     private fun configSelectAllButtons(
         bucketId: Long?, images: ArrayList<Image>?, selectedImages: ArrayList<Image>?
     ) {
-        if (!config.isMultiSelectMode) return
+        if (config.isSingleSelectMode) return
 
         val state = ImageHelper.getBucketSelectionState(
             images, selectedImages, bucketId
diff --git a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerViewModel.kt b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerViewModel.kt
index 85ad20a..21edf83 100644
--- a/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerViewModel.kt
+++ b/imagepicker/src/main/java/com/nguyenhoanglam/imagepicker/ui/imagepicker/ImagePickerViewModel.kt
@@ -89,13 +89,13 @@ class ImagePickerViewModel(application: Application) : AndroidViewModel(applicat
 
                 while (cursor.moveToNext()) {
                     val id = cursor.getLong(idColumn)
-                    val name = cursor.getString(nameColumn)
+                    val name = cursor.getStringOrNull(nameColumn) ?: ""
                     val bucketId = cursor.getLong(bucketIdColumn)
                     val bucketName = cursor.getStringOrNull(bucketNameColumn) ?: ""
 
                     val uri = ContentUris.withAppendedId(imageCollectionUri, id)
 
-                    val image = Image(uri, name, bucketId, bucketName)
+                    val image = Image(uri, name.toString(), bucketId, bucketName)
                     images.add(image)
                 }
                 cursor.close()