fix: mime / feat: add photo/video size in response

Author: gizthub

android/build.gradle

@@ -127,7 +127,7 @@ 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'){
+  implementation ('io.github.lucksiege:pictureselector:v2.7.2'){
     exclude group: 'com.github.LuckSiege.PictureSelector', module: 'ucrop'
   }
   implementation 'com.github.bumptech.glide:glide:4.12.0'

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

@@ -172,7 +172,8 @@ 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 = LocalMedia(id, path, realPath, fileName, parentFolderName, duration, chooseModel, mimeType, width, height, size, bucketId, dateAddedColumn)
         return localMedia
     }
 
@@ -185,7 +186,7 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
         media.putString("fileName", item.fileName)
         media.putInt("width", item.width)
         media.putInt("height", item.height)
-        media.putString("mine", item.mimeType)
+        media.putString("mime", item.mimeType)
         media.putString("type", type)
         media.putInt("localIdentifier", item.id.toInt())
         media.putInt("position", item.position)
@@ -228,6 +229,7 @@ class MultipleImagePickerModule(reactContext: ReactApplicationContext) : ReactCo
             return ""
         }
     }
+
     private fun createDirIfNotExists(path: String): File {
         val dir = File(path)
         if (dir.exists()) {

example/ios/Podfile.lock

@@ -185,7 +185,7 @@ PODS:
     - React-cxxreact (= 0.63.4)
     - React-jsi (= 0.63.4)
   - React-jsinspector (0.63.4)
-  - react-native-multiple-image-picker (0.1.2):
+  - react-native-multiple-image-picker (0.2.10):
     - React-Core
     - TLPhotoPicker
   - React-RCTActionSheet (0.63.4):
@@ -248,7 +248,7 @@ PODS:
     - React-Core (= 0.63.4)
     - React-cxxreact (= 0.63.4)
     - React-jsi (= 0.63.4)
-  - TLPhotoPicker (2.1.3)
+  - TLPhotoPicker (2.1.4)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -360,7 +360,7 @@ SPEC CHECKSUMS:
   React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
   React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
   React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
-  react-native-multiple-image-picker: a96a603caef6b0228c88b15f4d1260a27114769f
+  react-native-multiple-image-picker: 1bf3daea720df4b8679226cfccef5539585f2255
   React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
   React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
   React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
@@ -371,9 +371,9 @@ SPEC CHECKSUMS:
   React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
-  TLPhotoPicker: 2c4a20d62952bd368edbf44d18476f663a718ada
+  TLPhotoPicker: f486e8499e1c3f464d0e886697635e25a72a52b8
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
 
 PODFILE CHECKSUM: 739a34f1722633656d85522351accd0e9e63cc35
 
-COCOAPODS: 1.10.0
+COCOAPODS: 1.10.1

example/src/App.js

@@ -13,6 +13,7 @@ export default function App() {
         selectedAssets: images,
         isExportThumbnail: true,
         maxVideo: 1,
+        singleSelectedMode: true,
         // selectedColor: '#f9813a',
       });
       console.log('done: ', response);

ios/MultipleImagePicker.swift

@@ -51,7 +51,7 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
 
     func dismissComplete() {
         DispatchQueue.main.async {
-        self.getTopMostViewController()?.dismiss(animated: true, completion: nil)
+            self.getTopMostViewController()?.dismiss(animated: true, completion: nil)
         }
     }
 
@@ -108,7 +108,7 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
         let mediaType = self.options["mediaType"] as! String;
 
         MultipleImagePickerConfigure.mediaType = mediaType == "video" ? PHAssetMediaType.video : mediaType == "image" ? PHAssetMediaType.image : nil ;
-
+        
         MultipleImagePickerConfigure.nibSet = (nibName: "Cell", bundle: MultipleImagePickerBundle.bundle())
 
         //        configure.allowedPhotograph = self.options["allowedPhotograph"]
@@ -143,7 +143,7 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
     }
 
     func createAttachmentResponse(filePath: String?, withFilename filename: String?, withType type: String?, withAsset asset: PHAsset, withTLAsset TLAsset: TLPHAsset ) -> [AnyHashable :Any]? {
-        
+        print("asets: ",asset, TLAsset)
         var media = [
             "path": "file://" + filePath! as String,
             "localIdentifier": asset.localIdentifier,
@@ -155,9 +155,21 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
             "type": asset.mediaType == .video ? "video" : "image"
         ] as [String : Any]
 
-        if(asset.mediaType == .video && options["isExportThumbnail"] as! Bool){
-            let thumbnail = getThumbnail(from: filePath!, in: 0.1)
-            media["thumbnail"] = thumbnail
+        //option in video
+        if(asset.mediaType == .video){
+            //get video's thumbnail
+            if(options["isExportThumbnail"] as! Bool){
+                let thumbnail = getThumbnail(from: filePath!, in: 0.1)
+                media["thumbnail"] = thumbnail
+            }
+            //get video size
+            TLAsset.videoSize { Int in
+                media["size"] = Int
+            }
+        }else{
+            TLAsset.photoSize { Int in
+                media["size"] = Int
+            }
         }
         return media
     }
@@ -197,23 +209,6 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
 
     }
 
-//    func resizedImage(at url: URL, for size: CGSize) -> UIImage? {
-//        let options: [CFString: Any] = [
-//            kCGImageSourceCreateThumbnailFromImageIfAbsent: true,
-//            kCGImageSourceCreateThumbnailWithTransform: true,
-//            kCGImageSourceShouldCacheImmediately: true,
-//            kCGImageSourceThumbnailMaxPixelSize: max(size.width, size.height)
-//        ]
-//
-//        guard let imageSource = CGImageSourceCreateWithURL(url as NSURL, nil),
-//              let image = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, options as CFDictionary)
-//        else {
-//            return nil
-//        }
-//
-//        return UIImage(cgImage: image)
-//    }
-    
     func dismissPhotoPicker(withTLPHAssets: [TLPHAsset]) {
         if(withTLPHAssets.count == 0){
             self.resolve([]);
@@ -226,6 +221,7 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
         if(withTLPHAssetsCount == selectedAssetsCount && withTLPHAssets[withTLPHAssetsCount - 1].phAsset?.localIdentifier == self.selectedAssets[selectedAssetsCount-1].phAsset?.localIdentifier){
             return;
         }
+        
         let selections = NSMutableArray.init(array: withTLPHAssets);
         self.selectedAssets = withTLPHAssets
         //imageRequestOptions
@@ -240,7 +236,14 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate,UINavi
             group.enter()
             let asset = TLAsset.phAsset
             let index = TLAsset.selectedOrder - 1;
-            TLAsset.tempCopyMediaFile(videoRequestOptions: nil, imageRequestOptions: imageRequestOptions, livePhotoRequestOptions: nil, exportPreset: AVAssetExportPresetHighestQuality, convertLivePhotosToJPG: true, progressBlock: { (Double) in
+            
+            let videoRequestOptions = PHVideoRequestOptions.init()
+            videoRequestOptions.version = PHVideoRequestOptionsVersion.current
+            videoRequestOptions.deliveryMode = PHVideoRequestOptionsDeliveryMode.automatic
+            videoRequestOptions.isNetworkAccessAllowed = true
+            
+            TLAsset.tempCopyMediaFile(videoRequestOptions: videoRequestOptions, imageRequestOptions: imageRequestOptions, livePhotoRequestOptions: nil, exportPreset: AVAssetExportPresetHighestQuality, convertLivePhotosToJPG: true, progressBlock: { (Double) in
+                print("progressBlock: ", Double)
 
             }, completionBlock: { (filePath, fileType) in
                 let object = NSDictionary(dictionary: self.createAttachmentResponse(

src/index.js

@@ -63,6 +63,7 @@ exportObject = {
     return new Promise(async (resolve, reject) => {
       try {
         const response = await MultipleImagePicker.openPicker(options);
+        console.log('res', response);
         if (response?.length) {
           resolve(response);
           return;