@capgo/camera-preview 8.0.1 → 8.0.3

package/ios/Sources/CapgoCameraPreviewPlugin/Plugin.swift

@@ -34,7 +34,7 @@ extension UIWindow {
  */
 @objc(CameraPreview)
 public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelegate {
-    private let pluginVersion: String = "8.0.1"
+    private let pluginVersion: String = "8.0.3"
     public let identifier = "CameraPreviewPlugin"
     public let jsName = "CameraPreview"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -470,8 +470,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             availableHeight = webViewHeight - paddingBottom
         } else {
             // Manual positioning - calculate remaining space
-            availableWidth = webViewWidth - self.posX!
-            availableHeight = webViewHeight - self.posY! - paddingBottom
+            availableWidth = webViewWidth - (self.posX ?? 0)
+            availableHeight = webViewHeight - (self.posY ?? 0) - paddingBottom
         }
 
         // Parse aspect ratio - convert to portrait orientation for camera use
@@ -722,20 +722,20 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
 
         // 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)
+        if let xPosition = call.getInt("x") {
+            self.posX = CGFloat(xPosition)
         } 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)
+        if let yPosition = call.getInt("y") {
+            self.posY = CGFloat(yPosition)
         } else {
             self.posY = -1 // Use -1 to indicate auto-centering
         }
-        if call.getInt("paddingBottom") != nil {
-            self.paddingBottom = CGFloat(call.getInt("paddingBottom")!)
+        if let paddingBottomValue = call.getInt("paddingBottom") {
+            self.paddingBottom = CGFloat(paddingBottomValue)
         }
 
         self.rotateWhenOrientationChanged = call.getBool("rotateWhenOrientationChanged") ?? true
@@ -823,7 +823,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
         // Add preview view to hierarchy first
         self.webView?.addSubview(self.previewView)
-        if self.toBack! {
+        if self.toBack == true {
             self.webView?.sendSubviewToBack(self.previewView)
         }
 
@@ -1177,13 +1177,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             if Thread.isMainThread {
                 return (self.previewView.frame.width, self.previewView.frame.height)
             }
-            var w: CGFloat = 0
-            var h: CGFloat = 0
+            var width: CGFloat = 0
+            var height: CGFloat = 0
             DispatchQueue.main.sync {
-                w = self.previewView.frame.width
-                h = self.previewView.frame.height
+                width = self.previewView.frame.width
+                height = self.previewView.frame.height
             }
-            return (w, h)
+            return (width, height)
         }()
         print("[CameraPreview] Preview dimensions: \(previewWidth)x\(previewHeight)")
 
@@ -1398,7 +1398,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
     }
 
     @objc func captureSample(_ call: CAPPluginCall) {
-        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 {
@@ -1410,14 +1410,17 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             let imageData: Data?
             if self.cameraPosition == "front" {
                 let flippedImage = image.withHorizontallyFlippedOrientation()
-                imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
+                imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality)/100)
             } else {
-                imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
+                imageData = image.jpegData(compressionQuality: CGFloat(quality)/100)
             }
 
             if self.storeToFile == false {
-                let imageBase64 = imageData?.base64EncodedString()
-                call.resolve(["value": imageBase64!])
+                guard let imageBase64 = imageData?.base64EncodedString() else {
+                    call.reject("Failed to encode image to base64")
+                    return
+                }
+                call.resolve(["value": imageBase64])
             } else {
                 do {
                     let fileUrl = self.getTempFilePath()
@@ -1464,8 +1467,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
                 flashModeAsEnum = AVCaptureDevice.FlashMode.auto
             default: break
             }
-            if flashModeAsEnum != nil {
-                try self.cameraController.setFlashMode(flashMode: flashModeAsEnum!)
+            if let flashModeEnum = flashModeAsEnum {
+                try self.cameraController.setFlashMode(flashMode: flashModeEnum)
             } else if flashMode == "torch" {
                 try self.cameraController.setTorchMode()
             } else {
@@ -1633,7 +1636,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         // First, convert from UI/display zoom to native zoom using the iOS 18 multiplier
         let displayMultiplier = self.cameraController.getDisplayZoomMultiplier()
         if displayMultiplier != 1.0 {
-            level = level / displayMultiplier
+            level /= displayMultiplier
         }
 
         let ramp = call.getBool("ramp") ?? true
@@ -1905,12 +1908,12 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
     }
 
-    private func calculateCameraFrame(x: CGFloat? = nil, y: CGFloat? = nil, width: CGFloat? = nil, height: CGFloat? = nil, aspectRatio: String? = nil) -> CGRect {
+    private func calculateCameraFrame(xPosition: CGFloat? = nil, yPosition: 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 currentX = xPosition ?? self.posX ?? -1
+        let currentY = yPosition ?? self.posY ?? -1
         let currentAspectRatio = aspectRatio ?? self.aspectRatio
 
         let paddingBottom = self.paddingBottom ?? 0
@@ -2014,11 +2017,11 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
 
             if currentRatio > ratio {
                 let newWidth = frame.height * ratio
-                frame.origin.x = frame.origin.x + (frame.width - newWidth) / 2
+                frame.origin.x += (frame.width - newWidth) / 2
                 frame.size.width = newWidth
             } else {
                 let newHeight = frame.width / ratio
-                frame.origin.y = frame.origin.y + (frame.height - newHeight) / 2
+                frame.origin.y += (frame.height - newHeight) / 2
                 frame.size.height = newHeight
             }
         }
@@ -2071,14 +2074,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         }
 
         // Always set to -1 for auto-centering if not explicitly provided
-        if let x = call.getInt("x") {
-            self.posX = CGFloat(x)
+        if let xValue = call.getInt("x") {
+            self.posX = CGFloat(xValue)
         } else {
             self.posX = -1 // Auto-center if X not provided
         }
 
-        if let y = call.getInt("y") {
-            self.posY = CGFloat(y)
+        if let yValue = call.getInt("y") {
+            self.posY = CGFloat(yValue)
         } else {
             self.posY = -1 // Auto-center if Y not provided
         }
@@ -2107,13 +2110,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             return
         }
 
-        guard let x = call.getFloat("x"), let y = call.getFloat("y") else {
+        guard let xCoord = call.getFloat("x"), let yCoord = 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 {
+        if xCoord < 0 || xCoord > 1 || yCoord < 0 || yCoord > 1 {
             call.reject("Focus coordinates must be between 0 and 1")
             return
         }
@@ -2121,8 +2124,8 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
         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 viewX = CGFloat(xCoord) * self.previewView.bounds.width
+                let viewY = CGFloat(yCoord) * self.previewView.bounds.height
                 let focusPoint = CGPoint(x: viewX, y: viewY)
 
                 // Convert view coordinates to device coordinates
@@ -2232,13 +2235,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin, CLLocationManagerDelega
             // Snap to valid range and step
             var range = try self.cameraController.getExposureCompensationRange()
             if range.step <= 0 { range.step = 0.1 }
-            let lo = min(range.min, range.max)
-            let hi = max(range.min, range.max)
-            // Clamp to [lo, hi]
-            value = max(lo, min(hi, value))
+            let minValue = min(range.min, range.max)
+            let maxValue = max(range.min, range.max)
+            // Clamp to [minValue, maxValue]
+            value = max(minValue, min(maxValue, value))
             // Snap to nearest step
-            let steps = round((value - lo) / range.step)
-            let snapped = lo + steps * range.step
+            let steps = round((value - minValue) / range.step)
+            let snapped = minValue + steps * range.step
 
             try self.cameraController.setExposureCompensation(snapped)
             call.resolve()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/camera-preview",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "Camera preview",
   "license": "MPL-2.0",
   "repository": {