@capacitor-community/camera-preview 7.0.5 → 8.0.0

package/CapacitorCommunityCameraPreview.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.author = package['author']
   s.source = { :git => 'https://github.com/capacitor-community/camera-preview.git', :tag => s.version.to_s }
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target = '14.0'
+  s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -3,14 +3,14 @@ import PackageDescription
 
 let package = Package(
     name: "CapacitorCommunityCameraPreview",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v15)],
     products: [
         .library(
             name: "CapacitorCommunityCameraPreviewPlugin",
             targets: ["CameraPreviewPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.2")
     ],
     targets: [
         .target(
@@ -25,4 +25,4 @@ let package = Package(
             dependencies: ["CameraPreviewPlugin"],
             path: "ios/Tests/CameraPreviewPluginTests")
     ]
-)
+)

package/README.md

@@ -2,15 +2,17 @@
 <h3 align="center">Capacitor Camera Preview</h3>
 <p align="center"><strong><code>@capacitor-community/camera-preview</code></strong></p>
 <br>
-<p align="center"><strong>CAPACITOR 7</strong></p><br>
+<p align="center"><strong>CAPACITOR 8</strong></p><br>
 
 <p align="center">
   Capacitor plugin that allows camera interaction from Javascript and HTML<br>(based on cordova-plugin-camera-preview).
 </p>
 <br>
-Version 7 of this plugin requires Capacitor 7.
+Version 8 of this plugin requires Capacitor 8.
 
-If you are using Capacitor 6, use [version 6.1](https://github.com/capacitor-community/camera-preview/releases/tag/v6.0.1)
+If you are using Capacitor 7, use [version 7.0.5](https://github.com/capacitor-community/camera-preview/releases/tag/v7.0.5)
+
+If you are using Capacitor 6, use [version 6.0.1](https://github.com/capacitor-community/camera-preview/releases/tag/v6.0.1)
 
 If you are using Capacitor 5, use [version 5](https://github.com/capacitor-community/camera-preview/releases/tag/v5.0.0)
 

package/android/build.gradle

@@ -1,42 +1,49 @@
-ext {
-    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
-    androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.3.7'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
-}
-
 buildscript {
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20'
+
     repositories {
-        mavenCentral()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
     }
 }
 
+ext {
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
+    androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.4.2'
+}
+
 apply plugin: 'com.android.library'
 
 android {
-    namespace "com.ahm.capacitor.camera.preview.capacitorcamerapreview"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
+    namespace = "com.ahm.capacitor.camera.preview.capacitorcamerapreview"
+    compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion as Integer : 36
+
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdkVersion = project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion as Integer : 24
+        targetSdkVersion = project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion as Integer : 36
+        versionCode = 1
+        versionName = "1.0.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
-        abortOnError false
+
+    lint {
+        abortOnError = false
     }
+
 }
 
 repositories {
@@ -44,12 +51,12 @@ repositories {
     mavenCentral()
 }
 
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation "androidx.exifinterface:exifinterface:$androidxExifInterfaceVersion"
+
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/ios/Sources/CameraPreviewPlugin/CameraController.swift

@@ -185,10 +185,14 @@ extension CameraController {
     }
 
     func updateVideoOrientation() {
-        assert(Thread.isMainThread) // UIApplication.statusBarOrientation requires the main thread.
+        assert(Thread.isMainThread) // UIKit access requires main thread
+
+        let currentOrientation = UIApplication.shared.connectedScenes
+            .first(where: { $0 is UIWindowScene })
+            .flatMap({ $0 as? UIWindowScene })?.interfaceOrientation ?? .unknown
 
         let videoOrientation: AVCaptureVideoOrientation
-        switch UIApplication.shared.statusBarOrientation {
+        switch currentOrientation {
         case .portrait:
             videoOrientation = .portrait
         case .landscapeLeft:
@@ -484,10 +488,13 @@ extension CameraController: UIGestureRecognizerDelegate {
 }
 
 extension CameraController: AVCapturePhotoCaptureDelegate {
-    public func photoOutput(_ captureOutput: AVCapturePhotoOutput, didFinishProcessingPhoto photoSampleBuffer: CMSampleBuffer?, previewPhoto previewPhotoSampleBuffer: CMSampleBuffer?,
-                            resolvedSettings: AVCaptureResolvedPhotoSettings, bracketSettings: AVCaptureBracketedStillImageSettings?, error: Swift.Error?) {
-        if let error = error { self.photoCaptureCompletionBlock?(nil, error) } else if let buffer = photoSampleBuffer, let data = AVCapturePhotoOutput.jpegPhotoDataRepresentation(forJPEGSampleBuffer: buffer, previewPhotoSampleBuffer: nil),
-                                                                                       let image = UIImage(data: data) {
+    public func photoOutput(_ output: AVCapturePhotoOutput, didFinishProcessingPhoto photo: AVCapturePhoto, error: Error?) {
+        if let error = error {
+            self.photoCaptureCompletionBlock?(nil, error)
+            return
+        }
+
+        if let data = photo.fileDataRepresentation(), let image = UIImage(data: data) {
             self.photoCaptureCompletionBlock?(image.fixedOrientation(), nil)
         } else {
             self.photoCaptureCompletionBlock?(nil, CameraControllerError.unknown)
@@ -610,11 +617,11 @@ extension UIImage {
         // Flip image one more time if needed to, this is to prevent flipped image
         switch imageOrientation {
         case .upMirrored, .downMirrored:
-            transform.translatedBy(x: size.width, y: 0)
-            transform.scaledBy(x: -1, y: 1)
+            transform = transform.translatedBy(x: size.width, y: 0)
+            transform = transform.scaledBy(x: -1, y: 1)
         case .leftMirrored, .rightMirrored:
-            transform.translatedBy(x: size.height, y: 0)
-            transform.scaledBy(x: -1, y: 1)
+            transform = transform.translatedBy(x: size.height, y: 0)
+            transform = transform.scaledBy(x: -1, y: 1)
         case .up, .down, .left, .right:
             break
         }

package/ios/Sources/CameraPreviewPlugin/CameraPreviewPlugin.swift

@@ -1,6 +1,8 @@
 import Foundation
 import Capacitor
 import AVFoundation
+import UIKit
+
 /**
  * Please read the Capacitor iOS Plugin Development Guide
  * here: https://capacitor.ionicframework.com/docs/plugins/ios
@@ -40,6 +42,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
     var highResolutionOutput: Bool = false
     var disableAudio: Bool = false
 
+    // Helper to get the current interface orientation via connectedScenes (iOS 15+)
+    private func getInterfaceOrientation() -> UIInterfaceOrientation {
+        return UIApplication.shared.connectedScenes
+            .first(where: { $0 is UIWindowScene })
+            .flatMap({ $0 as? UIWindowScene })?.interfaceOrientation ?? .unknown
+    }
+
     @objc func rotated() {
         guard let previewView = self.previewView,
               let x = self.x,
@@ -50,13 +59,14 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         }
 
         let adjustedHeight = self.paddingBottom != nil ? height - self.paddingBottom! : height
+        let orientation = getInterfaceOrientation()
 
-        if UIApplication.shared.statusBarOrientation.isLandscape {
+        if orientation.isLandscape {
             previewView.frame = CGRect(x: y, y: x, width: max(adjustedHeight, width), height: min(adjustedHeight, width))
             self.cameraController.previewLayer?.frame = previewView.frame
         }
 
-        if UIApplication.shared.statusBarOrientation.isPortrait {
+        if orientation.isPortrait {
             previewView.frame = CGRect(x: x, y: y, width: min(adjustedHeight, width), height: max(adjustedHeight, width))
             self.cameraController.previewLayer?.frame = previewView.frame
         }
@@ -91,52 +101,51 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         self.enableZoom = call.getBool("enableZoom") ?? false
         self.disableAudio = call.getBool("disableAudio") ?? false
 
-        AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
-            guard granted else {
-                call.reject("permission failed")
+        AVCaptureDevice.requestAccess(for: .video) { [weak self] granted in
+            guard let self = self else { return }
+            if !granted {
+                call.reject("Camera permission denied")
                 return
             }
 
             DispatchQueue.main.async {
                 if self.cameraController.captureSession?.isRunning ?? false {
                     call.reject("camera already started")
-                } else {
-                    self.cameraController.prepare(cameraPosition: self.cameraPosition, disableAudio: self.disableAudio) {error in
-                        if let error = error {
-                            print(error)
-                            call.reject(error.localizedDescription)
-                            return
-                        }
-                        guard let height = self.height, let width = self.width else {
-                            call.reject("Invalid dimensions")
-                            return
-                        }
-
-                        let adjustedHeight = self.paddingBottom != nil ? height - self.paddingBottom! : height
-                        self.previewView = UIView(frame: CGRect(x: self.x ?? 0, y: self.y ?? 0, width: width, height: adjustedHeight))
-                        self.webView?.isOpaque = false
-                        self.webView?.backgroundColor = UIColor.clear
-                        self.webView?.scrollView.backgroundColor = UIColor.clear
-                        self.webView?.superview?.addSubview(self.previewView)
-                        if let toBack = self.toBack, toBack {
-                            self.webView?.superview?.bringSubviewToFront(self.webView!)
-                        }
-                        try? self.cameraController.displayPreview(on: self.previewView)
-
-                        let frontView = (self.toBack ?? false) ? self.webView : self.previewView
-                        self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom ?? false)
-
-                        if self.rotateWhenOrientationChanged == true {
-                            NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
-                        }
-
-                        call.resolve()
+                    return
+                } 
+                self.cameraController.prepare(cameraPosition: self.cameraPosition, disableAudio: self.disableAudio) {error in
+                    if let error = error {
+                        print(error)
+                        call.reject(error.localizedDescription)
+                        return
+                    }
+                    guard let height = self.height, let width = self.width else {
+                        call.reject("Invalid dimensions")
+                        return
+                    }
+
+                    let adjustedHeight = self.paddingBottom != nil ? height - self.paddingBottom! : height
+                    self.previewView = UIView(frame: CGRect(x: self.x ?? 0, y: self.y ?? 0, width: width, height: adjustedHeight))
+                    self.webView?.isOpaque = false
+                    self.webView?.backgroundColor = UIColor.clear
+                    self.webView?.scrollView.backgroundColor = UIColor.clear
+                    self.webView?.superview?.addSubview(self.previewView)
+                    if let toBack = self.toBack, toBack {
+                        self.webView?.superview?.bringSubviewToFront(self.webView!)
+                    }
+                    try? self.cameraController.displayPreview(on: self.previewView)
+
+                    let frontView = (self.toBack ?? false) ? self.webView : self.previewView
+                    self.cameraController.setupGestures(target: frontView ?? self.previewView, enableZoom: self.enableZoom ?? false)
 
+                    if self.rotateWhenOrientationChanged == true {
+                        NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
                     }
+
+                    call.resolve()
                 }
             }
-        })
-
+        }
     }
 
     @objc func flip(_ call: CAPPluginCall) {
@@ -175,9 +184,9 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
         let identifier = UUID()
         let randomIdentifier = identifier.uuidString.replacingOccurrences(of: "-", with: "")
         let finalIdentifier = String(randomIdentifier.prefix(8))
-        let fileName="cpcp_capture_"+finalIdentifier+".jpg"
-        let fileUrl=path.appendingPathComponent(fileName)
-        return fileUrl
+        let fileName = "cpcp_capture_" + finalIdentifier + ".jpg"
+
+        return path.appendingPathComponent(fileName)
     }
 
     @objc func capture(_ call: CAPPluginCall) {
@@ -185,15 +194,16 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
 
             let quality: Int? = call.getInt("quality", 85)
 
-            self.cameraController.captureImage { (image, error) in
+            self.cameraController.captureImage { [weak self] (image, error) in
+                guard let self = self else { return }
+                
+                if let error = error {
+                    call.reject(error.localizedDescription)
+                    return
+                }
 
                 guard let image = image else {
-                    print(error ?? "Image capture error")
-                    guard let error = error else {
-                        call.reject("Image capture error")
-                        return
-                    }
-                    call.reject(error.localizedDescription)
+                    call.reject("Image capture failed: no data received")
                     return
                 }
                 let imageData: Data?
@@ -209,7 +219,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                     call.resolve(["value": imageBase64!])
                 } else {
                     do {
-                        let fileUrl=self.getTempFilePath()
+                        let fileUrl = self.getTempFilePath()
                         try imageData?.write(to: fileUrl)
                         call.resolve(["value": fileUrl.absoluteString])
                     } catch {
@@ -222,7 +232,7 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
 
     @objc func captureSample(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
-            let quality: Int? = call.getInt("quality", 85)
+            let quality = call.getInt("quality", 85)
 
             self.cameraController.captureSample { image, error in
                 guard let image = image else {
@@ -232,11 +242,13 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
                 }
 
                 let imageData: Data?
+                let compression = CGFloat(quality) / 100.0
+
                 if self.cameraPosition == "front" {
                     let flippedImage = image.withHorizontallyFlippedOrientation()
-                    imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
+                    imageData = flippedImage.jpegData(compressionQuality: compression)
                 } else {
-                    imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
+                    imageData = image.jpegData(compressionQuality: compression)
                 }
 
                 if self.storeToFile == false {
@@ -266,22 +278,23 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
 
     @objc func setFlashMode(_ call: CAPPluginCall) {
         guard let flashMode = call.getString("flashMode") else {
-            call.reject("failed to set flash mode. required parameter flashMode is missing")
+            call.reject("flashMode parameter is required")
             return
         }
         do {
             var flashModeAsEnum: AVCaptureDevice.FlashMode?
             switch flashMode {
             case "off":
-                flashModeAsEnum = AVCaptureDevice.FlashMode.off
+                flashModeAsEnum = .off
             case "on":
-                flashModeAsEnum = AVCaptureDevice.FlashMode.on
+                flashModeAsEnum = .on
             case "auto":
-                flashModeAsEnum = AVCaptureDevice.FlashMode.auto
+                flashModeAsEnum = .auto
             default: break
             }
-            if flashModeAsEnum != nil {
-                try self.cameraController.setFlashMode(flashMode: flashModeAsEnum!)
+
+            if let mode = flashModeAsEnum {
+                try self.cameraController.setFlashMode(flashMode: mode)
             } else if flashMode == "torch" {
                 try self.cameraController.setTorchMode()
             } else {
@@ -334,5 +347,4 @@ public class CameraPreview: CAPPlugin, CAPBridgedPlugin {
             }
         }
     }
-
 }

package/package.json

@@ -1,11 +1,37 @@
 {
   "name": "@capacitor-community/camera-preview",
-  "version": "7.0.5",
+  "version": "8.0.0",
   "description": "Camera preview",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "unpkg": "dist/plugin.js",
+  "files": [
+    "android/src/main/",
+    "android/build.gradle",
+    "dist/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
+    "CapacitorCommunityCameraPreview.podspec",
+    "LICENSE"
+  ],
+  "author": "Ariel Hernandez Musa",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/capacitor-community/camera-preview.git"
+  },
+  "bugs": {
+    "url": "https://github.com/capacitor-community/camera-preview/issues"
+  },
+  "keywords": [
+    "capacitor",
+    "plugin",
+    "native",
+    "ios",
+    "android"
+  ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
     "verify:ios": "xcodebuild -scheme CapacitorCommunityCameraPreview -destination generic/platform=iOS",
@@ -22,12 +48,10 @@
     "prepublishOnly": "npm run build",
     "prepare": "husky install && npm run build"
   },
-  "author": "Ariel Hernandez Musa",
-  "license": "MIT",
   "devDependencies": {
-    "@capacitor/android": "^7.4.5",
-    "@capacitor/core": "^7.4.5",
-    "@capacitor/ios": "^7.4.5",
+    "@capacitor/android": "^8.0.2",
+    "@capacitor/core": "^8.0.2",
+    "@capacitor/ios": "^8.0.2",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
@@ -36,39 +60,22 @@
     "concurrently": "^9.2.1",
     "eslint": "^9.39.2",
     "husky": "^9.1.7",
-    "prettier": "^3.8.1",
-    "prettier-plugin-java": "^2.8.1",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.7",
     "pretty-quick": "^4.1.1",
     "rimraf": "^6.1.2",
-    "rollup": "^4.57.0",
+    "rollup": "^4.57.1",
     "swiftlint": "^2.0.0",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@capacitor/core": ">=7.0.0"
+    "@capacitor/core": ">=8.0.2"
   },
   "husky": {
     "hooks": {
       "pre-commit": "pretty-quick --staged"
     }
   },
-  "files": [
-    "android/src/main/",
-    "android/build.gradle",
-    "dist/",
-    "ios/Sources",
-    "ios/Tests",
-    "Package.swift",
-    "CapacitorCommunityCameraPreview.podspec",
-    "LICENSE"
-  ],
-  "keywords": [
-    "capacitor",
-    "plugin",
-    "native",
-    "ios",
-    "android"
-  ],
   "capacitor": {
     "ios": {
       "src": "ios"
@@ -82,13 +89,6 @@
   "eslintConfig": {
     "extends": "@ionic/eslint-config/recommended"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/capacitor-community/camera-preview.git"
-  },
-  "bugs": {
-    "url": "https://github.com/capacitor-community/camera-preview/issues"
-  },
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"