@capacitor-community/camera-preview 1.1.3 → 2.0.0-beta.2

package/ios/Plugin/Plugin.swift

@@ -19,35 +19,46 @@ public class CameraPreview: CAPPlugin {
     var rotateWhenOrientationChanged: Bool?
     var toBack: Bool?
     var storeToFile: Bool?
-    
+    var highResolutionOutput: Bool = false
+
     @objc func rotated() {
-        
-        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
 
         if UIDevice.current.orientation.isLandscape {
-            
-            self.previewView.frame = CGRect(x: self.y!, y: self.x!, width: height, height: self.width!)
-            self.cameraController.previewLayer?.frame = self.previewView.frame
-            
-            if (UIDevice.current.orientation == UIDeviceOrientation.landscapeLeft) {
-                self.cameraController.previewLayer?.connection?.videoOrientation = .landscapeRight
-            }
-            
-            if (UIDevice.current.orientation == UIDeviceOrientation.landscapeRight) {
-                self.cameraController.previewLayer?.connection?.videoOrientation = .landscapeLeft
+            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)
             }
+            self.cameraController.previewLayer?.frame = self.previewView.frame
         }
 
         if UIDevice.current.orientation.isPortrait {
-            self.previewView.frame = CGRect(x: self.x!, y: self.y!, width: self.width!, height: self.height!)
+            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.cameraController.previewLayer?.frame = self.previewView.frame
-            self.cameraController.previewLayer?.connection?.videoOrientation = .portrait
         }
+
+        cameraController.updateVideoOrientation()
     }
 
     @objc func start(_ call: CAPPluginCall) {
         self.cameraPosition = call.getString("position") ?? "rear"
-        
+        self.highResolutionOutput = call.getBool("enableHighResolution") ?? false
+        self.cameraController.highResolutionOutput = self.highResolutionOutput;
+
         if call.getInt("width") != nil {
             self.width = CGFloat(call.getInt("width")!)
         } else {
@@ -64,44 +75,48 @@ public class CameraPreview: CAPPlugin {
             self.paddingBottom = CGFloat(call.getInt("paddingBottom")!)
         }
 
-        AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
-            if (!granted) {
-                call.reject("permission failed");
-            }
-        });
-
         self.rotateWhenOrientationChanged = call.getBool("rotateWhenOrientationChanged") ?? true
         self.toBack = call.getBool("toBack") ?? false
         self.storeToFile = call.getBool("storeToFile") ?? false
 
-        if (self.rotateWhenOrientationChanged == true) {
-            NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
-        }
-        
-        DispatchQueue.main.async {
-            if (self.cameraController.captureSession?.isRunning ?? false) {
-                call.reject("camera already started")
-            } else {
-                self.cameraController.prepare(cameraPosition: self.cameraPosition){error in
-                    if let error = error {
-                        print(error)
-                        call.reject(error.localizedDescription)
-                        return
-                    }
-                    self.previewView = UIView(frame: CGRect(x: self.x!, y: self.y!, width: self.width!, height: self.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!) {
-                        self.webView.superview?.bringSubviewToFront(self.webView)
-                    }
-                    try? self.cameraController.displayPreview(on: self.previewView)
-                    call.resolve()
+        AVCaptureDevice.requestAccess(for: .video, completionHandler: { (granted: Bool) in
+            guard granted else {
+                call.reject("permission failed");
+                return
+            }
+            
+            DispatchQueue.main.async {
+                if (self.cameraController.captureSession?.isRunning ?? false) {
+                    call.reject("camera already started")
+                } else {
+                    self.cameraController.prepare(cameraPosition: self.cameraPosition){error in
+                        if let error = error {
+                            print(error)
+                            call.reject(error.localizedDescription)
+                            return
+                        }
+                        let height = self.paddingBottom != nil ? self.height! - self.paddingBottom!: self.height!;
+                        self.previewView = UIView(frame: CGRect(x: 0, 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!) {
+                            self.webView?.superview?.bringSubviewToFront(self.webView!)
+                        }
+                        try? self.cameraController.displayPreview(on: self.previewView)
+                        
+                        if (self.rotateWhenOrientationChanged == true) {
+                            NotificationCenter.default.addObserver(self, selector: #selector(CameraPreview.rotated), name: UIDevice.orientationDidChangeNotification, object: nil)
+                        }
+                        
+                        call.resolve()
 
+                    }
                 }
             }
-        }
+        });
+        
     }
 
     @objc func flip(_ call: CAPPluginCall) {
@@ -118,7 +133,7 @@ public class CameraPreview: CAPPlugin {
             if (self.cameraController.captureSession?.isRunning ?? false) {
                 self.cameraController.captureSession?.stopRunning()
                 self.previewView.removeFromSuperview()
-                self.webView.isOpaque = true
+                self.webView?.isOpaque = true
                 call.resolve()
             } else {
                 call.reject("camera already stopped")
@@ -153,11 +168,11 @@ public class CameraPreview: CAPPlugin {
                 return
             }
             let imageData: Data?
-            if (self.cameraPosition == "front") {
+            if (self.cameraController.currentCameraPosition == .front) {
                 let flippedImage = image.withHorizontallyFlippedOrientation()
-                imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!))
+                imageData = flippedImage.jpegData(compressionQuality: CGFloat(quality!/100))
             } else {
-                imageData = image.jpegData(compressionQuality: CGFloat(quality!))
+                imageData = image.jpegData(compressionQuality: CGFloat(quality!/100))
             }
 
             if (self.storeToFile == false){
@@ -175,6 +190,41 @@ public class CameraPreview: CAPPlugin {
         }
         }
     }
+
+    @objc func captureSample(_ call: CAPPluginCall) {
+        DispatchQueue.main.async {
+            let quality: Int? = call.getInt("quality", 85)
+
+            self.cameraController.captureSample { image, error in
+                guard let image = image else {
+                    print("Image capture error: \(String(describing: error))")
+                    call.reject("Image capture error: \(String(describing: error))")
+                    return
+                }
+
+                let imageData: Data?
+                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){
+                    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 getSupportedFlashModes(_ call: CAPPluginCall) {
         do {
@@ -214,5 +264,37 @@ public class CameraPreview: CAPPlugin {
             call.reject("failed to set flash mode")
         }
     }
+
+        @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 {
+                    print(error ?? "Image capture error")
+                    guard let error = error else {
+                        call.reject("Image capture error")
+                        return
+                    }
+                    call.reject(error.localizedDescription)
+                    return
+                }
+
+                    //self.videoUrl = image
+
+                    call.resolve(["value":image.absoluteString])
+                }
+            }
+        }
+
+
+        @objc func stopRecordVideo(_ call: CAPPluginCall) {
+
+            self.cameraController.stopRecording { (error) in
+
+            }
+        }
     
 }

package/ios/Plugin.xcodeproj/project.pbxproj

@@ -14,8 +14,6 @@
 		4C2070D622DA87B100D1AD33 /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070D522DA87B100D1AD33 /* CoreImage.framework */; };
 		4C2070D822DA87C600D1AD33 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070D722DA87C500D1AD33 /* QuartzCore.framework */; };
 		4C2070DA22DA87CE00D1AD33 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070D922DA87CE00D1AD33 /* CoreVideo.framework */; };
-		4C2070DC22DA87D700D1AD33 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070DB22DA87D700D1AD33 /* GLKit.framework */; };
-		4C2070DE22DA87E700D1AD33 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070DD22DA87E700D1AD33 /* OpenGLES.framework */; };
 		4C2070E022DA87F500D1AD33 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070DF22DA87F500D1AD33 /* CoreGraphics.framework */; };
 		4C2070E222DA87FB00D1AD33 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070E122DA87FB00D1AD33 /* AssetsLibrary.framework */; };
 		4C2070E422DA881600D1AD33 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C2070E322DA881600D1AD33 /* CoreLocation.framework */; };
@@ -77,8 +75,6 @@
 				4C2070E422DA881600D1AD33 /* CoreLocation.framework in Frameworks */,
 				4C2070E222DA87FB00D1AD33 /* AssetsLibrary.framework in Frameworks */,
 				4C2070E022DA87F500D1AD33 /* CoreGraphics.framework in Frameworks */,
-				4C2070DE22DA87E700D1AD33 /* OpenGLES.framework in Frameworks */,
-				4C2070DC22DA87D700D1AD33 /* GLKit.framework in Frameworks */,
 				4C2070D822DA87C600D1AD33 /* QuartzCore.framework in Frameworks */,
 				4C2070D622DA87B100D1AD33 /* CoreImage.framework in Frameworks */,
 				4C2070D222DA878E00D1AD33 /* ImageIO.framework in Frameworks */,
@@ -418,7 +414,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -473,7 +469,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -497,7 +493,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)\n$(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;
@@ -522,7 +518,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Plugin/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.getcapacitor.Plugin;

package/ios/Podfile

@@ -1,4 +1,4 @@
-platform :ios, '11.0'
+platform :ios, '12.1'
 
 target 'Plugin' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks
@@ -10,4 +10,4 @@ target 'PluginTests' do
   use_frameworks!
 
   pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
-end
+end

package/ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
-  - Capacitor (2.0.1):
-    - CapacitorCordova (= 2.0.1)
+  - Capacitor (3.0.0):
+    - CapacitorCordova
   - CapacitorCordova (2.0.1)
 
 DEPENDENCIES:
@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@capacitor/ios"
 
 SPEC CHECKSUMS:
-  Capacitor: 893baa42b33635ddf23d29d23d2a7f33f7c08bc7
+  Capacitor: 06cd8cd01340f5b162e9528bf5569d87a6f29009
   CapacitorCordova: 9fee2eb6780331b6ff09710d6a7d1f2e4707f1b9
 
-PODFILE CHECKSUM: 38d083712967e4c216faff8d0b7c5eb7faa2b523
+PODFILE CHECKSUM: d3e2703a3105a8e75e11dfc45c25f5cbf9801486
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@capacitor-community/camera-preview",
-  "version": "1.1.3",
+  "version": "2.0.0-beta.2",
   "description": "Camera preview",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
   "scripts": {
     "build": "npm run clean && tsc",
-    "clean": "rm -rf ./dist",
+    "clean": "rimraf './dist'",
     "watch": "tsc --watch",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "prepare": "npm run build"
   },
   "author": "Ariel Hernandez Musa",
   "license": "MIT",
@@ -18,7 +19,8 @@
   "devDependencies": {
     "@capacitor/android": "latest",
     "@capacitor/ios": "latest",
-    "typescript": "^3.2.4"
+    "rimraf": "^3.0.2",
+    "typescript": "^4.3.2"
   },
   "files": [
     "dist/",

package/android/.npmignore

@@ -1 +0,0 @@
-/build

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sun Jul 14 21:09:11 UYT 2019
-sdk.dir=/Users/arielhernandezmusa/Library/Android/sdk

package/ios/Plugin.xcodeproj/xcuserdata/nielsvanharen.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Plugin.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>4</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>