@capgo/camera-preview 7.4.0-alpha.3 → 7.4.0-alpha.32

package/ios/Sources/CapgoCameraPreviewPlugin/CameraController.swift

@@ -25,7 +25,7 @@ class CameraController: NSObject {
     var focusIndicatorView: UIView?
 
     var flashMode = AVCaptureDevice.FlashMode.off
-    var photoCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
+    var photoCaptureCompletionBlock: ((UIImage?, Data?, [AnyHashable: Any]?, Error?) -> Void)?
 
     var sampleBufferCaptureCompletionBlock: ((UIImage?, Error?) -> Void)?
 
@@ -51,6 +51,25 @@ class CameraController: NSObject {
         // A rear multi-lens virtual camera will have a min zoom of 1.0 but support wider angles
         return device.position == .back && device.isVirtualDevice && device.constituentDevices.count > 1
     }
+
+    // Returns the display zoom multiplier introduced in iOS 18 to map between
+    // native zoom factor and the UI-displayed zoom factor. Falls back to 1.0 on
+    // older systems or if the property is unavailable.
+    func getDisplayZoomMultiplier() -> Float {
+        var multiplier: Float = 1.0
+        // Use KVC to avoid compile-time dependency on the iOS 18 SDK symbol
+        let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera
+        if #available(iOS 18.0, *), let device = device {
+            if let value = device.value(forKey: "displayVideoZoomFactorMultiplier") as? NSNumber {
+                let m = value.floatValue
+                if m > 0 { multiplier = m }
+            }
+        }
+        return multiplier
+    }
+
+    // Track whether an aspect ratio was explicitly requested
+    var requestedAspectRatio: String?
 }
 
 extension CameraController {
@@ -169,7 +188,7 @@ extension CameraController {
         self.outputsPrepared = true
     }
 
-    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, aspectRatio: String? = nil, initialZoomLevel: Float = 1.0, completionHandler: @escaping (Error?) -> Void) {
+    func prepare(cameraPosition: String, deviceId: String? = nil, disableAudio: Bool, cameraMode: Bool, aspectRatio: String? = nil, initialZoomLevel: Float?, completionHandler: @escaping (Error?) -> Void) {
         print("[CameraPreview] 🎬 Starting prepare - position: \(cameraPosition), deviceId: \(deviceId ?? "nil"), disableAudio: \(disableAudio), cameraMode: \(cameraMode), aspectRatio: \(aspectRatio ?? "nil"), zoom: \(initialZoomLevel)")
 
         DispatchQueue.global(qos: .userInitiated).async { [weak self] in
@@ -196,7 +215,8 @@ extension CameraController {
                 // Configure the session
                 captureSession.beginConfiguration()
 
-                // Set aspect ratio preset
+                // Set aspect ratio preset and remember requested ratio
+                self.requestedAspectRatio = aspectRatio
                 self.configureSessionPreset(for: aspectRatio)
 
                 // Configure device inputs
@@ -252,16 +272,31 @@ extension CameraController {
     private func configureSessionPreset(for aspectRatio: String?) {
         guard let captureSession = self.captureSession else { return }
 
-        var targetPreset: AVCaptureSession.Preset = .high
-
+        var targetPreset: AVCaptureSession.Preset = .photo
         if let aspectRatio = aspectRatio {
             switch aspectRatio {
             case "16:9":
-                targetPreset = captureSession.canSetSessionPreset(.hd1920x1080) ? .hd1920x1080 : .high
+                if captureSession.canSetSessionPreset(.hd4K3840x2160) {
+                    targetPreset = .hd4K3840x2160
+                } else if captureSession.canSetSessionPreset(.hd1920x1080) {
+                    targetPreset = .hd1920x1080
+                }
             case "4:3":
-                targetPreset = captureSession.canSetSessionPreset(.photo) ? .photo : .high
+                if captureSession.canSetSessionPreset(.photo) {
+                    targetPreset = .photo
+                } else if captureSession.canSetSessionPreset(.high) {
+                    targetPreset = .high
+                } else {
+                    targetPreset = captureSession.sessionPreset
+                }
             default:
-                targetPreset = .high
+                if captureSession.canSetSessionPreset(.photo) {
+                    targetPreset = .photo
+                } else if captureSession.canSetSessionPreset(.high) {
+                    targetPreset = .high
+                } else {
+                    targetPreset = captureSession.sessionPreset
+                }
             }
         }
 
@@ -270,7 +305,7 @@ extension CameraController {
         }
     }
 
-    private func setInitialZoom(level: Float) {
+    private func setInitialZoom(level: Float?) {
         let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera
         guard let device = device else {
             print("[CameraPreview] No device available for initial zoom")
@@ -280,7 +315,12 @@ extension CameraController {
         let minZoom = device.minAvailableVideoZoomFactor
         let maxZoom = min(device.maxAvailableVideoZoomFactor, saneMaxZoomFactor)
 
-        let adjustedLevel = level
+        // Compute UI-level default = 1 * multiplier when not provided
+        let multiplier = self.getDisplayZoomMultiplier()
+        // if level is nil, it's the initial zoom
+        let uiLevel: Float = level ?? (2.0 * multiplier)
+        // Map UI/display zoom to native zoom using iOS 18+ multiplier
+        let adjustedLevel = multiplier != 1.0 ? (uiLevel / multiplier) : uiLevel
 
         guard CGFloat(adjustedLevel) >= minZoom && CGFloat(adjustedLevel) <= maxZoom else {
             print("[CameraPreview] Initial zoom level \(adjustedLevel) out of range (\(minZoom)-\(maxZoom))")
@@ -376,7 +416,8 @@ extension CameraController {
         }
 
         // Fast configuration without CATransaction overhead
-        previewLayer.videoGravity = .resizeAspectFill
+        // Use resizeAspect to avoid crop when no aspect ratio is requested; otherwise fill
+        previewLayer.videoGravity = (requestedAspectRatio == nil) ? .resizeAspect : .resizeAspectFill
         previewLayer.frame = view.bounds
 
         // Insert layer immediately (only if new)
@@ -464,6 +505,33 @@ extension CameraController {
         photoOutput?.connections.forEach { $0.videoOrientation = videoOrientation }
     }
 
+    private func setDefaultZoomAfterFlip() {
+        let device = (currentCameraPosition == .rear) ? rearCamera : frontCamera
+        guard let device = device else {
+            print("[CameraPreview] No device available for default zoom after flip")
+            return
+        }
+
+        // Set zoom to 1.0x in UI terms, accounting for display multiplier
+        let multiplier = self.getDisplayZoomMultiplier()
+        let targetUIZoom: Float = 1.0  // We want 1.0x in the UI
+        let nativeZoom = multiplier != 1.0 ? (targetUIZoom / multiplier) : targetUIZoom
+
+        let minZoom = device.minAvailableVideoZoomFactor
+        let maxZoom = min(device.maxAvailableVideoZoomFactor, saneMaxZoomFactor)
+        let clampedZoom = max(minZoom, min(CGFloat(nativeZoom), maxZoom))
+
+        do {
+            try device.lockForConfiguration()
+            device.videoZoomFactor = clampedZoom
+            device.unlockForConfiguration()
+            self.zoomFactor = clampedZoom
+            print("[CameraPreview] Set default zoom after flip: UI=\(targetUIZoom)x, native=\(clampedZoom), multiplier=\(multiplier)")
+        } catch {
+            print("[CameraPreview] Failed to set default zoom after flip: \(error)")
+        }
+    }
+
     func switchCameras() throws {
         guard let currentCameraPosition = currentCameraPosition,
               let captureSession = self.captureSession else {
@@ -553,17 +621,29 @@ extension CameraController {
 
         // Update video orientation
         self.updateVideoOrientation()
+
+        // Set default 1.0 zoom level after camera switch to prevent iOS 18+ zoom jumps
+        DispatchQueue.main.async { [weak self] in
+            self?.setDefaultZoomAfterFlip()
+        }
     }
 
-    func captureImage(width: Int?, height: Int?, aspectRatio: String?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Error?) -> Void) {
+    func captureImage(width: Int?, height: Int?, aspectRatio: String?, quality: Float, gpsLocation: CLLocation?, completion: @escaping (UIImage?, Data?, [AnyHashable: Any]?, Error?) -> Void) {
         print("[CameraPreview] captureImage called - width: \(width ?? -1), height: \(height ?? -1), aspectRatio: \(aspectRatio ?? "nil")")
 
         guard let photoOutput = self.photoOutput else {
-            completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
+            completion(nil, nil, nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Photo output is not available"]))
             return
         }
 
         let settings = AVCapturePhotoSettings()
+        // Request highest quality photo capture
+        if #available(iOS 13.0, *) {
+            settings.isHighResolutionPhotoEnabled = true
+        }
+        if #available(iOS 15.0, *) {
+            settings.photoQualityPrioritization = .balanced
+        }
 
         // Apply the current flash mode to the photo settings
         // Check if the current device supports flash
@@ -585,14 +665,14 @@ extension CameraController {
             }
         }
 
-        self.photoCaptureCompletionBlock = { (image, error) in
+        self.photoCaptureCompletionBlock = { (image, photoData, metadata, error) in
             if let error = error {
-                completion(nil, error)
+                completion(nil, nil, nil, error)
                 return
             }
 
             guard let image = image else {
-                completion(nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
+                completion(nil, nil, nil, NSError(domain: "Camera", code: 0, userInfo: [NSLocalizedDescriptionKey: "Failed to capture image"]))
                 return
             }
 
@@ -646,7 +726,7 @@ extension CameraController {
                 }
             }
 
-            completion(finalImage, nil)
+            completion(finalImage, photoData, metadata, nil)
         }
 
         photoOutput.capturePhoto(with: settings, delegate: self)
@@ -804,6 +884,7 @@ extension CameraController {
         return supportedFlashModesAsStrings
 
     }
+
     func getHorizontalFov() throws -> Float {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {
@@ -830,6 +911,7 @@ extension CameraController {
 
         return adjustedFov
     }
+
     func setFlashMode(flashMode: AVCaptureDevice.FlashMode) throws {
         var currentCamera: AVCaptureDevice?
         switch currentCameraPosition {
@@ -903,6 +985,7 @@ extension CameraController {
 
     func getZoom() throws -> (min: Float, max: Float, current: Float) {
         var currentCamera: AVCaptureDevice?
+
         switch currentCameraPosition {
         case .front:
             currentCamera = self.frontCamera
@@ -957,9 +1040,9 @@ extension CameraController {
             self.zoomFactor = zoomLevel
 
             // Trigger autofocus after zoom if requested
-            // if autoFocus {
-            //     self.triggerAutoFocus()
-            // }
+            if autoFocus {
+                self.triggerAutoFocus()
+            }
         } catch {
             throw CameraControllerError.invalidOperation
         }
@@ -1372,23 +1455,48 @@ extension CameraController: UIGestureRecognizerDelegate {
         // Remove any existing focus indicator
         focusIndicatorView?.removeFromSuperview()
 
-        // Create a new focus indicator
+        // Create a new focus indicator (iOS Camera style): square with mid-edge ticks
         let indicator = UIView(frame: CGRect(x: 0, y: 0, width: 80, height: 80))
         indicator.center = point
         indicator.layer.borderColor = UIColor.yellow.cgColor
         indicator.layer.borderWidth = 2.0
-        indicator.layer.cornerRadius = 40
+        indicator.layer.cornerRadius = 0
         indicator.backgroundColor = UIColor.clear
         indicator.alpha = 0
         indicator.transform = CGAffineTransform(scaleX: 1.5, y: 1.5)
 
-        // Add inner circle for better visibility
-        let innerCircle = UIView(frame: CGRect(x: 20, y: 20, width: 40, height: 40))
-        innerCircle.layer.borderColor = UIColor.yellow.cgColor
-        innerCircle.layer.borderWidth = 1.0
-        innerCircle.layer.cornerRadius = 20
-        innerCircle.backgroundColor = UIColor.clear
-        indicator.addSubview(innerCircle)
+        // Add 4 tiny mid-edge ticks inside the square
+        let stroke: CGFloat = 2.0
+        let tickLen: CGFloat = 12.0
+        let inset: CGFloat = stroke // ticks should touch the sides
+        // Top tick (perpendicular): vertical inward from top edge
+        let topTick = UIView(frame: CGRect(x: (indicator.bounds.width - stroke)/2,
+                                           y: inset,
+                                           width: stroke,
+                                           height: tickLen))
+        topTick.backgroundColor = .yellow
+        indicator.addSubview(topTick)
+        // Bottom tick (perpendicular): vertical inward from bottom edge
+        let bottomTick = UIView(frame: CGRect(x: (indicator.bounds.width - stroke)/2,
+                                              y: indicator.bounds.height - inset - tickLen,
+                                              width: stroke,
+                                              height: tickLen))
+        bottomTick.backgroundColor = .yellow
+        indicator.addSubview(bottomTick)
+        // Left tick (perpendicular): horizontal inward from left edge
+        let leftTick = UIView(frame: CGRect(x: inset,
+                                            y: (indicator.bounds.height - stroke)/2,
+                                            width: tickLen,
+                                            height: stroke))
+        leftTick.backgroundColor = .yellow
+        indicator.addSubview(leftTick)
+        // Right tick (perpendicular): horizontal inward from right edge
+        let rightTick = UIView(frame: CGRect(x: indicator.bounds.width - inset - tickLen,
+                                             y: (indicator.bounds.height - stroke)/2,
+                                             width: tickLen,
+                                             height: stroke))
+        rightTick.backgroundColor = .yellow
+        indicator.addSubview(rightTick)
 
         view.addSubview(indicator)
         focusIndicatorView = indicator
@@ -1398,7 +1506,7 @@ extension CameraController: UIGestureRecognizerDelegate {
             indicator.alpha = 1.0
             indicator.transform = CGAffineTransform.identity
         }) { _ in
-            // Keep the indicator visible for a moment
+            // Keep the indicator visible briefly
             UIView.animate(withDuration: 0.2, delay: 0.5, options: [], animations: {
                 indicator.alpha = 0.3
             }) { _ in
@@ -1460,22 +1568,23 @@ extension CameraController: UIGestureRecognizerDelegate {
 extension CameraController: AVCapturePhotoCaptureDelegate {
     public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) {
         if let error = error {
-            self.photoCaptureCompletionBlock?(nil, error)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, error)
             return
         }
 
         // Get the photo data using the modern API
         guard let imageData = photo.fileDataRepresentation() else {
-            self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, CameraControllerError.unknown)
             return
         }
 
         guard let image = UIImage(data: imageData) else {
-            self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
+            self.photoCaptureCompletionBlock?(nil, nil, nil, CameraControllerError.unknown)
             return
         }
 
-        self.photoCaptureCompletionBlock?(image.fixedOrientation(), nil)
+        // Pass through original file data and metadata so callers can preserve EXIF
+        self.photoCaptureCompletionBlock?(image.fixedOrientation(), imageData, photo.metadata, nil)
     }
 }