react-native-okaycam 1.2.0 → 2.0.1

package/README.md

@@ -39,9 +39,16 @@ end
 
 #### Android Issue
 
-Duplicate class org.hamcrest.xxx
+**Add following rules for proguard in the `android/app/proguard-rules.pro`**
 
-If you encouter the errors above, you may exclude junit module.
+```
+-keep class org.pytorch.** { *; }
+-keep class com.facebook.jni.** { *; }
+```
+
+**Duplicate class org.hamcrest.xxx**
+
+If you encouter the errors above, you may exclude junit module in the `android/app/build.gradle`
 
 ```
 configurations { compile.exclude group: "junit", module: "junit" }
@@ -92,9 +99,13 @@ const license = Platform.select({
 |confirmBtnConfig|contentColor|content color of the confirm button|#ffffff|
 |retakeBtnConfig|backgroundColor|background color of the retake button|#ffa500|
 |retakeBtnConfig|contentColor|content color of the retake button|#ffffff|
+|captureConfig|first|config for the first capture|delay:0s,onFlash:false,outputPath: null|
+|captureConfig|second|config for the second capture|delay:5s,onFlash:true,outputPath: null|
+|<sup>**New**</sup>captureConfig|first|config for the first capture|delay:0s,onFlash:false,outputPath:null,onImageQuality:false|
+|<sup>**New**</sup>captureConfig|second|config for the second capture|delay:5s,onFlash:true,outputPath:null,onImageQuality:false|
 |-|captureBtnColor|color of the capture button|#ffffff|
 |-|firstPhotoConfig|config for the first capture|delay:0s,onFlash:false,outputPath: null|
-|-|secondPhotoConfig|config for the second capture|null|
+|-|secondPhotoConfig|config for the second capture|delay:5s,onFlash:false,outputPath: null|
 |preview |title|title on preview screen|""(empty string)|
 |preview |refImg|ref image on preview screen|null|
 |preview |instruction1|instruction on preview screen|""(empty string)|
@@ -189,11 +200,17 @@ captureDocument(
 	})
 ```
 
+> **_NOTE:_** <br/>
+Supported image format : JPG | PNG | SVG <br/>
+Preffered size : less than 500KB
+
 ### Result
 | Result | Description |
 |--|--|
 |fullDocumentImage|Result of firstPhotoConfig|
-|fullDocumentImage2|Result of secondPhotoConfig. Will only return if secondPhotoConfig is configured|
+|fullDocumentImage2|Result of secondPhotoConfig. Will only return if secondPhotoConfig is configured. if secondPhotoConfig is not configured, it will be original image of fullDocumentImage|
+|fullDocumentImage3|Original Image if it exist|
+|fullDocumentImage4|Original Image if it exist|
 
 ## OkayCam Selfie
 ### Configuration

package/android/build.gradle

@@ -1,9 +1,9 @@
 buildscript {
     ext.kotlin_version = '1.4.21'
     repositories {
+        google()
         jcenter()
         mavenCentral()
-        google()
     }
 
     dependencies {
@@ -14,12 +14,11 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 22
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -30,28 +29,22 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    repositories {
-//        jcenter({ url "https://dl.bintray.com/innov8tifekyc/OkayCam/" })
-        //  maven { url "https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1064" }
-
-    }
-
 }
 
 repositories {
-    mavenCentral()
     google()
+    mavenCentral()
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:+'
-    implementation('com.innov8tif.okaycam:OkayCam:1.2.2@aar') {
+    implementation('com.facebook.react:react-native:+'){
+        exclude module: 'fbjni-java-only'
+    }
+    implementation('com.innov8tif.okaycam:OkayCam:2.0.0@aar') {
         transitive = true
     }
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
     implementation 'com.caverock:androidsvg-aar:1.4'
 }
   

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 

package/android/src/main/java/com/innov8tif/RNOkayCam/RNOkayCamModule.java

@@ -128,12 +128,14 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
                 firstPhoto != null ? new OkayCamCaptureConfig(
                         firstPhoto.getInt("delay"),
                         firstPhoto.getBoolean("onFlash"),
-                        firstPhoto.getString("outputPath")
+                        firstPhoto.getString("outputPath"),
+                        firstPhoto.getBoolean("onImageQuality")
                 ) : null,
                 secondPhoto != null ? new OkayCamCaptureConfig(
                         secondPhoto.getInt("delay"),
                         secondPhoto.getBoolean("onFlash"),
-                        secondPhoto.getString("outputPath")
+                        secondPhoto.getString("outputPath"),
+                        secondPhoto.getBoolean("onImageQuality")
                 ) : null
         ));
 

package/index.ts

@@ -61,6 +61,7 @@ interface CaptureConfig {
   delay: number;
   onFlash: Boolean;
   outputPath?: string;
+  onImageQuality: Boolean;
 }
 
 interface SwitchBtnConfig {
@@ -75,6 +76,13 @@ const defaultColor = "#ffffff";
 const defaultColor2 = "#ffa500";
 const imageResizedWidth = -1;
 
+const imageResolvedAssetSource: ImageResolvedAssetSource = {
+  height: 0,
+  width: 0,
+  scale: 0,
+  uri: "",
+};
+
 const labelConfig: LabelConfig = {
   text: "",
   color: defaultColor,
@@ -87,7 +95,7 @@ const defaultFrame: Frame = {
     height: (screenWidth * 54) / 85,
   },
   color: defaultColor,
-  content: null,
+  content: imageResolvedAssetSource,
 };
 
 const timerConfig: TimerConfig = {
@@ -105,31 +113,37 @@ const defaultCaptureBtnColor: string = defaultColor;
 const captureConfigFirst: CaptureConfig = {
   delay: 0,
   onFlash: false,
-  outputPath: null,
+  outputPath: "",
+  onImageQuality: false,
 };
 
-const defaultPreview: OkayCamPreviewConfig = null;
+const defaultPreview: OkayCamPreviewConfig = null!;
 
-const defaultInstruction: OkayCamInstruction = null;
+const defaultInstruction: OkayCamInstruction = null!;
 
-const captureConfigSecond: CaptureConfig = null;
+const captureConfigSecond: CaptureConfig = {
+  delay: 5,
+  onFlash: false,
+  outputPath: "",
+  onImageQuality: false,
+};
 
 const formatImage = (img: ImageResolvedAssetSource) => {
-  return Image.resolveAssetSource(img).uri;
-  // return img;
+  // return Image.resolveAssetSource(img).uri;
+  return img;
 };
 
 const formatInstruction = (
   instruction: OkayCamInstruction
 ): OkayCamInstruction => {
-  if (instruction == null) return null;
+  if (instruction == null) return null!;
 
   const ref1: OkaycamInstructionRefImg = {
     ...instruction.refImage1,
     img: formatImage(instruction.refImage1.img),
   };
 
-  let ref2: OkaycamInstructionRefImg = null;
+  let ref2: OkaycamInstructionRefImg = null!;
   if (instruction.refImage2 != null) {
     ref2 = {
       ...instruction.refImage2,
@@ -168,10 +182,98 @@ export const captureDocument = (
     instruction = defaultInstruction,
   }
 ) => {
+  if (topLabel.text == undefined) {
+    topLabel.text = labelConfig.text;
+  }
+
+  if (topLabel.color == undefined) {
+    topLabel.color = labelConfig.color;
+  }
+
+  if (topLabel.size == undefined) {
+    topLabel.size = labelConfig.size;
+  }
+
+  if (bottomLabel.text == undefined) {
+    bottomLabel.text = labelConfig.text;
+  }
+
+  if (bottomLabel.color == undefined) {
+    bottomLabel.color = labelConfig.color;
+  }
+
+  if (bottomLabel.size == undefined) {
+    bottomLabel.size = labelConfig.size;
+  }
+
   if (frame.size == undefined) {
     frame.size = defaultFrame.size;
   }
 
+  if (timer.backgroundColor == undefined || timer.textColor == undefined) {
+    timer.backgroundColor = timerConfig.backgroundColor;
+  }
+
+  if (timer.textColor == undefined) {
+    timer.textColor = timerConfig.textColor;
+  }
+
+  if (confirmBtnConfig.backgroundColor == undefined) {
+    confirmBtnConfig.backgroundColor = okayCamBtnConfig.backgroundColor;
+  }
+
+  if (confirmBtnConfig.contentColor == undefined) {
+    confirmBtnConfig.contentColor = okayCamBtnConfig.contentColor;
+  }
+
+  if (retakeBtnConfig.backgroundColor == undefined) {
+    retakeBtnConfig.backgroundColor = okayCamBtnConfig.backgroundColor;
+  }
+
+  if (retakeBtnConfig.contentColor == undefined) {
+    retakeBtnConfig.contentColor = okayCamBtnConfig.contentColor;
+  }
+
+  if (captureBtnColor == undefined) {
+    captureBtnColor = defaultCaptureBtnColor;
+  }
+
+  if (firstPhotoConfig.delay == undefined) {
+    firstPhotoConfig.delay = captureConfigFirst.delay;
+  }
+
+  if (firstPhotoConfig.onFlash == undefined) {
+    firstPhotoConfig.onFlash = captureConfigFirst.onFlash;
+  }
+
+  if (firstPhotoConfig.onImageQuality == undefined) {
+    firstPhotoConfig.onImageQuality = captureConfigFirst.onImageQuality;
+  }
+
+  if (firstPhotoConfig.outputPath == undefined) {
+    firstPhotoConfig.outputPath = captureConfigFirst.outputPath;
+  }
+
+  if (secondPhotoConfig.delay == undefined) {
+    secondPhotoConfig.delay = captureConfigSecond.delay;
+  }
+
+  if (secondPhotoConfig.onFlash == undefined) {
+    secondPhotoConfig.onFlash = captureConfigSecond.onFlash;
+  }
+
+  if (secondPhotoConfig.onImageQuality == undefined) {
+    secondPhotoConfig.onImageQuality = captureConfigSecond.onImageQuality;
+  }
+
+  if (secondPhotoConfig.outputPath == undefined) {
+    secondPhotoConfig.outputPath = captureConfigSecond.outputPath;
+  }
+
+  if (width == undefined) {
+    width = imageResizedWidth;
+  }
+
   const resultedPreview =
     preview == null
       ? null
@@ -253,6 +355,54 @@ export const captureSelfie = (
     imageQuality = 1.0,
   }
 ) => {
+  if (topLabel.text == undefined) {
+    topLabel.text = labelConfig.text;
+  }
+
+  if (topLabel.color == undefined) {
+    topLabel.color = labelConfig.color;
+  }
+
+  if (topLabel.size == undefined) {
+    topLabel.size = labelConfig.size;
+  }
+
+  if (switchBtnConfig.color == undefined) {
+    switchBtnConfig.color = defaultSwitchBtnConfig.color;
+  }
+
+  if (switchBtnConfig.show == undefined) {
+    switchBtnConfig.show = defaultSwitchBtnConfig.show;
+  }
+
+  if (confirmBtnConfig.backgroundColor == undefined) {
+    confirmBtnConfig.backgroundColor = okayCamBtnConfig.backgroundColor;
+  }
+
+  if (confirmBtnConfig.contentColor == undefined) {
+    confirmBtnConfig.contentColor = okayCamBtnConfig.contentColor;
+  }
+
+  if (retakeBtnConfig.backgroundColor == undefined) {
+    retakeBtnConfig.backgroundColor = okayCamBtnConfig.backgroundColor;
+  }
+
+  if (retakeBtnConfig.contentColor == undefined) {
+    retakeBtnConfig.contentColor = okayCamBtnConfig.contentColor;
+  }
+
+  if (defaultCameraFacing == undefined) {
+    defaultCameraFacing = cameraFacing;
+  }
+
+  if (captureBtnColor == undefined) {
+    captureBtnColor = defaultCaptureBtnColor;
+  }
+
+  if (width == undefined) {
+    width = imageResizedWidth;
+  }
+
   return new Promise(function (resolve, reject) {
     RNOkayCam.captureSelfie({
       license: license,

package/ios/RNOkayCam.swift

@@ -106,12 +106,12 @@ class RNOkayCam: NSObject {
             okayCamConfig.captureConfigPair = CaptureConfigPair(
                 firstPhoto: OkayCamCaptureConfig(
                     timeOut: firstPhoto.object(forKey: "delay") as! Int,
-                    onFlash: firstPhoto.object(forKey: "onFlash") as! Bool,
+                    onFlash: firstPhoto.object(forKey: "onFlash") as! Bool, onImageQuality: firstPhoto.object(forKey: "onImageQuality") as! Bool,
                     outputPath: (firstPhotoPath != nil) ? URL(string: (firstPhoto.object(forKey: "outputPath") as? String)!) : nil
                 ),
                 secondPhoto: (secondPhoto != nil) ? OkayCamCaptureConfig(
                     timeOut: secondPhoto?.object(forKey: "delay") as? Int ?? 0,
-                    onFlash: secondPhoto?.object(forKey: "onFlash") as? Bool ?? false,
+                    onFlash: secondPhoto?.object(forKey: "onFlash") as? Bool ?? false, onImageQuality: secondPhoto?.object(forKey: "onImageQuality") as! Bool,
                     outputPath: (secondPhotoPath != nil) ? URL(string: (secondPhoto?.object(forKey: "outputPath") as! String?)!) : nil
                 ) : nil
             )

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-okaycam",
   "title": "React Native OkayCam",
-  "version": "1.2.0",
+  "version": "2.0.1",
   "description": "React-Native version of OkayCam",
   "main": "index.ts",
   "files": [
@@ -35,6 +35,10 @@
   },
   "devDependencies": {
     "react": "^16.9.0",
-    "react-native": "^0.61.5"
+    "react-native": "^0.65.1"
+  },
+  "dependencies": {
+    "@types/react-native": "^0.71.3",
+    "react-native-codegen": "^0.0.7"
   }
 }

package/react-native-okaycam.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.static_framework = true
   s.dependency "React"
-  s.dependency "OkayCam", "1.1.10"
+  s.dependency "OkayCam", "2.0.0"
 end