@capgo/camera-preview 7.4.0-beta.2 → 7.4.0-beta.4

package/ios/Sources/CapgoCameraPreview/CameraController.swift

@@ -8,6 +8,7 @@
 
 import AVFoundation
 import UIKit
+import CoreLocation
 
 class CameraController: NSObject {
     var captureSession: AVCaptureSession?
@@ -26,6 +27,7 @@ class CameraController: NSObject {
     var fileVideoOutput: AVCaptureMovieFileOutput?
 
     var previewLayer: AVCaptureVideoPreviewLayer?
+    var gridOverlayView: GridOverlayView?
 
     var flashMode = AVCaptureDevice.FlashMode.off
     var photoCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
@@ -50,7 +52,7 @@ class CameraController: NSObject {
 }
 
 extension CameraController {
-    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, completionHandler: @escaping (Error?) -> Void) {
+    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, aspectRatio: String? = nil, completionHandler: @escaping (Error?) -> Void) {
         func createCaptureSession() {
             self.captureSession = AVCaptureSession()
         }
@@ -203,11 +205,54 @@ extension CameraController {
         func configurePhotoOutput(cameraMode: Bool) throws {
             guard let captureSession = self.captureSession else { throw CameraControllerError.captureSessionIsMissing }
 
-            //  TODO: check if that really useful
-            if !cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.photo) {
-                captureSession.sessionPreset = .photo
-            } else if cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.high) {
-                captureSession.sessionPreset = .high
+            // Configure session preset based on aspect ratio and other settings
+            var targetPreset: AVCaptureSession.Preset = .photo // Default preset
+
+            if let aspectRatio = aspectRatio {
+                switch aspectRatio {
+                case "16:9":
+                    // Use HD presets for 16:9 aspect ratio
+                    if self.highResolutionOutput && captureSession.canSetSessionPreset(.hd1920x1080) {
+                        targetPreset = .hd1920x1080
+                    } else if captureSession.canSetSessionPreset(.hd1280x720) {
+                        targetPreset = .hd1280x720
+                    } else {
+                        targetPreset = .high
+                    }
+                case "4:3":
+                    // Use photo preset for 4:3 aspect ratio (traditional photo format)
+                    if self.highResolutionOutput && captureSession.canSetSessionPreset(.photo) {
+                        targetPreset = .photo
+                    } else {
+                        targetPreset = .medium
+                    }
+                default:
+                    // Default behavior for unrecognized aspect ratios
+                    if !cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.photo) {
+                        targetPreset = .photo
+                    } else if cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.high) {
+                        targetPreset = .high
+                    }
+                }
+            } else {
+                // Original logic when no aspect ratio is specified
+                if !cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.photo) {
+                    targetPreset = .photo
+                } else if cameraMode && self.highResolutionOutput && captureSession.canSetSessionPreset(.high) {
+                    targetPreset = .high
+                }
+            }
+
+            // Apply the determined preset
+            if captureSession.canSetSessionPreset(targetPreset) {
+                captureSession.sessionPreset = targetPreset
+                print("[CameraPreview] Set session preset to \(targetPreset) for aspect ratio: \(aspectRatio ?? "default")")
+            } else {
+                // Fallback to a basic preset if the target preset is not supported
+                print("[CameraPreview] Target preset \(targetPreset) not supported, falling back to .medium")
+                if captureSession.canSetSessionPreset(.medium) {
+                    captureSession.sessionPreset = .medium
+                }
             }
 
             self.photoOutput = AVCapturePhotoOutput()
@@ -275,6 +320,19 @@ extension CameraController {
         updateVideoOrientation()
     }
 
+    func addGridOverlay(to view: UIView, gridMode: String) {
+        removeGridOverlay()
+
+        gridOverlayView = GridOverlayView(frame: view.bounds)
+        gridOverlayView?.gridMode = gridMode
+        view.addSubview(gridOverlayView!)
+    }
+
+    func removeGridOverlay() {
+        gridOverlayView?.removeFromSuperview()
+        gridOverlayView = nil
+    }
+
     func setupGestures(target: UIView, enableZoom: Bool) {
         setupTapGesture(target: target, selector: #selector(handleTap(_:)), delegate: self)
         if enableZoom {
@@ -427,15 +485,75 @@ 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()
 
-        settings.flashMode = self.flashMode
-        settings.isHighResolutionPhotoEnabled = self.highResolutionOutput
+        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
+            }
+
+            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)
+    }
 
-        self.photoOutput?.capturePhoto(with: settings, delegate: self)
-        self.photoCaptureCompletionBlock = completion
+    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 }
+
+        var metadata = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [String: Any] ?? [:]
+
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
+
+        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: formatter.string(from: location.timestamp),
+            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)
+    }
+
+    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) {
@@ -677,7 +795,7 @@ extension CameraController {
 
         return device.uniqueID
     }
-    
+
     func getCurrentLensInfo() throws -> (focalLength: Float, deviceType: String, baseZoomRatio: Float) {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {

package/ios/Sources/CapgoCameraPreview/GridOverlayView.swift

@@ -0,0 +1,65 @@
+import UIKit
+
+class GridOverlayView: UIView {
+
+    var gridMode: String = "none" {
+        didSet {
+            isHidden = gridMode == "none"
+            setNeedsDisplay()
+        }
+    }
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setup()
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setup()
+    }
+
+    private func setup() {
+        backgroundColor = UIColor.clear
+        isUserInteractionEnabled = false
+        isHidden = true
+    }
+
+    override func draw(_ rect: CGRect) {
+        guard let context = UIGraphicsGetCurrentContext() else { return }
+
+        if gridMode == "none" {
+            return
+        }
+
+        context.setStrokeColor(UIColor.white.withAlphaComponent(0.5).cgColor)
+        context.setLineWidth(1.0)
+
+        if gridMode == "3x3" {
+            drawGrid(context: context, rect: rect, divisions: 3)
+        } else if gridMode == "4x4" {
+            drawGrid(context: context, rect: rect, divisions: 4)
+        }
+    }
+
+    private func drawGrid(context: CGContext, rect: CGRect, divisions: Int) {
+        let stepX = rect.width / CGFloat(divisions)
+        let stepY = rect.height / CGFloat(divisions)
+
+        // Draw vertical lines
+        for i in 1..<divisions {
+            let x = CGFloat(i) * stepX
+            context.move(to: CGPoint(x: x, y: 0))
+            context.addLine(to: CGPoint(x: x, y: rect.height))
+        }
+
+        // Draw horizontal lines
+        for i in 1..<divisions {
+            let y = CGFloat(i) * stepY
+            context.move(to: CGPoint(x: 0, y: y))
+            context.addLine(to: CGPoint(x: rect.width, y: y))
+        }
+
+        context.strokePath()
+    }
+}

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -3,6 +3,8 @@ import Capacitor
 import AVFoundation
 import Photos
 import CoreImage
+import CoreLocation
+
 
 extension UIWindow {
     static var isLandscape: Bool {
@@ -34,7 +36,7 @@ extension UIWindow {
  * here: https://capacitor.ionicframework.com/docs/plugins/ios
  */
 @objc(CameraPreview)
-public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
+public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelegate {
     public let identifier = "CameraPreviewPlugin"
     public let jsName = "CameraPreview"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -56,7 +58,9 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "setZoom", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "getFlashMode", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "setDeviceId", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getDeviceId", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "getDeviceId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setAspectRatio", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getAspectRatio", returnType: CAPPluginReturnPromise)
     ]
     // Camera state tracking
     private var isInitializing: Bool = false
@@ -76,33 +80,43 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     var enableZoom: Bool?
     var highResolutionOutput: Bool = false
     var disableAudio: Bool = false
-
-    // MARK: - Transparency Methods
+    var locationManager: CLLocationManager?
+    var currentLocation: CLLocation?
+    private var aspectRatio: String?
     
+    // MARK: - Transparency Methods
+
+
     private func makeWebViewTransparent() {
         guard let webView = self.webView else { return }
-        
+
+
         // Define a recursive function to traverse the view hierarchy
         func makeSubviewsTransparent(_ view: UIView) {
             // Set the background color to clear
             view.backgroundColor = .clear
-            
+
+
             // Recurse for all subviews
             for subview in view.subviews {
                 makeSubviewsTransparent(subview)
             }
         }
-        
+
+
         // Set the main webView to be transparent
         webView.isOpaque = false
         webView.backgroundColor = .clear
-        
+
+
         // Recursively make all subviews transparent
         makeSubviewsTransparent(webView)
-        
+
+
         // Also ensure the webview's container is transparent
         webView.superview?.backgroundColor = .clear
-        
+
+
         // Force a layout pass to apply changes
         DispatchQueue.main.async {
             webView.setNeedsLayout()
@@ -147,13 +161,38 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
 
         cameraController.updateVideoOrientation()
-        
+
+                cameraController.updateVideoOrientation()
+
+        // Update grid overlay frame if it exists
+        if let gridOverlay = self.cameraController.gridOverlayView {
+            gridOverlay.frame = previewView.bounds
+        }
+
         // Ensure webview remains transparent after rotation
         if self.isInitialized {
             self.makeWebViewTransparent()
         }
     }
     
+    @objc func setAspectRatio(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        self.aspectRatio = call.getString("aspectRatio")
+        self.updateCameraFrame()
+        call.resolve()
+    }
+
+    @objc func getAspectRatio(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        call.resolve(["aspectRatio": self.aspectRatio ?? "fill"])
+    }
+    
     @objc func appDidBecomeActive() {
         if self.isInitialized {
             DispatchQueue.main.async {
@@ -161,7 +200,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             }
         }
     }
-    
+
+
     @objc func appWillEnterForeground() {
         if self.isInitialized {
             DispatchQueue.main.async {
@@ -288,7 +328,9 @@ 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
+        self.aspectRatio = call.getString("aspectRatio")
+        let gridMode = call.getString("gridMode") ?? "none"
 
         AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
             guard granted else {
@@ -300,18 +342,18 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 if self.cameraController.captureSession?.isRunning ?? false {
                     call.reject("camera already started")
                 } else {
-                    self.cameraController.prepare(cameraPosition: self.cameraPosition, deviceId: deviceId, disableAudio: self.disableAudio, cameraMode: cameraMode) {error in
+                    self.cameraController.prepare(cameraPosition: self.cameraPosition, deviceId: deviceId, disableAudio: self.disableAudio, cameraMode: cameraMode, aspectRatio: self.aspectRatio) {error in
                         if let error = error {
                             print(error)
                             call.reject(error.localizedDescription)
                             return
                         }
-                        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!
-                        self.previewView = UIView(frame: CGRect(x: self.posX ?? 0, y: self.posY ?? 0, width: self.width!, height: height))
+                        self.updateCameraFrame()
                         
                         // Make webview transparent - comprehensive approach
                         self.makeWebViewTransparent()
-                        
+
+
                         self.webView?.superview?.addSubview(self.previewView)
                         if self.toBack! {
                             self.webView?.superview?.bringSubviewToFront(self.webView!)
@@ -321,17 +363,34 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                         let frontView = self.toBack! ? self.webView : self.previewView
                         self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom!)
 
+                        // Add grid overlay if enabled
+                        if gridMode != "none" {
+                            self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
+                        }
+
+                        // Add grid overlay if enabled
+                        if gridMode != "none" {
+                            self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
+                        }
+
                         if self.rotateWhenOrientationChanged == true {
                             NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
                         }
-                        
+
+
                         // Add observers for app state changes to maintain transparency
                         NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appDidBecomeActive), name: UIApplication.didBecomeActiveNotification, object: nil)
                         NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.appWillEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
 
                         self.isInitializing = false
                         self.isInitialized = true
-                        call.resolve()
+                        
+                        var returnedObject = JSObject()
+                        returnedObject["width"] = self.previewView.frame.width as any JSValue
+                        returnedObject["height"] = self.previewView.frame.height as any JSValue
+                        returnedObject["x"] = self.previewView.frame.origin.x as any JSValue
+                        returnedObject["y"] = self.previewView.frame.origin.y as any JSValue
+                        call.resolve(returnedObject)
 
                     }
                 }
@@ -368,10 +427,12 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                             self.cameraController.previewLayer?.frame = self.previewView.bounds
                             self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
                             self.previewView.isUserInteractionEnabled = true
-                            
+
+
                             // Ensure webview remains transparent after flip
                             self.makeWebViewTransparent()
-                            
+
+
                             call.resolve()
                         }
                     } catch {
@@ -408,6 +469,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             }
 
             // Always attempt to stop and clean up, regardless of captureSession state
+            self.cameraController.removeGridOverlay()
             if let previewView = self.previewView {
                 previewView.removeFromSuperview()
                 self.previewView = nil
@@ -417,7 +479,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             self.isInitialized = false
             self.isInitializing = false
             self.cameraController.cleanup()
-            
+
+
             // Remove notification observers
             NotificationCenter.default.removeObserver(self)
 
@@ -440,8 +503,18 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
 
             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()
+            }
 
-            self.cameraController.captureImage(quality: quality) { (image, error) in
+            self.cameraController.captureImage(width: width, height: height, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
                 if let error = error {
                     call.reject(error.localizedDescription)
                     return
@@ -452,7 +525,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                         PHAssetChangeRequest.creationRequestForAsset(from: image!)
                     }, completionHandler: { (success, error) in
                         if !success {
-                            Logger.error("CameraPreview", "Error saving image to gallery", error)
+                            print("CameraPreview: Error saving image to gallery: \(error?.localizedDescription ?? "Unknown error")")
                         }
                     })
                 }
@@ -461,10 +534,12 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                     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
@@ -479,12 +554,28 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
               let exifDict = imageProperties[kCGImagePropertyExifDictionary as String] as? [String: Any] else {
             return [:]
         }
-        
+
+
         var exifData = JSObject()
         for (key, value) in exifDict {
-            exifData[key] = value
+            // Convert value to JSValue-compatible type
+            if let stringValue = value as? String {
+                exifData[key] = stringValue
+            } else if let numberValue = value as? NSNumber {
+                exifData[key] = numberValue
+            } else if let boolValue = value as? Bool {
+                exifData[key] = boolValue
+            } else if let arrayValue = value as? [Any] {
+                exifData[key] = arrayValue
+            } else if let dictValue = value as? [String: Any] {
+                exifData[key] = JSObject(_immutableCocoaDictionary: NSMutableDictionary(dictionary: dictValue))
+            } else {
+                // Convert other types to string as fallback
+                exifData[key] = String(describing: value)
+            }
         }
-        
+
+
         return exifData
     }
 
@@ -627,9 +718,11 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         // Collect all devices by position
         for device in session.devices {
             var lenses: [[String: Any]] = []
-            
+
+
             let constituentDevices = device.isVirtualDevice ? device.constituentDevices : [device]
-            
+
+
             for lensDevice in constituentDevices {
                 var deviceType: String
                 switch lensDevice.deviceType {
@@ -649,7 +742,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 } else if lensDevice.deviceType == .builtInTelephotoCamera {
                     baseZoomRatio = 2.0 // A common value for telephoto lenses
                 }
-                
+
+
                 let lensInfo: [String: Any] = [
                     "label": lensDevice.localizedName,
                     "deviceType": deviceType,
@@ -660,7 +754,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 ]
                 lenses.append(lensInfo)
             }
-            
+
+
             let deviceData: [String: Any] = [
                 "deviceId": device.uniqueID,
                 "label": device.localizedName,
@@ -670,7 +765,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 "maxZoom": Float(device.maxAvailableVideoZoomFactor),
                 "isLogical": device.isVirtualDevice
             ]
-            
+
+
             devices.append(deviceData)
         }
 
@@ -686,7 +782,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         do {
             let zoomInfo = try self.cameraController.getZoom()
             let lensInfo = try self.cameraController.getCurrentLensInfo()
-            
+
+
             var minZoom = zoomInfo.min
             var maxZoom = zoomInfo.max
             var currentZoom = zoomInfo.current
@@ -782,10 +879,12 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                         self.cameraController.previewLayer?.frame = self.previewView.bounds
                         self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
                         self.previewView.isUserInteractionEnabled = true
-                        
+
+
                         // Ensure webview remains transparent after device switch
                         self.makeWebViewTransparent()
-                        
+
+
                         call.resolve()
                     }
                 } catch {
@@ -812,6 +911,46 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        self.currentLocation = locations.last
+        self.locationManager?.stopUpdatingLocation()
+    }
 
+    public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        print("CameraPreview: Failed to get location: \(error.localizedDescription)")
+    }
 
+    private func updateCameraFrame() {
+        guard let width = self.width, var height = self.height, let posX = self.posX, let posY = self.posY else { return }
+        let paddingBottom = self.paddingBottom ?? 0
+        height -= paddingBottom
+
+        var frame = CGRect(x: posX, y: posY, width: width, height: height)
+
+        if let aspectRatio = self.aspectRatio, aspectRatio != "fill" {
+            let ratioParts = aspectRatio.split(separator: ":").map { Double($0) ?? 1.0 }
+            let ratio = ratioParts[0] / ratioParts[1]
+            let viewWidth = Double(width)
+            let viewHeight = Double(height)
+
+            if viewWidth / ratio > viewHeight {
+                let newWidth = viewHeight * ratio
+                frame.origin.x += (viewWidth - newWidth) / 2
+                frame.size.width = newWidth
+            } else {
+                let newHeight = viewWidth / ratio
+                frame.origin.y += (viewHeight - newHeight) / 2
+                frame.size.height = newHeight
+            }
+        }
+        
+        if self.previewView == nil {
+            self.previewView = UIView(frame: frame)
+        } else {
+            self.previewView.frame = frame
+        }
+        
+        // Update the preview layer frame to match the preview view
+        self.cameraController.previewLayer?.frame = frame
+    }
 }

package/package.json

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