@capgo/camera-preview 7.4.0-beta.1 → 7.4.0-beta.3

package/ios/Sources/CapgoCameraPreview/CameraController.swift

@@ -8,6 +8,7 @@
 
 import AVFoundation
 import UIKit
+import CoreLocation
 
 class CameraController: NSObject {
     var captureSession: AVCaptureSession?
@@ -427,15 +428,74 @@ extension CameraController {
         }
     }
 
-    func captureImage(completion: @escaping (UIImage?, Error?) -> Void) {
-        guard let captureSession = captureSession, captureSession.isRunning else { completion(nil, CameraControllerError.captureSessionIsMissing); return }
+    func captureImage(width: Int?, height: Int?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Error?) -> Void) {
+        guard let photoOutput = self.photoOutput else {
+            completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
+            return
+        }
+        
         let settings = AVCapturePhotoSettings()
+        if photoOutput.isHighResolutionCaptureEnabled {
+            settings.isHighResolutionCaptureEnabled = true
+        }
+
+        self.photoCaptureCompletionBlock = { (image, error) in
+            if let error = error {
+                completion(nil, error)
+                return
+            }
+            
+            guard let image = image else {
+                completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
+                return
+            }
 
-        settings.flashMode = self.flashMode
-        settings.isHighResolutionPhotoEnabled = self.highResolutionOutput
+            if let location = gpsLocation {
+                self.addGPSMetadata(to: image, location: location)
+            }
+            
+            if let width = width, let height = height {
+                let resizedImage = self.resizeImage(image: image, to: CGSize(width: width, height: height))
+                completion(resizedImage, nil)
+            } else {
+                completion(image, nil)
+            }
+        }
+        
+        photoOutput.capturePhoto(with: settings, delegate: self)
+    }
+
+    func addGPSMetadata(to image: UIImage, location: CLLocation) {
+        guard let jpegData = image.jpegData(compressionQuality: 1.0),
+              let source = CGImageSourceCreateWithData(jpegData as CFData, nil),
+              let uti = CGImageSourceGetType(source) else { return }
+        
+        let metadata = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [String: Any] ?? [:]
+        
+        let gpsDict: [String: Any] = [
+            kCGImagePropertyGPSLatitude as String: abs(location.coordinate.latitude),
+            kCGImagePropertyGPSLatitudeRef as String: location.coordinate.latitude >= 0 ? "N" : "S",
+            kCGImagePropertyGPSLongitude as String: abs(location.coordinate.longitude),
+            kCGImagePropertyGPSLongitudeRef as String: location.coordinate.longitude >= 0 ? "E" : "W",
+            kCGImagePropertyGPSTimeStamp as String: location.timestamp.ISO8601Format(),
+            kCGImagePropertyGPSAltitude as String: location.altitude,
+            kCGImagePropertyGPSAltitudeRef as String: location.altitude >= 0 ? 0 : 1
+        ]
+        
+        metadata[kCGImagePropertyGPSDictionary as String] = gpsDict
+        
+        let destData = NSMutableData()
+        guard let destination = CGImageDestinationCreateWithData(destData, uti, 1, nil) else { return }
+        CGImageDestinationAddImageFromSource(destination, source, 0, metadata as CFDictionary)
+        CGImageDestinationFinalize(destination)
+    }
 
-        self.photoOutput?.capturePhoto(with: settings, delegate: self)
-        self.photoCaptureCompletionBlock = completion
+    func resizeImage(image: UIImage, to size: CGSize) -> UIImage? {
+        let renderer = UIGraphicsImageRenderer(size: size)
+        let resizedImage = renderer.image { (context) in
+            image.draw(in: CGRect(origin: .zero, size: size))
+        }
+        return resizedImage
     }
 
     func captureSample(completion: @escaping (UIImage?, Error?) -> Void) {

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -1,6 +1,9 @@
 import Foundation
 import Capacitor
 import AVFoundation
+import Photos
+import CoreImage
+import CoreLocation
 
 extension UIWindow {
     static var isLandscape: Bool {
@@ -74,7 +77,9 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     var enableZoom: Bool?
     var highResolutionOutput: Bool = false
     var disableAudio: Bool = false
-
+    var locationManager: CLLocationManager?
+    var currentLocation: CLLocation?
+    
     // MARK: - Transparency Methods
     
     private func makeWebViewTransparent() {
@@ -286,7 +291,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         self.toBack = call.getBool("toBack") ?? true
         self.storeToFile = call.getBool("storeToFile") ?? false
         self.enableZoom = call.getBool("enableZoom") ?? false
-        self.disableAudio = call.getBool("disableAudio") ?? false
+        self.disableAudio = call.getBool("disableAudio") ?? true
 
         AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
             guard granted else {
@@ -436,43 +441,66 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     @objc func capture(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
 
-            let quality: Int? = call.getInt("quality", 85)
-
-            self.cameraController.captureImage { (image, error) in
+            let quality = call.getFloat("quality", 85)
+            let saveToGallery = call.getBool("saveToGallery", false)
+            let withExifLocation = call.getBool("withExifLocation", false)
+            let width = call.getInt("width")
+            let height = call.getInt("height")
+
+            if withExifLocation {
+                self.locationManager = CLLocationManager()
+                self.locationManager?.delegate = self
+                self.locationManager?.requestWhenInUseAuthorization()
+                self.locationManager?.startUpdatingLocation()
+            }
 
-                guard let image = image else {
-                    print(error ?? "Image capture error")
-                    guard let error = error else {
-                        call.reject("Image capture error")
-                        return
-                    }
+            self.cameraController.captureImage(width: width, height: height, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
+                if let error = error {
                     call.reject(error.localizedDescription)
                     return
                 }
-                let imageData: Data?
-                if self.cameraController.currentCameraPosition == .front {
-                    let flippedImage = image.withHorizontallyFlippedOrientation()
-                    imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
-                } else {
-                    imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
+
+                if saveToGallery {
+                    PHPhotoLibrary.shared().performChanges({
+                        PHAssetChangeRequest.creationRequestForAsset(from: image!)
+                    }, completionHandler: { (success, error) in
+                        if !success {
+                            Logger.error("CameraPreview", "Error saving image to gallery", error)
+                        }
+                    })
                 }
 
-                if self.storeToFile == false {
-                    let imageBase64 = imageData?.base64EncodedString()
-                    call.resolve(["value": imageBase64!])
-                } else {
-                    do {
-                        let fileUrl=self.getTempFilePath()
-                        try imageData?.write(to: fileUrl)
-                        call.resolve(["value": fileUrl.absoluteString])
-                    } catch {
-                        call.reject("error writing image to file")
-                    }
+                guard let imageData = image?.jpegData(compressionQuality: CGFloat(quality / 100.0)) else {
+                    call.reject("Failed to get JPEG data from image")
+                    return
                 }
+                
+                let exifData = self.getExifData(from: imageData)
+                let base64Image = imageData.base64EncodedString()
+                
+                var result = JSObject()
+                result["value"] = base64Image
+                result["exif"] = exifData
+                call.resolve(result)
             }
         }
     }
 
+    private func getExifData(from imageData: Data) -> JSObject {
+        guard let imageSource = CGImageSourceCreateWithData(imageData as CFData, nil),
+              let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any],
+              let exifDict = imageProperties[kCGImagePropertyExifDictionary as String] as? [String: Any] else {
+            return [:]
+        }
+        
+        var exifData = JSObject()
+        for (key, value) in exifDict {
+            exifData[key] = value
+        }
+        
+        return exifData
+    }
+
     @objc func captureSample(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
             let quality: Int? = call.getInt("quality", 85)
@@ -797,6 +825,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        self.currentLocation = locations.last
+        self.locationManager?.stopUpdatingLocation()
+    }
+
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        Logger.error("CameraPreview", "Failed to get location", error)
+    }
 
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "7.4.0-beta.1",
+  "version": "7.4.0-beta.3",
   "description": "Camera preview",
   "license": "MIT",
   "repository": {