react-native-okaycam 1.1.22 → 1.1.27

package/README.md

@@ -95,12 +95,17 @@ const license = Platform.select({
 |-|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|
-|preview <sup>**New**</sup>|title|title on preview screen|""(empty string)|
-|preview <sup>**New**</sup>|refImg|ref image on preview screen|null|
-|preview <sup>**New**</sup>|instruction1|instruction on preview screen|""(empty string)|
-|preview <sup>**New**</sup>|instruction2|instruction on preview screen|""(empty string)|
-|preview <sup>**New**</sup>|instruction3|instruction on preview screen|""(empty string)|
-|preview <sup>**New**</sup>|backgroundColor|background color of preview screen|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)|
+|preview|instruction2|instruction on preview screen|""(empty string)|
+|preview |instruction3|instruction on preview screen|""(empty string)|
+|preview |backgroundColor|background color of preview screen|null|
+|instruction <sup>**New**</sup> |title|Instruction's title on camera caputre screen|""(empty string)|
+|instruction <sup>**New**</sup> |refImage1|Instruction's reference image 1|null|
+|instruction <sup>**New**</sup> |refImage2|Instruction's reference image 2|null|
+
+
 
 ## Usage
 ```
@@ -162,7 +167,18 @@ captureDocument(
 			instruction2: {text: 'instr2', color: '#000000', size: 14},
 			instruction3: {text: 'instr3', color: '#000000', size: 14},
 			backgroundColor: '#374fff',
-      }
+      },
+	  instruction: {
+        title: {text: 'instr1', color: '#ffffff', size: 14},
+        refImage1: {
+          title: {text: 'ref1', color: '#ffffff', size: 14},
+          img: require('./images/ref.png'),
+        },
+        refImage2: {
+          title: {text: 'ref2', color: '#ffffff', size: 14},
+          img: require('./images/ref.png'),
+        },
+      },
 	}
 )
 	.then(result => {

package/android/.idea/jarRepositories.xml

@@ -36,5 +36,10 @@
       <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__com_innov8tif_okaycam_OkayCam_1_1_10_aar.xml

@@ -0,0 +1,15 @@
+<component name="libraryTable">
+  <library name="Gradle: com.innov8tif.okaycam:OkayCam:1.1.10@aar">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/d475d7eab3beed356dcb43e92fe8afa3/transformed/jetified-OkayCam-1.1.10/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d475d7eab3beed356dcb43e92fe8afa3/transformed/jetified-OkayCam-1.1.10/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/d475d7eab3beed356dcb43e92fe8afa3/transformed/jetified-OkayCam-1.1.10/AndroidManifest.xml" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.innov8tif.okaycam/OkayCam/1.1.10/d87bd11330b88497cefe8e10482aefbe6e25e795/OkayCam-1.1.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.innov8tif.okaycam/OkayCam/1.1.10/d869c29d69b3fa6aaed3ea3025849f5a099de27f/OkayCam-1.1.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

package/android/.idea/modules/android.iml

@@ -99,7 +99,7 @@
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.webkit:android-jsc:r174650@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.innov8tif.okaycam:OkayCam:1.1.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.innov8tif.okaycam:OkayCam:1.1.10@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.caverock:androidsvg-aar:1.4@aar" level="project" />
   </component>
 </module>

package/android/build.gradle

@@ -33,7 +33,7 @@ android {
 
     repositories {
 //        jcenter({ url "https://dl.bintray.com/innov8tifekyc/OkayCam/" })
-        //  maven { url "https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1063" }
+        //  maven { url "https://s01.oss.sonatype.org/content/repositories/cominnov8tif-1064" }
 
     }
 
@@ -46,7 +46,7 @@ repositories {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation('com.innov8tif.okaycam:OkayCam:1.1.9@aar') {
+    implementation('com.innov8tif.okaycam:OkayCam:1.1.11@aar') {
         transitive = true
     }
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'

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

@@ -26,6 +26,8 @@ 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;
@@ -76,6 +78,7 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
         ReadableMap firstPhoto = captureConfigPair.getMap("firstPhoto");
         ReadableMap secondPhoto = captureConfigPair.getMap("secondPhoto");
         ReadableMap preview = userConfig.getMap("preview");
+        ReadableMap instruction = userConfig.getMap("instruction");
 
 
         OkayCamConfig okayCamConfig = OkayCamConfig.init(this.getCurrentActivity());
@@ -136,6 +139,7 @@ public class RNOkayCamModule extends ReactContextBaseJavaModule {
 
 
         okayCamConfig.setPreview(getPreviewConfig(preview, frameConfig));
+        okayCamConfig.setInstruction(getInstructionConfig(instruction, frameConfig));
 
         OkayCamDoc.start(this.getCurrentActivity(), LICENSE_KEY, okayCamConfig, (success, images, exception) -> {
 
@@ -170,6 +174,102 @@ 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"));

package/index.ts

@@ -26,6 +26,16 @@ interface OkayCamPreviewConfig {
   backgroundColor: string;
 }
 
+interface OkaycamInstructionRefImg {
+  title: LabelConfig;
+  img: ImageResolvedAssetSource;
+}
+interface OkayCamInstruction {
+  title: LabelConfig;
+  refImage1: OkaycamInstructionRefImg;
+  refImage2?: OkaycamInstructionRefImg;
+}
+
 interface FrameSize {
   width: number;
   height: number;
@@ -100,8 +110,41 @@ const captureConfigFirst: CaptureConfig = {
 
 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,
@@ -122,6 +165,7 @@ export const captureDocument = (
     width = imageResizedWidth,
     imageQuality = 1.0,
     preview = defaultPreview,
+    instruction = defaultInstruction,
   }
 ) => {
   if (frame.size == undefined) {
@@ -174,6 +218,7 @@ export const captureDocument = (
         width: width,
         imageQuality: imageQuality,
         preview: resultedPreview,
+        instruction: formatInstruction(instruction),
       },
     })
       .then((result) => {

package/ios/RNOkayCam.swift

@@ -80,7 +80,7 @@ class RNOkayCam: NSObject {
             okayCamConfig.showOverlay = showOverlay
             
             // timer
-            okayCamConfig.timer.backgroundColor = self.hexStringToUIColor(hex: timer.object(forKey: "backgroundColor") as! String)
+            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
@@ -127,6 +127,10 @@ class RNOkayCam: NSObject {
             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)
             
             // start the SDK
             OkayCamDoc.start(
@@ -199,6 +203,36 @@ class RNOkayCam: NSObject {
         
         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
@@ -314,7 +348,7 @@ class RNOkayCam: NSObject {
         return result
     }
     
-    func hexStringToUIColor (hex:String) -> UIColor {
+    func hexStringToUIColor (hex:String,alpha : Float = 1.0) -> UIColor {
         var cString:String = hex.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
         
         if (cString.hasPrefix("#")) {
@@ -332,7 +366,7 @@ class RNOkayCam: NSObject {
             red: CGFloat((rgbValue & 0xFF0000) >> 16) / 255.0,
             green: CGFloat((rgbValue & 0x00FF00) >> 8) / 255.0,
             blue: CGFloat(rgbValue & 0x0000FF) / 255.0,
-            alpha: CGFloat(1.0)
+            alpha: CGFloat(alpha)
         )
     }
     

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-okaycam",
   "title": "React Native OkayCam",
-  "version": "1.1.22",
+  "version": "1.1.27",
   "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.8"
+  s.dependency "OkayCam", "1.1.10"
 end
 
 

package/android/.idea/libraries/Gradle__com_innov8tif_okaycam_OkayCam_1_1_9_aar.xml

@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.innov8tif.okaycam:OkayCam:1.1.9@aar">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/b12bf69e41ba9a9e3fd3f5f7d0798395/transformed/jetified-OkayCam-1.1.9/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b12bf69e41ba9a9e3fd3f5f7d0798395/transformed/jetified-OkayCam-1.1.9/res" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-3/b12bf69e41ba9a9e3fd3f5f7d0798395/transformed/jetified-OkayCam-1.1.9/AndroidManifest.xml" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.innov8tif.okaycam/OkayCam/1.1.9/36c120ad1e000095296163b137076379bf7e52c/OkayCam-1.1.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.innov8tif.okaycam/OkayCam/1.1.9/be529d2fe231cd2bd0e084261ac2b686bd62f1f/OkayCam-1.1.9-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>