Merge master and add Readme

This commit is contained in:
Shalom Yerushalmy 2019-01-07 10:49:26 +02:00
commit e86d440f00
2 changed files with 11 additions and 2 deletions

View File

@ -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```

View File

@ -37,8 +37,11 @@ public class CameraPermission {
} }
private boolean isCameraPermission(int requestCode, String[] permissions) { private boolean isCameraPermission(int requestCode, String[] permissions) {
return requestCode == CAMERA_PERMISSION_REQUEST_CODE && if (permissions.length > 0) {
Manifest.permission.CAMERA.equals(permissions[0]); return requestCode == CAMERA_PERMISSION_REQUEST_CODE &&
Manifest.permission.CAMERA.equals(permissions[0]);
}
return false;
} }
public int checkAuthorizationStatus(Activity activity) { public int checkAuthorizationStatus(Activity activity) {