fix [#39](#39) and add feature for [#42](#42) / [#38](#38)

Author: gizthub

README.md

@@ -47,6 +47,8 @@ __C.UIAction.init(title: Swift.String, image: __C.UIImage?, identifier: __C.UIAc
 
 Here are some related issues in the RN repo: [Issue 30202](https://github.com/facebook/react-native/pull/30202) and [Issue 29178](https://github.com/facebook/react-native/pull/29178). This bug could be fixed in a future version of react native, but a workaround I've found is to do the following:
 
+<img src="./files/resolve-error-iOS.png">
+
 1. Open your `ios/project.xcworkspace` project.
 2. In the project navigator panel (located on the right side of Xcode), select your project group (i.e. the item with the blueprint icon).
 3. The Xcode project editor should appear. In the left panel, under the "Project" section, select your project (if it isn't already selected).
@@ -61,18 +63,22 @@ Here are some related issues in the RN repo: [Issue 30202](https://github.com/fa
    - Try clearing out Xcode's `derivedData` directory: `rm -rf ~/Library/Developer/Xcode/DerivedData/*` (check out this [gist](https://gist.github.com/maciekish/66b6deaa7bc979d0a16c50784e16d697) for instructions on how to clean up Xcode)
    - Try clearing out the `Cocoapods` cache: `rm -rf "${HOME}/Library/Caches/CocoaPods"` (and then try running `pod install` again).
 
-<img src="./files/resolve-error-iOS.png">
-
 ### Android
 
+> Add this lines in `settings.gradle` then `Sync Project with Gradle Files`
+
+```
+include ':picture_library'
+project(':picture_library').projectDir = new File(rootProject.projectDir, '../node_modules/@baronha/react-native-multiple-image-picker/picture_library')
+```
+
 > Add Permission in `AndroidManifest.xml`
 
 ```xml
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 ```
-
 ## Usage
 
 See [options](#Options)
@@ -121,8 +127,9 @@ const response = await MultipleImagePicker.openPicker(options);
 | emptyMessage                                | string |                       No albums                       |   iOS    | Show string when gallery empty                                                                    |
 | maximumMessageTitle                         | string |                     Notification                      |   iOS    | The title of the alert when the user chooses to exceed the specified number of pictures           |
 | messageTitleButton                          | string |                     Notification                      |   iOS    | The title of button in the alert when the user chooses to exceed the specified number of pictures |
-| maximumMessage                              | string | You have selected the maximum number of media allowed |   iOS    | The description of the alert when the user chooses to exceed the specified number of pictures     |
 | tapHereToChange                             | string |                  Tap here to change                   |   iOS    | The sub-title in navigation bar (under albums's name in iOS)                                      |
+| maximumMessage                              | string | You have selected the maximum number of media allowed |   Both    | The description of the alert when the user chooses to exceed the specified number of pictures     |
+| maximumVideoMessage                              | string | You have selected the maximum number of media allowed |   Both    | The description of the alert when the user chooses to exceed the specified number of videos     |
 
 #### selectedAssets (Important)
 
@@ -150,7 +157,6 @@ Get an Array value only. If you want React Native Multiple Image Picker to re-se
 - [ ] Typescript.
 - [ ] (Bug) Record Video (iOS).
 - [ ] Video Compression.
-- [x] iCloud.
 
 ## Performance
 

android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['MultipleImagePicker_kotlinVersion']
+  def kotlin_version = "1.4.32"
 
   repositories {
     google()
@@ -121,15 +121,13 @@ repositories {
   }
 }
 
-def kotlin_version = getExtOrDefault('kotlinVersion')
+def kotlin_version = "1.4.32"
 
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation ('com.github.LuckSiege.PictureSelector:picture_library:v2.6.0'){
-    exclude group: 'com.github.LuckSiege.PictureSelector', module: 'ucrop'
-  }
+  implementation project(":picture_library")
   implementation 'com.github.bumptech.glide:glide:4.12.0'
   annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 }

android/src/main/java/com/reactnativemultipleimagepicker/MultipleImagePickerModule.kt

@@ -14,6 +14,7 @@ import com.luck.picture.lib.config.PictureConfig
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.engine.PictureSelectorEngine
 import com.luck.picture.lib.entity.LocalMedia
+import com.luck.picture.lib.entity.LocalMedia.parseLocalMedia
 import com.luck.picture.lib.listener.OnResultCallbackListener
 import com.luck.picture.lib.style.PictureParameterStyle
 import java.io.File
@@ -24,7 +25,8 @@ import java.util.*
 
 
 @Suppress("INCOMPATIBLE_ENUM_COMPARISON", "UNCHECKED_CAST")
-class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), IApp {
+class MultipleImagePickerModule(reactContext: ReactApplicationContext) :
+    ReactContextBaseJavaModule(reactContext), IApp {
 
     override fun getName(): String {
         return "MultipleImagePicker"
@@ -41,6 +43,8 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
     private var isExportThumbnail: Boolean = false
     private var maxVideo: Int = 20
     private var isCamera: Boolean = true
+    private var maximumMessage: String = ""
+    private var maximumVideoMessage: String = ""
 
     @ReactMethod
     fun openPicker(options: ReadableMap?, promise: Promise): Unit {
@@ -49,56 +53,59 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
         setConfiguration(options)
 
         PictureSelector.create(activity)
-                .openGallery(if (mediaType == "video") PictureMimeType.ofVideo() else if (mediaType == "image") PictureMimeType.ofImage() else PictureMimeType.ofAll())
-                .loadImageEngine(GlideEngine.createGlideEngine())
-                .maxSelectNum(maxSelectedAssets)
-                .imageSpanCount(numberOfColumn)
-                .isZoomAnim(true)
-                .isPageStrategy(true, 50)
-                .isWithVideoImage(true)
-                .videoMaxSecond(maxVideoDuration)
-                .maxVideoSelectNum(if (maxVideo != 20) maxVideo else maxSelectedAssets)
-                .isMaxSelectEnabledMask(true)
-                .selectionData(selectedAssets)
-                .setPictureStyle(mPictureParameterStyle)
-                .isPreviewImage(isPreview)
-                .isPreviewVideo(isPreview)
-                .isCamera(isCamera)
-                .isReturnEmpty(true)
-                .selectionMode(if (singleSelectedMode) PictureConfig.SINGLE else PictureConfig.MULTIPLE)
-                .forResult(object : OnResultCallbackListener<Any?> {
-                    override fun onResult(result: MutableList<Any?>?) {
-                        //check difference
-                        if (singleSelectedMode) {
-                            val singleLocalMedia: WritableArray = WritableNativeArray()
-                            val media: WritableMap = createAttachmentResponse(result?.get(0) as LocalMedia)
-                            singleLocalMedia.pushMap(media)
-                            promise.resolve(singleLocalMedia)
-                            return
-                        }
-                        val localMedia: WritableArray = WritableNativeArray()
-                        if (result?.size == 0) {
-                            promise.resolve(localMedia)
-                            return
-                        }
-                        if (result?.size == selectedAssets.size && (result[result.size - 1] as LocalMedia).id == (selectedAssets[selectedAssets.size - 1].id)) {
-                            return
-                        }
-                        if (result != null) {
-                            for (i in 0 until result.size) {
-                                val item: LocalMedia = result[i] as LocalMedia
-                                println("item: $item")
-                                val media: WritableMap = createAttachmentResponse(item)
-                                localMedia.pushMap(media)
-                            }
-                        }
+            .openGallery(if (mediaType == "video") PictureMimeType.ofVideo() else if (mediaType == "image") PictureMimeType.ofImage() else PictureMimeType.ofAll())
+            .loadImageEngine(GlideEngine.createGlideEngine())
+            .maxSelectNum(maxSelectedAssets)
+            .imageSpanCount(numberOfColumn)
+            .isZoomAnim(true)
+            .isPageStrategy(true, 50)
+            .isWithVideoImage(true)
+            .videoMaxSecond(maxVideoDuration)
+            .maxVideoSelectNum(if (maxVideo != 20) maxVideo else maxSelectedAssets)
+            .isMaxSelectEnabledMask(true)
+            .selectionData(selectedAssets)
+            .setPictureStyle(mPictureParameterStyle)
+            .isPreviewImage(isPreview)
+            .isPreviewVideo(isPreview)
+            .isCamera(isCamera)
+            .isReturnEmpty(true)
+            .maximumMessage(maximumMessage)
+            .maximumVideoMessage(maximumVideoMessage)
+            .selectionMode(if (singleSelectedMode) PictureConfig.SINGLE else PictureConfig.MULTIPLE)
+            .forResult(object : OnResultCallbackListener<LocalMedia?> {
+                override fun onResult(result: MutableList<LocalMedia?>?) {
+                    //check difference
+                    if (singleSelectedMode) {
+                        val singleLocalMedia: WritableArray = WritableNativeArray()
+                        val media: WritableMap =
+                            createAttachmentResponse(result?.get(0) as LocalMedia)
+                        singleLocalMedia.pushMap(media)
+                        promise.resolve(singleLocalMedia)
+                        return
+                    }
+                    val localMedia: WritableArray = WritableNativeArray()
+                    if (result?.size == 0) {
                         promise.resolve(localMedia)
+                        return
                     }
-
-                    override fun onCancel() {
-                        promise.reject("user cancel")
+                    if (result?.size == selectedAssets.size && (result[result.size - 1] as LocalMedia).id == (selectedAssets[selectedAssets.size - 1].id)) {
+                        return
                     }
-                })
+                    if (result != null) {
+                        for (i in 0 until result.size) {
+                            val item: LocalMedia = result[i] as LocalMedia
+                            println("item: $item")
+                            val media: WritableMap = createAttachmentResponse(item)
+                            localMedia.pushMap(media)
+                        }
+                    }
+                    promise.resolve(localMedia)
+                }
+
+                override fun onCancel() {
+                    promise.reject("user cancel")
+                }
+            })
     }
 
     private fun setConfiguration(options: ReadableMap?) {
@@ -114,6 +121,8 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
             maxVideo = options.getInt("maxVideo")
             mPictureParameterStyle = getStyle(options)
             isCamera = options.getBoolean("usedCameraButton")
+            maximumMessage = options.getString("maximumMessage").toString()
+            maximumVideoMessage = options.getString("maximumVideoMessage").toString()
         }
     }
 
@@ -145,7 +154,8 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
         if (options?.hasKey("selectedAssets")!!) {
             val assetsType = options.getType("selectedAssets")
             if (assetsType == ReadableType.Array) {
-                val assets: ReadableNativeArray = options.getArray("selectedAssets") as ReadableNativeArray
+                val assets: ReadableNativeArray =
+                    options.getArray("selectedAssets") as ReadableNativeArray
                 if (assets.size() > 0) {
                     val list = mutableListOf<LocalMedia>()
                     for (i in 0 until assets.size()) {
@@ -177,7 +187,22 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
         val height: Int = asset.getInt("height")
         val size: Long = asset.getDouble("size").toLong()
         val bucketId: Long = asset.getDouble("bucketId").toLong()
-        val localMedia = LocalMedia(id, path, realPath, fileName, parentFolderName, duration, chooseModel, mimeType, width, height, size, bucketId)
+        val dateAddedColumn: Long = Date().time.toLong()
+        val localMedia = parseLocalMedia(
+            id,
+            path,
+            realPath,
+            fileName,
+            parentFolderName,
+            duration,
+            chooseModel,
+            mimeType,
+            width,
+            height,
+            size,
+            bucketId,
+            dateAddedColumn
+        )
         return localMedia
     }
 
@@ -212,9 +237,9 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
         retriever.setDataSource(filePath)
         val image = retriever.getFrameAtTime(1000000, MediaMetadataRetriever.OPTION_CLOSEST_SYNC)
 
-        val fullPath: String = reactApplicationContext.applicationContext.cacheDir.absolutePath.toString() + "/thumbnails"
+        val fullPath: String =
+            reactApplicationContext.applicationContext.cacheDir.absolutePath.toString() + "/thumbnails"
         try {
-            val dir = fullPath.let { createDirIfNotExists(it) }
             var fOut: OutputStream? = null
             val fileName = "thumb-" + UUID.randomUUID().toString() + ".jpeg"
             print("fileName $fileName")

example/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
   package="com.example.reactnativemultipleimagepicker">
 
   <uses-permission android:name="android.permission.INTERNET" />
@@ -25,6 +26,7 @@
       </intent-filter>
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+
   </application>
 
 </manifest>

example/android/build.gradle

@@ -3,9 +3,9 @@
 buildscript {
     ext {
         buildToolsVersion = "29.0.2"
-        minSdkVersion = 19
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        minSdkVersion = 21
+        compileSdkVersion = 30
+        targetSdkVersion = 30
     }
     repositories {
         google()

example/android/settings.gradle

@@ -2,5 +2,8 @@ rootProject.name = 'MultipleImagePickerExample'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 
+include ':picture_library'
+project(':picture_library').projectDir = new File(rootProject.projectDir, '../../picture_library')
+
 include ':reactnativemultipleimagepicker'
 project(':reactnativemultipleimagepicker').projectDir = new File(rootProject.projectDir, '../../android')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baronha/react-native-multiple-image-picker",
-  "version": "0.4.1",
+  "version": "0.4.5",
   "description": "react-native-multiple-image-picker enables application to pick images and videos from multiple smart album in iOS/Android, similar to the current facebook app.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -11,6 +11,7 @@
     "src",
     "lib",
     "android",
+    "picture_library",
     "ios",
     "cpp",
     "react-native-multiple-image-picker.podspec",

picture_library/.gitignore

@@ -0,0 +1 @@
+/build

picture_library/build.gradle

@@ -0,0 +1,48 @@
+apply plugin: 'com.android.library'
+apply from: "config.gradle"
+
+android {
+    compileSdkVersion cfgs.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion cfgs.minSdkVersion
+        targetSdkVersion cfgs.targetSdkVersion
+        versionCode cfgs.versionCode
+        versionName cfgs.versionName
+
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+
+    resourcePrefix 'ucrop_'
+}
+
+apply from: './publish.gradle'
+
+dependencies {
+    implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}"
+    implementation "androidx.recyclerview:recyclerview:${cfgs.version_recyclerview}"
+    implementation "androidx.activity:activity:${cfgs.activity_version}"
+    implementation "androidx.fragment:fragment:${cfgs.fragment_version}"
+    implementation "androidx.concurrent:concurrent-futures:${cfgs.futures_version}"
+    implementation "androidx.annotation:annotation-experimental:${cfgs.experimental_version}"
+    implementation "androidx.exifinterface:exifinterface:${cfgs.androidx_exifinterface_version}"
+    implementation "androidx.localbroadcastmanager:localbroadcastmanager:${cfgs.localbroadcastmanager}"
+    implementation "androidx.camera:camera-view:${cfgs.camerax_view}"
+    implementation "androidx.transition:transition:${cfgs.androidx_transition_version}"
+    implementation "androidx.camera:camera-lifecycle:${cfgs.camerax_version}"
+}