react-native-okaycam 1.1.10 → 1.1.22

package/index.ts

@@ -1,204 +1,234 @@
-import { NativeModules, Dimensions, PixelRatio, Image, ImageResolvedAssetSource, Platform } from 'react-native';
+import {
+  NativeModules,
+  Dimensions,
+  PixelRatio,
+  Image,
+  ImageResolvedAssetSource,
+  Platform,
+} from "react-native";
 
 const { RNOkayCam } = NativeModules;
 
-const screenWidth = Dimensions.get("screen").width
+const screenWidth = Dimensions.get("screen").width;
 
 interface LabelConfig {
-    text: string,
-    color: string,
-    size: number
+  text: string;
+  color: string;
+  size: number;
+}
+
+interface OkayCamPreviewConfig {
+  title: LabelConfig;
+  refImage: ImageResolvedAssetSource;
+  instruction1: LabelConfig;
+  instruction2: LabelConfig;
+  instruction3: LabelConfig;
+  backgroundColor: string;
 }
 
 interface FrameSize {
-    width: number,
-    height: number
+  width: number;
+  height: number;
 }
 
 interface Frame {
-    size: FrameSize,
-    color: string,
-    content: ImageResolvedAssetSource
+  size: FrameSize;
+  color: string;
+  content: ImageResolvedAssetSource;
 }
 
 interface TimerConfig {
-    backgroundColor: string,
-    textColor: string
+  backgroundColor: string;
+  textColor: string;
 }
 
 interface OkayCamBtnConfig {
-    backgroundColor: string,
-    contentColor: string
+  backgroundColor: string;
+  contentColor: string;
 }
 
 interface CaptureConfig {
-    delay: number,
-    onFlash: Boolean,
-    outputPath?: string
+  delay: number;
+  onFlash: Boolean;
+  outputPath?: string;
 }
 
 interface SwitchBtnConfig {
-    color: string,
-    show: Boolean
+  color: string;
+  show: Boolean;
 }
 
-type cameraFacingType = "front" | "back"
+type cameraFacingType = "front" | "back";
 
 // Set default values
-const defaultColor = "#ffffff"
-const defaultColor2 = "#ffa500"
-const imageResizedWidth = -1
+const defaultColor = "#ffffff";
+const defaultColor2 = "#ffa500";
+const imageResizedWidth = -1;
 
 const labelConfig: LabelConfig = {
-    text: "",
-    color: defaultColor,
-    size: 20
-}
+  text: "",
+  color: defaultColor,
+  size: 20,
+};
 
 const defaultFrame: Frame = {
-    size: {
-        width: screenWidth * 0.9,
-        height: screenWidth * 54 / 85
-    },
-    color: defaultColor,
-    content: null
-}
+  size: {
+    width: screenWidth * 0.9,
+    height: (screenWidth * 54) / 85,
+  },
+  color: defaultColor,
+  content: null,
+};
 
 const timerConfig: TimerConfig = {
-    backgroundColor: defaultColor2,
-    textColor: defaultColor
-}
+  backgroundColor: defaultColor2,
+  textColor: defaultColor,
+};
 
 const okayCamBtnConfig: OkayCamBtnConfig = {
-    backgroundColor: defaultColor2,
-    contentColor: defaultColor
-}
+  backgroundColor: defaultColor2,
+  contentColor: defaultColor,
+};
 
-const defaultCaptureBtnColor: string = defaultColor
+const defaultCaptureBtnColor: string = defaultColor;
 
 const captureConfigFirst: CaptureConfig = {
-    delay: 0,
-    onFlash: false,
-    outputPath: null
-}
+  delay: 0,
+  onFlash: false,
+  outputPath: null,
+};
+
+const defaultPreview: OkayCamPreviewConfig = null;
 
-const captureConfigSecond: CaptureConfig = null
+const captureConfigSecond: CaptureConfig = null;
 
 // 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
-    }
+  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,
+  }
 ) => {
-
-    if (frame.size == undefined) {
-        frame.size = defaultFrame.size
-    }
-
-    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
-            }
-        })
-            .then(result => {
-                resolve(JSON.parse(result))
-            })
-            .catch(error => {
-                reject(error)
-            })
+  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,
+      },
     })
-}
+      .then((result) => {
+        resolve(JSON.parse(result));
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+};
 
 const defaultSwitchBtnConfig: SwitchBtnConfig = {
-    show: true,
-    color: defaultColor
-}
+  show: true,
+  color: defaultColor,
+};
 
-const cameraFacing: cameraFacingType = 'front'
+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
-    }
+  license: string,
+  base64: Boolean,
+  {
+    topLabel = labelConfig,
+    bottomFrameColor = defaultColor2,
+    captureBtnColor = defaultColor,
+    switchBtnConfig = defaultSwitchBtnConfig,
+    confirmBtnConfig = okayCamBtnConfig,
+    retakeBtnConfig = okayCamBtnConfig,
+    defaultCameraFacing = cameraFacing,
+    width = imageResizedWidth,
+    imageQuality = 1.0,
+  }
 ) => {
-    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
-            }
-        })
-            .then(result => {
-                resolve(JSON.parse(result))
-            })
-            .catch(error => {
-                reject(error)
-            })
+  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,
+      },
     })
-}
+      .then((result) => {
+        resolve(JSON.parse(result));
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+};

package/ios/RNOkayCam.swift

@@ -122,6 +122,12 @@ class RNOkayCam: NSObject {
                 okayCamConfig.width = width
             }
             
+            // preview config
+            
+            let previewConfig = rnOkayCamConfig.object(forKey: "preview") as? NSDictionary
+            
+            okayCamConfig.preview = self.getOkaycamPreview(previewConfig: previewConfig)
+            
             // start the SDK
             OkayCamDoc.start(
                 okayCamConfig: okayCamConfig,
@@ -143,6 +149,14 @@ class RNOkayCam: NSObject {
                             if (filePaths!.count > 1) {
                                 okayCamObject.setValue(self.convertImgToBase64(base64: base64, image: urls[1]), forKey: "fullDocumentImage2")
                             }
+
+                            if (filePaths!.count > 2) {
+                                okayCamObject.setValue(self.convertImgToBase64(base64: base64, image: urls[2]), forKey: "fullDocumentImage3")
+                            }
+                            
+                            if (filePaths!.count > 3) {
+                                okayCamObject.setValue(self.convertImgToBase64(base64: base64, image: urls[3]), forKey: "fullDocumentImage4")
+                            }
                             
                             let jsonData = try JSONSerialization.data(withJSONObject: okayCamObject, options: .prettyPrinted)
                             let jsonString = String(data: jsonData, encoding: String.Encoding.ascii)!
@@ -158,6 +172,41 @@ 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 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

package/ios/RNOkayCam.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		4D47E5C025C083810038D7EC /* RNOkayCam.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D47E5BF25C083810038D7EC /* RNOkayCam.swift */; };
 		B3E7B58A1CC2AC0600A0062D /* RNOkayCam.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNOkayCam.m */; };
+		DB20EA94C7207FA4A153737A /* Pods_RNOkayCam.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF8168FCF180DE99D3443D56 /* Pods_RNOkayCam.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -28,6 +29,9 @@
 		4D47E5BD25C083530038D7EC /* RNOkayCam-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RNOkayCam-Bridging-Header.h"; sourceTree = "<group>"; };
 		4D47E5BF25C083810038D7EC /* RNOkayCam.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNOkayCam.swift; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNOkayCam.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNOkayCam.m; sourceTree = "<group>"; };
+		CB6B4CC187A245DF02C1905A /* Pods-RNOkayCam.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNOkayCam.release.xcconfig"; path = "Target Support Files/Pods-RNOkayCam/Pods-RNOkayCam.release.xcconfig"; sourceTree = "<group>"; };
+		FED8765FCB8A0E8CACFC386E /* Pods-RNOkayCam.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNOkayCam.debug.xcconfig"; path = "Target Support Files/Pods-RNOkayCam/Pods-RNOkayCam.debug.xcconfig"; sourceTree = "<group>"; };
+		FF8168FCF180DE99D3443D56 /* Pods_RNOkayCam.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNOkayCam.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -35,12 +39,23 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DB20EA94C7207FA4A153737A /* Pods_RNOkayCam.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0968FBA9E90D8EE56660C935 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FED8765FCB8A0E8CACFC386E /* Pods-RNOkayCam.debug.xcconfig */,
+				CB6B4CC187A245DF02C1905A /* Pods-RNOkayCam.release.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -56,7 +71,17 @@
 				4D47E5BF25C083810038D7EC /* RNOkayCam.swift */,
 				134814211AA4EA7D00B7C361 /* Products */,
 				4D47E5BD25C083530038D7EC /* RNOkayCam-Bridging-Header.h */,
+				0968FBA9E90D8EE56660C935 /* Pods */,
+				E382AF4271A2883E64F698E0 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		E382AF4271A2883E64F698E0 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FF8168FCF180DE99D3443D56 /* Pods_RNOkayCam.framework */,
 			);
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -66,6 +91,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNOkayCam" */;
 			buildPhases = (
+				693E4AB06E794461882BF8F3 /* [CP] Check Pods Manifest.lock */,
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
 				58B511D91A9E6C8500147676 /* CopyFiles */,
@@ -112,6 +138,31 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		693E4AB06E794461882BF8F3 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RNOkayCam-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		58B511D71A9E6C8500147676 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -162,7 +213,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -199,7 +250,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -208,6 +259,7 @@
 		};
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = FED8765FCB8A0E8CACFC386E /* Pods-RNOkayCam.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
@@ -229,6 +281,7 @@
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = CB6B4CC187A245DF02C1905A /* Pods-RNOkayCam.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (

package/ios/RNOkayCam.xcodeproj/xcuserdata/thet.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>RNOkayCam.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>3</integer>
 		</dict>
 	</dict>
 </dict>

package/ios/RNOkayCam.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:RNOkayCam.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

package/package.json

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

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.5"
+  s.dependency "OkayCam", "1.1.8"
 end