✨ feat: handle result for camera

Author: baronha

MultipleImagePicker.podspec

@@ -27,9 +27,9 @@ Pod::Spec.new do |s|
   }
 
 
-  s.dependency "HXPhotoPicker/Picker", "4.2.3"
-  s.dependency "HXPhotoPicker/Editor", "4.2.3"
-  s.dependency "HXPhotoPicker/Camera", "4.2.3"
+  s.dependency "HXPhotoPicker/Picker", "4.2.4"
+  s.dependency "HXPhotoPicker/Editor", "4.2.4"
+  s.dependency "HXPhotoPicker/Camera/Lite", "4.2.4"
 
   s.pod_target_xcconfig = {
     # C++ compiler flags, mainly for folly.

android/src/main/java/com/margelo/nitro/multipleimagepicker/MultipleImagePickerImp.kt

@@ -14,6 +14,7 @@ import com.facebook.react.bridge.ReactMethod
 import com.luck.picture.lib.app.IApp
 import com.luck.picture.lib.app.PictureAppMaster
 import com.luck.picture.lib.basic.PictureSelector
+import com.luck.picture.lib.config.Crop
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.config.SelectMimeType
 import com.luck.picture.lib.config.SelectModeConfig
@@ -323,8 +324,10 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
         PictureSelector
             .create(currentActivity)
             .openCamera(chooseMode)
-//            .setLanguage(getLanguage(config.language))
+            .setLanguage(getLanguage(config.language))
             .isQuickCapture(true)
+            .setCropEngine(CropEngine(cropOption))
+//            .setOfAllCameraType(chooseMode)
             .setCameraInterceptListener(CameraEngine(appContext, cameraConfig))
             .forResult(object : OnResultCallbackListener<LocalMedia?> {
                 override fun onResult(result: java.util.ArrayList<LocalMedia?>?) {
@@ -556,9 +559,8 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
             height = item.cropImageHeight.toDouble()
         }
 
+
         val media = Result(
-            path,
-            fileName = item.fileName,
             localIdentifier = item.id.toString(),
             width,
             height,
@@ -568,10 +570,12 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
             realPath = item.realPath,
             parentFolderName = item.parentFolderName,
             creationDate = item.dateAddedTime.toDouble(),
+            crop = item.isCut,
+            path,
             type,
-            duration = item.duration.toDouble(),
+            fileName = item.fileName,
             thumbnail = item.videoThumbnailPath,
-            crop = item.isCut
+            duration = item.duration.toDouble()
         )
 
         return media

example/package.json

@@ -13,7 +13,6 @@
     "gradle": "cd android && ./gradlew clean && ./gradlew build"
   },
   "dependencies": {
-    "@baronha/react-native-multiple-image-picker": "file:../",
     "@baronha/react-native-image-grid": "^0.2.7",
     "@react-native-segmented-control/segmented-control": "2.5.2",
     "expo": "~51.0.38",

example/src/index.tsx

@@ -83,7 +83,7 @@ export default function App() {
     try {
       const response = await openPicker({
         ...options,
-        selectedAssets: images,
+        selectedAssets: images.filter((item) => item.localIdentifier),
       })
 
       setImages(Array.isArray(response) ? response : [response])
@@ -96,10 +96,17 @@ export default function App() {
   const onCamera = async () => {
     try {
       const response = await openCamera({
-        crop: false,
+        crop: true,
+        isSaveSystemAlbum: false,
+        mediaType: 'all',
+        videoMaximumDuration: 5,
       })
 
-      console.log('response: ', response)
+      setImages((prev) => {
+        return [response as Result, ...prev]
+      })
+
+      console.log('camera response: ', response)
 
       layoutEffect()
     } catch (e) {
@@ -430,7 +437,7 @@ export default function App() {
                   <Switch
                     value={options.crop !== undefined}
                     onValueChange={(value) =>
-                      setOptions('crop', value ? {} : undefined)
+                      setOptions('crop', value ? true : undefined)
                     }
                   />
                 </SectionView>

example/yarn.lock

@@ -1151,9 +1151,6 @@
   resolved "https://registry.npmjs.org/@baronha/react-native-image-grid/-/react-native-image-grid-0.2.7.tgz"
   integrity sha512-F5q+hJ1p0+hfWYhOK4uL2EgseG89hpiMu0rMIaiw7lMpEA3sKC1AUOhOTKS58LeX1xE/XoqZ0P7tzyntKN+EoQ==
 
-"@baronha/react-native-multiple-image-picker@file:..":
-  version "2.0.4"
-
 "@expo/bunyan@^4.0.0":
   version "4.0.1"
   resolved "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.1.tgz"

ios/Assets.swift

@@ -20,6 +20,7 @@ class Assets {
 
 extension UIImage {
     static var close = UIImage(name: "close")
+
     convenience init(name: String) {
         self.init(named: name, in: Assets.bundle(), compatibleWith: nil)!
     }

ios/HybridMultipleImagePicker+Camera.swift

@@ -5,10 +5,25 @@
 //  Created by BAO HA on 13/12/24.
 //
 
+import AVFoundation
 import HXPhotoPicker
+import Photos
 
 extension HybridMultipleImagePicker {
     func openCamera(config: NitroCameraConfig, resolved: @escaping ((CameraResult) -> Void), rejected: @escaping ((Double) -> Void)) throws {
+        var captureType: CameraController.CaptureType = .all
+
+        // check media type
+        switch config.mediaType {
+        case .image:
+            captureType = .photo
+        case .video:
+            captureType = .video
+        default:
+            break
+        }
+
+        // config
         var cameraConfig = CameraConfiguration()
 
         cameraConfig.videoMaximumDuration = config.videoMaximumDuration ?? 60
@@ -26,8 +41,7 @@ extension HybridMultipleImagePicker {
 
         cameraConfig.languageType = setLocale(language: config.language)
         cameraConfig.isSaveSystemAlbum = config.isSaveSystemAlbum ?? false
-        cameraConfig.allowLocation = config.allowLocation ?? true
-        cameraConfig.sessionPreset = .hd1920x1080
+        cameraConfig.sessionPreset = .hd4K3840x2160
         cameraConfig.aspectRatio = .fullScreen
 
         if let color = config.color, let focusColor = getReactColor(Int(color)) {
@@ -41,9 +55,62 @@ extension HybridMultipleImagePicker {
             cameraConfig.position = .back
         }
 
+        func getCameraResult(_ result: CameraController.Result, _ asset: PHAsset?) {
+            if let asset {
+                Task {
+                    let photoAsset = PhotoAsset(asset)
+                    let urlResult = try await photoAsset.urlResult()
+                    let path = urlResult.url.absoluteString
+
+                    let phAsset = photoAsset.phAsset
+                    let thumbnail = phAsset?.getVideoAssetThumbnail(from: path, in: 1)
+
+                    resolved(CameraResult(path: path, type: photoAsset.mediaType == .photo ? ResultType.image : ResultType.video, width: photoAsset.imageSize.width, height: photoAsset.imageSize.height, duration: photoAsset.videoDuration, thumbnail: thumbnail, fileName: phAsset?.fileName))
+                }
+
+            } else {
+                switch result {
+                case .image(let uiImage):
+
+                    let fileName = "IMG_\(Int(Date().timeIntervalSince1970)).jpg"
+                    let filePath = uiImage.getPath(fileName: fileName, quality: 1.0)
+
+                    if let filePath {
+                        resolved(CameraResult(path: filePath, type: ResultType.image, width: uiImage.size.width, height: uiImage.size.height, duration: nil, thumbnail: nil, fileName: fileName))
+                    } else {
+                        rejected(0)
+                    }
+
+                case .video(let url):
+
+                    let asset = AVAsset(url: url)
+
+                    let thumbnail = getVideoThumbnail(from: url.absoluteString, in: 1)
+
+                    var result = CameraResult(path: url.absoluteString,
+                                              type: ResultType.video,
+                                              width: nil,
+                                              height: nil,
+                                              duration: asset.duration.seconds,
+                                              thumbnail: thumbnail,
+                                              fileName: url.lastPathComponent)
+
+                    if let track = asset.tracks(withMediaType: AVMediaType.video).first {
+                        let trackSize = track.naturalSize.applying(track.preferredTransform)
+                        let size = CGSize(width: abs(trackSize.width), height: abs(trackSize.height))
+
+                        result.width = Double(size.width)
+                        result.height = Double(size.height)
+                    }
+
+                    resolved(result)
+                }
+            }
+        }
+
         DispatchQueue.main.async {
-            Photo.capture(cameraConfig) { result, _, _ in
-                print("result: ", result)
+            Photo.capture(cameraConfig, type: captureType) { result, asset, _ in
+                getCameraResult(result, asset)
             }
         }
     }

ios/HybridMultipleImagePicker+Config.swift

@@ -124,9 +124,7 @@ extension HybridMultipleImagePicker {
         if let cameraOption = options.camera {
             photoList.allowAddCamera = true
 
-            var cameraConfig = setCameraConfig(cameraOption)
-
-            photoList.cameraType = .system(cameraConfig)
+            photoList.cameraType = .system(setCameraConfig(cameraOption))
         } else {
             photoList.allowAddCamera = false
         }

ios/HybridMultipleImagePicker+Result.swift

@@ -6,31 +6,23 @@
 //
 
 import HXPhotoPicker
-import Photos
+// import Photos
 
 extension HybridMultipleImagePicker {
     func getResult(_ asset: PhotoAsset) async throws -> Result {
         let urlResult = try await asset.urlResult()
         let url = urlResult.url
-            
+
         let creationDate = Int(asset.phAsset?.creationDate?.timeIntervalSince1970 ?? 0)
-            
+
         let mime = url.getMimeType()
-            
-        let fileName = {
-            if let phAsset = asset.phAsset, let resources = PHAssetResource.assetResources(for: phAsset).first {
-                return resources.originalFilename
-            }
-                
-            return ""
-        }()
-            
+
+        let phAsset = asset.phAsset
+
         let type: ResultType = .init(fromString: asset.mediaType == .video ? "video" : "image")!
-        let thumbnail = asset.phAsset?.getVideoThumbnail(from: url.absoluteString, in: 1)
-            
-        return Result(path: url.absoluteString,
-                      fileName: fileName,
-                      localIdentifier: asset.phAsset!.localIdentifier,
+        let thumbnail = asset.phAsset?.getVideoAssetThumbnail(from: url.absoluteString, in: 1)
+
+        return Result(localIdentifier: phAsset!.localIdentifier,
                       width: asset.imageSize.width,
                       height: asset.imageSize.height,
                       mime: mime,
@@ -39,9 +31,11 @@ extension HybridMultipleImagePicker {
                       realPath: nil,
                       parentFolderName: nil,
                       creationDate: creationDate > 0 ? Double(creationDate) : nil,
+                      crop: false,
+                      path: url.absoluteString,
                       type: type,
                       duration: asset.videoDuration,
                       thumbnail: thumbnail,
-                      crop: false)
+                      fileName: phAsset?.fileName)
     }
 }

ios/PHAsset+Thumbnail.swift

@@ -8,52 +8,46 @@
 import Photos
 
 extension PHAsset {
-    func getVideoThumbnail(from moviePath: String, in seconds: Double) -> String? {
+    func getVideoAssetThumbnail(from moviePath: String, in seconds: Double) -> String? {
         if mediaType == .video {
-            let filepath = moviePath.replacingOccurrences(of: "file://", with: "")
-            let vidURL = URL(fileURLWithPath: filepath)
-
-            let asset = AVURLAsset(url: vidURL, options: nil)
-            let generator = AVAssetImageGenerator(asset: asset)
-            generator.appliesPreferredTrackTransform = true
-
-            let time = CMTime(seconds: seconds, preferredTimescale: 600)
-
-            var thumbnail: UIImage?
+            return getVideoThumbnail(from: moviePath, in: seconds)
+        }
 
-            do {
-                let imgRef = try generator.copyCGImage(at: time, actualTime: nil)
-                thumbnail = UIImage(cgImage: imgRef)
-            } catch {
-                print("Error create thumbnail: \(error)")
-                return nil
-            }
+        return nil
+    }
 
-            if let thumbnail {
-                return getImagePathFromUIImage(uiImage: thumbnail, prefix: "thumb")
-            }
+    var fileName: String {
+        if let resources = PHAssetResource.assetResources(for: self).first {
+            return resources.originalFilename
         }
 
-        return nil
+        return ""
     }
+}
 
-    private func getImagePathFromUIImage(uiImage: UIImage, prefix: String? = "thumb") -> String? {
-        let fileManager = FileManager.default
+func getVideoThumbnail(from moviePath: String, in seconds: Double) -> String? {
+    let filepath = moviePath.replacingOccurrences(of: "file://", with: "")
+    let vidURL = URL(fileURLWithPath: filepath)
 
-        guard
-            let tempDirectory = FileManager.default.urls(
-                for: .cachesDirectory,
-                in: .userDomainMask).map(\.path).last
-        else {
-            return nil
-        }
+    let asset = AVURLAsset(url: vidURL, options: nil)
+    let generator = AVAssetImageGenerator(asset: asset)
+    generator.appliesPreferredTrackTransform = true
 
-        let data = uiImage.jpegData(compressionQuality: 0.9)
+    let time = CMTime(seconds: seconds, preferredTimescale: 600)
 
-        let fullPath = URL(fileURLWithPath: tempDirectory).appendingPathComponent("\(prefix ?? "thumb")-\(ProcessInfo.processInfo.globallyUniqueString).jpg").path
+    var thumbnail: UIImage?
 
-        fileManager.createFile(atPath: fullPath, contents: data, attributes: nil)
+    do {
+        let imgRef = try generator.copyCGImage(at: time, actualTime: nil)
+        thumbnail = UIImage(cgImage: imgRef)
+    } catch {
+        print("Error create thumbnail: \(error)")
+        return nil
+    }
 
-        return "file://" + fullPath
+    if let thumbnail {
+        return thumbnail.getPath(fileName: nil, quality: 0.8)
     }
+
+    return nil
 }