From 63fe1e6cbfdc9ed8aeec575838f25a5be1d60b0f Mon Sep 17 00:00:00 2001 From: Dylan McIntyre Date: Tue, 4 Apr 2017 09:07:12 -0400 Subject: [PATCH] add new attrs to readme --- README.md | 68 +++++++++++++++++++++++++ camerakit/src/main/res/values/attrs.xml | 4 +- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d5b76c7..3a59d28f 100644 --- a/README.md +++ b/README.md @@ -135,8 +135,10 @@ camera.postDelayed(new Runnable() { camerakit:ckFocus="continuous" camerakit:ckMethod="standard" camerakit:ckZoom="pinch" + camerakit:ckPermissions="strict" camerakit:ckCropOutput="true" camerakit:ckJpegQuality="100" + camerakit:ckVideoQuality="480p" android:adjustViewBounds="true" /> ``` @@ -147,8 +149,10 @@ camera.postDelayed(new Runnable() { |[`ckFocus`](#ckfocus)|[`off`](#off-1) [`continuous`](#continuous) [`tap`](#tap)|`continuous`| |[`ckMethod`](#ckmethod)|[`standard`](#standard) [`still`](#still) [`speed`](#speed)|`standard`| |[`ckZoom`](#ckzoom)|[`off`](#off-2) [`pinch`](#pinch)|`off`| +|[`ckPermissions`](#ckpermissions)|[`strict`](#strict) [`lazy`](#lazy) [`picture`](#picture`)|`strict`| |[`ckCropOutput`](#ckcropoutput)|[`true`](#true) [`false`](#false)|`false`| |[`ckJpegQuality`](#ckjpegquality)|[`0 <= n <= 100`](#ckjpegquality)|`100`| +|[`ckVideoQuality`](#ckvideoquality)|[`max480p`](#max480p) [`max720p`](#max720p) [`max1080p`](#max1080p) [`max2160p`](#max2160p) [`highest`](#highest) [`lowest`](#lowest)|`max480p`| - - - @@ -263,6 +267,29 @@ cameraView.setZoom(CameraKit.Constants.ZOOM_PINCH); - - - +### `ckPermissions` +[`strict`](#strict) [`lazy`](#lazy) [`picture`](#picture`) + +#### `strict` + +```java +cameraView.setPermissions(CameraKit.Constants.PERMISSIONS_STRICT); +``` + +#### `lazy` + +```java +cameraView.setPermissions(CameraKit.Constants.PERMISSIONS_LAZY); +``` + +#### `picture` + +```java +cameraView.setPermissions(CameraKit.Constants.PERMISSIONS_PICTURE); +``` + +- - - + ### `ckCropOutput` [`true`](#true) [`false`](#false) @@ -288,6 +315,47 @@ cameraView.setJpegQuality(100); - - - +### `ckVideoQuality` +[`max480p`](#max480p) [`max720p`](#max720p) [`max1080p`](#max1080p) [`max2160p`](#max2160p) [`highest`](#highest) [`lowest`](#lowest) + +#### `max480p` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_480P); +``` + +#### `max720p` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_720P); +``` + +#### `max1080p` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_1080P); +``` + +#### `max2160p` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_2160P); +``` + +#### `lowest` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_LOWEST); +``` + +#### `highest` + +```java +cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_HIGHEST); +``` + +- - - + ## Automatic Permissions Behavior You can handle permissions yourself in whatever way you want, but if you make a call to `CameraView.start()` without the `android.permission.CAMERA` permission, an exception would normally be thrown and your app would crash. diff --git a/camerakit/src/main/res/values/attrs.xml b/camerakit/src/main/res/values/attrs.xml index e9f52705..62724b36 100644 --- a/camerakit/src/main/res/values/attrs.xml +++ b/camerakit/src/main/res/values/attrs.xml @@ -43,6 +43,8 @@ + + @@ -52,8 +54,6 @@ - -