react-native-okaycam 3.0.5 → 3.0.6

package/android/build.gradle

@@ -44,7 +44,7 @@ repositories {
 
 dependencies {
     compileOnly "com.facebook.react:react-android"
-    implementation('com.innov8tif.okaycam:OkayCam:3.0.11@aar') {
+    implementation('com.innov8tif.okaycam:OkayCam:3.1.3@aar') {
         transitive = true
         exclude group: "junit", module: "junit"
         exclude group: "org.hamcrest", module: "hamcrest-core"

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

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 
 import com.innov8tif.okaycam.cam.OkayCamAutoDoc;
+import com.innov8tif.okaycam.cam.OkayCamAutoSelfie;
 import com.innov8tif.okaycam.config.CameraFacing;
 import com.innov8tif.okaycam.config.OkayCamBtnConfig;
 import com.innov8tif.okaycam.config.OkayCamCaptureConfig;
@@ -27,9 +28,9 @@ import com.innov8tif.okaycam.config.OkayCamAutoCaptureConfig;
 import com.innov8tif.okaycam.config.OkaySelfieConfig;
 import com.innov8tif.okaycam.config.OkaySelfieLabelConfig;
 import com.innov8tif.okaycam.config.OkaySelfieSwichBtnConfig;
-import com.innov8tif.okaycam.selfie.OkayCamSelfie;
-import com.innov8tif.okaycam.utils.BitmapUtils;
 import com.innov8tif.okaycam.config.OkayCamAutoCaptureMode;
+import com.innov8tif.okaycam.config.OkayCamAutoSelfieConfig;
+import com.innov8tif.okaycam.utils.BitmapUtils;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -43,11 +44,8 @@ import java.net.URL;
 
 public class RNOkayCamModule extends ReactContextBaseJavaModule {
 
-    private final ReactApplicationContext reactContext;
-
     public RNOkayCamModule(ReactApplicationContext reactContext) {
         super(reactContext);
-        this.reactContext = reactContext;
     }
 
     @Override
@@ -89,18 +87,18 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
             if (success) {
                 JSONObject results = new JSONObject();
                 try {
-                    results.put("fullDocumentImage", convertImgToBase64(base64, images.get(0)));
+                    results.put("fullDocumentImage", base64 ? convertImgToBase64(base64, images.get(0)) : images.get(0));
 
                     if (images.size() > 1) {
-                        results.put("fullDocumentImage2", convertImgToBase64(base64, images.get(1)));
+                        results.put("fullDocumentImage2", base64 ? convertImgToBase64(base64, images.get(1)) : images.get(1));
                     }
 
                     if (images.size() > 2) {
-                        results.put("fullDocumentImage3", convertImgToBase64(base64, images.get(2)));
+                        results.put("fullDocumentImage3", base64 ? convertImgToBase64(base64, images.get(2)) : images.get(2));
                     }
 
                     if (images.size() > 3) {
-                        results.put("fullDocumentImage4", convertImgToBase64(base64, images.get(3)));
+                        results.put("fullDocumentImage4", base64 ? convertImgToBase64(base64, images.get(3)) : images.get(3));
                     }
 
                     promise.resolve(results.toString());
@@ -121,55 +119,13 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
 
         Boolean base64 = configs.getBoolean("base64");
 
-        ReadableMap userConfig = configs.getMap("config");
-        ReadableMap topLabel = userConfig.getMap("topLabel");
-        ReadableMap switchBtnConfig = userConfig.getMap("switchBtnConfig");
-        ReadableMap confirmBtnConfig = userConfig.getMap("confirmBtnConfig");
-        ReadableMap retakeBtnConfig = userConfig.getMap("retakeBtnConfig");
-
-        OkaySelfieConfig okaySelfieConfig = OkaySelfieConfig.init(this.getCurrentActivity());
-
-        okaySelfieConfig.setTopLabel(new OkaySelfieLabelConfig(
-                topLabel.getString("text"),
-                Color.parseColor(topLabel.getString("color")),
-                topLabel.getInt("size")
-        ));
-        okaySelfieConfig.setBottomFrameColor(Color.parseColor(userConfig.getString("bottomFrameColor")));
-
-        okaySelfieConfig.setCaptureBtnColor(Color.parseColor(userConfig.getString("captureBtnColor")));
-
-        okaySelfieConfig.setSwitchBtnConfig(new OkaySelfieSwichBtnConfig(
-                Color.parseColor(switchBtnConfig.getString("color")),
-                switchBtnConfig.getBoolean("show")
-        ));
-
-        okaySelfieConfig.setConfirmBtnConfig(new OkayCamBtnConfig(
-                Color.parseColor(confirmBtnConfig.getString("backgroundColor")),
-                Color.parseColor(confirmBtnConfig.getString("contentColor"))
-        ));
-
-        okaySelfieConfig.setRetakeBtnConfig(new OkayCamBtnConfig(
-                Color.parseColor(retakeBtnConfig.getString("backgroundColor")),
-                Color.parseColor(retakeBtnConfig.getString("contentColor"))
-        ));
-
-        if (userConfig.getString("defaultCameraFacing").equals("front")) {
-            okaySelfieConfig.setDefaultCameraFacing(CameraFacing.FRONT);
-        } else if (userConfig.getString("defaultCameraFacing").equals("back")) {
-            okaySelfieConfig.setDefaultCameraFacing(CameraFacing.BACK);
-        }
-
-        if (userConfig.getInt("width") != -1) {
-            okaySelfieConfig.setWidth(userConfig.getInt("width"));
-        }
-
-        okaySelfieConfig.setImageQuality((float) userConfig.getDouble("imageQuality"));
+        OkayCamAutoSelfieConfig okaySelfieConfig = OkayCamAutoSelfieConfig.init();
 
-        OkayCamSelfie.start(this.getCurrentActivity(), LICENSE_KEY, okaySelfieConfig, (success, image, exception) -> {
+        OkayCamAutoSelfie.start(this.getCurrentActivity(), LICENSE_KEY, okaySelfieConfig, (success, image, exception) -> {
             if (success) {
                 JSONObject results = new JSONObject();
                 try {
-                    results.put("selfieImage", convertImgToBase64(base64, image));
+                    results.put("selfieImage", base64 ? convertImgToBase64(base64, image) : image);
                     promise.resolve(results.toString());
                 } catch (JSONException e) {
                     e.printStackTrace();

package/index.ts

@@ -9,39 +9,7 @@ export enum DocumentCaptureMode {
   FRONT_WITH_FLASH = "FRONT_WITH_FLASH",
 }
 
-interface LabelConfig {
-  text: string;
-  color: string;
-  size: number;
-}
-
-interface OkayCamBtnConfig {
-  backgroundColor: string;
-  contentColor: string;
-}
-
-interface SwitchBtnConfig {
-  color: string;
-  show: boolean;
-}
-
-type cameraFacingType = "front" | "back";
-
-// Set default values
-const defaultColor = "#ffffff";
-const defaultColor2 = "#ffa500";
-const imageResizedWidth = -1;
-
-const labelConfig: LabelConfig = {
-  text: "",
-  color: defaultColor,
-  size: 20,
-};
-
-const okayCamBtnConfig: OkayCamBtnConfig = {
-  backgroundColor: defaultColor2,
-  contentColor: defaultColor,
-};
+const imageResizedWidth = 1080;
 
 // cal native capture document
 export const captureDocument = (
@@ -82,43 +50,23 @@ export const captureDocument = (
   });
 };
 
-const defaultSwitchBtnConfig: SwitchBtnConfig = {
-  show: true,
-  color: defaultColor,
-};
-
-const cameraFacing: cameraFacingType = "front";
-
 // call native capture selfie
 export const captureSelfie = (
   license: string,
   base64: boolean,
-  {
-    topLabel = labelConfig,
-    bottomFrameColor = defaultColor2,
-    captureBtnColor = defaultColor,
-    switchBtnConfig = defaultSwitchBtnConfig,
-    confirmBtnConfig = okayCamBtnConfig,
-    retakeBtnConfig = okayCamBtnConfig,
-    defaultCameraFacing = cameraFacing,
-    width = imageResizedWidth,
-    imageQuality = 1.0,
-  },
+  config: {
+    width?: number;
+    height?: number;
+  } = {},
 ) => {
+  const { width = imageResizedWidth, height = 1920 } = config;
   return new Promise(function (resolve, reject) {
     RNOkayCam.captureSelfie({
       license: license,
       base64: base64,
       config: {
-        topLabel: topLabel,
-        bottomFrameColor: bottomFrameColor,
-        captureBtnColor: captureBtnColor,
-        switchBtnConfig: switchBtnConfig,
-        confirmBtnConfig: confirmBtnConfig,
-        retakeBtnConfig: retakeBtnConfig,
-        defaultCameraFacing: defaultCameraFacing,
         width: width,
-        imageQuality: imageQuality,
+        height: height,
       },
     })
       .then((result: string) => {

package/ios/RNOkayCam.swift

@@ -59,7 +59,7 @@ class RNOkayCam: NSObject {
 
             config.mode = self.parseMode(mode)
 
-            OkayCamDocAutoCapture.start(
+            OkayCamAutoDoc.start(
                 okayCamConfig: config,
                 license: license
             ) { filePaths, error in
@@ -105,16 +105,6 @@ class RNOkayCam: NSObject {
         
         let license = configs.object(forKey: "license")! as! String
         let base64 = configs.object(forKey: "base64") as! Bool
-        let rnOkayCamConfig = configs.object(forKey: "config") as! NSDictionary
-        let topLabel = rnOkayCamConfig.object(forKey: "topLabel") as! NSDictionary
-        let bottomFrameColor = rnOkayCamConfig.object(forKey: "bottomFrameColor") as! String
-        let captureBtnColor = rnOkayCamConfig.object(forKey: "captureBtnColor") as! String
-        let switchBtnConfig = rnOkayCamConfig.object(forKey: "switchBtnConfig") as! NSDictionary
-        let confirmBtnConfig = rnOkayCamConfig.object(forKey: "confirmBtnConfig") as! NSDictionary
-        let retakeBtnConfig = rnOkayCamConfig.object(forKey: "retakeBtnConfig") as! NSDictionary
-        let defaultCameraFacing = rnOkayCamConfig.object(forKey: "defaultCameraFacing") as! String
-        let width = rnOkayCamConfig.object(forKey: "width") as! Int
-        let imageQuality = rnOkayCamConfig.object(forKey: "imageQuality") as! CGFloat
         
         DispatchQueue.main.async {
             guard let rootViewController = UIApplication.shared.windows.first?.rootViewController else {
@@ -122,51 +112,10 @@ class RNOkayCam: NSObject {
                 return
             }
 
-            let okaySelfieConfig = OkaySelfieConfig(viewController: rootViewController)
-            
-            // top label
-            okaySelfieConfig.topLabel.text = topLabel.object(forKey: "text") as! String
-            okaySelfieConfig.topLabel.color = self.hexStringToUIColor(hex: topLabel.object(forKey: "color") as! String)
-            okaySelfieConfig.topLabel.size = CGFloat(topLabel.object(forKey: "size") as! Int)
-            
-            // bottom frame color
-            okaySelfieConfig.bottomFrameColor = self.hexStringToUIColor(hex: bottomFrameColor)
-            
-            // capture button color
-            okaySelfieConfig.captureBtnColor = self.hexStringToUIColor(hex: captureBtnColor)
-            
-            // capture configurations
-            okaySelfieConfig.captureBtnColor = self.hexStringToUIColor(hex: captureBtnColor)
-
-            // confirm button config
-            okaySelfieConfig.confirmBtnConfig.backgroundColor = self.hexStringToUIColor(hex: confirmBtnConfig.object(forKey: "backgroundColor") as! String)
-            okaySelfieConfig.confirmBtnConfig.contentColor = self.hexStringToUIColor(hex: confirmBtnConfig.object(forKey: "contentColor") as! String)
-
-            // retake button config
-            okaySelfieConfig.retakeBtnConfig.backgroundColor = self.hexStringToUIColor(hex: retakeBtnConfig.object(forKey: "backgroundColor") as! String)
-            okaySelfieConfig.retakeBtnConfig.contentColor = self.hexStringToUIColor(hex: retakeBtnConfig.object(forKey: "contentColor") as! String)
-            
-            // switch button config
-            okaySelfieConfig.switchBtnConfig.color = self.hexStringToUIColor(hex: switchBtnConfig.object(forKey: "color") as! String)
-//            okaySelfieConfig.switchBtnConfig.show = switchBtnConfig.object(forKey: "show") as! Bool
-            okaySelfieConfig.switchBtnConfig.show = true
-            // camera facing
-            if (defaultCameraFacing == "front") {
-                okaySelfieConfig.defaultCameraFacing = OkayCam.CameraDevice.front
-            }
-            else {
-                okaySelfieConfig.defaultCameraFacing = OkayCam.CameraDevice.back
-            }
-            
-            // resize
-            if (width != -1) {
-                okaySelfieConfig.width = width
-            }
-            
-            okaySelfieConfig.imageQuality = imageQuality
+            let okaySelfieConfig = OkayCamAutoSelfieConfig(viewController: rootViewController)
             
             // start the SDK
-            OkayCamSelfie.start(
+            OkayCamAutoSelfie.start(
                 okaySelfieConfig: okaySelfieConfig,
                 license: license,
                 { filePath, error in

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-okaycam",
   "title": "React Native OkayCam",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "React-Native version of OkayCam",
   "main": "index.ts",
   "files": [

package/react-native-okaycam.podspec

@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.dependency "React-RCTFabric"
 
   # OkayCam CocoaPod dependency
-  s.dependency "OkayCam", "3.0.16"
+  s.dependency "OkayCam", "3.1.3"
   s.dependency "CryptoSwift", "1.8.2"
 
   s.pod_target_xcconfig = {