assentify-sdk-react-native 0.0.32 → 0.0.34

package/android/src/main/java/com/assentifysdk/ScanIDActivity.kt

@@ -31,10 +31,15 @@ import com.assentify.sdk.RemoteClient.Models.StepDefinitions
 import com.assentify.sdk.RemoteClient.Models.StepMap
 import ImageToBase64Converter
 import android.content.Intent
+import android.content.res.ColorStateList
 import com.assentify.sdk.Core.Constants.BrightnessEvents
+import com.assentify.sdk.Core.Constants.DoneFlags
 import com.assentify.sdk.RemoteClient.Models.SubmitRequestModel
+import com.assentify.sdk.ScanIDCard.ScanIDCardManual
+import com.assentify.sdk.ScanIDCard.ScanIDCardResult
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.squareup.picasso.Picasso
 
 class ScanIDActivity: AppCompatActivity(),
   IDCardCallback {
@@ -43,6 +48,8 @@ class ScanIDActivity: AppCompatActivity(),
   private lateinit var reactApplicationContext: ReactApplicationContext
   private lateinit var assentifySdk: AssentifySdk
   private lateinit var scanID: ScanIDCard
+  private lateinit var scanIDManual: ScanIDCardManual
+  private  var isManual: Boolean = false;
   private lateinit var infoText: TextView
   private lateinit var infoIcon: ImageView
   private lateinit var infoLayout: LinearLayout
@@ -66,6 +73,8 @@ class ScanIDActivity: AppCompatActivity(),
   private  var apiKey: String = "";
   val values: MutableMap<String, String> = mutableMapOf()
   private var stepID: Int = -1;
+  private lateinit var takePhotoButton: Button;
+  private lateinit var manualClickColor: String;
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_scan)
@@ -83,7 +92,28 @@ class ScanIDActivity: AppCompatActivity(),
     isFlippingCard = intent.getBooleanExtra("flippingCard",false)!!
     showCountDown = intent.getBooleanExtra("showCountDown",true)
     apiKey = intent.getStringExtra("apiKey")!!
+    manualClickColor = intent.getStringExtra("manualClickColor")!!
     stepID = intent.getIntExtra("stepID",-1)!!
+
+    takePhotoButton = findViewById<Button>(R.id.takePhoto)
+    takePhotoButton.visibility = View.GONE
+    takePhotoButton.setTextColor(Color.parseColor(processingColor))
+    takePhotoButton.backgroundTintList = ColorStateList.valueOf(
+      Color.parseColor(manualClickColor)
+    )
+    takePhotoButton.setOnClickListener {
+      scanIDManual.takePicture();
+    }
+
+    infoLayout = findViewById<LinearLayout>(R.id.infoLayout)
+    val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
+    drawableInfo?.setColorFilter(Color.parseColor(holdHandColor), PorterDuff.Mode.SRC_ATOP)
+    infoLayout.setBackground(drawableInfo)
+
+    val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
+    toolbarTitle.setText(title)
+    toolbarTitle.setTextColor(Color.parseColor(processingColor))
+
     startAssentifySdk()
 
 
@@ -96,24 +126,24 @@ class ScanIDActivity: AppCompatActivity(),
     backButton.setOnClickListener {
       runOnUiThread {
         triggerEvent("onBackClick", null)
-        scanID.stopScanning();
+        if(isManual){
+          scanIDManual.stopScanning();
+        }else{
+          scanID.stopScanning();
+        }
+
         finish()
       }
     }
 
 
-    infoLayout = findViewById<LinearLayout>(R.id.infoLayout)
-    val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
-    drawableInfo?.setColorFilter(Color.parseColor(holdHandColor), PorterDuff.Mode.SRC_ATOP)
-    infoLayout.setBackground(drawableInfo)
+
 
 
     flippingCard = findViewById<GifImageView>(R.id.flippingCard)
     flippingCard.visibility = View.GONE
 
-    val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
-    toolbarTitle.setText(title)
-    toolbarTitle.setTextColor(Color.parseColor(processingColor))
+
 
 
     infoText = findViewById(R.id.infoText)
@@ -138,11 +168,17 @@ class ScanIDActivity: AppCompatActivity(),
         popUpContainer.visibility = View.GONE
       }
     }
+
+
   }
 
   override fun onBackPressed() {
     triggerEvent("onBackClick", null)
-    scanID.stopScanning();
+    if(isManual){
+      scanIDManual.stopScanning();
+    }else{
+      scanID.stopScanning();
+    }
     finish()
     super.onBackPressed()
   }
@@ -199,14 +235,36 @@ class ScanIDActivity: AppCompatActivity(),
 
   fun startAssentifySdk() {
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
-    scanID = assentifySdk!!.startScanIDCard(
+
+    when (val result = assentifySdk!!.startScanIDCard(
       this@ScanIDActivity,kycDocumentDetails,language,stepID!!
-    );
-    Thread.sleep(500);
-    var fragmentManager = supportFragmentManager
-    var transaction = fragmentManager.beginTransaction()
-    transaction.replace(R.id.fragmentContainer, scanID)
-    transaction.commit()
+    )) {
+      is ScanIDCardResult.Manual -> {
+        scanIDManual = result.data
+        isManual =true
+        runOnUiThread{
+          infoLayout.visibility = View.GONE
+          val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
+          drawableInfo?.setColorFilter(Color.parseColor(manualClickColor), PorterDuff.Mode.SRC_ATOP)
+          takePhotoButton.setBackground(drawableInfo)
+          takePhotoButton.visibility = View.VISIBLE
+        }
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+      is ScanIDCardResult.Auto -> {
+        scanID = result.data
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+    }
+
 
   }
 
@@ -214,7 +272,7 @@ class ScanIDActivity: AppCompatActivity(),
     triggerEvent("onError", dataModel)
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning, "Unable to extract", "Let's try again", false)
+      showPopUpMessage(R.drawable.warning, "Your internet connection seems unstable. Please check your connection and try again.\n", "Let's try again", false)
     }
   }
 
@@ -232,7 +290,7 @@ class ScanIDActivity: AppCompatActivity(),
     triggerEvent("onRetry", dataModel)
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning, "Unable to extract", "Let's try again", false)
+      showPopUpMessage(R.drawable.warning, "We couldn’t read your card. Try again in better lighting and make sure the card is clear and visible.", "Let's try again", false)
     }
   }
 
@@ -243,7 +301,7 @@ class ScanIDActivity: AppCompatActivity(),
       start = false;
       showPopUpMessage(
         R.drawable.id_warning,
-        "Failed ID Check",
+        "Please use your original physical ID card, not a photo or copy.",
         "Please real ID (Not copy)",
         false
       )
@@ -251,37 +309,46 @@ class ScanIDActivity: AppCompatActivity(),
   }
 
 
-  override fun onComplete(dataModel: IDResponseModel, order: Int) {
+  override fun onComplete(dataModel: IDResponseModel, order: Int,doneFlag:DoneFlags) {
 
-    triggerCompleteEvent("onComplete",dataModel.iDExtractedModel!!)
+    triggerCompleteEvent("onComplete",dataModel.iDExtractedModel!!,doneFlag)
 
       values.putAll(convertMap(dataModel.iDExtractedModel!!.transformedProperties))
 
 
       if(kycDocumentDetails.size > 1){
         if(order == kycDocumentDetails.size -1 ){
-          scanID.stopScanning();
+          if(isManual){
+            scanIDManual.stopScanning();
+          }else{
+            scanID.stopScanning();
+          }
           /** Data To Submit **/
 
-          val documentCaptureSharedPreferences =
-            reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
+          val sharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
+          val gson = Gson()
+          val existingJson = sharedPreferences.getString(stepID.toString(), null)
+          val updatedModel: SubmitRequestModel = if (existingJson != null) {
+            // Deserialize to object
+            val existingModel = gson.fromJson(existingJson, SubmitRequestModel::class.java)
 
-          val stepKey = stepID.toString()
-          val editor = documentCaptureSharedPreferences.edit()
+            // Make a mutable copy of the existing map
+            val updatedInfo = existingModel.extractedInformation.toMutableMap()
 
-          if (documentCaptureSharedPreferences.contains(stepKey)) {
-            editor.remove(stepKey)
-          }
-
-          val documentCaptureModel = SubmitRequestModel(
-            stepID!!,
-            StepsName.DocumentCapture,
-            values
-          )
+            // Merge new values (replace if exists, add if not)
+            for ((k, v) in values) {
+              updatedInfo[k] = v
+            }
 
-          val documentCaptureStep = Gson().toJson(documentCaptureModel)
-          editor.putString(stepKey, documentCaptureStep)
-          editor.apply()
+            // Create new model with updated map
+            existingModel.copy(extractedInformation = updatedInfo)
+          } else {
+            // If no existing model, just create a new one
+            SubmitRequestModel(stepID!!, StepsName.DocumentCapture, values)
+          }
+          sharedPreferences.edit()
+            .putString(stepID.toString(), gson.toJson(updatedModel))
+            .apply()
 
 
 
@@ -296,39 +363,46 @@ class ScanIDActivity: AppCompatActivity(),
           }
           hidePopUpMessage()
           if(isFlippingCard){
-            flippingCard.visibility = View.VISIBLE
-            val backgroundThread = Thread {
-              try {
-                Thread.sleep(5000)
-                runOnUiThread{
-                  flippingCard.visibility = View.GONE
-                }
-              } catch (e: InterruptedException) {
-                e.printStackTrace()
-              }
+            showBackIDPage();
+          }else{
+            if(isManual){
+              scanIDManual.changeTemplateId(kycDocumentDetails.last().templateProcessingKeyInformation);
+            }else{
+              scanID.changeTemplateId(kycDocumentDetails.last().templateProcessingKeyInformation);
             }
-            backgroundThread.start()
           }
         }
       }else{
-        scanID.stopScanning();
+        if(isManual){
+          scanIDManual.stopScanning();
+        }else{
+          scanID.stopScanning();
+        }
         /** Data To Submit **/
-          val documentCaptureSharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
-            val documentCaptureModel = SubmitRequestModel(
-              stepID!!,StepsName.DocumentCapture,
-              values
-            );
-            val documentCaptureSharedPreferencesEditor =
-              documentCaptureSharedPreferences.edit()
-            val documentCaptureGson = Gson()
-            val documentCaptureStep: String =
-              documentCaptureGson.toJson(documentCaptureModel)
-            documentCaptureSharedPreferencesEditor.putString(
-              stepID.toString(),
-              documentCaptureStep
-            );
-            documentCaptureSharedPreferencesEditor.apply()
 
+        val sharedPreferences = reactApplicationContext.getSharedPreferences("SubmitStepModel", Context.MODE_PRIVATE)
+        val gson = Gson()
+        val existingJson = sharedPreferences.getString(stepID.toString(), null)
+        val updatedModel: SubmitRequestModel = if (existingJson != null) {
+          // Deserialize to object
+          val existingModel = gson.fromJson(existingJson, SubmitRequestModel::class.java)
+
+          // Make a mutable copy of the existing map
+          val updatedInfo = existingModel.extractedInformation.toMutableMap()
+
+          for ((k, v) in values) {
+            updatedInfo[k] = v
+          }
+
+          // Create new model with updated map
+          existingModel.copy(extractedInformation = updatedInfo)
+        } else {
+          // If no existing model, just create a new one
+          SubmitRequestModel(stepID!!, StepsName.DocumentCapture, values)
+        }
+         sharedPreferences.edit()
+          .putString(stepID.toString(), gson.toJson(updatedModel))
+          .apply()
 
         /** **/
         runOnUiThread {
@@ -343,7 +417,7 @@ class ScanIDActivity: AppCompatActivity(),
     triggerEvent("onWrongTemplate", dataModel);
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning, "Wrong Template", "Let's try again", false)
+      showPopUpMessage(R.drawable.warning, "Please double-check that you selected the correct ID type and are presenting this ID type", "Let's try again", false)
     }
   }
 
@@ -400,12 +474,13 @@ class ScanIDActivity: AppCompatActivity(),
   }
 
 
-  private fun triggerCompleteEvent(eventName:String, dataModel: IDExtractedModel?){
+  private fun triggerCompleteEvent(eventName:String, dataModel: IDExtractedModel?,doneFlag:DoneFlags){
       val eventResultMap = Arguments.createMap().apply {
         if(dataModel!=null){
           val gson = Gson()
           val jsonString = gson.toJson(dataModel!!)
           putString("IdDataModel", jsonString)
+          putString("DoneFlag", doneFlag.toString())
         }
       }
       reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
@@ -444,4 +519,56 @@ class ScanIDActivity: AppCompatActivity(),
   }
 
 
+  fun showBackIDPage(){
+    runOnUiThread{
+
+      takePhotoButton.visibility = View.GONE
+      val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
+      toolbarTitle.setText("Capture Back of ID")
+      toolbarTitle.setTextColor(Color.parseColor(processingColor))
+
+
+     val backIDPage  = findViewById<LinearLayout>(R.id.backIDPage)
+      backIDPage.setBackgroundColor(Color.parseColor(holdHandColor))
+      backIDPage.visibility = View.VISIBLE
+
+
+      val nextTemplate = findViewById<Button>(R.id.nextTemplate)
+      nextTemplate.setOnClickListener {
+        if(isManual){
+          scanIDManual.changeTemplateId(kycDocumentDetails.last().templateProcessingKeyInformation);
+        }else{
+          scanID.changeTemplateId(kycDocumentDetails.last().templateProcessingKeyInformation);
+        }
+        hidrBackIDPage();
+      }
+
+      val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
+      drawableInfo?.setColorFilter(Color.parseColor(manualClickColor), PorterDuff.Mode.SRC_ATOP)
+      nextTemplate.setBackground(drawableInfo)
+
+      val ivSample = findViewById<ImageView>(R.id.ivSample)
+      Picasso.get()
+        .load(kycDocumentDetails.last().templateSpecimen)
+        .into(ivSample)
+    }
+  }
+
+  fun hidrBackIDPage(){
+    runOnUiThread{
+      if(isManual){
+        takePhotoButton.visibility = View.VISIBLE
+      }
+      val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
+      toolbarTitle.setText(title)
+      toolbarTitle.setTextColor(Color.parseColor(processingColor))
+
+      val backIDPage  = findViewById<LinearLayout>(R.id.backIDPage)
+      backIDPage.setBackgroundColor(Color.parseColor(holdHandColor))
+      backIDPage.visibility = View.GONE
+
+
+    }
+  }
+
 }

package/android/src/main/java/com/assentifysdk/ScanOtherActivity.kt

@@ -12,6 +12,7 @@ import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.assentify.sdk.Core.Constants.MotionType
 import com.assentify.sdk.Core.Constants.ZoomType
 import ImageToBase64Converter
+import android.content.res.ColorStateList
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 import com.google.gson.Gson
@@ -33,6 +34,9 @@ import android.graphics.PorterDuff
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import com.assentify.sdk.Core.Constants.BrightnessEvents
+import com.assentify.sdk.Core.Constants.DoneFlags
+import com.assentify.sdk.ScanOther.ScanOtherManual
+import com.assentify.sdk.ScanOther.ScanOtherResult
 import java.text.SimpleDateFormat
 
 
@@ -42,6 +46,8 @@ class ScanOtherActivity: AppCompatActivity(),
   private lateinit var reactApplicationContext: ReactApplicationContext
   private lateinit var assentifySdk: AssentifySdk
   private lateinit var scanOther: ScanOther
+  private lateinit var scanOtherManual: ScanOtherManual
+  private  var isManual: Boolean = false;
   private lateinit var infoText: TextView
   private lateinit var infoIcon: ImageView
   private lateinit var infoLayout: LinearLayout
@@ -59,6 +65,8 @@ class ScanOtherActivity: AppCompatActivity(),
   private  var showCountDown: Boolean = true;
   private  var apiKey: String = "";
   private var stepID: Int = -1;
+  private lateinit var takePhotoButton: Button;
+  private lateinit var manualClickColor: String;
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_scan)
@@ -67,8 +75,25 @@ class ScanOtherActivity: AppCompatActivity(),
     processingColor = intent.getStringExtra("processingColor")!!
     language = intent.getStringExtra("language")!!
     apiKey = intent.getStringExtra("apiKey")!!
+    manualClickColor = intent.getStringExtra("manualClickColor")!!
     showCountDown = intent.getBooleanExtra("showCountDown",true)
     stepID = intent.getIntExtra("stepID",-1)!!
+
+    takePhotoButton = findViewById<Button>(R.id.takePhoto)
+    takePhotoButton.visibility = View.GONE
+    takePhotoButton.setTextColor(Color.parseColor(processingColor))
+    takePhotoButton.backgroundTintList = ColorStateList.valueOf(
+      Color.parseColor(manualClickColor)
+    )
+    takePhotoButton.setOnClickListener {
+      scanOtherManual.takePicture()
+    }
+
+    infoLayout = findViewById<LinearLayout>(R.id.infoLayout)
+    val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
+    drawableInfo?.setColorFilter(Color.parseColor(holdHandColor), PorterDuff.Mode.SRC_ATOP)
+    infoLayout.setBackground(drawableInfo)
+
     startAssentifySdk()
 
 
@@ -81,16 +106,18 @@ class ScanOtherActivity: AppCompatActivity(),
     backButton.setOnClickListener {
       runOnUiThread {
         triggerEvent("onBackClick", null)
-        scanOther.stopScanning();
+        if(isManual){
+          scanOtherManual.stopScanning();
+
+        }else{
+          scanOther.stopScanning();
+        }
         finish()
       }
     }
 
 
-    infoLayout = findViewById<LinearLayout>(R.id.infoLayout)
-    val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
-    drawableInfo?.setColorFilter(Color.parseColor(holdHandColor), PorterDuff.Mode.SRC_ATOP)
-    infoLayout.setBackground(drawableInfo)
+
 
 
     val toolbarTitle = findViewById<TextView>(R.id.toolbar_title)
@@ -120,11 +147,18 @@ class ScanOtherActivity: AppCompatActivity(),
         popUpContainer.visibility = View.GONE
       }
     }
+
+
   }
 
   override fun onBackPressed() {
     triggerEvent("onBackClick", null)
-    scanOther.stopScanning();
+    if(isManual){
+      scanOtherManual.stopScanning();
+
+    }else{
+      scanOther.stopScanning();
+    }
     finish()
     super.onBackPressed()
   }
@@ -179,15 +213,36 @@ class ScanOtherActivity: AppCompatActivity(),
 
   fun startAssentifySdk() {
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
-    scanOther = assentifySdk!!.startScanOther(
+
+    when (val result =  assentifySdk!!.startScanOther(
       this@ScanOtherActivity,
       language,stepID!!
-    );
-    Thread.sleep(500);
-    var fragmentManager = supportFragmentManager
-    var transaction = fragmentManager.beginTransaction()
-    transaction.replace(R.id.fragmentContainer, scanOther)
-    transaction.commit()
+    )) {
+      is ScanOtherResult.Manual -> {
+        isManual =true
+        runOnUiThread{
+          infoLayout.visibility = View.GONE
+          val drawableInfo = getResources().getDrawable(R.drawable.info_rounded_background)
+          drawableInfo?.setColorFilter(Color.parseColor(manualClickColor), PorterDuff.Mode.SRC_ATOP)
+          takePhotoButton.setBackground(drawableInfo)
+          takePhotoButton.visibility = View.VISIBLE
+        }
+        scanOtherManual = result.data
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+      is ScanOtherResult.Auto -> {
+        scanOther = result.data
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+    }
 
   }
 
@@ -195,7 +250,7 @@ class ScanOtherActivity: AppCompatActivity(),
     triggerEvent("onError", dataModel)
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning, "Unable to extract", "Let's try again", false)
+      showPopUpMessage(R.drawable.warning, "Your internet connection seems unstable. Please check your connection and try again.\n", "Let's try again", false)
     }
   }
 
@@ -213,14 +268,14 @@ class ScanOtherActivity: AppCompatActivity(),
     triggerEvent("onRetry", dataModel)
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning, "Unable to extract", "Let's try again", false)
+      showPopUpMessage(R.drawable.warning, "We couldn’t read your card. Try again in better lighting and make sure the card is clear and visible.", "Let's try again", false)
     }
   }
 
 
 
-  override fun onComplete(dataModel: OtherResponseModel) {
-    triggerCompleteEvent("onComplete",dataModel)
+  override fun onComplete(dataModel: OtherResponseModel,doneFlag: DoneFlags) {
+    triggerCompleteEvent("onComplete",dataModel,doneFlag)
       /** Steps **/
 
     /** Data To Submit **/
@@ -248,7 +303,12 @@ class ScanOtherActivity: AppCompatActivity(),
 
       /** End **/
     runOnUiThread {
-      scanOther.stopScanning();
+      if(isManual){
+        scanOtherManual.stopScanning();
+
+      }else{
+        scanOther.stopScanning();
+      }
       finish()
     }
 
@@ -319,12 +379,13 @@ class ScanOtherActivity: AppCompatActivity(),
     } ?: emptyMap()
   }
 
-  private fun triggerCompleteEvent(eventName:String, dataModel: OtherResponseModel?){
+  private fun triggerCompleteEvent(eventName:String, dataModel: OtherResponseModel?,doneFlag: DoneFlags){
       val eventResultMap = Arguments.createMap().apply {
         if(dataModel!=null){
           val gson = Gson()
           val jsonString = gson.toJson(dataModel.otherExtractedModel!!)
           putString("OtherDataModel", jsonString)
+          putString("DoneFlag", doneFlag.toString())
         }
       }
       reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)