assentify-sdk-react-native 0.0.32 → 0.0.33

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)

package/android/src/main/java/com/assentifysdk/ScanPassportActivity.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
@@ -35,12 +36,17 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import java.text.SimpleDateFormat
 import com.assentify.sdk.Core.Constants.BrightnessEvents
+import com.assentify.sdk.Core.Constants.DoneFlags
+import com.assentify.sdk.ScanPassport.ScanPassportManual
+import com.assentify.sdk.ScanPassport.ScanPassportResult
 
 class ScanPassportActivity : AppCompatActivity(),
   ScanPassportCallback {
   private lateinit var assentifySdk: AssentifySdk
   private lateinit var reactApplicationContext: ReactApplicationContext
   private lateinit var scanPassport: ScanPassport
+  private lateinit var scanPassportManual: ScanPassportManual
+  private  var isManual: Boolean = false;
   private lateinit var infoText: TextView
   private lateinit var infoIcon: ImageView
   private lateinit var infoLayout: LinearLayout
@@ -59,7 +65,8 @@ class ScanPassportActivity : AppCompatActivity(),
   private var isDone: Boolean = false;
   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)
@@ -68,9 +75,25 @@ class ScanPassportActivity : 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 {
+      scanPassportManual.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()
 
     val backButton = findViewById<RelativeLayout>(R.id.backButton)
@@ -81,16 +104,18 @@ class ScanPassportActivity : AppCompatActivity(),
     backButton.setOnClickListener {
       runOnUiThread {
         triggerEvent("onBackClick", null)
-        scanPassport.stopScanning();
+        if(isManual){
+          scanPassportManual.stopScanning();
+        }else{
+          scanPassport.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)
@@ -121,11 +146,16 @@ class ScanPassportActivity : AppCompatActivity(),
       }
     }
 
+
   }
 
   override fun onBackPressed() {
     triggerEvent("onBackClick", null)
-    scanPassport.stopScanning();
+    if(isManual){
+      scanPassportManual.stopScanning();
+    }else{
+      scanPassport.stopScanning();
+    }
     finish()
     super.onBackPressed()
   }
@@ -181,15 +211,35 @@ class ScanPassportActivity : AppCompatActivity(),
 
   fun startAssentifySdk() {
     assentifySdk = AssentifySdkObject.getAssentifySdkObject();
-    scanPassport = assentifySdk!!.startScanPassport(
+    when (val result = assentifySdk.startScanPassport(
       this@ScanPassportActivity,
-      language,stepID!!
-    );
-    Thread.sleep(500);
-    var fragmentManager = supportFragmentManager
-    var transaction = fragmentManager.beginTransaction()
-    transaction.replace(R.id.fragmentContainer, scanPassport)
-    transaction.commit()
+      language,stepID
+    )) {
+      is ScanPassportResult.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
+        }
+        scanPassportManual = result.data
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+      is ScanPassportResult.Auto -> {
+        scanPassport = result.data
+        Thread.sleep(500);
+        var fragmentManager = supportFragmentManager
+        var transaction = fragmentManager.beginTransaction()
+        transaction.replace(R.id.fragmentContainer, result.data)
+        transaction.commit()
+      }
+    }
 
   }
 
@@ -197,7 +247,7 @@ class ScanPassportActivity : 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)
     }
   }
 
@@ -215,7 +265,7 @@ class ScanPassportActivity : 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)
     }
   }
 
@@ -223,19 +273,19 @@ class ScanPassportActivity : AppCompatActivity(),
     triggerEvent("onLivenessUpdate", dataModel)
     runOnUiThread {
       start = false;
-      showPopUpMessage(R.drawable.warning,"Failed ID Check","Please real ID (Not copy)",false)
+      showPopUpMessage(R.drawable.warning,"Please use your original physical ID card, not a photo or copy.","Let's try again",false)
     }
   }
 
-  override fun onComplete(dataModel: PassportResponseModel) {
+  override fun onComplete(dataModel: PassportResponseModel,doneFlag: DoneFlags) {
 
-    if (isExpired(dataModel.passportExtractedModel!!.identificationDocumentCapture!!.expiryDate.toString())) {
+    if (doneFlag == DoneFlags.Success &&  isExpired(dataModel.passportExtractedModel!!.identificationDocumentCapture!!.expiryDate.toString())) {
       runOnUiThread {
         start = false;
         showPopUpMessage(R.drawable.expire, "Expired", "Please provide valid ID", false)
       }
     } else {
-      triggerCompleteEvent("onComplete", dataModel)
+      triggerCompleteEvent("onComplete", dataModel,doneFlag)
       /** Steps **/
 
       /** Data To Submit **/
@@ -264,7 +314,11 @@ class ScanPassportActivity : AppCompatActivity(),
       /**  **/
 
         runOnUiThread {
-          scanPassport.stopScanning();
+          if(isManual){
+            scanPassportManual.stopScanning();
+          }else{
+            scanPassport.stopScanning();
+          }
           /** End **/
          if(!isDone){
            isDone = true;
@@ -343,12 +397,14 @@ class ScanPassportActivity : AppCompatActivity(),
     } ?: emptyMap()
   }
 
-  private fun triggerCompleteEvent(eventName: String, dataModel: PassportResponseModel?) {
+  private fun triggerCompleteEvent(eventName: String, dataModel: PassportResponseModel? ,doneFlag: DoneFlags) {
+
     val eventResultMap = Arguments.createMap().apply {
       if (dataModel != null) {
         val gson = Gson()
         val jsonString = gson.toJson(dataModel.passportExtractedModel!!)
         putString("PassportDataModel", jsonString)
+        putString("DoneFlag", doneFlag.toString())
       }
     }
     reactApplicationContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

package/android/src/main/res/drawable/button_rounded_background.xml

@@ -1,6 +1,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="50dp"
-        android:alpha="0.5"/>
+  android:shape="rectangle">
+  <corners android:radius="50dp"
+    android:alpha="0.5"/>
 
-</shape>
+</shape>