capacitor-camera-view 1.2.0 → 1.2.2

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["CameraViewPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.2.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.4.2")
     ],
     targets: [
         .target(

package/README.md

@@ -150,6 +150,9 @@ This plugin supports real-time barcode detection directly from the live camera f
 *   **Android:** Utilizes Google's [**ML Kit Barcode Scanning**](https://developers.google.com/ml-kit/vision/barcode-scanning).
 *   **Web:** Uses the [**Barcode Detection API**](https://developer.mozilla.org/en-US/docs/Web/API/Barcode_Detection_API) where available in the browser.
 
+> [!NOTE]
+> **Web Support:** The Barcode Detection API is not supported in all browsers (e.g., Windows browsers). For full browser compatibility, consider using a polyfill such as [`@undecaf/barcode-detector-polyfill`](https://www.npmjs.com/package/@undecaf/barcode-detector-polyfill) or [`barcode-detector`](https://www.npmjs.com/package/barcode-detector).
+
 **Enabling Barcode Detection:**
 To enable this feature, set the `enableBarcodeDetection` option to `true` when calling the `start()` method:
 

package/android/src/main/java/com/michaelwolz/capacitorcameraview/CameraView.kt

@@ -19,6 +19,7 @@ import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
 import androidx.camera.core.ImageProxy
+import androidx.camera.core.TorchState
 import androidx.camera.core.resolutionselector.AspectRatioStrategy
 import androidx.camera.core.resolutionselector.ResolutionSelector
 import androidx.camera.mlkit.vision.MlKitAnalyzer
@@ -55,7 +56,6 @@ class CameraView(plugin: Plugin) {
     // Camera state
     private var currentCameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
     private var currentFlashMode: Int = ImageCapture.FLASH_MODE_OFF
-    private var isTorchEnabled: Boolean = false
 
     // Plugin context
     private var lifecycleOwner: LifecycleOwner? = null
@@ -416,8 +416,16 @@ class CameraView(plugin: Plugin) {
     }
 
     /** Get the current torch mode */
-    fun getTorchMode(): Boolean {
-        return isTorchEnabled
+    fun getTorchMode(callback: (Boolean) -> Unit) {
+        mainHandler.post {
+            val cameraInfo = cameraController?.cameraInfo
+                ?: run {
+                    callback(false)
+                    return@post
+                }
+
+            callback(cameraInfo.torchState.value == TorchState.ON)
+        }
     }
 
     /** Set the torch mode */
@@ -437,7 +445,6 @@ class CameraView(plugin: Plugin) {
                 }
 
                 controller.cameraControl?.enableTorch(enabled)
-                isTorchEnabled = enabled
                 callback?.invoke(null)
             } catch (e: Exception) {
                 callback?.invoke(e)

package/android/src/main/java/com/michaelwolz/capacitorcameraview/CameraViewPlugin.kt

@@ -220,8 +220,7 @@ class CameraViewPlugin : Plugin() {
 
     @PluginMethod
     fun getTorchMode(call: PluginCall) {
-        try {
-            val enabled = implementation.getTorchMode()
+        implementation.getTorchMode { enabled ->
             call.resolve(JSObject().apply {
                 put("enabled", enabled)
                 put(
@@ -230,8 +229,6 @@ class CameraViewPlugin : Plugin() {
                     if (enabled) 1.0f else 0.0f
                 )
             })
-        } catch (e: Exception) {
-            call.reject("Failed to get torch mode: ${e.localizedMessage}", e)
         }
     }
 

package/ios/Sources/CameraViewPlugin/CameraViewManager.swift

@@ -29,10 +29,6 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
     /// Currently selected flash mode.
     private var flashMode: AVCaptureDevice.FlashMode = .auto
 
-    /// Currently selected torch mode and level.
-    private var torchEnabled: Bool = false
-    private var torchLevel: Float = 1.0
-
     /// Reference to the blur overlay view that is shown when switching to the triple camera in order to have a smooth transition
     private var blurOverlayView: UIVisualEffectView?
 
@@ -94,10 +90,20 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
                 completion: { error in
                     if error != nil { completion(error) }
 
+                    // Handle barcode detection after session is running
+                    if configuration.enableBarcodeDetection {
+                        do {
+                            try self.enableBarcodeDetection()
+                        } catch {
+                            completion(error)
+                            return
+                        }
+                    }
+
                     // Complete already because the camera is ready to be used
-                    // We might asynchronously upgrade to a triple camera in the background if available and configured
                     completion(nil)
 
+                    // We might asynchronously upgrade to a triple camera in the background if available and configured
                     if configuration.useTripleCameraIfAvailable {
                         Task {
                             await self.upgradeToTripleCameraIfAvailable()
@@ -248,7 +254,12 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
     ///
     /// - Returns: A tuple containing the torch enabled state and level
     public func getTorchMode() -> (enabled: Bool, level: Float) {
-        return (torchEnabled, torchLevel)
+        guard let camera = currentCameraDevice else { return (false, 0.0) }
+
+        let isEnabled = camera.torchMode == .on
+        let level = camera.torchLevel
+
+        return (isEnabled, level)
     }
 
     /// Sets the torch mode and level for the currently active camera device.
@@ -270,9 +281,6 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
             } else {
                 camera.torchMode = .off
             }
-
-            torchEnabled = enabled && level > 0.0
-            torchLevel = level
         } catch {
             throw CameraError.configurationFailed(error)
         }
@@ -361,10 +369,7 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
         // Set up the video data output for snapshots
         try setupVideoDataOutput()
 
-        // Setup metadata output for QR code scanning if enabled
-        if configuration.enableBarcodeDetection {
-            try setupMetadataOutput()
-        } else {
+        if !configuration.enableBarcodeDetection {
             // Remove the metadata output in case it already existed for the
             // capture session
             removeMetadataOutput()
@@ -407,6 +412,26 @@ internal let SUPPORTED_CAMERA_DEVICE_TYPES: [AVCaptureDevice.DeviceType] = [
         }
     }
 
+
+    /// Enables barcode detection by adding metadata output to the running session.
+    /// Somehow adding the metadata output with the session not being started yet
+    /// caused issues on some devices (iPad 7th Gen) where the session would just
+    /// not start at all without an error being thrown. I haven't been able to
+    /// figure out the root cause of this but it might generally be a good idea
+    /// to only add the metadata output when the session is already running.
+    ///
+    /// - Throws: An error if the metadata output cannot be added.
+    private func enableBarcodeDetection() throws {
+        guard captureSession.isRunning else {
+            throw CameraError.sessionNotRunning
+        }
+
+        captureSession.beginConfiguration()
+        defer { captureSession.commitConfiguration() }
+
+        try setupMetadataOutput()
+    }
+
     /// Retrieve a list of a available camera devices
     ///
     /// - Returns: a list of all  available camera devices.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-camera-view",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A Capacitor plugin for embedding a live camera feed directly into your app.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",