Merge master and add Readme
This commit is contained in:
commit
e86d440f00
|
@ -55,6 +55,12 @@ And in the package list in the same file (e.g. `getPackages`) add:
|
||||||
+ new RNCameraKitPackage()
|
+ new RNCameraKitPackage()
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Add to `proguard-rules.pro` file:
|
||||||
|
|
||||||
|
```diff
|
||||||
|
+ -dontwarn com.google.zxing.qrcode.decoder.**
|
||||||
|
```
|
||||||
|
|
||||||
## Running the example project
|
## Running the example project
|
||||||
|
|
||||||
- ```cd old-example```
|
- ```cd old-example```
|
||||||
|
|
|
@ -37,9 +37,12 @@ public class CameraPermission {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isCameraPermission(int requestCode, String[] permissions) {
|
private boolean isCameraPermission(int requestCode, String[] permissions) {
|
||||||
|
if (permissions.length > 0) {
|
||||||
return requestCode == CAMERA_PERMISSION_REQUEST_CODE &&
|
return requestCode == CAMERA_PERMISSION_REQUEST_CODE &&
|
||||||
Manifest.permission.CAMERA.equals(permissions[0]);
|
Manifest.permission.CAMERA.equals(permissions[0]);
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public int checkAuthorizationStatus(Activity activity) {
|
public int checkAuthorizationStatus(Activity activity) {
|
||||||
final int statusCode = PermissionChecker.checkCallingOrSelfPermission(activity, Manifest.permission.CAMERA);
|
final int statusCode = PermissionChecker.checkCallingOrSelfPermission(activity, Manifest.permission.CAMERA);
|
||||||
|
|
Loading…
Reference in New Issue