@oiti/rn-liveness3d 4.0.0 → 5.1.0

package/android/build.gradle

@@ -139,7 +139,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'br.com.oiti:liveness3d-sdk:9.4.9'
+  implementation 'br.com.oiti:liveness3d-sdk:9.5.3'
 
 // From node_modules
 }

package/android/gradle.properties

@@ -1,5 +1,5 @@
-RnLiveness3d_kotlinVersion=1.7.0
-RnLiveness3d_minSdkVersion=21
-RnLiveness3d_targetSdkVersion=31
-RnLiveness3d_compileSdkVersion=31
-RnLiveness3d_ndkversion=21.4.7075529
+RnLiveness3d_kotlinVersion=2.1.20
+RnLiveness3d_minSdkVersion=24
+RnLiveness3d_targetSdkVersion=36
+RnLiveness3d_compileSdkVersion=36
+RnLiveness3d_ndkversion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -1,9 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="br.com.oiti.rnliveness3d">
-
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

package/android/src/main/java/br/com/oiti/rnliveness3d/RnLiveness3dModule.kt

@@ -1,221 +1,247 @@
-  package br.com.oiti.rnliveness3d
-
-  import android.Manifest
-  import android.app.Activity
-  import android.content.Intent
-  import android.content.pm.PackageManager
-  import android.util.Log
-  import androidx.annotation.NonNull
-  import androidx.core.app.ActivityCompat
-  import androidx.core.content.*
-
-  import br.com.oiti.liveness3d.app.ui.HybridLiveness3DActivity
-  import br.com.oiti.rnliveness3d.theme.Liveness3DTheme
-
-  import br.com.oiti.liveness3d.data.model.*
-  import br.com.oiti.rnliveness3d.theme.Liveness3DText
-
-  import com.facebook.react.bridge.*
-  import com.facebook.react.bridge.Promise
-  import com.facebook.react.bridge.ReactApplicationContext
-  import com.facebook.react.bridge.ReactContextBaseJavaModule
-  import com.facebook.react.bridge.ReactMethod
-  import com.facebook.react.modules.core.PermissionAwareActivity
-  import org.json.JSONObject
-
-  class RnLiveness3dModule(reactContext: ReactApplicationContext) :
-    ReactContextBaseJavaModule(reactContext) {
-
-    private var mLiveness3dPromisse: Promise? = null
-
-    init {
-      reactContext.addActivityEventListener(object : BaseActivityEventListener() {
-        override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
-          if (requestCode == LIVENESS3D_REQUEST && mLiveness3dPromisse != null) {
-            when (resultCode) {
-              Activity.RESULT_CANCELED -> mLiveness3dPromisse!!.reject(RESULT_CANCELED,onLiveness3DResultCancelled(data))
-              Activity.RESULT_OK -> mLiveness3dPromisse!!.resolve(onLiveness3DResultSuccess(data))
-            }
-            mLiveness3dPromisse = null
-          }
-        }
-      })
-    }
+package br.com.oiti.rnliveness3d
+
+import android.Manifest
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.util.Log
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import br.com.oiti.liveness3d.app.ui.HybridLiveness3DActivity
+import br.com.oiti.liveness3d.data.model.ENVIRONMENT3D
+import br.com.oiti.liveness3d.data.model.Liveness3DFontsKey
+import br.com.oiti.liveness3d.data.model.Liveness3DUser
+import br.com.oiti.liveness3d.data.model.LoadingType3D
+import br.com.oiti.rnliveness3d.theme.Liveness3DText
+import br.com.oiti.rnliveness3d.theme.Liveness3DTheme
+import com.facebook.react.bridge.BaseActivityEventListener
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.module.annotations.ReactModule
+import org.json.JSONObject
+
+@ReactModule(name = RnLiveness3dModule.NAME)
+class RnLiveness3dModule(reactContext: ReactApplicationContext) :
+  NativeRnLiveness3dSpec(reactContext) {
+  private var liveness3dPromise: Promise? = null
+  private var cameraPermissionCallback: Callback? = null
+
+  init {
+    reactContext.addActivityEventListener(object : BaseActivityEventListener() {
+      override fun onActivityResult(
+        activity: Activity,
+        requestCode: Int,
+        resultCode: Int,
+        data: Intent?
+      ) {
+        handleActivityResult(requestCode = requestCode, resultCode = resultCode, data = data)
+      }
+    })
+  }
 
-    fun onLiveness3DResultSuccess(data: Intent?): String {
-      val resultMap = mutableMapOf<String, Any?>()
+  /**
+   * Spec methods
+   */
 
-      resultMap["valid"] = data?.getBooleanExtra(HybridLiveness3DActivity.PARAM_RESULT_VALID, false)
-      resultMap["cause"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_CAUSE)
-      resultMap["codId"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_COD_ID)
-      resultMap["protocol"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_PROTOCOL)
-      resultMap["blob"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_SCAN)
+  override fun getName(): String {
+    return NAME
+  }
 
-      return JSONObject(resultMap).toString()
-    }
+  override fun checkCameraPermissionGranted(): Boolean {
+    val permission =
+      ContextCompat.checkSelfPermission(reactApplicationContext, Manifest.permission.CAMERA)
+    return permission == PackageManager.PERMISSION_GRANTED
+  }
 
-    fun onLiveness3DResultCancelled(data: Intent?): String {
-      return data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_ERROR) ?: ""
+  override fun requestCameraPermission(resolve: Callback?) {
+    val activity = reactApplicationContext.currentActivity ?: run {
+      resolve?.invoke(false)
+      return
     }
-    override fun getName(): String {
-      return NAME
+
+    val permissionGranted = checkCameraPermissionGranted()
+    if (permissionGranted) {
+      resolve?.invoke(true)
+      return
     }
-    @NonNull
-    @ReactMethod
-    fun startliveness3d(
-      appKey: String,
-      ticket: String,
-      type: String,
-      size: Int,
-      backgroundColor: String,
-      loadingColor: String,
-      themeJson: ReadableMap?,
-      fontsJson: ReadableMap?,
-      textsJson: ReadableMap?,
-      environment: String,
-      promise: Promise,
-    ) {
-      mLiveness3dPromisse = promise
-      val currentActivity = currentActivity
-
-      val themeBuilder = themeJson?.let { Liveness3DTheme(readableMapToMap(themeJson)).apply() }
-      val fonts = fontsJson?.let { getFonts(readableMapToMap(fontsJson)) }
-      val texts = textsJson?.let { Liveness3DText().getTexts(readableMapToMap(textsJson)) }
-
-      Log.d("ENV", environment)
-
-      if (currentActivity == null) {
-        promise.reject(E_ACTIVITY_DOES_NOT_EXIST, "Activity doesn't exist")
-        return;
-      }
-        try {
-          val env: ENVIRONMENT3D = if (environment.equals("PRD")) ENVIRONMENT3D.PRD else ENVIRONMENT3D.HML
-          val liveness3DUser = Liveness3DUser(appKey = appKey, env, themeBuilder)
-
-          val intent = Intent(currentActivity, HybridLiveness3DActivity::class.java).apply {
-            putExtra(HybridLiveness3DActivity.PARAM_LIVENESS3D_USER, liveness3DUser)
-            if (ticket.isNotEmpty()) {
-              putExtra(HybridLiveness3DActivity.PARAM_TICKET, ticket)
-            }
-            putExtra(HybridLiveness3DActivity.PARAM_TEXTS, texts)
-            putExtra(HybridLiveness3DActivity.PARAM_FONTS, fonts)
-            putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_BACKGROUND, backgroundColor)
-            putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_SPINNER_COLOR, loadingColor)
-            putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_SIZE, size)
-            if(type == "default"){
-              putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_TYPE, LoadingType3D.ACTIVITY_INDICATOR)
-            }else{
-              putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_TYPE, LoadingType3D.SPINNER)
-            }
-          }
 
-          currentActivity.startActivityForResult(intent, LIVENESS3D_REQUEST)
+    ActivityCompat.requestPermissions(
+      activity,
+      arrayOf(Manifest.permission.CAMERA),
+      CAMERA_PERMISSION_REQUEST_CODE
+    )
+    resolve?.invoke(false)
+  }
 
-        } catch (e: Exception) {
-          Log.d("APPKEY_FAILED", appKey)
-          mLiveness3dPromisse?.reject(E_FAILED_TO_SHOW_PICKER, e)
-          mLiveness3dPromisse = null
-        }
+  override fun startLiveness3d(args: ReadableMap?, promise: Promise?) {
+    liveness3dPromise = promise
+
+    val currentActivity = reactApplicationContext.currentActivity ?: run {
+      promise?.reject(E_ACTIVITY_DOES_NOT_EXIST, "Activity doesn't exist")
+      return
     }
 
-    fun readableMapToMap(readableMap: ReadableMap?): Map<String, String?> {
-      val map = mutableMapOf<String, String?>()
-      readableMap?.let {
-        val iterator = it.keySetIterator()
-        while (iterator.hasNextKey()) {
-          val key = iterator.nextKey()
-          val value = it.getString(key)
-          map[key] = value
-        }
+    val appKey = args?.getString(name = "appkey") ?: ""
+    val environmentString = args?.getString(name = "environment") ?: "HML"
+    val themeMap = args?.getMap(name = "theme")
+    val fontsMap = args?.getMap(name = "fonts")
+    val textsMap = args?.getMap(name = "liveness3Dtext")
+    val loadingMap = args?.getMap(name = "loading")
+
+    val themeBuilder = themeMap?.let { Liveness3DTheme(readableMapToMap(it)).apply() }
+    val fonts = fontsMap?.let { getFonts(readableMapToMap(it)) }
+    val texts = textsMap?.let { Liveness3DText().getTexts(readableMapToMap(it)) }
+
+    val loadingTypeString = loadingMap?.getString(name = "type") ?: "default"
+    val loadingType =
+      if (loadingTypeString == "default") LoadingType3D.ACTIVITY_INDICATOR else LoadingType3D.SPINNER
+    val loadingColor = loadingMap?.getString(name = "loadingColor") ?: "#000000"
+    val loadingBackground = loadingMap?.getString(name = "backgroundColor") ?: "#FFFFFF"
+    val loadingSize = when(loadingMap?.hasKey(name = "size")) {
+      true -> loadingMap.getInt(name = "size")
+      else -> 10
+    }
+
+    Log.d("ENV", environmentString)
+    Log.d("ENV", appKey)
+
+    try {
+      val environment = if (environmentString == "PRD") ENVIRONMENT3D.PRD else ENVIRONMENT3D.HML
+      val liveness3DUser = Liveness3DUser(
+        appKey = appKey,
+        environment = environment,
+        liveness3DTheme = themeBuilder
+      )
+
+      val intent = Intent(currentActivity, HybridLiveness3DActivity::class.java).apply {
+        putExtra(HybridLiveness3DActivity.PARAM_LIVENESS3D_USER, liveness3DUser)
+        putExtra(HybridLiveness3DActivity.PARAM_TEXTS, texts)
+        putExtra(HybridLiveness3DActivity.PARAM_FONTS, fonts)
+
+        putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_TYPE, loadingType)
+        putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_SPINNER_COLOR, loadingColor)
+        putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_BACKGROUND, loadingBackground)
+        putExtra(HybridLiveness3DActivity.PARAM_CUSTOM_LOADING_SIZE, loadingSize)
       }
-      return map
+
+      currentActivity.startActivityForResult(intent, LIVENESS3D_REQUEST)
+    } catch (e: Exception) {
+      Log.d("APPKEY_FAILED", appKey)
+      liveness3dPromise?.reject(E_FAILED_TO_SHOW_PICKER, e)
+      liveness3dPromise = null
     }
+  }
 
-    private fun getFonts(fontsBuilder: Map<String, String?>?): HashMap<Liveness3DFontsKey?, String?> {
-      val hashMap = HashMap<Liveness3DFontsKey?, String?>()
-      if (fontsBuilder != null) {
-        val fontsMap = fontsBuilder
-          .mapNotNull {
-            val key = getFontKey(it.key)
-            val value = it.value
-            if (value?.isEmpty() == true) {
-              null
-            } else { Pair(key, "fonts/$value.ttf".lowercase()) }
+  /**
+   * Private methods
+   */
+
+  private fun handleActivityResult(
+    requestCode: Int,
+    resultCode: Int,
+    data: Intent?
+  ) {
+    when (requestCode) {
+      LIVENESS3D_REQUEST -> {
+        liveness3dPromise?.let {
+          when (resultCode) {
+            Activity.RESULT_OK -> it.resolve(onLivenessSuccess(data))
+            Activity.RESULT_CANCELED -> it.reject(RESULT_CANCELED, onLivenessCancelled(data))
           }
-          .toMap()
-        hashMap.putAll(fontsMap)
+          liveness3dPromise = null
+        }
       }
-      return hashMap
-    }
 
-    private fun getFontKey(identifier: String): Liveness3DFontsKey? {
-      return when(identifier) {
-        /* Guidance */
-        "guidanceCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_HEADER_FONT
-        "guidanceCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_SUBTEXT_FONT
-        /* Button */
-        "guidanceCustomizationButtonFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_BUTTON_FONT
-
-        /* Ready Screen */
-        "readyScreenCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_HEADER_FONT
-        "readyScreenCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_SUBTEXT_FONT
-        /* Retry Screen */
-        "retryScreenCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_HEADER_FONT
-        "retryScreenCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_SUBTEXT_FONT
-        /* Result Screen */
-        "resultScreenCustomizationMessageFont" -> Liveness3DFontsKey.RESULT_SCREEN_CUSTOMIZATION_MESSAGE_FONT
-        /* Feedback */
-        "feedbackCustomizationTextFont" -> Liveness3DFontsKey.FEEDBACK_CUSTOMIZATION_TEXT_FONT
-        else -> null
+      CAMERA_PERMISSION_REQUEST_CODE -> {
+        cameraPermissionCallback?.let {
+          when (resultCode) {
+            Activity.RESULT_OK -> it.invoke(checkCameraPermissionGranted())
+            Activity.RESULT_CANCELED -> it.invoke(false)
+          }
+          cameraPermissionCallback = null
+        }
       }
     }
+  }
 
-    @ReactMethod
-    fun checkcamerapermission(promise: Promise) {
-      val currentActivity = currentActivity
-      if (currentActivity != null) {
-        if (ContextCompat.checkSelfPermission(currentActivity, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-          promise.resolve(true)
-        } else {
-          promise.resolve(false)
-        }
-      } else {
-        promise.reject("UNAVAILABLE", "Could not get current activity.")
+  private fun onLivenessSuccess(data: Intent?): String {
+    val resultMap = mutableMapOf<String, Any?>()
+
+    resultMap["valid"] = data?.getBooleanExtra(HybridLiveness3DActivity.PARAM_RESULT_VALID, false)
+    resultMap["cause"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_CAUSE)
+    resultMap["codId"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_COD_ID)
+    resultMap["protocol"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_PROTOCOL)
+    resultMap["blob"] = data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_SCAN)
+
+    return JSONObject(resultMap).toString()
+  }
+
+  private fun onLivenessCancelled(data: Intent?): String {
+    return data?.getStringExtra(HybridLiveness3DActivity.PARAM_RESULT_ERROR) ?: ""
+  }
+
+  private fun readableMapToMap(readableMap: ReadableMap?): Map<String, String?> {
+    val map = mutableMapOf<String, String?>()
+    readableMap?.let {
+      val iterator = it.keySetIterator()
+      while (iterator.hasNextKey()) {
+        val key = iterator.nextKey()
+        val value = it.getString(key)
+        map[key] = value
       }
     }
+    return map
+  }
 
-    @ReactMethod
-    fun askcamerapermission(promise: Promise) {
-      val currentActivity = currentActivity
-
-      if (currentActivity != null) {
-        if (ContextCompat.checkSelfPermission(currentActivity, Manifest.permission.CAMERA)
-          == PackageManager.PERMISSION_GRANTED
-        ) {
-          promise.resolve(true)
-        } else {
-          if (currentActivity is PermissionAwareActivity) {
-            ActivityCompat.requestPermissions(
-              currentActivity,
-              arrayOf(Manifest.permission.CAMERA),
-              CAMERA_PERMISSION_REQUEST_CODE
-            )
+  private fun getFonts(fontsBuilder: Map<String, String?>?): HashMap<Liveness3DFontsKey?, String?> {
+    val hashMap = HashMap<Liveness3DFontsKey?, String?>()
+    if (fontsBuilder != null) {
+      val fontsMap = fontsBuilder
+        .mapNotNull {
+          val key = getFontKey(it.key)
+          val value = it.value
+          if (value?.isEmpty() == true) {
+            null
           } else {
-            promise.resolve(false)
+            Pair(key, "fonts/$value.ttf".lowercase())
           }
-          promise.resolve(false)
         }
-      } else {
-        promise.resolve(true)
-      }
+        .toMap()
+      hashMap.putAll(fontsMap)
     }
+    return hashMap
+  }
 
-    companion object {
-      const val NAME = "RnLiveness3d"
-        const val CAMERA_PERMISSION_REQUEST_CODE = 1111
-        private const val LIVENESS3D_REQUEST = 1
-        private const val E_ACTIVITY_DOES_NOT_EXIST = "E_ACTIVITY_DOES_NOT_EXIST"
-        private const val E_FAILED_TO_SHOW_PICKER = "E_FAILED_TO_SHOW_PICKER"
-        private val RESULT_CANCELED = "RESULT_CANCELED"
+  private fun getFontKey(identifier: String): Liveness3DFontsKey? {
+    return when (identifier) {
+      /* Guidance */
+      "guidanceCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_HEADER_FONT
+      "guidanceCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_SUBTEXT_FONT
+      /* Button */
+      "guidanceCustomizationButtonFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_BUTTON_FONT
+
+      /* Ready Screen */
+      "readyScreenCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_HEADER_FONT
+      "readyScreenCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_SUBTEXT_FONT
+      /* Retry Screen */
+      "retryScreenCustomizationHeaderFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_HEADER_FONT
+      "retryScreenCustomizationSubtextFont" -> Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_SUBTEXT_FONT
+      /* Result Screen */
+      "resultScreenCustomizationMessageFont" -> Liveness3DFontsKey.RESULT_SCREEN_CUSTOMIZATION_MESSAGE_FONT
+      /* Feedback */
+      "feedbackCustomizationTextFont" -> Liveness3DFontsKey.FEEDBACK_CUSTOMIZATION_TEXT_FONT
+      else -> null
     }
   }
+
+  companion object {
+    const val NAME = "RnLiveness3d"
+    private const val CAMERA_PERMISSION_REQUEST_CODE = 100
+    private const val LIVENESS3D_REQUEST = 1
+    private const val RESULT_CANCELED = "RESULT_CANCELED"
+    private const val E_ACTIVITY_DOES_NOT_EXIST = "E_ACTIVITY_DOES_NOT_EXIST"
+    private const val E_FAILED_TO_SHOW_PICKER = "E_FAILED_TO_SHOW_PICKER"
+  }
+}

package/android/src/main/java/br/com/oiti/rnliveness3d/RnLiveness3dPackage.kt

@@ -1,16 +1,33 @@
 package br.com.oiti.rnliveness3d
-import com.facebook.react.ReactPackage
+
+import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import java.util.HashMap
 
-class RnLiveness3dPackage : ReactPackage {
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-    return listOf(RnLiveness3dModule(reactContext))
+class RnLiveness3dPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == RnLiveness3dModule.NAME) {
+      RnLiveness3dModule(reactContext)
+    } else {
+      null
+    }
   }
 
-  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-    return emptyList()
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+      moduleInfos[RnLiveness3dModule.NAME] = ReactModuleInfo(
+        RnLiveness3dModule.NAME,
+        RnLiveness3dModule.NAME,
+        false,
+        false,
+        false,
+        true
+      )
+      moduleInfos
+    }
   }
-
 }

package/android/src/main/java/br/com/oiti/rnliveness3d/theme/Liveness3DFonts.kt

@@ -2,43 +2,37 @@ package br.com.oiti.rnliveness3d.theme
 
 import br.com.oiti.liveness3d.data.model.Liveness3DFontsKey
 
-class Liveness3DFonts(private val fontsBuilder: Map<String,String?>?) {
-    private val guidanceCustomizationHeaderFont: String = fontsBuilder?.get("guidanceCustomizationHeaderFont")?.lowercase() + ".ttf"
-    private val guidanceCustomizationSubtextFont: String =
-        ("fonts/" + fontsBuilder?.get("guidanceCustomizationSubtextFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val readyScreenCustomizationHeaderFont: String =
-        ("fonts/" + fontsBuilder?.get("readyScreenCustomizationHeaderFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val readyScreenCustomizationSubtextFont: String =
-        ("fonts/" + fontsBuilder?.get("readyScreenCustomizationSubtextFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val retryScreenCustomizationHeaderFont: String =
-        ("fonts/" + fontsBuilder?.get("retryScreenCustomizationHeaderFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val retryScreenCustomizationSubtextFont: String =
-        ("fonts/" + fontsBuilder?.get("retryScreenCustomizationSubtextFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val resultScreenCustomizationMessageFont: String =
-        ("fonts/" + fontsBuilder?.get("resultScreenCustomizationMessageFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val guidanceCustomizationButtonFont: String =
-        ("fonts/" + fontsBuilder?.get("guidanceCustomizationButtonFont")?.lowercase() + ".ttf")
-            ?: ""
-    private val feedbackCustomizationTextFont: String =
-        ("fonts/" + fontsBuilder?.get("feedbackCustomizationTextFont")?.lowercase() + ".ttf") ?: ""
+class Liveness3DFonts(private val fontsBuilder: Map<String, String?>?) {
+  private val guidanceCustomizationHeaderFont: String =
+    fontsBuilder?.get("guidanceCustomizationHeaderFont")?.lowercase() + ".ttf"
+  private val guidanceCustomizationSubtextFont: String =
+    ("fonts/" + fontsBuilder?.get("guidanceCustomizationSubtextFont")?.lowercase() + ".ttf")
+  private val readyScreenCustomizationHeaderFont: String =
+    ("fonts/" + fontsBuilder?.get("readyScreenCustomizationHeaderFont")?.lowercase() + ".ttf")
+  private val readyScreenCustomizationSubtextFont: String =
+    ("fonts/" + fontsBuilder?.get("readyScreenCustomizationSubtextFont")?.lowercase() + ".ttf")
+  private val retryScreenCustomizationHeaderFont: String =
+    ("fonts/" + fontsBuilder?.get("retryScreenCustomizationHeaderFont")?.lowercase() + ".ttf")
+  private val retryScreenCustomizationSubtextFont: String =
+    ("fonts/" + fontsBuilder?.get("retryScreenCustomizationSubtextFont")?.lowercase() + ".ttf")
+  private val resultScreenCustomizationMessageFont: String =
+    ("fonts/" + fontsBuilder?.get("resultScreenCustomizationMessageFont")?.lowercase() + ".ttf")
+  private val guidanceCustomizationButtonFont: String =
+    ("fonts/" + fontsBuilder?.get("guidanceCustomizationButtonFont")?.lowercase() + ".ttf")
+  private val feedbackCustomizationTextFont: String =
+    ("fonts/" + fontsBuilder?.get("feedbackCustomizationTextFont")?.lowercase() + ".ttf")
 
-    fun apply(): HashMap<Liveness3DFontsKey, String> {
-        return hashMapOf(
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_HEADER_FONT to guidanceCustomizationHeaderFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_SUBTEXT_FONT to guidanceCustomizationSubtextFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_HEADER_FONT to readyScreenCustomizationHeaderFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_SUBTEXT_FONT to readyScreenCustomizationSubtextFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_HEADER_FONT to retryScreenCustomizationHeaderFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_SUBTEXT_FONT to retryScreenCustomizationSubtextFont,
-            Liveness3DFontsKey.RESULT_SCREEN_CUSTOMIZATION_MESSAGE_FONT to resultScreenCustomizationMessageFont,
-            Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_BUTTON_FONT to guidanceCustomizationButtonFont,
-            Liveness3DFontsKey.FEEDBACK_CUSTOMIZATION_TEXT_FONT to feedbackCustomizationTextFont,
-        )
-    }
+  fun apply(): HashMap<Liveness3DFontsKey, String> {
+    return hashMapOf(
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_HEADER_FONT to guidanceCustomizationHeaderFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_SUBTEXT_FONT to guidanceCustomizationSubtextFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_HEADER_FONT to readyScreenCustomizationHeaderFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_READY_SCREEN_SUBTEXT_FONT to readyScreenCustomizationSubtextFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_HEADER_FONT to retryScreenCustomizationHeaderFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_RETRY_SCREEN_SUBTEXT_FONT to retryScreenCustomizationSubtextFont,
+      Liveness3DFontsKey.RESULT_SCREEN_CUSTOMIZATION_MESSAGE_FONT to resultScreenCustomizationMessageFont,
+      Liveness3DFontsKey.GUIDANCE_CUSTOMIZATION_BUTTON_FONT to guidanceCustomizationButtonFont,
+      Liveness3DFontsKey.FEEDBACK_CUSTOMIZATION_TEXT_FONT to feedbackCustomizationTextFont,
+    )
+  }
 }

package/android/src/main/java/br/com/oiti/rnliveness3d/theme/Liveness3DText.kt

@@ -1,11 +1,10 @@
 package br.com.oiti.rnliveness3d.theme
 
-import android.util.Log
 import br.com.oiti.liveness3d.data.model.Liveness3DTextKey
 
 class Liveness3DText {
   fun getTextKey(identifier: String): Liveness3DTextKey? {
-    return when(identifier) {
+    return when (identifier) {
       /* Ready */
       "READY_HEADER_1" -> Liveness3DTextKey.READY_HEADER_1
       "READY_HEADER_2" -> Liveness3DTextKey.READY_HEADER_2
@@ -49,6 +48,7 @@ class Liveness3DText {
       else -> null
     }
   }
+
   fun getTexts(textsBuilder: Map<String, String?>?): HashMap<Liveness3DTextKey, String> {
     val hashMap = HashMap<Liveness3DTextKey, String>()
     if (textsBuilder != null) {
@@ -58,7 +58,9 @@ class Liveness3DText {
           val value = it.value
           if (key != null && value != null) {
             Pair(key, value)
-          } else { null }
+          } else {
+            null
+          }
         }
         .toMap()
       hashMap.putAll(textsMap)