react-native-okaycam 1.1.27 → 1.1.29

package/README.md

@@ -92,9 +92,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)|

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,28 @@ 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.1.11@aar') {
+    implementation ('org.pytorch:pytorch_android_lite:1.5.0'){
+        exclude module: 'fbjni-java-only'
+    }
+    implementation ('org.pytorch:pytorch_android_torchvision_lite:1.5.0'){
+        exclude module: 'fbjni-java-only'
+    }
+    implementation('com.facebook.react:react-native:+'){
+        exclude module: 'fbjni-java-only'
+    }
+    implementation('com.innov8tif.okaycam:OkayCam:0.0.3@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.1.27",
+  "version": "1.1.29",
   "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", "1.1.14"
 end
 
 

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Apr 12 11:53:33 MYT 2022
-gradle.version=6.8

package/android/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

package/android/.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>

package/android/.idea/gradle.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/jarRepositories.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1061" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1062" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1063" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1064" />
-    </remote-repository>
-  </component>
-</project>

package/android/.idea/libraries/Gradle__androidx_activity_activity_1_0_0_aar.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.activity:activity:1.0.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/da312bfad18124b605d313e917900960/transformed/activity-1.0.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da312bfad18124b605d313e917900960/transformed/activity-1.0.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/da312bfad18124b605d313e917900960/transformed/activity-1.0.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.activity/activity/1.0.0/28eb83e6a29ac3fbb87aa632cfa0e644a313f491/activity-1.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

package/android/.idea/libraries/Gradle__androidx_annotation_annotation_1_2_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.annotation:annotation:1.2.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/8945212022e5276658ab7864714ced3553ea724a/annotation-1.2.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

package/android/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_1_0_aar.xml

@@ -1,16 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.appcompat:appcompat:1.1.0@aar">
-    <ANNOTATIONS>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8bad765fb0c44392f5cbc11d5eec1b3c/transformed/appcompat-1.1.0/annotations.zip!/" />
-    </ANNOTATIONS>
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/8bad765fb0c44392f5cbc11d5eec1b3c/transformed/appcompat-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8bad765fb0c44392f5cbc11d5eec1b3c/transformed/appcompat-1.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/8bad765fb0c44392f5cbc11d5eec1b3c/transformed/appcompat-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.1.0/9865019bbd2d95e41dede3d8ebf964aa93f97766/appcompat-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

package/android/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_1_0_aar.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/bc7b4694fcf64bb50365a9b9f1e36a4e/transformed/appcompat-resources-1.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bc7b4694fcf64bb50365a9b9f1e36a4e/transformed/appcompat-resources-1.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/bc7b4694fcf64bb50365a9b9f1e36a4e/transformed/appcompat-resources-1.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat-resources/1.1.0/a7dcffd1afb81e3c892ad061b33da031c2d7289f/appcompat-resources-1.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

package/android/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.arch.core:core-common:2.1.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/80ac2d7c8e6400ce2fbc663cd1a7e1cbef38c4b8/core-common-2.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

package/android/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/774ee57ccf13a9a46aba03e36f06e20e/transformed/core-runtime-2.1.0/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/774ee57ccf13a9a46aba03e36f06e20e/transformed/core-runtime-2.1.0/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/774ee57ccf13a9a46aba03e36f06e20e/transformed/core-runtime-2.1.0/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-runtime/2.1.0/f19886651c9946b39f83d8c184fd0e2ce9f43c16/core-runtime-2.1.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>