@oiti/rn-liveness3d 5.3.0 → 5.3.1

package/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
       google()
       mavenCentral()
       maven {
-        url 'https://raw.githubusercontent.com/oititec/android-oiti-versions-beta/master'
+        url 'https://raw.githubusercontent.com/oititec/android-oiti-versions/master'
       }
   }
 
@@ -140,7 +140,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation 'br.com.oiti:liveness3d-sdk:9.5.6'
+  implementation 'br.com.oiti:liveness3d-sdk:9.5.8'
 
 // From node_modules
 }

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="br.com.oiti.rnliveness3d">
 </manifest>

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

@@ -19,6 +19,7 @@ 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.bridge.ReadableType
 import com.facebook.react.module.annotations.ReactModule
 import org.json.JSONObject
 
@@ -90,19 +91,18 @@ class RnLiveness3dModule(reactContext: ReactApplicationContext) :
     val textsMap = args?.getMap(name = "liveness3Dtext")
     val loadingMap = args?.getMap(name = "loading")
 
-    val themeBuilder = themeMap?.let { Liveness3DTheme(readableMapToMap(it)).apply() }
+    val themeBuilder = themeMap
+      ?.takeIf { it.hasKeyIteratorEntries() }
+      ?.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 loadingTypeString = loadingMap.readStringKey("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
-    }
+    val loadingColor = loadingMap.readStringKey("loadingColor") ?: "#000000"
+    val loadingBackground = loadingMap.readStringKey("backgroundColor") ?: "#FFFFFF"
+    val loadingSize = normalizeLoadingSize(loadingMap.readIntKey("size") ?: 10)
 
     Log.d("ENV", environmentString)
     Log.d("ENV", appKey)
@@ -188,7 +188,12 @@ class RnLiveness3dModule(reactContext: ReactApplicationContext) :
       val iterator = it.keySetIterator()
       while (iterator.hasNextKey()) {
         val key = iterator.nextKey()
-        val value = it.getString(key)
+        val value = when (it.getType(key)) {
+          ReadableType.String -> it.getString(key)
+          ReadableType.Number -> it.getDouble(key).toString()
+          ReadableType.Boolean -> it.getBoolean(key).toString()
+          else -> null
+        }
         map[key] = value
       }
     }
@@ -236,6 +241,35 @@ class RnLiveness3dModule(reactContext: ReactApplicationContext) :
     }
   }
 
+  private fun ReadableMap.hasKeyIteratorEntries(): Boolean {
+    val iterator = keySetIterator()
+    return iterator.hasNextKey()
+  }
+
+  private fun ReadableMap?.readStringKey(key: String): String? {
+    if (this == null || !hasKey(key) || isNull(key)) return null
+    return when (getType(key)) {
+      ReadableType.String -> getString(key)
+      ReadableType.Number -> getDouble(key).toString()
+      ReadableType.Boolean -> getBoolean(key).toString()
+      else -> null
+    }?.takeIf { it.isNotBlank() }
+  }
+
+  private fun ReadableMap?.readIntKey(key: String): Int? {
+    if (this == null || !hasKey(key) || isNull(key)) return null
+    return when (getType(key)) {
+      ReadableType.Number -> getDouble(key).toInt()
+      ReadableType.String -> getString(key)?.toIntOrNull()
+      else -> null
+    }
+  }
+
+  private fun normalizeLoadingSize(rawSize: Int): Int {
+    val safeSize = rawSize.coerceAtLeast(0)
+    return if (safeSize <= 10) safeSize * 30 else safeSize
+  }
+
   companion object {
     const val NAME = "RnLiveness3d"
     private const val CAMERA_PERMISSION_REQUEST_CODE = 100

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

@@ -1,229 +1,168 @@
 package br.com.oiti.rnliveness3d.theme
 
-import androidx.annotation.DrawableRes
 import br.com.oiti.liveness3d.theme.Liveness3DTheme
 
 class Liveness3DTheme(
   private var themeBuilder: Map<String, String?>?,
 ) {
-  //Guidance customization
+  private fun parseIntThemeValue(key: String): Int? {
+    val raw = themeBuilder?.get(key)?.trim()?.takeIf { it.isNotEmpty() } ?: return null
+    return raw.toIntOrNull() ?: raw.toDoubleOrNull()?.toInt()
+  }
+
   private val guidanceCustomizationBackgroundColors: String? =
-    themeBuilder?.get("guidanceCustomizationBackgroundColors") ?: "#FFFFFF"
+    themeBuilder?.get("guidanceCustomizationBackgroundColors")
   private val guidanceCustomizationForegroundColor: String? =
-    themeBuilder?.get("guidanceCustomizationForegroundColor") ?: "#FFFFFF"
+    themeBuilder?.get("guidanceCustomizationForegroundColor")
 
-  //Buttons
   private val guidanceCustomizationButtonTextNormalColor: String? =
-    themeBuilder?.get("guidanceCustomizationForegroundColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationButtonTextNormalColor")
   private val guidanceCustomizationButtonBackgroundNormalColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonBackgroundNormalColor") ?: "#4bb75f"
-
+    themeBuilder?.get("guidanceCustomizationButtonBackgroundNormalColor")
   private val guidanceCustomizationButtonTextHighlightColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonTextHighlightColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationButtonTextHighlightColor")
   private val guidanceCustomizationButtonBackgroundHighlightColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonBackgroundHighlightColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationButtonBackgroundHighlightColor")
   private val guidanceCustomizationButtonTextDisabledColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonTextDisabledColor") ?: "#333333"
+    themeBuilder?.get("guidanceCustomizationButtonTextDisabledColor")
   private val guidanceCustomizationButtonBackgroundDisabledColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonBackgroundDisabledColor") ?: "#333333"
+    themeBuilder?.get("guidanceCustomizationButtonBackgroundDisabledColor")
   private val guidanceCustomizationButtonBorderColor: String? =
-    themeBuilder?.get("guidanceCustomizationButtonBorderColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationButtonBorderColor")
   private val guidanceCustomizationButtonBorderWidth: Int? =
-    themeBuilder?.get("guidanceCustomizationButtonBorderWidth")?.toInt() ?: 0
+    parseIntThemeValue("guidanceCustomizationButtonBorderWidth")
   private val guidanceCustomizationButtonCornerRadius: Int? =
-    themeBuilder?.get("guidanceCustomizationButtonCornerRadius")?.toInt() ?: 25
+    parseIntThemeValue("guidanceCustomizationButtonCornerRadius")
 
-  //Ready Screen
   private val guidanceCustomizationReadyScreenHeaderTextColor: String? =
-    themeBuilder?.get("guidanceCustomizationReadyScreenHeaderTextColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationReadyScreenHeaderTextColor")
   private val guidanceCustomizationReadyScreenSubtextTextColor: String? =
-    themeBuilder?.get("guidanceCustomizationReadyScreenSubtextTextColor") ?: "#333333"
+    themeBuilder?.get("guidanceCustomizationReadyScreenSubtextTextColor")
 
-  //Retry Screen
   private val guidanceCustomizationRetryScreenHeaderTextColor: String? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenHeaderTextColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationRetryScreenHeaderTextColor")
   private val guidanceCustomizationRetryScreenSubtextTextColor: String? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenSubtextTextColor") ?: "#333333"
+    themeBuilder?.get("guidanceCustomizationRetryScreenSubtextTextColor")
   private val guidanceCustomizationReadyScreenOvalFillColor: String? =
-    themeBuilder?.get("guidanceCustomizationReadyScreenOvalFillColor") ?: "#000000"
+    themeBuilder?.get("guidanceCustomizationReadyScreenOvalFillColor")
   private val guidanceCustomizationReadyScreenTextBackgroundColor: String? =
-    themeBuilder?.get("guidanceCustomizationReadyScreenTextBackgroundColor") ?: "#4bb75f"
+    themeBuilder?.get("guidanceCustomizationReadyScreenTextBackgroundColor")
   private val guidanceCustomizationReadyScreenTextBackgroundCornerRadius: Int? =
-    themeBuilder?.get("guidanceCustomizationReadyScreenTextBackgroundCornerRadius")?.toInt() ?: 0
+    parseIntThemeValue("guidanceCustomizationReadyScreenTextBackgroundCornerRadius")
   private val guidanceCustomizationRetryScreenImageBorderColor: String? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenImageBorderColor") ?: "#4bb75f"
+    themeBuilder?.get("guidanceCustomizationRetryScreenImageBorderColor")
   private val guidanceCustomizationRetryScreenImageBorderWidth: Int? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenImageBorderWidth")?.toInt() ?: 0
+    parseIntThemeValue("guidanceCustomizationRetryScreenImageBorderWidth")
   private val guidanceCustomizationRetryScreenImageCornerRadius: Int? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenImageCornerRadius")?.toInt() ?: 3
+    parseIntThemeValue("guidanceCustomizationRetryScreenImageCornerRadius")
   private val guidanceCustomizationRetryScreenOvalStrokeColor: String? =
-    themeBuilder?.get("guidanceCustomizationRetryScreenOvalStrokeColor") ?: "#4bb75f"
+    themeBuilder?.get("guidanceCustomizationRetryScreenOvalStrokeColor")
 
-  //Result Screen Customization
-  private val resultScreenCustomizationAnimationRelativeScale: Float = 1.0F
   private val resultScreenCustomizationForegroundColor: String? =
-    themeBuilder?.get("resultScreenCustomizationForegroundColor") ?: "#FFFFFF"
+    themeBuilder?.get("resultScreenCustomizationForegroundColor")
   private val resultScreenCustomizationBackgroundColors: String? =
-    themeBuilder?.get("resultScreenCustomizationBackgroundColors") ?: "#FFFFFF"
+    themeBuilder?.get("resultScreenCustomizationBackgroundColors")
   private val resultScreenCustomizationActivityIndicatorColor: String? =
-    themeBuilder?.get("resultScreenCustomizationActivityIndicatorColor") ?: "#FFFFFF"
-
-  @DrawableRes
-  private val resultScreenCustomizationCustomActivityIndicatorImage: Int? = null
-  private val resultScreenCustomizationCustomActivityIndicatorRotationInterval: Int = 1000
-  private val resultScreenCustomizationCustomActivityIndicatorAnimation: Int = 0
-  private val resultScreenCustomizationShowUploadProgressBar: Boolean = true
+    themeBuilder?.get("resultScreenCustomizationActivityIndicatorColor")
   private val resultScreenCustomizationUploadProgressFillColor: String? =
-    themeBuilder?.get("resultScreenCustomizationUploadProgressFillColor") ?: "#4bb75f"
+    themeBuilder?.get("resultScreenCustomizationUploadProgressFillColor")
   private val resultScreenCustomizationUploadProgressTrackColor: String? =
-    themeBuilder?.get("resultScreenCustomizationUploadProgressTrackColor") ?: "#333333"
+    themeBuilder?.get("resultScreenCustomizationUploadProgressTrackColor")
   private val resultScreenCustomizationResultAnimationBackgroundColor: String? =
-    themeBuilder?.get("resultScreenCustomizationResultAnimationBackgroundColor") ?: "#05D758"
+    themeBuilder?.get("resultScreenCustomizationResultAnimationBackgroundColor")
   private val resultScreenCustomizationResultAnimationForegroundColor: String? =
-    themeBuilder?.get("resultScreenCustomizationResultAnimationForegroundColor") ?: "#FFFFFF"
-
+    themeBuilder?.get("resultScreenCustomizationResultAnimationForegroundColor")
 
-  //Oval Customization
   private val ovalCustomizationStrokeWidth: Int? =
-    themeBuilder?.get("ovalCustomizationStrokeWidth")?.toInt() ?: 3
+    parseIntThemeValue("ovalCustomizationStrokeWidth")
   private val ovalCustomizationStrokeColor: String? =
-    themeBuilder?.get("ovalCustomizationStrokeColor") ?: "#4bb75f"
+    themeBuilder?.get("ovalCustomizationStrokeColor")
   private val ovalCustomizationProgressStrokeWidth: Int? =
-    themeBuilder?.get("ovalCustomizationProgressStrokeWidth")?.toInt() ?: 2
+    parseIntThemeValue("ovalCustomizationProgressStrokeWidth")
   private val ovalCustomizationProgressColor1: String? =
-    themeBuilder?.get("ovalCustomizationProgressColor1") ?: "#4bb75f"
+    themeBuilder?.get("ovalCustomizationProgressColor1")
   private val ovalCustomizationProgressColor2: String? =
-    themeBuilder?.get("ovalCustomizationProgressColor2") ?: "#4bb75f"
+    themeBuilder?.get("ovalCustomizationProgressColor2")
   private val ovalCustomizationProgressRadialOffset: Int? =
-    themeBuilder?.get("ovalCustomizationProgressRadialOffset")?.toInt() ?: 2
+    parseIntThemeValue("ovalCustomizationProgressRadialOffset")
 
-  //Frame Customization
   private val frameCustomizationBorderWidth: Int? =
-    themeBuilder?.get("frameCustomizationBorderWidth")?.toInt() ?: 0
+    parseIntThemeValue("frameCustomizationBorderWidth")
   private val frameCustomizationCornerRadius: Int? =
-    themeBuilder?.get("frameCustomizationCornerRadius")?.toInt() ?: 0
+    parseIntThemeValue("frameCustomizationCornerRadius")
   private val frameCustomizationBorderColor: String? =
-    themeBuilder?.get("frameCustomizationBorderColor") ?: "#4bb75f"
+    themeBuilder?.get("frameCustomizationBorderColor")
   private val frameCustomizationBackgroundColor: String? =
-    themeBuilder?.get("frameCustomizationBackgroundColor") ?: "#FFFFFF"
+    themeBuilder?.get("frameCustomizationBackgroundColor")
   private val frameCustomizationElevation: Int? =
-    themeBuilder?.get("frameCustomizationElevation")?.toInt() ?: 0
+    parseIntThemeValue("frameCustomizationElevation")
 
-  //Overlay Customization
   private val overlayCustomizationBackgroundColor: String? =
-    themeBuilder?.get("overlayCustomizationBackgroundColor") ?: "#FFFFFF"
+    themeBuilder?.get("overlayCustomizationBackgroundColor")
 
-  //Feedback Customization
   private val feedbackCustomizationCornerRadius: Int? =
-    themeBuilder?.get("feedbackCustomizationCornerRadius")?.toInt() ?: 2
+    parseIntThemeValue("feedbackCustomizationCornerRadius")
   private val feedbackCustomizationBackgroundColors: String? =
-    themeBuilder?.get("overlayCustomizationBackgroundColor") ?: "#666666"
+    themeBuilder?.get("feedbackCustomizationBackgroundColors")
   private val feedbackCustomizationTextColor: String? =
-    themeBuilder?.get("feedbackCustomizationTextColor") ?: "#FFFFFF"
+    themeBuilder?.get("feedbackCustomizationTextColor")
 
 
   fun apply(): Liveness3DTheme {
-    return Liveness3DTheme.Builder()
-      .guidanceCustomizationBackgroundColors(guidanceCustomizationBackgroundColors)
-      .guidanceCustomizationForegroundColor(guidanceCustomizationForegroundColor)
-      //Botões
-      .guidanceCustomizationButtonTextNormalColor(guidanceCustomizationButtonTextNormalColor)
-      .guidanceCustomizationButtonBackgroundNormalColor(
-        guidanceCustomizationButtonBackgroundNormalColor
-      )
-      .guidanceCustomizationButtonTextHighlightColor(guidanceCustomizationButtonTextHighlightColor)
-      .guidanceCustomizationButtonBackgroundHighlightColor(
-        guidanceCustomizationButtonBackgroundHighlightColor
-      )
-      .guidanceCustomizationButtonTextDisabledColor(guidanceCustomizationButtonTextDisabledColor)
-      .guidanceCustomizationButtonBackgroundDisabledColor(
-        guidanceCustomizationButtonBackgroundDisabledColor
-      )
-      .guidanceCustomizationButtonBorderColor(guidanceCustomizationButtonBorderColor)
-      .guidanceCustomizationButtonBorderWidth(guidanceCustomizationButtonBorderWidth)
-      .guidanceCustomizationButtonCornerRadius(guidanceCustomizationButtonCornerRadius)
-
-
-      //Ready Screen
-      .guidanceCustomizationReadyScreenHeaderTextColor(
-        guidanceCustomizationReadyScreenHeaderTextColor
-      )
-      .guidanceCustomizationReadyScreenSubtextTextColor(
-        guidanceCustomizationReadyScreenSubtextTextColor
-      )
-
-      //Retry Screen
-      .guidanceCustomizationRetryScreenHeaderTextColor(
-        guidanceCustomizationRetryScreenHeaderTextColor
-      )
-      .guidanceCustomizationRetryScreenSubtextTextColor(
-        guidanceCustomizationRetryScreenSubtextTextColor
-      )
-      .guidanceCustomizationRetryScreenImageBorderColor(
-        guidanceCustomizationRetryScreenImageBorderColor
-      )
-      .guidanceCustomizationRetryScreenImageBorderWidth(
-        guidanceCustomizationRetryScreenImageBorderWidth
-      )
-      .guidanceCustomizationRetryScreenImageCornerRadius(
-        guidanceCustomizationRetryScreenImageCornerRadius
-      )
-      .guidanceCustomizationRetryScreenOvalStrokeColor(
-        guidanceCustomizationRetryScreenOvalStrokeColor
-      )
-      .guidanceCustomizationReadyScreenOvalFillColor(guidanceCustomizationReadyScreenOvalFillColor)
-      .guidanceCustomizationReadyScreenTextBackgroundColor(
-        guidanceCustomizationReadyScreenTextBackgroundColor
-      )
-      .guidanceCustomizationReadyScreenTextBackgroundCornerRadius(
-        guidanceCustomizationReadyScreenTextBackgroundCornerRadius
-      )
-
-      //Result Screen
-      .resultScreenCustomizationAnimationRelativeScale(
-        resultScreenCustomizationAnimationRelativeScale
-      )
-      .resultScreenCustomizationForegroundColor(resultScreenCustomizationForegroundColor)
-      .resultScreenCustomizationBackgroundColors(resultScreenCustomizationBackgroundColors)
-      .resultScreenCustomizationActivityIndicatorColor(
-        resultScreenCustomizationActivityIndicatorColor
-      )
-      .resultScreenCustomizationUploadProgressFillColor(
-        resultScreenCustomizationUploadProgressFillColor
-      )
-      .resultScreenCustomizationUploadProgressTrackColor(
-        resultScreenCustomizationUploadProgressTrackColor
-      )
-      .resultScreenCustomizationResultAnimationBackgroundColor(
-        resultScreenCustomizationResultAnimationBackgroundColor
-      )
-      .resultScreenCustomizationResultAnimationForegroundColor(
-        resultScreenCustomizationResultAnimationForegroundColor
-      )
-
-      //Oval
-      .ovalCustomizationStrokeWidth(ovalCustomizationStrokeWidth)
-      .ovalCustomizationStrokeColor(ovalCustomizationStrokeColor)
-      .ovalCustomizationProgressStrokeWidth(ovalCustomizationProgressStrokeWidth)
-      .ovalCustomizationProgressColor1(ovalCustomizationProgressColor1)
-      .ovalCustomizationProgressColor2(ovalCustomizationProgressColor2)
-      .ovalCustomizationProgressRadialOffset(ovalCustomizationProgressRadialOffset)
-
-      //Frame
-      .frameCustomizationBorderWidth(frameCustomizationBorderWidth)
-      .frameCustomizationCornerRadius(frameCustomizationCornerRadius)
-      .frameCustomizationBorderColor(frameCustomizationBorderColor)
-      .frameCustomizationBackgroundColor(frameCustomizationBackgroundColor)
-      .frameCustomizationElevation(frameCustomizationElevation)
-
-      //Overlay
-      .overlayCustomizationBackgroundColor(overlayCustomizationBackgroundColor)
-
-      //Feedback Screen
-      .feedbackCustomizationCornerRadius(feedbackCustomizationCornerRadius)
-      .feedbackCustomizationBackgroundColors(feedbackCustomizationBackgroundColors)
-      .feedbackCustomizationTextColor(feedbackCustomizationTextColor)
-
-      .build()
+    val builder = Liveness3DTheme.Builder()
+
+    guidanceCustomizationBackgroundColors?.let { builder.guidanceCustomizationBackgroundColors(it) }
+    guidanceCustomizationForegroundColor?.let { builder.guidanceCustomizationForegroundColor(it) }
+    guidanceCustomizationButtonTextNormalColor?.let { builder.guidanceCustomizationButtonTextNormalColor(it) }
+    guidanceCustomizationButtonBackgroundNormalColor?.let { builder.guidanceCustomizationButtonBackgroundNormalColor(it) }
+    guidanceCustomizationButtonTextHighlightColor?.let { builder.guidanceCustomizationButtonTextHighlightColor(it) }
+    guidanceCustomizationButtonBackgroundHighlightColor?.let { builder.guidanceCustomizationButtonBackgroundHighlightColor(it) }
+    guidanceCustomizationButtonTextDisabledColor?.let { builder.guidanceCustomizationButtonTextDisabledColor(it) }
+    guidanceCustomizationButtonBackgroundDisabledColor?.let { builder.guidanceCustomizationButtonBackgroundDisabledColor(it) }
+    guidanceCustomizationButtonBorderColor?.let { builder.guidanceCustomizationButtonBorderColor(it) }
+    guidanceCustomizationButtonBorderWidth?.let { builder.guidanceCustomizationButtonBorderWidth(it) }
+    guidanceCustomizationButtonCornerRadius?.let { builder.guidanceCustomizationButtonCornerRadius(it) }
+
+    guidanceCustomizationReadyScreenHeaderTextColor?.let { builder.guidanceCustomizationReadyScreenHeaderTextColor(it) }
+    guidanceCustomizationReadyScreenSubtextTextColor?.let { builder.guidanceCustomizationReadyScreenSubtextTextColor(it) }
+
+    guidanceCustomizationRetryScreenHeaderTextColor?.let { builder.guidanceCustomizationRetryScreenHeaderTextColor(it) }
+    guidanceCustomizationRetryScreenSubtextTextColor?.let { builder.guidanceCustomizationRetryScreenSubtextTextColor(it) }
+    guidanceCustomizationRetryScreenImageBorderColor?.let { builder.guidanceCustomizationRetryScreenImageBorderColor(it) }
+    guidanceCustomizationRetryScreenImageBorderWidth?.let { builder.guidanceCustomizationRetryScreenImageBorderWidth(it) }
+    guidanceCustomizationRetryScreenImageCornerRadius?.let { builder.guidanceCustomizationRetryScreenImageCornerRadius(it) }
+    guidanceCustomizationRetryScreenOvalStrokeColor?.let { builder.guidanceCustomizationRetryScreenOvalStrokeColor(it) }
+    guidanceCustomizationReadyScreenOvalFillColor?.let { builder.guidanceCustomizationReadyScreenOvalFillColor(it) }
+    guidanceCustomizationReadyScreenTextBackgroundColor?.let { builder.guidanceCustomizationReadyScreenTextBackgroundColor(it) }
+    guidanceCustomizationReadyScreenTextBackgroundCornerRadius?.let { builder.guidanceCustomizationReadyScreenTextBackgroundCornerRadius(it) }
+
+    resultScreenCustomizationForegroundColor?.let { builder.resultScreenCustomizationForegroundColor(it) }
+    resultScreenCustomizationBackgroundColors?.let { builder.resultScreenCustomizationBackgroundColors(it) }
+    resultScreenCustomizationActivityIndicatorColor?.let { builder.resultScreenCustomizationActivityIndicatorColor(it) }
+    resultScreenCustomizationUploadProgressFillColor?.let { builder.resultScreenCustomizationUploadProgressFillColor(it) }
+    resultScreenCustomizationUploadProgressTrackColor?.let { builder.resultScreenCustomizationUploadProgressTrackColor(it) }
+    resultScreenCustomizationResultAnimationBackgroundColor?.let { builder.resultScreenCustomizationResultAnimationBackgroundColor(it) }
+    resultScreenCustomizationResultAnimationForegroundColor?.let { builder.resultScreenCustomizationResultAnimationForegroundColor(it) }
+
+    ovalCustomizationStrokeWidth?.let { builder.ovalCustomizationStrokeWidth(it) }
+    ovalCustomizationStrokeColor?.let { builder.ovalCustomizationStrokeColor(it) }
+    ovalCustomizationProgressStrokeWidth?.let { builder.ovalCustomizationProgressStrokeWidth(it) }
+    ovalCustomizationProgressColor1?.let { builder.ovalCustomizationProgressColor1(it) }
+    ovalCustomizationProgressColor2?.let { builder.ovalCustomizationProgressColor2(it) }
+    ovalCustomizationProgressRadialOffset?.let { builder.ovalCustomizationProgressRadialOffset(it) }
+
+    frameCustomizationBorderWidth?.let { builder.frameCustomizationBorderWidth(it) }
+    frameCustomizationCornerRadius?.let { builder.frameCustomizationCornerRadius(it) }
+    frameCustomizationBorderColor?.let { builder.frameCustomizationBorderColor(it) }
+    frameCustomizationBackgroundColor?.let { builder.frameCustomizationBackgroundColor(it) }
+    frameCustomizationElevation?.let { builder.frameCustomizationElevation(it) }
+
+    overlayCustomizationBackgroundColor?.let { builder.overlayCustomizationBackgroundColor(it) }
+
+    feedbackCustomizationCornerRadius?.let { builder.feedbackCustomizationCornerRadius(it) }
+    feedbackCustomizationBackgroundColors?.let { builder.feedbackCustomizationBackgroundColors(it) }
+    feedbackCustomizationTextColor?.let { builder.feedbackCustomizationTextColor(it) }
+
+    return builder.build()
   }
 }

package/ios/Podfile

@@ -1,6 +1,6 @@
 platform :ios, '12.4' 
 
-source 'https://github.com/oititec/ios-artifactory-beta.git'
+source 'https://github.com/oititec/ios-artifactory.git'
 source 'https://github.com/CocoaPods/Specs.git'
  
 
@@ -8,6 +8,6 @@ target 'RnLiveness3d' do
     # Comment the next line if you don't want to use dynamic frameworks
     use_frameworks!
     
-    pod 'OILiveness3D', '3.11.0'
+    pod 'OILiveness3D', '3.15.0'
   
   end

package/ios/RnLiveness3d.h

@@ -1,15 +1,5 @@
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RnLiveness3dSpec/RnLiveness3dSpec.h>
-#endif
 
-#import <React/RCTBridgeModule.h>
-
-@interface RnLiveness3d : NSObject <
-#ifdef RCT_NEW_ARCH_ENABLED
-  NativeRnLiveness3dSpec
-#else
-  RCTBridgeModule
-#endif
->
+@interface RnLiveness3d : NSObject <NativeRnLiveness3dSpec>
 
 @end

package/ios/RnLiveness3d.mm

@@ -6,14 +6,10 @@
    RnLiveness3dSwiftModule *_module;
  }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 + (NSString *)moduleName
 {
   return @"RnLiveness3d";
 }
-#else
-RCT_EXPORT_MODULE()
-#endif
 
 - (instancetype)init
 {
@@ -24,23 +20,23 @@ RCT_EXPORT_MODULE()
   return self;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
+/**
+ * TurboModules Bridge
+ */
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
   (const facebook::react::ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<facebook::react::NativeRnLiveness3dSpecJSI>(params);
 }
-#endif
 
-#ifdef RCT_NEW_ARCH_ENABLED
+/**
+ * Codegen interface implementation
+ */
+
 - (void)startLiveness3d:(NSDictionary *)args
                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject
-#else
-RCT_EXPORT_METHOD(startLiveness3d:(NSDictionary *)args
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject)
-#endif
 {
   if (_module) {
     [_module startLiveness3d:args
@@ -55,11 +51,7 @@ RCT_EXPORT_METHOD(startLiveness3d:(NSDictionary *)args
   }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (NSNumber *)checkCameraPermissionGranted
-#else
-RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, checkCameraPermissionGranted)
-#endif
 {
   if (_module) {
     BOOL result = [_module checkCameraPermissionGranted];
@@ -68,11 +60,7 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSNumber *, checkCameraPermissionGranted)
   return @NO;
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)requestCameraPermission:(RCTResponseSenderBlock)resolve
-#else
-RCT_EXPORT_METHOD(requestCameraPermission:(RCTResponseSenderBlock)resolve)
-#endif
 {
   if (_module) {
     [_module requestCameraPermission:resolve];