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

package/CapacitorCommunityCameraPreview.podspec

@@ -1,13 +1,14 @@
 
   Pod::Spec.new do |s|
     s.name = 'CapacitorCommunityCameraPreview'
-    s.version = '0.0.1'
+    s.version = '2.0.0'
     s.summary = 'Camera preview'
     s.license = 'MIT'
     s.homepage = 'https://github.com/capacitor-community/camera-preview.git'
     s.author = 'Ariel Hernandez Musa'
     s.source = { :git => 'https://github.com/capacitor-community/camera-preview.git', :tag => s.version.to_s }
     s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
-    s.ios.deployment_target  = '11.0'
+    s.ios.deployment_target  = '12.0'
     s.dependency 'Capacitor'
+    s.swift_version = '5.1'
   end

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Ariel Hernandez Musa.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,8 +1,15 @@
-# Capacitor Camera Preview
+<p align="center"><br><img src="https://user-images.githubusercontent.com/236501/85893648-1c92e880-b7a8-11ea-926d-95355b8175c7.png" width="128" height="128" /></p>
+<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 3</strong></p><br>
 
-Capacitor plugin that allows camera interaction from Javascript and HTML (based on cordova-plugin-camera-preview)
+<p align="center">
+  Capacitor plugin that allows camera interaction from Javascript and HTML<br>(based on cordova-plugin-camera-preview).
+</p>
+<br>
 
-**Releases are being kept up to date when appropriate. However, this plugin is under constant development. As such it is recommended to use master to always have the latest fixes & features.**
+Version 2 of this plugin is compatible with Ionic 5 and Capacitor 3. If your project uses Capacitor 2, please make sure you install [version 1](https://github.com/capacitor-community/camera-preview/releases/tag/v1.2.1) of this plugin.
 
 **PR's are greatly appreciated. Maintainer(s) wanted.**
 
@@ -23,22 +30,6 @@ Capacitor plugin that allows camera interaction from Javascript and HTML (based
 
 # Installation
 
-<!-- Use any one of the installation methods listed below depending on which framework you use. -->
-
-<!-- To install the master version with latest fixes and features -->
-
-<!-- ```
-cordova plugin add https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git
-
-ionic cordova plugin add https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git
-
-meteor add cordova:cordova-plugin-camera-preview@https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git#[latest_commit_id]
-
-<plugin spec="https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview.git" source="git" />
-``` -->
-
-<!-- or if you want to use the last released version on npm -->
-
 ```
 yarn add @capacitor-community/camera-preview
 
@@ -51,44 +42,19 @@ Then run
 npx cap sync
 ```
 
-#### Android Quirks
-
-On Android remember to add the plugin to `MainActivity`
-```java
-import com.ahm.capacitor.camera.preview.CameraPreview;
-
-
-this.init(savedInstanceState, new ArrayList<Class<? extends Plugin>>() {{
-      // Additional plugins you've installed go here
-      // Ex: add(TotallyAwesomePlugin.class);
-      add(CameraPreview.class);
-}});
+## Extra Android installation steps
+Open `android/app/src/main/AndroidManifest.xml` and above the closing `</manifest>` tag add this line to request the CAMERA permission:
+```xml
+<uses-permission android:name="android.permission.CAMERA" />
 ```
+For more help consult the [Capacitor docs](https://capacitorjs.com/docs/android/configuration#configuring-androidmanifestxml).
 
-#### Web Quirks
-Add `import '@capacitor-community/camera-preview'` to you entry script in ionic on `app.module.ts`, so capacitor can register the web platform from the plugin
-<!--
-#### iOS Quirks
-If you are developing for iOS 10+ you must also add the following to your config.xml
+## Extra iOS installation steps
+You will need to add two permissions to `Info.plist`. Follow the [Capacitor docs](https://capacitorjs.com/docs/ios/configuration#configuring-infoplist) and add permissions with the raw keys `NSCameraUsageDescription` and `NSMicrophoneUsageDescription`.
 
-```xml
-<config-file platform="ios" target="*-Info.plist" parent="NSCameraUsageDescription" overwrite="true">
-  <string>Allow the app to use your camera</string>
-</config-file> -->
+## Extra Web installation steps
+Add `import '@capacitor-community/camera-preview'` to you entry script in ionic on `app.module.ts`, so capacitor can register the web platform from the plugin
 
-<!-- or for Phonegap -->
-
-<!-- <gap:config-file platform="ios" target="*-Info.plist" parent="NSCameraUsageDescription" overwrite="true">
-  <string>Allow the app to use your camera</string>
-</gap:config-file>
-``` -->
-<!--
-#### Android Quirks (older devices)
-When using the plugin for older devices, the camera preview will take the focus inside the app once initialized.
-In order to prevent the app from closing when a user presses the back button, the event for the camera view is disabled.
-If you still want the user to navigate, you can add a listener for the back event for the preview
-(see <code>[onBackButton](#onBackButton)</code>)
- -->
 
 # Methods
 
@@ -109,6 +75,8 @@ Starts the camera preview instance.
 | rotateWhenOrientationChanged | boolean   | (optional) Rotate preview when orientation changes (applicable to the ios platforms only; default value is true)                                                      |
 | storeToFile | boolean       | (optional) Capture images to a file and return back the file path instead of returning base64 encoded data, default false. |
 | disableExifHeaderStripping | boolean       | (optional) Disable automatic rotation of the image, and let the browser deal with it, default true (applicable to the android and ios platforms only) |
+| disableAudio | boolean | (optional) Disables audio stream to prevent permission requests, default false. (applicable to web only) |
+| lockAndroidOrientation | boolean | (optional) Locks device orientation when camer is showing, default false. (applicable to Android only) |
 
 <!-- <strong>Options:</strong>
 All options stated are optional and will default to values here
@@ -145,7 +113,7 @@ ion-content {
   --background: transparent;
 }
 ```
-Take into account that this will make transparent all ion-content on application, if you want to show camera preview only in one page, just add a cutom class to your ion-content and make it transparent:
+Take into account that this will make transparent all ion-content on application, if you want to show camera preview only in one page, just add a custom class to your ion-content and make it transparent:
 
 ```css
 .my-custom-camera-preview-content {
@@ -202,7 +170,7 @@ CameraPreview.hide();
 <!-- <info>Take the picture. If width and height are not specified or are 0 it will use the defaults. If width and height are specified, it will choose a supported photo size that is closest to width and height specified and has closest aspect ratio to the preview. The argument `quality` defaults to `85` and specifies the quality/compression value: `0=max compression`, `100=max quality`.</info><br/> -->
 
 ```javascript
-import { CameraPreviewFlashMode } from 'c@capacitor-community/camera-preview';
+import { CameraPreviewFlashMode } from '@capacitor-community/camera-preview';
 
 const cameraPreviewPictureOptions: CameraPreviewPictureOptions = {
   quality: 50
@@ -215,6 +183,28 @@ const base64PictureData = result.value;
 
 ```
 
+### captureSample(options)
+
+| Option   | values        | descriptions                                                         |
+|----------|---------------|----------------------------------------------------------------------|
+| quality  | number        | (optional) The picture quality, 0 - 100, default 85                  |
+
+<info>Captures a sample image from the video stream. Only for Android and iOS, web implementation falls back to `capture` method. This can be used to perform real-time analysis on the current frame in the video. The argument `quality` defaults to `85` and specifies the quality/compression value: `0=max compression`, `100=max quality`.</info><br/>
+
+```javascript
+import { CameraSampleOptions } from '@capacitor-community/camera-preview';
+
+const cameraSampleOptions: CameraSampleOptions = {
+  quality: 50
+};
+
+const result = await CameraPreview.captureSample(cameraSampleOptions);
+const base64PictureData = result.value;
+
+// do something with base64PictureData
+
+```
+
 ### getSupportedFlashModes()
 
 <info>Get the flash modes supported by the camera device currently started. Returns an array containing supported flash modes. See <code>[FLASH_MODE](#camera_Settings.FlashMode)</code> for possible values that can be returned</info><br/>
@@ -405,3 +395,5 @@ Created by Marcel Barbosa Pinto [@mbppower](https://github.com/mbppower)
 # Demo
 
 A working example can be found at [Demo](https://github.com/capacitor-community/camera-preview/tree/master/demo)
+
+To run the demo on your local network and access media devices, a secure context is needed. Add an `.env` file at the root of the demo folder with `HTTPS=true` to start react with HTTPS.

package/android/build.gradle

@@ -11,10 +11,10 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,8 +40,8 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.2'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

package/android/src/main/java/com/ahm/capacitor/camera/preview/CameraActivity.java

@@ -673,7 +673,17 @@ public class CameraActivity extends Fragment {
                 degrees = 0;
                 break;
             }
-            params.setRotation(degrees);
+            int orientation;
+            Camera.CameraInfo info = new Camera.CameraInfo();
+            if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+              orientation = (info.orientation + degrees) % 360;
+              if (degrees != 0) {
+                orientation = (360 - orientation) % 360;
+              }
+            } else {
+              orientation = (info.orientation - degrees + 360) % 360;
+            }
+            params.setRotation(orientation);
           } else {
             params.setRotation(mPreview.getDisplayOrientation());
           }