react-native-okaycam 3.0.2 → 3.0.4

package/android/build.gradle

@@ -43,8 +43,8 @@ repositories {
 }
 
 dependencies {
-    implementation "com.facebook.react:react-android"
-    implementation('com.innov8tif.okaycam:OkayCam:3.0.3@aar') {
+    compileOnly "com.facebook.react:react-android"
+    implementation('com.innov8tif.okaycam:OkayCam:3.0.9@aar') {
         transitive = true
         exclude group: "junit", module: "junit"
         exclude group: "org.hamcrest", module: "hamcrest-core"

package/android/consumer-rules.pro

@@ -1,3 +1,70 @@
+##---------------Begin: proguard configuration for Gson ----------
+# Gson uses generic type information stored in a class file when working with
+#fields. Proguard removes such information by default, so configure it to keep
+#all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.xendity.util.models.** { *; }
+-keep class com.xendity.util.R$drawable { *; }
+-keep class com.xendity.util.R$raw { *; }
+-keep class com.xendity.util.R$style  { *; }
+-keep class com.xendity.util.R { *; }
+    
+##---------------End: proguard configuration for Gson ----------
+
+# region XScannerConfig
+-keep class com.xendity.util.models.XScannerConfig {
+    *;
+}
+-keepclassmembers class com.xendity.util.models.XScannerConfig {
+    *;
+}
+-keepnames class com.xendity.util.models.XScannerConfig {
+    *;
+}
+-keepclassmembernames class com.xendity.util.models.XScannerConfig {
+    *;
+}
+# endregion
+
+# region XenUtil
+-keep class com.xendity.util.XenUtil {
+    public static *;
+}
+-keepclassmembers class com.xendity.util.XenUtil {
+    public static *;
+}
+-keepnames class com.xendity.util.XenUtil {
+    public static *;
+}
+-keepclassmembernames class com.xendity.util.XenUtil {
+    public static *;
+}
+# endregion
+
+# region XenLoadingUtil
+-keep class com.xendity.util.misc.XenLoadingUtil {
+    *;
+}
+-keepclassmembers class com.xendity.util.misc.XenLoadingUtil {
+    *;
+}
+-keepnames class com.xendity.util.misc.XenLoadingUtil {
+    *;
+}
+-keepclassmembernames class com.xendity.util.misc.XenLoadingUtil {
+    *;
+}
+# endregion
+
 # This is a configuration file for ProGuard.
 # http://proguard.sourceforge.net/index.html#manual/usage.html
 #
@@ -118,6 +185,7 @@
 -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { *; }
 -keep class com.google.common.flogger.** { *; }
 
+
 # These classes are duplicated between android.jar and org.apache.http.legacy.jar.
 -dontnote org.apache.http.**
 -dontnote android.net.http.**
@@ -130,3 +198,19 @@
 -dontwarn com.google.errorprone.annotations.CanIgnoreReturnValue
 -dontwarn com.google.errorprone.annotations.CheckReturnValue
 -dontwarn com.google.errorprone.annotations.MustBeClosed
+
+# Preserve MediaPipe task vision classes
+-keep class com.google.mediapipe.tasks.** { *; }
+
+# Preserve protocol buffer internals
+-keep class com.google.protobuf.** { *; }
+
+# Specifically preserve fields for generated proto messages
+# MediaPipe needs these fields (like length_) for reflection
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
+    <fields>;
+}
+
+# Ignore warnings
+-dontwarn com.google.mediapipe.**
+-dontwarn com.google.protobuf.**

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

@@ -18,23 +18,17 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 
-import com.innov8tif.okaycam.cam.OkayCamDoc;
+import com.innov8tif.okaycam.cam.OkayCamAutoDoc;
 import com.innov8tif.okaycam.config.CameraFacing;
-import com.innov8tif.okaycam.config.CaptureConfigPair;
 import com.innov8tif.okaycam.config.OkayCamBtnConfig;
 import com.innov8tif.okaycam.config.OkayCamCaptureConfig;
-import com.innov8tif.okaycam.config.OkayCamConfig;
-import com.innov8tif.okaycam.config.OkayCamFrameConfig;
-import com.innov8tif.okaycam.config.OkayCamInstruction;
-import com.innov8tif.okaycam.config.OkayCamInstructionRefImg;
-import com.innov8tif.okaycam.config.OkayCamLabelConfig;
-import com.innov8tif.okaycam.config.OkayCamPreviewConfig;
-import com.innov8tif.okaycam.config.OkayCamTimerConfig;
+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 org.json.JSONException;
 import org.json.JSONObject;
@@ -65,85 +59,20 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
         String LICENSE_KEY = configs.getString("license");
 
         Boolean base64 = configs.getBoolean("base64");
-
         ReadableMap userConfig = configs.getMap("config");
-        ReadableMap topLabel = userConfig.getMap("topLabel");
-        ReadableMap bottomLabel = userConfig.getMap("bottomLabel");
-        ReadableMap frame = userConfig.getMap("frame");
-        ReadableMap timer = userConfig.getMap("timer");
-        ReadableMap confirmBtnConfig = userConfig.getMap("confirmBtnConfig");
-        ReadableMap retakeBtnConfig = userConfig.getMap("retakeBtnConfig");
-        ReadableMap captureConfigPair = userConfig.getMap("captureConfigPair");
-        ReadableMap firstPhoto = captureConfigPair.getMap("firstPhoto");
-        ReadableMap secondPhoto = captureConfigPair.getMap("secondPhoto");
-        ReadableMap preview = userConfig.getMap("preview");
-        ReadableMap instruction = userConfig.getMap("instruction");
+        OkayCamAutoCaptureConfig config = OkayCamAutoCaptureConfig.init();
 
-        OkayCamConfig okayCamConfig = OkayCamConfig.init(this.getCurrentActivity());
+        // if (userConfig.getInt("width") != -1) {
+        //     config.setWidth(userConfig.getInt("width"));
+        // }
 
-        okayCamConfig.setShowOverlay(userConfig.getBoolean("showOverlay"));
-        okayCamConfig.setShowPreviewInstruction(userConfig.getBoolean("showPreviewInstruction"));
-        okayCamConfig.setTorchBtnEnabled(userConfig.getBoolean("torchBtnEnabled"));
-        okayCamConfig.setCrop(userConfig.getBoolean("crop"));
-
-        if (userConfig.getInt("width") != -1) {
-            okayCamConfig.setWidth(userConfig.getInt("width"));
+        if (userConfig.getDouble("imageQuality") > 0.0) {
+            config.setImageQuality((float) userConfig.getDouble("imageQuality"));
         }
 
-        okayCamConfig.setImageQuality((float) userConfig.getDouble("imageQuality"));
-
-        okayCamConfig.setTopLabel(new OkayCamLabelConfig(
-                topLabel.getString("text"),
-                Color.parseColor(topLabel.getString("color")),
-                topLabel.getInt("size")
-        ));
-
-        okayCamConfig.setBottomLabel(new OkayCamLabelConfig(
-                bottomLabel.getString("text"),
-                Color.parseColor(bottomLabel.getString("color")),
-                bottomLabel.getInt("size")
-        ));
-
-        OkayCamFrameConfig frameConfig = getFrameConfig(frame);
-        okayCamConfig.setFrame(frameConfig);
-
-        okayCamConfig.setCaptureBtnColor(Color.parseColor(userConfig.getString("captureBtnColor")));
-        okayCamConfig.setTimer(new OkayCamTimerConfig(
-                Color.parseColor(timer.getString("backgroundColor")),
-                Color.parseColor(timer.getString("textColor"))
-        ));
-
-        okayCamConfig.setConfirmBtnConfig(new OkayCamBtnConfig(
-                Color.parseColor(confirmBtnConfig.getString("backgroundColor")),
-                Color.parseColor(confirmBtnConfig.getString("contentColor"))
-        ));
-
-        okayCamConfig.setRetakeBtnConfig(new OkayCamBtnConfig(
-                Color.parseColor(retakeBtnConfig.getString("backgroundColor")),
-                Color.parseColor(retakeBtnConfig.getString("contentColor"))
-        ));
-
-        okayCamConfig.setCaptureConfig(new CaptureConfigPair(
-            firstPhoto != null ? new OkayCamCaptureConfig(
-                firstPhoto.getInt("delay"),
-                firstPhoto.getBoolean("onFlash"),
-                firstPhoto.getString("outputPath"),
-                firstPhoto.hasKey("onImageQuality") ? firstPhoto.getBoolean("onImageQuality") : false
-            ) : null,
-            secondPhoto != null ? new OkayCamCaptureConfig(
-                secondPhoto.getInt("delay"),
-                secondPhoto.getBoolean("onFlash"),
-                secondPhoto.getString("outputPath"),
-                secondPhoto.hasKey("onImageQuality") ? secondPhoto.getBoolean("onImageQuality") : false
-            ) : null
-        ));
-
-        okayCamConfig.setPreview(getPreviewConfig(preview, frameConfig));
-        okayCamConfig.setInstruction(getInstructionConfig(instruction, frameConfig));
-        okayCamConfig.setAutoCapture(userConfig.getBoolean("autoCapture"));
-
-        OkayCamDoc.start(this.getCurrentActivity(), LICENSE_KEY, okayCamConfig, (success, images, exception) -> {
+        config.setMode(parseMode(userConfig.getString("mode")));
 
+        OkayCamAutoDoc.start(this.getCurrentActivity(), LICENSE_KEY, config, (success, images, exception) -> {
             if (success) {
                 JSONObject results = new JSONObject();
                 try {
@@ -173,290 +102,6 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
         });
     }
 
-    private OkayCamInstruction getInstructionConfig(ReadableMap instruction, OkayCamFrameConfig frameConfig) {
-        if (instruction == null) return null;
-        OkayCamLabelConfig title = mapToLabelConfig(instruction.getMap("title"));
-
-        ReadableMap refMap1 = instruction.getMap("refImage1");
-        OkayCamInstructionRefImg ref1 = mapToRef(refMap1, frameConfig, "instr1");
-
-        ReadableMap refMap2 = instruction.getMap("refImage2");
-        OkayCamInstructionRefImg ref2 = mapToRef(refMap2, frameConfig, "instr2");
-
-
-        return new OkayCamInstruction(
-                title,
-                ref1,
-                ref2
-        );
-    }
-
-    private OkayCamInstructionRefImg mapToRef(ReadableMap refMap, OkayCamFrameConfig frameConfig, String fileName) {
-        if (refMap == null) return null;
-        OkayCamLabelConfig title = mapToLabelConfig(refMap.getMap("title"));
-        String img1 = getImageFromJs(refMap.getString("img"), frameConfig, fileName);
-
-        return new OkayCamInstructionRefImg(title, img1);
-    }
-
-    private String getImageFromJs(String refImage, OkayCamFrameConfig frameConfig, String fileName) {
-        Size size = frameConfig.getSize();
-        int frameWidth = size.getWidth();
-        int frameHeight = size.getHeight();
-
-        Bitmap contentBmp = null;
-        try {
-            if (refImage != null) {
-                // In debug, the image is returned as URL
-                if (BuildConfig.DEBUG) {
-                    InputStream inputStream = new URL(refImage).openStream();
-
-                    if (refImage.contains("svg")) {
-
-                        SVG svg = SVG.getFromInputStream(inputStream);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        contentBmp = BitmapFactory.decodeStream(inputStream);
-                    }
-                } else {
-                    // In release, the image is returned as raw (svg) or drawable (png, jpeg and etc)
-                    int resourceId = this.getCurrentActivity().getResources().getIdentifier(refImage, "raw", this.getCurrentActivity().getPackageName());
-
-                    if (resourceId != 0) {
-                        SVG svg = SVG.getFromResource(getReactApplicationContext(), resourceId);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        resourceId = this.getCurrentActivity().getResources().getIdentifier(refImage, "drawable", this.getCurrentActivity().getPackageName());
-                        contentBmp = BitmapFactory.decodeResource(getReactApplicationContext().getResources(), resourceId);
-                    }
-                }
-            }
-        } catch (SVGParseException | MalformedURLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return generateFile(contentBmp, fileName);
-    }
-
-    private OkayCamPreviewConfig getPreviewConfig(ReadableMap preview, OkayCamFrameConfig frameConfig) {
-        if (preview == null) return null;
-        OkayCamLabelConfig title = mapToLabelConfig(preview.getMap("title"));
-        OkayCamLabelConfig instr1 = mapToLabelConfig(preview.getMap("instruction1"));
-        OkayCamLabelConfig instr2 = mapToLabelConfig(preview.getMap("instruction2"));
-        OkayCamLabelConfig instr3 = mapToLabelConfig(preview.getMap("instruction3"));
-
-        int bgColor = Color.parseColor(preview.getString("backgroundColor"));
-
-        String refImage = preview.getString("refImage");
-
-        Size size = frameConfig.getSize();
-        int frameWidth = size.getWidth();
-        int frameHeight = size.getHeight();
-
-        Bitmap contentBmp = null;
-        try {
-            if (refImage != null) {
-                // In debug, the image is returned as URL
-                if (BuildConfig.DEBUG) {
-                    InputStream inputStream = new URL(refImage).openStream();
-
-                    if (refImage.contains("svg")) {
-
-                        SVG svg = SVG.getFromInputStream(inputStream);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        contentBmp = BitmapFactory.decodeStream(inputStream);
-                    }
-                } else {
-                    // In release, the image is returned as raw (svg) or drawable (png, jpeg and etc)
-                    int resourceId = this.getCurrentActivity().getResources().getIdentifier(refImage, "raw", this.getCurrentActivity().getPackageName());
-
-                    if (resourceId != 0) {
-                        SVG svg = SVG.getFromResource(getReactApplicationContext(), resourceId);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        resourceId = this.getCurrentActivity().getResources().getIdentifier(refImage, "drawable", this.getCurrentActivity().getPackageName());
-                        contentBmp = BitmapFactory.decodeResource(getReactApplicationContext().getResources(), resourceId);
-                    }
-                }
-            }
-        } catch (SVGParseException | MalformedURLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-
-        return new OkayCamPreviewConfig(
-                title,
-                generateFile(contentBmp, "ref.png"),
-                instr1,
-                instr2,
-                instr3,
-                bgColor
-        );
-
-    }
-
-    private OkayCamLabelConfig mapToLabelConfig(ReadableMap map) {
-        return new OkayCamLabelConfig(
-                map.getString("text"),
-                Color.parseColor(map.getString("color")),
-                map.getInt("size")
-        );
-
-    }
-
-    private OkayCamFrameConfig getFrameConfig(ReadableMap frameConfig) {
-        ReadableMap frameSizeMap = frameConfig.getMap("size");
-        String frameColor = frameConfig.getString("color");
-        String frameContent = frameConfig.getString("content");
-
-        int frameWidth = frameSizeMap.getInt("width");
-        int frameHeight = frameSizeMap.getInt("height");
-        Size frameSize = new Size(frameWidth, frameHeight);
-
-        try {
-            if (frameContent != null) {
-                Bitmap contentBmp = null;
-
-                // In debug, the image is returned as URL
-                if (BuildConfig.DEBUG) {
-                    InputStream inputStream = new URL(frameContent).openStream();
-
-                    if (frameContent.contains("svg")) {
-
-                        SVG svg = SVG.getFromInputStream(inputStream);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        contentBmp = BitmapFactory.decodeStream(inputStream);
-                    }
-                } else {
-                    // In release, the image is returned as raw (svg) or drawable (png, jpeg and etc)
-                    int resourceId = this.getCurrentActivity().getResources().getIdentifier(frameContent, "raw", this.getCurrentActivity().getPackageName());
-
-                    if (resourceId != 0) {
-                        SVG svg = SVG.getFromResource(getReactApplicationContext(), resourceId);
-
-                        svg.setDocumentWidth(frameWidth);
-                        svg.setDocumentHeight(frameHeight);
-
-                        if (svg.getDocumentWidth() != -1) {
-                            contentBmp = Bitmap.createBitmap((int) Math.ceil(svg.getDocumentWidth()),
-                                    (int) Math.ceil(svg.getDocumentHeight()),
-                                    Bitmap.Config.ARGB_8888);
-
-                            Canvas bmcanvas = new Canvas(contentBmp);
-
-                            // Render our document onto our canvas
-                            svg.renderToCanvas(bmcanvas, new RenderOptions().preserveAspectRatio(PreserveAspectRatio.FULLSCREEN));
-                        }
-                    } else {
-                        resourceId = this.getCurrentActivity().getResources().getIdentifier(frameContent, "drawable", this.getCurrentActivity().getPackageName());
-                        contentBmp = BitmapFactory.decodeResource(getReactApplicationContext().getResources(), resourceId);
-                    }
-                }
-                return new OkayCamFrameConfig(frameSize, Color.parseColor(frameColor), generateFile(contentBmp, "content.png"));
-            }
-        } catch (SVGParseException | MalformedURLException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return new OkayCamFrameConfig(frameSize, Color.parseColor(frameColor), null);
-    }
-
-    public String generateFile(Bitmap bitmap, String filename) {
-        try {
-            String resultedFolder = ".private";
-            File privateFolder = this.getReactApplicationContext().getExternalFilesDir(resultedFolder);
-
-            if (!privateFolder.exists()) {
-                privateFolder.mkdir();
-            }
-
-            File file = new File(privateFolder, filename);
-            file.createNewFile();
-
-            FileOutputStream fos = new FileOutputStream(file.getAbsolutePath());
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos);
-
-            return file.getAbsolutePath();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
     @ReactMethod
     public void captureSelfie(ReadableMap configs, Promise promise) {
         String LICENSE_KEY = configs.getString("license");
@@ -508,15 +153,12 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
         okaySelfieConfig.setImageQuality((float) userConfig.getDouble("imageQuality"));
 
         OkayCamSelfie.start(this.getCurrentActivity(), LICENSE_KEY, okaySelfieConfig, (success, image, exception) -> {
-
             if (success) {
-
                 JSONObject results = new JSONObject();
                 try {
                     results.put("selfieImage", convertImgToBase64(base64, image));
                     promise.resolve(results.toString());
                 } catch (JSONException e) {
-                    // TODO Auto-generated catch block
                     e.printStackTrace();
                     promise.reject(this.getError(e.getMessage()));
                 }
@@ -554,4 +196,19 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
         }
         return new Exception(errorString);
     }
+
+    private OkayCamAutoCaptureMode parseMode(String mode) {
+        if (mode == null) return OkayCamAutoCaptureMode.FULL;
+
+        switch (mode) {
+            case "FRONT_ONLY":
+                return OkayCamAutoCaptureMode.FRONT_ONLY;
+            case "FRONT_BACK":
+                return OkayCamAutoCaptureMode.FRONT_BACK;
+            case "FRONT_WITH_FLASH":
+                return OkayCamAutoCaptureMode.FRONT_WITH_FLASH;
+            default:
+                return OkayCamAutoCaptureMode.FULL;
+        }
+    }
 }

package/index.ts

@@ -1,15 +1,13 @@
-import {
-  NativeModules,
-  Dimensions,
-  PixelRatio,
-  Image,
-  ImageResolvedAssetSource,
-  Platform,
-} from "react-native";
+import { NativeModules } from "react-native";
 
 const { RNOkayCam } = NativeModules;
 
-const screenWidth = Dimensions.get("screen").width;
+export enum DocumentCaptureMode {
+  FULL = "FULL",
+  FRONT_ONLY = "FRONT_ONLY",
+  FRONT_BACK = "FRONT_BACK",
+  FRONT_WITH_FLASH = "FRONT_WITH_FLASH",
+}
 
 interface LabelConfig {
   text: string;
@@ -17,52 +15,11 @@ interface LabelConfig {
   size: number;
 }
 
-interface OkayCamPreviewConfig {
-  title: LabelConfig;
-  refImage: ImageResolvedAssetSource;
-  instruction1: LabelConfig;
-  instruction2: LabelConfig;
-  instruction3: LabelConfig;
-  backgroundColor: string;
-}
-
-interface OkaycamInstructionRefImg {
-  title: LabelConfig;
-  img: ImageResolvedAssetSource;
-}
-interface OkayCamInstruction {
-  title: LabelConfig;
-  refImage1: OkaycamInstructionRefImg;
-  refImage2?: OkaycamInstructionRefImg;
-}
-
-interface FrameSize {
-  width: number;
-  height: number;
-}
-
-interface Frame {
-  size: FrameSize;
-  color: string;
-  content: ImageResolvedAssetSource;
-}
-
-interface TimerConfig {
-  backgroundColor: string;
-  textColor: string;
-}
-
 interface OkayCamBtnConfig {
   backgroundColor: string;
   contentColor: string;
 }
 
-interface CaptureConfig {
-  delay: number;
-  onFlash: Boolean;
-  outputPath?: string;
-}
-
 interface SwitchBtnConfig {
   color: string;
   show: Boolean;
@@ -81,148 +38,29 @@ const labelConfig: LabelConfig = {
   size: 20,
 };
 
-const defaultFrame: Frame = {
-  size: {
-    width: screenWidth * 0.9,
-    height: (screenWidth * 54) / 85,
-  },
-  color: defaultColor,
-  content: null,
-};
-
-const timerConfig: TimerConfig = {
-  backgroundColor: defaultColor2,
-  textColor: defaultColor,
-};
-
 const okayCamBtnConfig: OkayCamBtnConfig = {
   backgroundColor: defaultColor2,
   contentColor: defaultColor,
 };
 
-const defaultCaptureBtnColor: string = defaultColor;
-
-const captureConfigFirst: CaptureConfig = {
-  delay: 0,
-  onFlash: false,
-  outputPath: null,
-};
-
-const defaultPreview: OkayCamPreviewConfig = null;
-
-const defaultInstruction: OkayCamInstruction = null;
-
-const captureConfigSecond: CaptureConfig = null;
-
-const formatImage = (img: ImageResolvedAssetSource) => {
-  return Image.resolveAssetSource(img).uri;
-  // return img;
-};
-
-const formatInstruction = (
-  instruction: OkayCamInstruction
-): OkayCamInstruction => {
-  if (instruction == null) return null;
-
-  const ref1: OkaycamInstructionRefImg = {
-    ...instruction.refImage1,
-    img: formatImage(instruction.refImage1.img),
-  };
-
-  let ref2: OkaycamInstructionRefImg = null;
-  if (instruction.refImage2 != null) {
-    ref2 = {
-      ...instruction.refImage2,
-      img: formatImage(instruction.refImage2.img),
-    };
-  }
-
-  const formattedInstruction: OkayCamInstruction = {
-    title: instruction.title,
-    refImage1: ref1,
-    refImage2: ref2,
-  };
-  return formattedInstruction;
-};
-
 // cal native capture document
 export const captureDocument = (
   license: string,
   base64: Boolean,
   {
-    showOverlay = true,
-    topLabel = labelConfig,
-    bottomLabel = labelConfig,
-    frame = defaultFrame,
-    timer = timerConfig,
-    torchBtnEnabled = false,
-    confirmBtnConfig = okayCamBtnConfig,
-    retakeBtnConfig = okayCamBtnConfig,
-    captureBtnColor = defaultCaptureBtnColor,
-    firstPhotoConfig = captureConfigFirst,
-    secondPhotoConfig = captureConfigSecond,
-    crop = false,
     width = imageResizedWidth,
     imageQuality = 1.0,
-    preview = defaultPreview,
-    instruction = defaultInstruction,
-    showPreviewInstruction = false,
-    autoCapture = true,
-  }
+    mode = DocumentCaptureMode.FULL,
+  },
 ) => {
-  if (frame.size == undefined) {
-    frame.size = defaultFrame.size;
-  }
-
-  const resultedPreview =
-    preview == null
-      ? null
-      : {
-          ...preview,
-          refImage: Image.resolveAssetSource(preview.refImage).uri,
-        };
-
   return new Promise(function (resolve, reject) {
     RNOkayCam.captureDocument({
       license: license,
       base64: base64,
       config: {
-        showOverlay: showOverlay,
-        topLabel: topLabel,
-        bottomLabel: bottomLabel,
-        frame: {
-          size: Platform.select({
-            android: {
-              width: PixelRatio.getPixelSizeForLayoutSize(frame.size.width),
-              height: PixelRatio.getPixelSizeForLayoutSize(frame.size.height),
-            },
-            ios: {
-              width: frame.size.width,
-              height: frame.size.height,
-            },
-          }),
-          color: frame.color != null ? frame.color : defaultFrame.color,
-          content:
-            frame.content != null
-              ? Image.resolveAssetSource(frame.content).uri
-              : null,
-        },
-        timer: timer,
-        torchBtnEnabled: torchBtnEnabled,
-        confirmBtnConfig: confirmBtnConfig,
-        retakeBtnConfig: retakeBtnConfig,
-        captureBtnColor: captureBtnColor,
-        captureConfigPair: {
-          firstPhoto: firstPhotoConfig,
-          secondPhoto: secondPhotoConfig,
-        },
-        crop: crop,
         width: width,
         imageQuality: imageQuality,
-        preview: resultedPreview,
-        instruction: formatInstruction(instruction),
-        showPreviewInstruction: showPreviewInstruction,
-        autoCapture: autoCapture,
+        mode: mode,
       },
     })
       .then((result) => {
@@ -255,7 +93,7 @@ export const captureSelfie = (
     defaultCameraFacing = cameraFacing,
     width = imageResizedWidth,
     imageQuality = 1.0,
-  }
+  },
 ) => {
   return new Promise(function (resolve, reject) {
     RNOkayCam.captureSelfie({

package/ios/RNOkayCam.swift

@@ -20,124 +20,32 @@ 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 bottomLabel = rnOkayCamConfig.object(forKey: "bottomLabel") as! NSDictionary
-        
-        // frame configurations
-        let frame = rnOkayCamConfig.object(forKey: "frame") as? NSDictionary
-        let frameSize = frame?.object(forKey: "size") as? NSDictionary
-        let frameWidth = frameSize?.object(forKey: "width") as? CGFloat
-        let frameHeight = frameSize?.object(forKey: "height") as? CGFloat
-        let frameColor = frame?.object(forKey: "color") as! String
-        let frameContent = frame?.object(forKey: "content") as? String
-        
-        let showOverlay = rnOkayCamConfig.object(forKey: "showOverlay") as! Bool
         
-        let timer = rnOkayCamConfig.object(forKey: "timer") as! NSDictionary
-        let captureBtnColor = rnOkayCamConfig.object(forKey: "captureBtnColor") as! String
-        let captureConfigPair = rnOkayCamConfig.object(forKey: "captureConfigPair") as! NSDictionary
-        let confirmBtnConfig = rnOkayCamConfig.object(forKey: "confirmBtnConfig") as! NSDictionary
-        let retakeBtnConfig = rnOkayCamConfig.object(forKey: "retakeBtnConfig") as! NSDictionary
-        let firstPhoto = captureConfigPair.object(forKey: "firstPhoto") as! NSDictionary
-        let secondPhoto = captureConfigPair.object(forKey: "secondPhoto") as? NSDictionary
-        let crop = rnOkayCamConfig.object(forKey: "crop") as! Bool
-        let torchBtnEnabled = rnOkayCamConfig.object(forKey: "torchBtnEnabled") as! Bool
         let width = rnOkayCamConfig.object(forKey: "width") as! Int
         let imageQuality = rnOkayCamConfig.object(forKey: "imageQuality") as! CGFloat
-        let autoCapture = rnOkayCamConfig.object(forKey: "autoCapture") as! Bool
+        let mode = rnOkayCamConfig.object(forKey: "mode") as? String
         
         DispatchQueue.main.async {
-            let rootViewController = (UIApplication.shared.keyWindow?.rootViewController)!
-            
-            let okayCamConfig = OkayCamConfig(viewController: rootViewController)
-            
-            // top label
-            okayCamConfig.topLabel.text = topLabel.object(forKey: "text") as! String
-            okayCamConfig.topLabel.color = self.hexStringToUIColor(hex: topLabel.object(forKey: "color") as! String)
-            okayCamConfig.topLabel.size = CGFloat(topLabel.object(forKey: "size") as! Int)
-
-            // bottom label
-            okayCamConfig.bottomLabel.text = bottomLabel.object(forKey: "text") as! String
-            okayCamConfig.bottomLabel.color = self.hexStringToUIColor(hex: bottomLabel.object(forKey: "color") as! String)
-            okayCamConfig.bottomLabel.size = bottomLabel.object(forKey: "size") as! CGFloat
-
-            // frame size
-            if (frameSize != nil) {
-                okayCamConfig.frame.size = CGSize(width: frameWidth!, height: frameHeight!)
-            }
-
-           // frame color
-           okayCamConfig.frame.color = self.hexStringToUIColor(hex: frameColor)
-
-            // frame contet
-            if (frameContent != nil) {
-                #if DEBUG
-                    okayCamConfig.frame.content = URL(string: frameContent!)
-                #else
-                okayCamConfig.frame.content = URL(fileURLWithPath: frameContent!.replacingOccurrences(of: "file:///", with: ""))
-                #endif
+            guard let rootViewController = UIApplication.shared.windows.first?.rootViewController else {
+                reject("no_root_view_controller", "Root view controller not found", nil)
+                return
             }
             
-            okayCamConfig.showOverlay = showOverlay
-            
-            // timer
-            okayCamConfig.timer.backgroundColor = self.hexStringToUIColor(hex: timer.object(forKey: "backgroundColor") as! String,alpha:0.5)
-            okayCamConfig.timer.textColor = self.hexStringToUIColor(hex: timer.object(forKey: "textColor") as! String)
-
-            // capture button color
-            okayCamConfig.captureBtnColor = self.hexStringToUIColor(hex: captureBtnColor)
-
-            // show torch button
-            okayCamConfig.torchBtnEnabled = torchBtnEnabled
+            let config = OkayCamAutoCaptureConfig(viewController: rootViewController)
             
-            // set image quality
-            okayCamConfig.imageQuality = imageQuality
-
-            // confirm button config
-            okayCamConfig.confirmBtnConfig.backgroundColor = self.hexStringToUIColor(hex: confirmBtnConfig.object(forKey: "backgroundColor") as! String)
-            okayCamConfig.confirmBtnConfig.contentColor = self.hexStringToUIColor(hex: confirmBtnConfig.object(forKey: "contentColor") as! String)
+            // if (width != -1) {
+            //     config.width = width
+            // }
 
-            // retake button config
-            okayCamConfig.retakeBtnConfig.backgroundColor = self.hexStringToUIColor(hex: retakeBtnConfig.object(forKey: "backgroundColor") as! String)
-            okayCamConfig.retakeBtnConfig.contentColor = self.hexStringToUIColor(hex: retakeBtnConfig.object(forKey: "contentColor") as! String)
-            
-            // capture configurations
-            let firstPhotoPath = firstPhoto.object(forKey: "outputPath") as? String
-            let secondPhotoPath = secondPhoto?.object(forKey: "outputPath") as? String
-            okayCamConfig.captureConfigPair = CaptureConfigPair(
-                firstPhoto: OkayCamCaptureConfig(
-                    timeOut: firstPhoto.object(forKey: "delay") as! Int,
-                    onFlash: firstPhoto.object(forKey: "onFlash") 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,
-                    outputPath: (secondPhotoPath != nil) ? URL(string: (secondPhoto?.object(forKey: "outputPath") as! String?)!) : nil
-                ) : nil
-            )
-            
-            okayCamConfig.crop = crop
-            
-            if (width != -1) {
-                okayCamConfig.width = width
+            if (imageQuality > 0.0) {
+                config.imageQuality = imageQuality
             }
-            
-            // preview config
-            
-            let previewConfig = rnOkayCamConfig.object(forKey: "preview") as? NSDictionary
-            
-            okayCamConfig.preview = self.getOkaycamPreview(previewConfig: previewConfig)
 
-            // instruction config
-            let instructionConfig = rnOkayCamConfig.object(forKey: "instruction") as? NSDictionary
-            okayCamConfig.instruction = self.getOkayCamInstruction(instructionConfig: instructionConfig)
-            
-            okayCamConfig.autoCapture = autoCapture
+            config.mode = self.parseMode(mode)
 
             // start the SDK
-            OkayCamDoc.start(
-                okayCamConfig: okayCamConfig,
+            OkayCamDocAutoCapture.start(
+                okayCamConfig: config,
                 license: license,
                 { filePaths, error in
                     // handle error
@@ -179,71 +87,6 @@ class RNOkayCam: NSObject {
         }
     }
     
-    func getOkaycamPreview(previewConfig: NSDictionary?) -> OkayCamPreviewConfig?{
-        if previewConfig == nil { return nil}
-    
-        
-        let title = configToOkayCamLabel(config: previewConfig?.object(forKey: "title") as! NSDictionary)
-        
-        let instr1 = configToOkayCamLabel(config: previewConfig?.object(forKey: "instruction1") as! NSDictionary)
-        
-        let instr2 = configToOkayCamLabel(config: previewConfig?.object(forKey: "instruction2") as! NSDictionary)
-        
-        let instr3 = configToOkayCamLabel(config: previewConfig?.object(forKey: "instruction3") as! NSDictionary)
-        
-        let bgColor = self.hexStringToUIColor(hex: previewConfig?.object(forKey: "backgroundColor") as! String)
-        
-        // frame contet
-        let ref = previewConfig?.object(forKey: "refImage") as? String
-        var refUrl:URL? = nil
-        if (ref != nil) {
-            #if DEBUG
-                refUrl = URL(string: ref!)!
-            #else
-            refUrl = URL(fileURLWithPath: ref!.replacingOccurrences(of: "file:///", with: ""))
-            #endif
-        }
-        
-        return OkayCamPreviewConfig(title: title, refImage: refUrl!, instruction1: instr1, instruction2: instr2, instruction3: instr3, backgroundColor: bgColor)
-    }
-
-    func getOkayCamInstruction(instructionConfig: NSDictionary?) -> OkayCamInstruction?{
-    if instructionConfig == nil {return nil}
-    
-    let title = configToOkayCamLabel(config: instructionConfig?.object(forKey: "title") as! NSDictionary)
-    
-    let ref1 = getInstructionRefImage(refImage: instructionConfig?.object(forKey: "refImage1") as! NSDictionary)
-    
-    let ref2 = getInstructionRefImage(refImage: instructionConfig?.object(forKey: "refImage2") as? NSDictionary)
-    
-    return OkayCamInstruction(title:title,refImage1:ref1!,refImage2:ref2)
-    }
-    
-    func getInstructionRefImage(refImage:NSDictionary?) -> OkaycamInstructionRefImg?{
-        if refImage == nil {return nil} 
-            
-        let title = configToOkayCamLabel(config: refImage?.object(forKey: "title") as! NSDictionary)
-            
-        // frame contet
-        let ref = refImage?.object(forKey: "img") as? String
-        var refUrl:URL? = nil
-        if (ref != nil) {
-            #if DEBUG
-                refUrl = URL(string: ref!)!
-            #else
-            refUrl = URL(fileURLWithPath: ref!.replacingOccurrences(of: "file:///", with: ""))
-            #endif
-        }
-        return OkaycamInstructionRefImg(title:title,img:refUrl!)
-    }
-    
-    func configToOkayCamLabel(config:NSDictionary) -> OkayCamLabelConfig{
-        let text = config.object(forKey: "text") as! String
-        let color = self.hexStringToUIColor(hex: config.object(forKey: "color") as! String)
-        let size = CGFloat(config.object(forKey: "size") as! Int)
-        return OkayCamLabelConfig(text: text, color: color, size: size)
-    }
-    
     @objc func captureSelfie(_ configs: NSDictionary, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         
         let license = configs.object(forKey: "license")! as! String
@@ -260,8 +103,11 @@ class RNOkayCam: NSObject {
         let imageQuality = rnOkayCamConfig.object(forKey: "imageQuality") as! CGFloat
         
         DispatchQueue.main.async {
-            let rootViewController = (UIApplication.shared.keyWindow?.rootViewController)!
-            
+            guard let rootViewController = UIApplication.shared.windows.first?.rootViewController else {
+                reject("no_root_view_controller", "Root view controller not found", nil)
+                return
+            }
+
             let okaySelfieConfig = OkaySelfieConfig(viewController: rootViewController)
             
             // top label
@@ -399,12 +245,30 @@ class RNOkayCam: NSObject {
         case .cameraPermission:
             reject("camera permission denied", "camera permission denied", nil)
             return
-        case .failedToCreateIADBundle:
-            reject("failed to create IAD bundle", "failed to create IAD bundle", nil)
-            return
         @unknown default:
             reject("no error", "no error", nil)
             return
         }
+    
+    }
+
+    func parseMode(_ mode: String?) -> OkayCamAutoCaptureMode {
+        guard let mode = mode else {
+            return .full
+        }
+
+        switch mode {
+        case "FRONT_ONLY":
+            return .frontOnly
+            
+        case "FRONT_BACK":
+            return .frontBack
+            
+        case "FRONT_WITH_FLASH":
+            return .frontWithFlash
+            
+        default:
+            return .full
+        }
     }
 }

package/package.json

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

package/react-native-okaycam.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://gitlab.com/innov8tif-ekyc-product/okaycam/mobile/react-native-okaycam.git"
   s.license      = "MIT"
   s.authors      = { "Innov8tif" => "ekyc.team@innov8tif.com" }
-  s.platforms    = { :ios => "15.0" }
+  s.platforms    = { :ios => "15.6" }
   s.source       = { :git => "https://gitlab.com/innov8tif-ekyc-product/okaycam/mobile/react-native-okaycam.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,swift}"
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.dependency "React-RCTFabric"
 
   # OkayCam CocoaPod dependency
-  s.dependency "OkayCam", "3.0.5"
+  s.dependency "OkayCam", "3.0.15"
   s.dependency "CryptoSwift", "1.8.2"
 
   s.pod_target_xcconfig = {

package/setup_podfile.js

@@ -50,7 +50,7 @@ post_install do |installer|
       script = <<~SCRIPT
       echo "Re-signing embedded frameworks..."
       set -e
-      APP_PATH="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"
+      APP_PATH="\${TARGET_BUILD_DIR}/\${WRAPPER_NAME}"
       find "$APP_PATH/Frameworks" -type d -name "*.framework" | while read framework
       do
         echo "Re-signing $framework"
@@ -67,7 +67,7 @@ end
 
 if (podfile.includes("post_install do |installer|")) {
   console.log(
-    "🔧 Detected existing post_install block — injecting after react_native_post_install"
+    "🔧 Detected existing post_install block — injecting after react_native_post_install",
   );
 
   const innerHook = `
@@ -80,7 +80,7 @@ if (podfile.includes("post_install do |installer|")) {
       script = <<~SCRIPT
       echo "Re-signing embedded frameworks..."
       set -e
-      APP_PATH="${TARGET_BUILD_DIR}/${WRAPPER_NAME}"
+      APP_PATH="\${TARGET_BUILD_DIR}/\${WRAPPER_NAME}"
       find "$APP_PATH/Frameworks" -type d -name "*.framework" | while read framework
       do
         echo "Re-signing $framework"
@@ -97,12 +97,12 @@ if (podfile.includes("post_install do |installer|")) {
   if (podfile.includes("react_native_post_install")) {
     podfile = podfile.replace(
       /(react_native_post_install\s*\(.*\)\s*)/,
-      `$1\n${innerHook}`
+      `$1\n${innerHook}`,
     );
     console.log("✨ Injected OkayCam hook after react_native_post_install.");
   } else {
     console.log(
-      "⚠️ react_native_post_install not found, appending before end of post_install."
+      "⚠️ react_native_post_install not found, appending before end of post_install.",
     );
     podfile = podfile.replace(/end\s*$/, `${innerHook}\nend`);
   }