@capacitor-community/camera-preview 2.0.0 → 3.1.0

package/ios/Plugin/Plugin.swift

@@ -8,7 +8,7 @@ import AVFoundation
 @objc(CameraPreview)
 public class CameraPreview: CAPPlugin {
 
-    var previewView:UIView!
+    var previewView: UIView!
     var cameraPosition = String()
     let cameraController = CameraController()
     var x: CGFloat?
@@ -19,34 +19,21 @@ public class CameraPreview: CAPPlugin {
     var rotateWhenOrientationChanged: Bool?
     var toBack: Bool?
     var storeToFile: Bool?
+    var enableZoom: Bool?
     var highResolutionOutput: Bool = false
+    var disableAudio: Bool = false
 
     @objc func rotated() {
+        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
 
-        if UIDevice.current.orientation.isLandscape {
-            if(self.width! > self.height!) {
-                // we started in landscape
-                let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
-                self.previewView.frame = CGRect(x: self.x!, y: self.y!, width: self.width!, height: height)
-            } else {
-                // we started in portrait
-                let width = self.paddingBottom != nil ? self.width! - self.paddingBottom!: self.width!;
-                self.previewView.frame = CGRect(x: self.y!, y: self.x!, width: self.height!, height: width)
-            }
+        if UIApplication.shared.statusBarOrientation.isLandscape {
+            self.previewView.frame = CGRect(x: self.y!, y: self.x!, width: max(height, self.width!), height: min(height, self.width!))
             self.cameraController.previewLayer?.frame = self.previewView.frame
         }
 
-        if UIDevice.current.orientation.isPortrait {
+        if UIApplication.shared.statusBarOrientation.isPortrait {
             if (self.previewView != nil && self.x != nil && self.y != nil && self.width != nil && self.height != nil) {
-                if(self.height! > self.width!) {
-                    // we started in portrait
-                    let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
-                    self.previewView.frame = CGRect(x: self.x!, y: self.y!, width: self.width!, height: height)
-                } else {
-                    // we started in landscape
-                    let width = self.paddingBottom != nil ? self.width! - self.paddingBottom!: self.width!;
-                    self.previewView.frame = CGRect(x: self.y!, y: self.x!, width: self.height!, height: width)
-                }
+                self.previewView.frame = CGRect(x: self.x!, y: self.y!, width: min(height, self.width!), height: max(height, self.width!))
             }
             self.cameraController.previewLayer?.frame = self.previewView.frame
         }
@@ -57,7 +44,7 @@ public class CameraPreview: CAPPlugin {
     @objc func start(_ call: CAPPluginCall) {
         self.cameraPosition = call.getString("position") ?? "rear"
         self.highResolutionOutput = call.getBool("enableHighResolution") ?? false
-        self.cameraController.highResolutionOutput = self.highResolutionOutput;
+        self.cameraController.highResolutionOutput = self.highResolutionOutput
 
         if call.getInt("width") != nil {
             self.width = CGFloat(call.getInt("width")!)
@@ -78,45 +65,50 @@ public class CameraPreview: CAPPlugin {
         self.rotateWhenOrientationChanged = call.getBool("rotateWhenOrientationChanged") ?? true
         self.toBack = call.getBool("toBack") ?? false
         self.storeToFile = call.getBool("storeToFile") ?? false
-
+        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");
+                call.reject("permission failed")
                 return
             }
-            
+
             DispatchQueue.main.async {
-                if (self.cameraController.captureSession?.isRunning ?? false) {
+                if self.cameraController.captureSession?.isRunning ?? false {
                     call.reject("camera already started")
                 } else {
-                    self.cameraController.prepare(cameraPosition: self.cameraPosition){error in
+                    self.cameraController.prepare(cameraPosition: self.cameraPosition, disableAudio: self.disableAudio){error in
                         if let error = error {
                             print(error)
                             call.reject(error.localizedDescription)
                             return
                         }
-                        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
+                        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!
                         self.previewView = UIView(frame: CGRect(x: self.x ?? 0, y: self.y ?? 0, width: self.width!, height: height))
                         self.webView?.isOpaque = false
                         self.webView?.backgroundColor = UIColor.clear
                         self.webView?.scrollView.backgroundColor = UIColor.clear
                         self.webView?.superview?.addSubview(self.previewView)
-                        if (self.toBack!) {
+                        if self.toBack! {
                             self.webView?.superview?.bringSubviewToFront(self.webView!)
                         }
                         try? self.cameraController.displayPreview(on: self.previewView)
-                        
-                        if (self.rotateWhenOrientationChanged == true) {
+
+                        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)
                         }
-                        
+
                         call.resolve()
 
                     }
                 }
             }
-        });
-        
+        })
+
     }
 
     @objc func flip(_ call: CAPPluginCall) {
@@ -130,7 +122,7 @@ public class CameraPreview: CAPPlugin {
 
     @objc func stop(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
-            if (self.cameraController.captureSession?.isRunning ?? false) {
+            if self.cameraController.captureSession?.isRunning ?? false {
                 self.cameraController.captureSession?.stopRunning()
                 self.previewView.removeFromSuperview()
                 self.webView?.isOpaque = true
@@ -150,45 +142,45 @@ public class CameraPreview: CAPPlugin {
         let fileUrl=path.appendingPathComponent(fileName)
         return fileUrl
     }
-    
+
     @objc func capture(_ call: CAPPluginCall) {
         DispatchQueue.main.async {
 
-        let quality: Int? = call.getInt("quality", 85)
-        
-        self.cameraController.captureImage { (image, error) in
+            let quality: Int? = call.getInt("quality", 85)
+
+            self.cameraController.captureImage { (image, error) in
 
-            guard let image = image else {
-                print(error ?? "Image capture error")
-                guard let error = error else {
-                    call.reject("Image capture error")
+                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)
                     return
                 }
-                call.reject(error.localizedDescription)
-                return
-            }
-            let imageData: Data?
-            if (self.cameraController.currentCameraPosition == .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.cameraController.currentCameraPosition == .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")
+                    }
                 }
             }
         }
-        }
     }
 
     @objc func captureSample(_ call: CAPPluginCall) {
@@ -203,20 +195,20 @@ public class CameraPreview: CAPPlugin {
                 }
 
                 let imageData: Data?
-                if (self.cameraPosition == "front") {
+                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){
+                if self.storeToFile == false {
                     let imageBase64 = imageData?.base64EncodedString()
                     call.resolve(["value": imageBase64!])
                 } else {
                     do {
                         let fileUrl = self.getTempFilePath()
-                        try imageData?.write(to:fileUrl)
+                        try imageData?.write(to: fileUrl)
                         call.resolve(["value": fileUrl.absoluteString])
                     } catch {
                         call.reject("Error writing image to file")
@@ -225,7 +217,7 @@ public class CameraPreview: CAPPlugin {
             }
         }
     }
-    
+
     @objc func getSupportedFlashModes(_ call: CAPPluginCall) {
         do {
             let supportedFlashModes = try self.cameraController.getSupportedFlashModes()
@@ -234,7 +226,7 @@ public class CameraPreview: CAPPlugin {
             call.reject("failed to get supported flash modes")
         }
     }
-    
+
     @objc func setFlashMode(_ call: CAPPluginCall) {
         guard let flashMode = call.getString("flashMode") else {
             call.reject("failed to set flash mode. required parameter flashMode is missing")
@@ -243,17 +235,17 @@ public class CameraPreview: CAPPlugin {
         do {
             var flashModeAsEnum: AVCaptureDevice.FlashMode?
             switch flashMode {
-                case "off" :
-                    flashModeAsEnum = AVCaptureDevice.FlashMode.off
-                case "on":
-                    flashModeAsEnum = AVCaptureDevice.FlashMode.on
-                case "auto":
-                    flashModeAsEnum = AVCaptureDevice.FlashMode.auto
-                default: break;
+            case "off" :
+                flashModeAsEnum = AVCaptureDevice.FlashMode.off
+            case "on":
+                flashModeAsEnum = AVCaptureDevice.FlashMode.on
+            case "auto":
+                flashModeAsEnum = AVCaptureDevice.FlashMode.auto
+            default: break
             }
             if flashModeAsEnum != nil {
                 try self.cameraController.setFlashMode(flashMode: flashModeAsEnum!)
-            } else if(flashMode == "torch") {
+            } else if flashMode == "torch" {
                 try self.cameraController.setTorchMode()
             } else {
                 call.reject("Flash Mode not supported")
@@ -265,11 +257,11 @@ public class CameraPreview: CAPPlugin {
         }
     }
 
-        @objc func startRecordVideo(_ call: CAPPluginCall) {
-            DispatchQueue.main.async {
+    @objc func startRecordVideo(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
 
             let quality: Int? = call.getInt("quality", 85)
-            
+
             self.cameraController.captureVideo { (image, error) in
 
                 guard let image = image else {
@@ -282,19 +274,18 @@ public class CameraPreview: CAPPlugin {
                     return
                 }
 
-                    //self.videoUrl = image
+                // self.videoUrl = image
 
-                    call.resolve(["value":image.absoluteString])
-                }
+                call.resolve(["value": image.absoluteString])
             }
         }
+    }
 
+    @objc func stopRecordVideo(_ call: CAPPluginCall) {
 
-        @objc func stopRecordVideo(_ call: CAPPluginCall) {
-
-            self.cameraController.stopRecording { (error) in
+        self.cameraController.stopRecording { (_) in
 
-            }
         }
-    
+    }
+
 }

package/ios/PluginTests/PluginTests.swift

@@ -3,33 +3,33 @@ import Capacitor
 @testable import Plugin
 
 class PluginTests: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
+
     func testEcho() {
         // This is an example of a functional test case for a plugin.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
-        
+
         let value = "Hello, World!"
         let plugin = MyPlugin()
-        
+
         let call = CAPPluginCall(callbackId: "test", options: [
             "value": value
-        ], success: { (result, call) in
+        ], success: { (result, _) in
             let resultValue = result!.data["value"] as? String
             XCTAssertEqual(value, resultValue)
-        }, error: { (err) in
+        }, error: { (_) in
             XCTFail("Error shouldn't have been called")
         })
-        
+
         plugin.echo(call!)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/camera-preview",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "description": "Camera preview",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -8,8 +8,13 @@
     "build": "npm run clean && tsc",
     "clean": "rimraf './dist'",
     "watch": "tsc --watch",
+    "lint": "concurrently -g \"npm:eslint\" \"npm:prettier -- --check\" \"npm run swiftlint -- lint ios\"",
+    "fmt": "concurrently -g \"npm:eslint -- --fix\" \"npm:prettier -- --write\" \"npm:swiftlint -- lint --fix --format ios\"",
+    "eslint": "eslint . --ext ts",
+    "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
+    "swiftlint": "node-swiftlint",
     "prepublishOnly": "npm run build",
-    "prepare": "npm run build"
+    "prepare": "husky install && npm run build"
   },
   "author": "Ariel Hernandez Musa",
   "license": "MIT",
@@ -19,9 +24,24 @@
   "devDependencies": {
     "@capacitor/android": "latest",
     "@capacitor/ios": "latest",
+    "@ionic/eslint-config": "^0.3.0",
+    "@ionic/prettier-config": "^2.0.0",
+    "@ionic/swiftlint-config": "^1.1.2",
+    "concurrently": "^7.0.0",
+    "eslint": "^7.32.0",
+    "husky": "^7.0.4",
+    "prettier": "^2.5.1",
+    "prettier-plugin-java": "^1.6.1",
+    "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
+    "swiftlint": "^1.0.1",
     "typescript": "^4.3.2"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "pretty-quick --staged"
+    }
+  },
   "files": [
     "dist/",
     "ios/",
@@ -41,6 +61,11 @@
       "src": "android"
     }
   },
+  "prettier": "@ionic/prettier-config",
+  "swiftlint": "@ionic/swiftlint-config",
+  "eslintConfig": {
+    "extends": "@ionic/eslint-config/recommended"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/capacitor-community/camera-preview.git"