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

package/ios/Sources/CapgoCameraPreview/Plugin.swift

@@ -1,8 +1,10 @@
 import Foundation
-import Capacitor
 import AVFoundation
 import Photos
+import Capacitor
 import CoreImage
+import CoreLocation
+import MobileCoreServices
 
 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,11 +58,19 @@ 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),
+        CAPPluginMethod(name: "setGridMode", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getGridMode", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getPreviewSize", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setPreviewSize", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setFocus", returnType: CAPPluginReturnPromise)
     ]
     // Camera state tracking
     private var isInitializing: Bool = false
     private var isInitialized: Bool = false
+    private var backgroundSession: AVCaptureSession?
 
     var previewView: UIView!
     var cameraPosition = String()
@@ -74,37 +84,42 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     var toBack: Bool?
     var storeToFile: Bool?
     var enableZoom: Bool?
-    var highResolutionOutput: Bool = false
     var disableAudio: Bool = false
+    var locationManager: CLLocationManager?
+    var currentLocation: CLLocation?
+    private var aspectRatio: String?
+    private var gridMode: String = "none"
+    private var permissionCallID: String?
+    private var waitingForLocation: Bool = false
 
     // 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 {
+            // 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
             webView.setNeedsLayout()
             webView.layoutIfNeeded()
         }
@@ -121,15 +136,9 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         let paddingBottom = self.paddingBottom ?? 0
         let height = heightValue - paddingBottom
 
-        if UIWindow.isLandscape {
-            previewView.frame = CGRect(x: posY, y: posX, width: max(height, width), height: min(height, width))
-            self.cameraController.previewLayer?.frame = previewView.frame
-        }
-
-        if UIWindow.isPortrait {
-            previewView.frame = CGRect(x: posX, y: posY, width: min(height, width), height: max(height, width))
-            self.cameraController.previewLayer?.frame = previewView.frame
-        }
+        // Handle auto-centering during rotation
+        // Always use the factorized method for consistent positioning
+        self.updateCameraFrame()
 
         if let connection = self.cameraController.fileVideoOutput?.connection(with: .video) {
             switch UIDevice.current.orientation {
@@ -147,13 +156,135 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
 
         cameraController.updateVideoOrientation()
-        
+
+        cameraController.updateVideoOrientation()
+
+        // Update grid overlay frame if it exists - no animation
+        if let gridOverlay = self.cameraController.gridOverlayView {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            gridOverlay.frame = previewView.bounds
+            CATransaction.commit()
+        }
+
         // 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
+        }
+
+        guard let newAspectRatio = call.getString("aspectRatio") else {
+            call.reject("aspectRatio parameter is required")
+            return
+        }
+
+        self.aspectRatio = newAspectRatio
+
+        DispatchQueue.main.async {
+            // When aspect ratio changes, always auto-center the view
+            // This ensures consistent behavior where changing aspect ratio recenters the view
+            self.posX = -1
+            self.posY = -1
+
+            // Calculate maximum size based on aspect ratio
+            let webViewWidth = self.webView?.frame.width ?? UIScreen.main.bounds.width
+            let webViewHeight = self.webView?.frame.height ?? UIScreen.main.bounds.height
+            let paddingBottom = self.paddingBottom ?? 0
+
+            // Calculate available space
+            let availableWidth: CGFloat
+            let availableHeight: CGFloat
+
+            if self.posX == -1 || self.posY == -1 {
+                // Auto-centering mode - use full dimensions
+                availableWidth = webViewWidth
+                availableHeight = webViewHeight - paddingBottom
+            } else {
+                // Manual positioning - calculate remaining space
+                availableWidth = webViewWidth - self.posX!
+                availableHeight = webViewHeight - self.posY! - paddingBottom
+            }
+
+            // Parse aspect ratio - convert to portrait orientation for camera use
+            let ratioParts = newAspectRatio.split(separator: ":").map { Double($0) ?? 1.0 }
+            // For camera, we want portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+            let ratio = ratioParts[1] / ratioParts[0]
+
+            // Calculate maximum size that fits the aspect ratio in available space
+            let maxWidthByHeight = availableHeight * CGFloat(ratio)
+            let maxHeightByWidth = availableWidth / CGFloat(ratio)
+
+            if maxWidthByHeight <= availableWidth {
+                // Height is the limiting factor
+                self.width = maxWidthByHeight
+                self.height = availableHeight
+            } else {
+                // Width is the limiting factor
+                self.width = availableWidth
+                self.height = maxHeightByWidth
+            }
+
+            print("[CameraPreview] Aspect ratio changed to \(newAspectRatio), new size: \(self.width!)x\(self.height!)")
+
+            self.updateCameraFrame()
+
+            // Return the actual preview bounds
+            var result = JSObject()
+            result["x"] = Double(self.previewView.frame.origin.x)
+            result["y"] = Double(self.previewView.frame.origin.y)
+            result["width"] = Double(self.previewView.frame.width)
+            result["height"] = Double(self.previewView.frame.height)
+            call.resolve(result)
+        }
+    }
+
+    @objc func getAspectRatio(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        call.resolve(["aspectRatio": self.aspectRatio ?? "4:3"])
+    }
+
+    @objc func setGridMode(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+
+        guard let gridMode = call.getString("gridMode") else {
+            call.reject("gridMode parameter is required")
+            return
+        }
+
+        self.gridMode = gridMode
+
+        // Update grid overlay
+        DispatchQueue.main.async {
+            if gridMode == "none" {
+                self.cameraController.removeGridOverlay()
+            } else {
+                self.cameraController.addGridOverlay(to: self.previewView, gridMode: gridMode)
+            }
+        }
+
+        call.resolve()
+    }
+
+    @objc func getGridMode(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+        call.resolve(["gridMode": self.gridMode])
+    }
+
     @objc func appDidBecomeActive() {
         if self.isInitialized {
             DispatchQueue.main.async {
@@ -161,7 +292,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             }
         }
     }
-    
+
     @objc func appWillEnterForeground() {
         if self.isInitialized {
             DispatchQueue.main.async {
@@ -265,21 +396,34 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         self.cameraPosition = call.getString("position") ?? "rear"
         let deviceId = call.getString("deviceId")
         let cameraMode = call.getBool("cameraMode") ?? false
-        self.highResolutionOutput = call.getBool("enableHighResolution") ?? false
-        self.cameraController.highResolutionOutput = self.highResolutionOutput
 
-        if call.getInt("width") != nil {
-            self.width = CGFloat(call.getInt("width")!)
+        // Set width - use screen width if not provided or if 0
+        if let width = call.getInt("width"), width > 0 {
+            self.width = CGFloat(width)
         } else {
             self.width = UIScreen.main.bounds.size.width
         }
-        if call.getInt("height") != nil {
-            self.height = CGFloat(call.getInt("height")!)
+
+        // Set height - use screen height if not provided or if 0
+        if let height = call.getInt("height"), height > 0 {
+            self.height = CGFloat(height)
         } else {
             self.height = UIScreen.main.bounds.size.height
         }
-        self.posX = call.getInt("x") != nil ? CGFloat(call.getInt("x")!)/UIScreen.main.scale: 0
-        self.posY = call.getInt("y") != nil ? CGFloat(call.getInt("y")!) / (call.getBool("includeSafeAreaInsets") ?? false ? 1.0 : UIScreen.main.scale) + (call.getBool("includeSafeAreaInsets") ?? false ? UIApplication.shared.windows.first?.safeAreaInsets.top ?? 0 : 0) : 0
+
+        // Set x position - use exact CSS pixel value from web view, or mark for centering
+        if let x = call.getInt("x") {
+            self.posX = CGFloat(x)
+        } else {
+            self.posX = -1 // Use -1 to indicate auto-centering
+        }
+
+        // Set y position - use exact CSS pixel value from web view, or mark for centering
+        if let y = call.getInt("y") {
+            self.posY = CGFloat(y)
+        } else {
+            self.posY = -1 // Use -1 to indicate auto-centering
+        }
         if call.getInt("paddingBottom") != nil {
             self.paddingBottom = CGFloat(call.getInt("paddingBottom")!)
         }
@@ -288,7 +432,18 @@ 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")
+        self.gridMode = call.getString("gridMode") ?? "none"
+        let initialZoomLevel = call.getFloat("initialZoomLevel") ?? 1.0
+        if self.aspectRatio != nil && (call.getInt("width") != nil || call.getInt("height") != nil) {
+            call.reject("Cannot set both aspectRatio and size (width/height). Use setPreviewSize after start.")
+            return
+        }
+
+        print("[CameraPreview] Camera start parameters - aspectRatio: \(String(describing: self.aspectRatio)), gridMode: \(self.gridMode)")
+        print("[CameraPreview] Screen dimensions: \(UIScreen.main.bounds.size)")
+        print("[CameraPreview] Final frame dimensions - width: \(String(describing: self.width)), height: \(String(describing: self.height)), x: \(String(describing: self.posX)), y: \(String(describing: self.posY))")
 
         AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
             guard granted else {
@@ -296,48 +451,80 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 return
             }
 
-            DispatchQueue.main.async {
-                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
-                        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))
-                        
-                        // Make webview transparent - comprehensive approach
-                        self.makeWebViewTransparent()
-                        
-                        self.webView?.superview?.addSubview(self.previewView)
-                        if self.toBack! {
-                            self.webView?.superview?.bringSubviewToFront(self.webView!)
-                        }
-                        try? self.cameraController.displayPreview(on: self.previewView)
-
-                        let frontView = self.toBack! ? self.webView : self.previewView
-                        self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom!)
-
-                        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()
-
+            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, aspectRatio: self.aspectRatio, initialZoomLevel: Float(initialZoomLevel)) {error in
+                    if let error = error {
+                        print(error)
+                        call.reject(error.localizedDescription)
+                        return
+                    }
+                    DispatchQueue.main.async {
+                        self.completeStartCamera(call: call)
                     }
                 }
             }
         })
+    }
 
+    private func completeStartCamera(call: CAPPluginCall) {
+        // Create and configure the preview view first
+        self.updateCameraFrame()
+
+        // Make webview transparent - comprehensive approach
+        self.makeWebViewTransparent()
+
+        // Add the preview view to the webview itself to use same coordinate system
+        self.webView?.addSubview(self.previewView)
+        if self.toBack! {
+            self.webView?.sendSubviewToBack(self.previewView)
+        }
+
+        // Display the camera preview on the configured view
+        try? self.cameraController.displayPreview(on: self.previewView)
+
+        self.cameraController.setupGestures(target: self.previewView, enableZoom: self.enableZoom!)
+
+        // Add grid overlay if enabled
+        if self.gridMode != "none" {
+            self.cameraController.addGridOverlay(to: self.previewView, gridMode: self.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
+
+        // Set up callback to wait for first frame before resolving
+        self.cameraController.firstFrameReadyCallback = { [weak self] in
+            guard let self = self else { return }
+            
+            DispatchQueue.main.async {
+                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)
+            }
+        }
+        
+        // If already received first frame (unlikely but possible), resolve immediately
+        if self.cameraController.hasReceivedFirstFrame {
+            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)
+        }
     }
 
     @objc func flip(_ call: CAPPluginCall) {
@@ -346,68 +533,46 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else {
-                call.reject("Camera controller deallocated")
-                return
-            }
+        // Disable user interaction during flip
+        self.previewView.isUserInteractionEnabled = false
 
-            // Disable user interaction during flip
-            self.previewView.isUserInteractionEnabled = false
+        do {
+            try self.cameraController.switchCameras()
 
-            // Perform camera switch on background thread
-            DispatchQueue.global(qos: .userInitiated).async {
-                var retryCount = 0
-                let maxRetries = 3
+            // Update preview layer frame without animation
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            self.cameraController.previewLayer?.frame = self.previewView.bounds
+            self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
+            CATransaction.commit()
 
-                func attemptFlip() {
-                    do {
-                        try self.cameraController.switchCameras()
+            self.previewView.isUserInteractionEnabled = true
 
-                        DispatchQueue.main.async {
-                            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 {
-                        retryCount += 1
-
-                        if retryCount < maxRetries {
-                            DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 0.5) {
-                                attemptFlip()
-                            }
-                        } else {
-                            DispatchQueue.main.async {
-                                self.previewView.isUserInteractionEnabled = true
-                                print("Failed to flip camera after \(maxRetries) attempts: \(error.localizedDescription)")
-                                call.reject("Failed to flip camera: \(error.localizedDescription)")
-                            }
-                        }
-                    }
-                }
+            // Ensure webview remains transparent after flip
+            self.makeWebViewTransparent()
 
-                attemptFlip()
-            }
+            call.resolve()
+        } catch {
+            self.previewView.isUserInteractionEnabled = true
+            print("Failed to flip camera: \(error.localizedDescription)")
+            call.reject("Failed to flip camera: \(error.localizedDescription)")
         }
     }
 
     @objc func stop(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            if self.isInitializing {
-                call.reject("cannot stop camera while initialization is in progress")
-                return
-            }
-            if !self.isInitialized {
-                call.reject("camera not initialized")
-                return
-            }
+        if self.isInitializing {
+            call.reject("cannot stop camera while initialization is in progress")
+            return
+        }
+        if !self.isInitialized {
+            call.reject("camera not initialized")
+            return
+        }
 
+        // UI operations must be on main thread
+        DispatchQueue.main.async {
             // 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 +582,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             self.isInitialized = false
             self.isInitializing = false
             self.cameraController.cleanup()
-            
+
             // Remove notification observers
             NotificationCenter.default.removeObserver(self)
 
@@ -436,39 +601,159 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func capture(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
+        let withExifLocation = call.getBool("withExifLocation", false)
+        print("[CameraPreview] capture called, withExifLocation: \(withExifLocation)")
+
+        if withExifLocation {
+            print("[CameraPreview] Location required for capture")
+
+            // Check location services before main thread dispatch
+            guard CLLocationManager.locationServicesEnabled() else {
+                print("[CameraPreview] Location services are disabled")
+                call.reject("Location services are disabled")
+                return
+            }
+
+            // Check if Info.plist has the required key
+            guard Bundle.main.object(forInfoDictionaryKey: "NSLocationWhenInUseUsageDescription") != nil else {
+                print("[CameraPreview] ERROR: NSLocationWhenInUseUsageDescription key missing from Info.plist")
+                call.reject("NSLocationWhenInUseUsageDescription key missing from Info.plist. Add this key with a description of how your app uses location.")
+                return
+            }
+
+            // Ensure location manager setup happens on main thread
+            DispatchQueue.main.async {
+                if self.locationManager == nil {
+                    print("[CameraPreview] Creating location manager on main thread")
+                    self.locationManager = CLLocationManager()
+                    self.locationManager?.delegate = self
+                    self.locationManager?.desiredAccuracy = kCLLocationAccuracyBest
+                    print("[CameraPreview] Location manager created, delegate set to: \(self)")
+                }
+
+                // Check current authorization status
+                let currentStatus = self.locationManager?.authorizationStatus ?? .notDetermined
+                print("[CameraPreview] Current authorization status: \(currentStatus.rawValue)")
+
+                switch currentStatus {
+                case .authorizedWhenInUse, .authorizedAlways:
+                    // Already authorized, get location and capture
+                    print("[CameraPreview] Already authorized, getting location immediately")
+                    self.getCurrentLocation { _ in
+                        self.performCapture(call: call)
+                    }
+
+                case .denied, .restricted:
+                    // Permission denied
+                    print("[CameraPreview] Location permission denied")
+                    call.reject("Location permission denied")
+
+                case .notDetermined:
+                    // Need to request permission
+                    print("[CameraPreview] Location permission not determined, requesting...")
+                    // Save the call for the delegate callback
+                    print("[CameraPreview] Saving call for location authorization flow")
+                    self.bridge?.saveCall(call)
+                    self.permissionCallID = call.callbackId
+                    self.waitingForLocation = true
+
+                    // Request authorization - this will trigger locationManagerDidChangeAuthorization
+                    print("[CameraPreview] Requesting location authorization...")
+                    self.locationManager?.requestWhenInUseAuthorization()
+                // The delegate will handle the rest
+
+                @unknown default:
+                    print("[CameraPreview] Unknown authorization status")
+                    call.reject("Unknown location permission status")
+                }
+            }
+        } else {
+            print("[CameraPreview] No location required, performing capture directly")
+            self.performCapture(call: call)
+        }
+    }
+
+    private func performCapture(call: CAPPluginCall) {
+        print("[CameraPreview] performCapture called")
+        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")
+        let aspectRatio = call.getString("aspectRatio")
+
+        // Check for conflicting parameters
+        if aspectRatio != nil && (width != nil || height != nil) {
+            print("[CameraPreview] Error: Cannot set both aspectRatio and size (width/height)")
+            call.reject("Cannot set both aspectRatio and size (width/height). Use setPreviewSize after start.")
+            return
+        }
 
-            let quality = call.getFloat("quality", 85)
-            let saveToGallery = call.getBool("saveToGallery", false)
+        // Use the stored aspectRatio if none is provided and no width/height is specified
+        // If no aspectRatio was set at all, use "4:3" as default (matching getAspectRatio behavior)
+        let captureAspectRatio: String? = if width == nil && height == nil && aspectRatio == nil {
+            self.aspectRatio ?? "4:3"
+        } else {
+            aspectRatio
+        }
+        
+        print("[CameraPreview] Capture params - quality: \(quality), saveToGallery: \(saveToGallery), withExifLocation: \(withExifLocation), width: \(width ?? -1), height: \(height ?? -1), aspectRatio: \(aspectRatio ?? "nil"), using aspectRatio: \(captureAspectRatio ?? "nil")")
+        print("[CameraPreview] Current location: \(self.currentLocation?.description ?? "nil")")
 
-            self.cameraController.captureImage(quality: quality) { (image, error) in
+        self.cameraController.captureImage(width: width, height: height, aspectRatio: captureAspectRatio, quality: quality, gpsLocation: self.currentLocation) { (image, error) in
+            print("[CameraPreview] captureImage callback received")
+            DispatchQueue.main.async {
+                print("[CameraPreview] Processing capture on main thread")
                 if let error = error {
+                    print("[CameraPreview] Capture error: \(error.localizedDescription)")
                     call.reject(error.localizedDescription)
                     return
                 }
 
+                guard let image = image,
+                      let imageDataWithExif = self.createImageDataWithExif(
+                        from: image,
+                        quality: Int(quality),
+                        location: withExifLocation ? self.currentLocation : nil
+                      )
+                else {
+                    print("[CameraPreview] Failed to create image data with EXIF")
+                    call.reject("Failed to create image data with EXIF")
+                    return
+                }
+
+                print("[CameraPreview] Image data created, size: \(imageDataWithExif.count) bytes")
+
                 if saveToGallery {
-                    PHPhotoLibrary.shared().performChanges({
-                        PHAssetChangeRequest.creationRequestForAsset(from: image!)
-                    }, completionHandler: { (success, error) in
-                        if !success {
-                            Logger.error("CameraPreview", "Error saving image to gallery", error)
+                    print("[CameraPreview] Saving to gallery...")
+                    self.saveImageDataToGallery(imageData: imageDataWithExif) { success, error in
+                        print("[CameraPreview] Save to gallery completed, success: \(success), error: \(error?.localizedDescription ?? "none")")
+                        let exifData = self.getExifData(from: imageDataWithExif)
+                        let base64Image = imageDataWithExif.base64EncodedString()
+
+                        var result = JSObject()
+                        result["value"] = base64Image
+                        result["exif"] = exifData
+                        result["gallerySaved"] = success
+                        if !success, let error = error {
+                            result["galleryError"] = error.localizedDescription
                         }
-                    })
-                }
 
-                guard let imageData = image?.jpegData(compressionQuality: CGFloat(quality / 100.0)) else {
-                    call.reject("Failed to get JPEG data from image")
-                    return
+                        print("[CameraPreview] Resolving capture call with gallery save")
+                        call.resolve(result)
+                    }
+                } else {
+                    print("[CameraPreview] Not saving to gallery, returning image data")
+                    let exifData = self.getExifData(from: imageDataWithExif)
+                    let base64Image = imageDataWithExif.base64EncodedString()
+
+                    var result = JSObject()
+                    result["value"] = base64Image
+                    result["exif"] = exifData
+
+                    print("[CameraPreview] Resolving capture call")
+                    call.resolve(result)
                 }
-                
-                let exifData = self.getExifData(from: imageData)
-                let base64Image = imageData.base64EncodedString()
-                
-                var result = JSObject()
-                result["value"] = base64Image
-                result["exif"] = exifData
-                call.resolve(result)
             }
         }
     }
@@ -479,45 +764,109 @@ 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
     }
 
+    private func createImageDataWithExif(from image: UIImage, quality: Int, location: CLLocation?) -> Data? {
+        guard let originalImageData = image.jpegData(compressionQuality: CGFloat(Double(quality) / 100.0)) else {
+            return nil
+        }
+
+        guard let imageSource = CGImageSourceCreateWithData(originalImageData as CFData, nil),
+              let imageProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, 0, nil) as? [String: Any],
+              let cgImage = image.cgImage else {
+            return originalImageData
+        }
+
+        let mutableData = NSMutableData()
+        guard let destination = CGImageDestinationCreateWithData(mutableData, kUTTypeJPEG, 1, nil) else {
+            return originalImageData
+        }
+
+        var finalProperties = imageProperties
+
+        // Add GPS location if available
+        if let location = location {
+            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
+            ]
+
+            finalProperties[kCGImagePropertyGPSDictionary as String] = gpsDict
+        }
+
+        // Create or update TIFF dictionary for device info
+        var tiffDict = finalProperties[kCGImagePropertyTIFFDictionary as String] as? [String: Any] ?? [:]
+        tiffDict[kCGImagePropertyTIFFMake as String] = "Apple"
+        tiffDict[kCGImagePropertyTIFFModel as String] = UIDevice.current.model
+        finalProperties[kCGImagePropertyTIFFDictionary as String] = tiffDict
+
+        CGImageDestinationAddImage(destination, cgImage, finalProperties as CFDictionary)
+
+        if CGImageDestinationFinalize(destination) {
+            return mutableData as Data
+        }
+
+        return originalImageData
+    }
+
     @objc func captureSample(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            let quality: Int? = call.getInt("quality", 85)
+        let quality: Int? = call.getInt("quality", 85)
 
-            self.cameraController.captureSample { image, error in
-                guard let image = image else {
-                    print("Image capture error: \(String(describing: error))")
-                    call.reject("Image capture error: \(String(describing: error))")
-                    return
-                }
+        self.cameraController.captureSample { image, error in
+            guard let image = image else {
+                print("Image capture error: \(String(describing: error))")
+                call.reject("Image capture error: \(String(describing: error))")
+                return
+            }
 
-                let imageData: Data?
-                if self.cameraPosition == "front" {
-                    let flippedImage = image.withHorizontallyFlippedOrientation()
-                    imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
-                } else {
-                    imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
-                }
+            let imageData: Data?
+            if self.cameraPosition == "front" {
+                let flippedImage = image.withHorizontallyFlippedOrientation()
+                imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
+            } else {
+                imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
+            }
 
-                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")
-                    }
+            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")
                 }
             }
         }
@@ -572,31 +921,27 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc func startRecordVideo(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            do {
-                try self.cameraController.captureVideo()
-                call.resolve()
-            } catch {
-                call.reject(error.localizedDescription)
-            }
+        do {
+            try self.cameraController.captureVideo()
+            call.resolve()
+        } catch {
+            call.reject(error.localizedDescription)
         }
     }
 
     @objc func stopRecordVideo(_ call: CAPPluginCall) {
-        DispatchQueue.main.async {
-            self.cameraController.stopRecording { (fileURL, error) in
-                guard let fileURL = fileURL else {
-                    print(error ?? "Video capture error")
-                    guard let error = error else {
-                        call.reject("Video capture error")
-                        return
-                    }
-                    call.reject(error.localizedDescription)
+        self.cameraController.stopRecording { (fileURL, error) in
+            guard let fileURL = fileURL else {
+                print(error ?? "Video capture error")
+                guard let error = error else {
+                    call.reject("Video capture error")
                     return
                 }
-
-                call.resolve(["videoFilePath": fileURL.absoluteString])
+                call.reject(error.localizedDescription)
+                return
             }
+
+            call.resolve(["videoFilePath": fileURL.absoluteString])
         }
     }
 
@@ -627,20 +972,20 @@ 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 {
-                    case .builtInWideAngleCamera: deviceType = "wideAngle"
-                    case .builtInUltraWideCamera: deviceType = "ultraWide"
-                    case .builtInTelephotoCamera: deviceType = "telephoto"
-                    case .builtInDualCamera: deviceType = "dual"
-                    case .builtInDualWideCamera: deviceType = "dualWide"
-                    case .builtInTripleCamera: deviceType = "triple"
-                    case .builtInTrueDepthCamera: deviceType = "trueDepth"
-                    default: deviceType = "unknown"
+                case .builtInWideAngleCamera: deviceType = "wideAngle"
+                case .builtInUltraWideCamera: deviceType = "ultraWide"
+                case .builtInTelephotoCamera: deviceType = "telephoto"
+                case .builtInDualCamera: deviceType = "dual"
+                case .builtInDualWideCamera: deviceType = "dualWide"
+                case .builtInTripleCamera: deviceType = "triple"
+                case .builtInTrueDepthCamera: deviceType = "trueDepth"
+                default: deviceType = "unknown"
                 }
 
                 var baseZoomRatio: Float = 1.0
@@ -649,7 +994,7 @@ 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 +1005,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 ]
                 lenses.append(lensInfo)
             }
-            
+
             let deviceData: [String: Any] = [
                 "deviceId": device.uniqueID,
                 "label": device.localizedName,
@@ -670,7 +1015,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 "maxZoom": Float(device.maxAvailableVideoZoomFactor),
                 "isLogical": device.isVirtualDevice
             ]
-            
+
             devices.append(deviceData)
         }
 
@@ -686,7 +1031,7 @@ 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
@@ -731,9 +1076,10 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
 
         let ramp = call.getBool("ramp") ?? true
+        let autoFocus = call.getBool("autoFocus") ?? true
 
         do {
-            try self.cameraController.setZoom(level: CGFloat(level), ramp: ramp)
+            try self.cameraController.setZoom(level: CGFloat(level), ramp: ramp, autoFocus: autoFocus)
             call.resolve()
         } catch {
             call.reject("Failed to set zoom: \(error.localizedDescription)")
@@ -765,40 +1111,32 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else {
-                call.reject("Camera controller deallocated")
-                return
-            }
+        // Disable user interaction during device swap
+        self.previewView.isUserInteractionEnabled = false
 
-            // Disable user interaction during device swap
-            self.previewView.isUserInteractionEnabled = false
+        do {
+            try self.cameraController.swapToDevice(deviceId: deviceId)
 
-            DispatchQueue.global(qos: .userInitiated).async {
-                do {
-                    try self.cameraController.swapToDevice(deviceId: deviceId)
+            // Update preview layer frame without animation
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            self.cameraController.previewLayer?.frame = self.previewView.bounds
+            self.cameraController.previewLayer?.videoGravity = .resizeAspectFill
+            CATransaction.commit()
 
-                    DispatchQueue.main.async {
-                        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 {
-                    DispatchQueue.main.async {
-                        self.previewView.isUserInteractionEnabled = true
-                        call.reject("Failed to swap to device \(deviceId): \(error.localizedDescription)")
-                    }
-                }
-            }
+            self.previewView.isUserInteractionEnabled = true
+
+            // Ensure webview remains transparent after device switch
+            self.makeWebViewTransparent()
+
+            call.resolve()
+        } catch {
+            self.previewView.isUserInteractionEnabled = true
+            call.reject("Failed to swap to device \(deviceId): \(error.localizedDescription)")
         }
     }
 
-        @objc func getDeviceId(_ call: CAPPluginCall) {
+    @objc func getDeviceId(_ call: CAPPluginCall) {
         guard isInitialized else {
             call.reject("Camera not initialized")
             return
@@ -812,6 +1150,385 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    // MARK: - Capacitor Permissions
+
+    private func requestLocationPermission(completion: @escaping (Bool) -> Void) {
+        print("[CameraPreview] requestLocationPermission called")
+        if self.locationManager == nil {
+            print("[CameraPreview] Creating location manager")
+            self.locationManager = CLLocationManager()
+            self.locationManager?.delegate = self
+        }
+
+        let authStatus = self.locationManager?.authorizationStatus
+        print("[CameraPreview] Current authorization status: \(String(describing: authStatus))")
+
+        switch authStatus {
+        case .authorizedWhenInUse, .authorizedAlways:
+            print("[CameraPreview] Location already authorized")
+            completion(true)
+        case .notDetermined:
+            print("[CameraPreview] Location not determined, requesting authorization...")
+            self.permissionCompletion = completion
+            self.locationManager?.requestWhenInUseAuthorization()
+        case .denied, .restricted:
+            print("[CameraPreview] Location denied or restricted")
+            completion(false)
+        case .none:
+            print("[CameraPreview] Location manager authorization status is nil")
+            completion(false)
+        @unknown default:
+            print("[CameraPreview] Unknown authorization status")
+            completion(false)
+        }
+    }
+
+    private var permissionCompletion: ((Bool) -> Void)?
+
+    public func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        let status = manager.authorizationStatus
+        print("[CameraPreview] locationManagerDidChangeAuthorization called, status: \(status.rawValue), thread: \(Thread.current)")
+
+        // Handle pending capture call if we have one
+        if let callID = self.permissionCallID, self.waitingForLocation {
+            print("[CameraPreview] Found pending capture call ID: \(callID)")
+
+            let handleAuthorization = {
+                print("[CameraPreview] Getting saved call on thread: \(Thread.current)")
+                guard let call = self.bridge?.savedCall(withID: callID) else {
+                    print("[CameraPreview] ERROR: Could not retrieve saved call")
+                    self.permissionCallID = nil
+                    self.waitingForLocation = false
+                    return
+                }
+                print("[CameraPreview] Successfully retrieved saved call")
+
+                switch status {
+                case .authorizedWhenInUse, .authorizedAlways:
+                    print("[CameraPreview] Location authorized, getting location for capture")
+                    self.getCurrentLocation { _ in
+                        self.performCapture(call: call)
+                        self.bridge?.releaseCall(call)
+                        self.permissionCallID = nil
+                        self.waitingForLocation = false
+                    }
+                case .denied, .restricted:
+                    print("[CameraPreview] Location denied, rejecting capture")
+                    call.reject("Location permission denied")
+                    self.bridge?.releaseCall(call)
+                    self.permissionCallID = nil
+                    self.waitingForLocation = false
+                case .notDetermined:
+                    print("[CameraPreview] Authorization not determined yet")
+                // Don't do anything, wait for user response
+                @unknown default:
+                    print("[CameraPreview] Unknown status, rejecting capture")
+                    call.reject("Unknown location permission status")
+                    self.bridge?.releaseCall(call)
+                    self.permissionCallID = nil
+                    self.waitingForLocation = false
+                }
+            }
+
+            // Check if we're already on main thread
+            if Thread.isMainThread {
+                print("[CameraPreview] Already on main thread")
+                handleAuthorization()
+            } else {
+                print("[CameraPreview] Not on main thread, dispatching")
+                DispatchQueue.main.async(execute: handleAuthorization)
+            }
+        } else {
+            print("[CameraPreview] No pending capture call")
+        }
+    }
+
+    public func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        print("[CameraPreview] locationManager didFailWithError: \(error.localizedDescription)")
+    }
+
+    private func getCurrentLocation(completion: @escaping (CLLocation?) -> Void) {
+        print("[CameraPreview] getCurrentLocation called")
+        self.locationCompletion = completion
+        self.locationManager?.startUpdatingLocation()
+        print("[CameraPreview] Started updating location")
+    }
+
+    private var locationCompletion: ((CLLocation?) -> Void)?
+
+    public func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        print("[CameraPreview] locationManager didUpdateLocations called, locations count: \(locations.count)")
+        self.currentLocation = locations.last
+        if let completion = locationCompletion {
+            print("[CameraPreview] Calling location completion with location: \(self.currentLocation?.description ?? "nil")")
+            self.locationManager?.stopUpdatingLocation()
+            completion(self.currentLocation)
+            locationCompletion = nil
+        } else {
+            print("[CameraPreview] No location completion handler found")
+        }
+    }
+
+    private func saveImageDataToGallery(imageData: Data, completion: @escaping (Bool, Error?) -> Void) {
+        // Check if NSPhotoLibraryUsageDescription is present in Info.plist
+        guard Bundle.main.object(forInfoDictionaryKey: "NSPhotoLibraryUsageDescription") != nil else {
+            let error = NSError(domain: "CameraPreview", code: 2, userInfo: [
+                NSLocalizedDescriptionKey: "NSPhotoLibraryUsageDescription key missing from Info.plist. Add this key with a description of how your app uses photo library access."
+            ])
+            completion(false, error)
+            return
+        }
+
+        let status = PHPhotoLibrary.authorizationStatus()
+
+        switch status {
+        case .authorized:
+            performSaveDataToGallery(imageData: imageData, completion: completion)
+        case .notDetermined:
+            PHPhotoLibrary.requestAuthorization { newStatus in
+                if newStatus == .authorized {
+                    self.performSaveDataToGallery(imageData: imageData, completion: completion)
+                } else {
+                    completion(false, NSError(domain: "CameraPreview", code: 1, userInfo: [NSLocalizedDescriptionKey: "Photo library access denied"]))
+                }
+            }
+        case .denied, .restricted:
+            completion(false, NSError(domain: "CameraPreview", code: 1, userInfo: [NSLocalizedDescriptionKey: "Photo library access denied"]))
+        case .limited:
+            performSaveDataToGallery(imageData: imageData, completion: completion)
+        @unknown default:
+            completion(false, NSError(domain: "CameraPreview", code: 1, userInfo: [NSLocalizedDescriptionKey: "Unknown photo library authorization status"]))
+        }
+    }
+
+    private func performSaveDataToGallery(imageData: Data, completion: @escaping (Bool, Error?) -> Void) {
+        // Create a temporary file to write the JPEG data with EXIF
+        let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString + ".jpg")
+
+        do {
+            try imageData.write(to: tempURL)
+
+            PHPhotoLibrary.shared().performChanges({
+                PHAssetChangeRequest.creationRequestForAssetFromImage(atFileURL: tempURL)
+            }, completionHandler: { success, error in
+                // Clean up temporary file
+                try? FileManager.default.removeItem(at: tempURL)
+
+                completion(success, error)
+            })
+        } catch {
+            completion(false, error)
+        }
+    }
+
+    private func calculateCameraFrame(x: CGFloat? = nil, y: CGFloat? = nil, width: CGFloat? = nil, height: CGFloat? = nil, aspectRatio: String? = nil) -> CGRect {
+        // Use provided values or existing ones
+        let currentWidth = width ?? self.width ?? UIScreen.main.bounds.size.width
+        let currentHeight = height ?? self.height ?? UIScreen.main.bounds.size.height
+        let currentX = x ?? self.posX ?? -1
+        let currentY = y ?? self.posY ?? -1
+        let currentAspectRatio = aspectRatio ?? self.aspectRatio
+
+        let paddingBottom = self.paddingBottom ?? 0
+        let adjustedHeight = currentHeight - CGFloat(paddingBottom)
+
+        // Cache webView dimensions for performance
+        let webViewWidth = self.webView?.frame.width ?? UIScreen.main.bounds.width
+        let webViewHeight = self.webView?.frame.height ?? UIScreen.main.bounds.height
+
+        var finalX = currentX
+        var finalY = currentY
+        var finalWidth = currentWidth
+        var finalHeight = adjustedHeight
+
+        // Handle auto-centering when position is -1
+        if currentX == -1 || currentY == -1 {
+            // Only override dimensions if aspect ratio is provided and no explicit dimensions given
+            if let ratio = currentAspectRatio, 
+               currentWidth == UIScreen.main.bounds.size.width && 
+               currentHeight == UIScreen.main.bounds.size.height {
+                finalWidth = webViewWidth
+
+                // Calculate height based on aspect ratio
+                let ratioParts = ratio.split(separator: ":").compactMap { Double($0) }
+                if ratioParts.count == 2 {
+                    // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+                    let ratioValue = ratioParts[1] / ratioParts[0]
+                    finalHeight = finalWidth / CGFloat(ratioValue)
+                }
+            }
+
+            // Center horizontally if x is -1
+            if currentX == -1 {
+                finalX = (webViewWidth - finalWidth) / 2
+            } else {
+                finalX = currentX
+            }
+
+            // Center vertically if y is -1
+            if currentY == -1 {
+                // Use full screen height for centering
+                let screenHeight = UIScreen.main.bounds.size.height
+                finalY = (screenHeight - finalHeight) / 2
+                print("[CameraPreview] Centering vertically: screenHeight=\(screenHeight), finalHeight=\(finalHeight), finalY=\(finalY)")
+            } else {
+                finalY = currentY
+            }
+        }
+
+        return CGRect(x: finalX, y: finalY, width: finalWidth, height: finalHeight)
+    }
+
+    private func updateCameraFrame() {
+        guard let width = self.width, let height = self.height, let posX = self.posX, let posY = self.posY else {
+            return
+        }
+
+        // Ensure UI operations happen on main thread
+        guard Thread.isMainThread else {
+            DispatchQueue.main.async {
+                self.updateCameraFrame()
+            }
+            return
+        }
+
+        // Calculate the base frame using the factorized method
+        var frame = calculateCameraFrame()
+
+        // Apply aspect ratio adjustments only if not auto-centering
+        if posX != -1 && posY != -1, let aspectRatio = self.aspectRatio {
+            let ratioParts = aspectRatio.split(separator: ":").compactMap { Double($0) }
+            if ratioParts.count == 2 {
+                // For camera, use portrait orientation: 4:3 becomes 3:4, 16:9 becomes 9:16
+                let ratio = ratioParts[1] / ratioParts[0]
+                let currentRatio = Double(frame.width) / Double(frame.height)
+
+                if currentRatio > ratio {
+                    let newWidth = Double(frame.height) * ratio
+                    frame.origin.x = frame.origin.x + (frame.width - CGFloat(newWidth)) / 2
+                    frame.size.width = CGFloat(newWidth)
+                } else {
+                    let newHeight = Double(frame.width) / ratio
+                    frame.origin.y = frame.origin.y + (frame.height - CGFloat(newHeight)) / 2
+                    frame.size.height = CGFloat(newHeight)
+                }
+            }
+        }
+
+        // Disable ALL animations for frame updates - we want instant positioning
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+
+        // Batch UI updates for better performance
+        if self.previewView == nil {
+            self.previewView = UIView(frame: frame)
+            self.previewView.backgroundColor = UIColor.clear
+        } else {
+            self.previewView.frame = frame
+        }
+
+        // Update preview layer frame efficiently
+        if let previewLayer = self.cameraController.previewLayer {
+            previewLayer.frame = self.previewView.bounds
+        }
+
+        // Update grid overlay frame if it exists
+        if let gridOverlay = self.cameraController.gridOverlayView {
+            gridOverlay.frame = self.previewView.bounds
+        }
+
+        CATransaction.commit()
+    }
+
+    @objc func getPreviewSize(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+
+        DispatchQueue.main.async {
+            var result = JSObject()
+            result["x"] = Double(self.previewView.frame.origin.x)
+            result["y"] = Double(self.previewView.frame.origin.y)
+            result["width"] = Double(self.previewView.frame.width)
+            result["height"] = Double(self.previewView.frame.height)
+            call.resolve(result)
+        }
+    }
+
+    @objc func setPreviewSize(_ call: CAPPluginCall) {
+        guard self.isInitialized else {
+            call.reject("camera not started")
+            return
+        }
+
+        // Always set to -1 for auto-centering if not explicitly provided
+        if let x = call.getInt("x") {
+            self.posX = CGFloat(x)
+        } else {
+            self.posX = -1 // Auto-center if X not provided
+        }
+
+        if let y = call.getInt("y") {
+            self.posY = CGFloat(y)
+        } else {
+            self.posY = -1 // Auto-center if Y not provided
+        }
+
+        if let width = call.getInt("width") { self.width = CGFloat(width) }
+        if let height = call.getInt("height") { self.height = CGFloat(height) }
+
+        DispatchQueue.main.async {
+            // Direct update without animation for better performance
+            self.updateCameraFrame()
+            self.makeWebViewTransparent()
+
+            // Return the actual preview bounds
+            var result = JSObject()
+            result["x"] = Double(self.previewView.frame.origin.x)
+            result["y"] = Double(self.previewView.frame.origin.y)
+            result["width"] = Double(self.previewView.frame.width)
+            result["height"] = Double(self.previewView.frame.height)
+            call.resolve(result)
+        }
+    }
+
+    @objc func setFocus(_ call: CAPPluginCall) {
+        guard isInitialized else {
+            call.reject("Camera not initialized")
+            return
+        }
+
+        guard let x = call.getFloat("x"), let y = call.getFloat("y") else {
+            call.reject("x and y parameters are required")
+            return
+        }
+
+        // Reject if values are outside 0-1 range
+        if x < 0 || x > 1 || y < 0 || y > 1 {
+            call.reject("Focus coordinates must be between 0 and 1")
+            return
+        }
 
+        DispatchQueue.main.async {
+            do {
+                // Convert normalized coordinates to view coordinates
+                let viewX = CGFloat(x) * self.previewView.bounds.width
+                let viewY = CGFloat(y) * self.previewView.bounds.height
+                let focusPoint = CGPoint(x: viewX, y: viewY)
+
+                // Convert view coordinates to device coordinates
+                guard let previewLayer = self.cameraController.previewLayer else {
+                    call.reject("Preview layer not available")
+                    return
+                }
+                let devicePoint = previewLayer.captureDevicePointConverted(fromLayerPoint: focusPoint)
 
+                try self.cameraController.setFocus(at: devicePoint, showIndicator: true, in: self.previewView)
+                call.resolve()
+            } catch {
+                call.reject("Failed to set focus: \(error.localizedDescription)")
+            }
+        }
+    }
 }