@regulaforensics/face-sdk 8.5.1468-rc → 8.5.1470-rc

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .package(url: "https://github.com/apache/cordova-ios.git", branch: "master"),
         .package(
             url: "https://github.com/regulaforensics/FaceSDK-Swift-Package",
-            exact: "8.5.5086-rc"
+            exact: "9.8.4815-rc"
         )
     ],
     targets: [

package/android/src/main/kotlin/com/regula/plugin/face/sdk/JSONConstructor.kt

@@ -7,6 +7,7 @@ import android.graphics.Bitmap
 import android.graphics.Point
 import android.graphics.Rect
 import android.graphics.Typeface
+import android.os.Build
 import android.util.Pair
 import android.util.Size
 import com.regula.facesdk.configuration.EnrollmentConfiguration
@@ -85,13 +86,19 @@ import java.lang.Float
 
 // Config ------------------------------
 
-fun typefaceFromJSON(it: JSONObject) = Pair(
-    Typeface.create(
-        it.getString("name"),
-        it.optInt("style", Typeface.NORMAL)
-    ),
-    it.getIntOrNull("size")
-)
+@SuppressLint("DiscouragedApi")
+fun typefaceFromJSON(it: JSONObject): Pair<Typeface?, Int?> {
+    val name = it.getString("name")
+    val font = try {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            context.resources.getFont(context.resources.getIdentifier(name, "font", context.packageName))
+        else null
+    } catch (_: Exception) { null }
+    return Pair(
+        font ?: Typeface.create(name, it.optInt("style", Typeface.NORMAL)), 
+        it.getIntOrNull("size")
+    )
+}
 
 fun faceCaptureConfigFromJSON(input: JSONObject) = input.let {
     val result = FaceCaptureConfiguration.Builder()

package/android/src/main/kotlin/com/regula/plugin/face/sdk/Utils.kt

@@ -158,7 +158,7 @@ fun Any.setFont(customization: Customization, value: Any) {
     val uiConfig = customization.uiConfigurationLive.value!!
     val privateFonts = uiConfig.javaClass.getDeclaredField("f")
     privateFonts.isAccessible = true
-    val fonts = privateFonts.get(uiConfig) as HashMap<CustomizationFont, Typeface>
+    val fonts = privateFonts.get(uiConfig) as HashMap<CustomizationFont, Typeface?>
     val privateSizes = uiConfig.javaClass.getDeclaredField("g")
     privateSizes.isAccessible = true
     val fontsSizes = privateSizes.get(uiConfig) as HashMap<CustomizationFont, Int>

package/examples/capacitor/package-lock.json

@@ -2122,9 +2122,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"

package/examples/capacitor/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "8.5.1468-rc",
-    "@regulaforensics/face-core-basic": "8.5.897-rc",
+    "@regulaforensics/face-sdk": "8.5.1470-rc",
+    "@regulaforensics/face-core-basic": "8.5.900-rc",
     "@capacitor/dialog": "^8.0.0",
     "@capacitor/cli": "^8.5.2",
     "@capacitor/core": "^8.5.2",
@@ -19,7 +19,8 @@
   "overrides": {
     "xcode": {
       "uuid": "^11.1.1"
-    }
+    },
+    "source-map-js": "^1.2.2"
   },
   "type": "module"
 }

package/examples/ionic/package-lock.json

@@ -12725,9 +12725,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.10.0.tgz",
-      "integrity": "sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.11.0.tgz",
+      "integrity": "sha512-JdxDPD0DBTyu08pq0kPC0xSNet/qsU07qT6IsX1AS8oO2ICNRY4ldNa8OAI6PuwAH8tG3lxEhbqmyp4Dw4036g==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -12908,9 +12908,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"

package/examples/ionic/package.json

@@ -20,8 +20,8 @@
     "@awesome-cordova-plugins/camera": "^9.6.0",
     "@awesome-cordova-plugins/dialogs": "^9.6.0",
     "@awesome-cordova-plugins/file": "^9.6.0",
-    "@regulaforensics/face-sdk": "8.5.1468-rc",
-    "@regulaforensics/face-core-basic": "8.5.897-rc",
+    "@regulaforensics/face-sdk": "8.5.1470-rc",
+    "@regulaforensics/face-core-basic": "8.5.900-rc",
     "cordova-android": "^15.1.0",
     "cordova-ios": "^8.1.1",
     "cordova-plugin-camera": "^8.0.0",
@@ -36,7 +36,9 @@
   },
   "overrides": {
     "serialize-javascript": "^7.1.1",
-    "uuid": "^11.1.1"
+    "uuid": "^11.1.1",
+    "source-map-js": "^1.2.2",
+    "shell-quote": "^1.11.0"
   },
   "cordova": {
     "plugins": {

package/examples/react_native/package-lock.json

@@ -1341,9 +1341,9 @@
       }
     },
     "node_modules/@expo/metro-file-map": {
-      "version": "58.0.1",
-      "resolved": "https://registry.npmjs.org/@expo/metro-file-map/-/metro-file-map-58.0.1.tgz",
-      "integrity": "sha512-jR4NeNY7DLSQMwuaF+Y+H9AoSMhghk06UA7OEzKN/QvEd6m4AzXafaDOLY2tky0Tz7zDFmS1NQ1XcYfWRTRm8w==",
+      "version": "58.0.4",
+      "resolved": "https://registry.npmjs.org/@expo/metro-file-map/-/metro-file-map-58.0.4.tgz",
+      "integrity": "sha512-PkrYQ6FiUzRTmYSrO0o1YNYz0gx+z4oij61aXX26Kn5ehudujom9GMvZiC5xexUVEyJdoZN+mNLWXUunlqb5Rg==",
       "license": "MIT",
       "dependencies": {
         "2g": "^0.4.3",
@@ -1351,7 +1351,6 @@
         "fb-watchman": "^2.0.2",
         "invariant": "^2.2.4",
         "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
         "walker": "^1.0.8"
       }
     },
@@ -6538,9 +6537,9 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.10.0.tgz",
-      "integrity": "sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.11.0.tgz",
+      "integrity": "sha512-JdxDPD0DBTyu08pq0kPC0xSNet/qsU07qT6IsX1AS8oO2ICNRY4ldNa8OAI6PuwAH8tG3lxEhbqmyp4Dw4036g==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -6606,9 +6605,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz",
+      "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"

package/examples/react_native/package.json

@@ -8,8 +8,8 @@
     "start": "expo start --port \"$npm_package_config_metroPort\""
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "8.5.1468-rc",
-    "@regulaforensics/face-core-basic": "8.5.897-rc",
+    "@regulaforensics/face-sdk": "8.5.1470-rc",
+    "@regulaforensics/face-core-basic": "8.5.900-rc",
     "react-native": "0.88.0-rc.0",
     "react-native-fs": "^2.20.0",
     "react-native-image-picker": "^8.2.1",
@@ -27,7 +27,10 @@
     "uuid": "^14.0.0",
     "expo-custom-assets": {
       "expo": "$expo"
-    }
+    },
+    "source-map-js": "^1.2.2",
+    "shell-quote": "^1.11.0",
+    "@expo/metro-file-map": "^58.0.4"
   },
   "config": {
     "metroPort": 8082

package/ios/Config.swift

@@ -11,7 +11,7 @@ func setCustomization(_ it: [String: [String: Any]]) {
         for (k, v) in value {
             switch key {
             case("colors"): dict[Int(k)!] = UIColor.decode(v)
-            case("fonts"): dict[Int(k)!] = UIFont.decode(v)
+            case("fonts"): dict[CustomizationFont.fromDartKey(k)] = UIFont.decode(v)
             case("images"): dict[k] = UIImage.decode(v)
             default: break
             }
@@ -19,6 +19,24 @@ func setCustomization(_ it: [String: [String: Any]]) {
     }
 }
 
+extension CustomizationFont {
+    static func fromDartKey(_ key: String) -> CustomizationFont? {
+        switch key {
+        case "100": return .onboardingScreenStartButton
+        case "101": return .onboardingScreenTitleLabel
+        case "102": return .onboardingScreenSubtitleLabel
+        case "103": return .onboardingScreenMessageLabels
+        case "200": return .cameraScreenHintLabel
+        case "300": return .retryScreenRetryButton
+        case "301": return .retryScreenTitleLabel
+        case "302": return .retryScreenSubtitleLabel
+        case "303": return .retryScreenHintLabels
+        case "400": return .processingScreenLabel
+        default: return nil
+        }
+    }
+}
+
 public extension FaceCaptureConfiguration {
     static func decode(_ it: Any?) -> Self? {
         guard let it = it as? [String: Any] else { return nil }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "8.5.1468-rc",
+  "version": "8.5.1470-rc",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="8.5.1468-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="8.5.1470-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -27,7 +27,7 @@
         <source url="https://github.com/regulaforensics/podspecs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKStage" spec="8.5.5086" nospm="true" />
+        <pod name="FaceSDKStage" spec="9.8.4815" nospm="true" />
       </pods>
     </podspec>
   </platform>

package/react-native-face-sdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'react-native-face-sdk'
-  s.version      = '8.5.1468-rc'
+  s.version      = '8.5.1470-rc'
   s.summary      = 'Regula React Native plugin.'
   s.license      = 'commercial'
   s.authors      = { 'RegulaForensics' => 'support@regulaforensics.com' }
@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '15.0'
   s.source_files = [ 'ios/*.swift', 'ios/RN*.m' ]
   s.exclude_files = [ 'ios/CDVFaceSDK.swift' ]
-  s.dependency 'FaceSDKStage', '8.5.5086'
+  s.dependency 'FaceSDKStage', '9.8.4815'
   s.dependency 'React'
 end

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/face-sdk",
-      "version": "8.5.1468-rc",
+      "version": "8.5.1470-rc",
       "dev": true,
       "license": "commercial",
       "dependencies": {

package/www/capacitor/index.js

@@ -11,7 +11,7 @@ import { CustomizationColors } from './customization/customization_colors'
 import { CustomizationFonts } from './customization/customization_fonts'
 import { CustomizationImages } from './customization/customization_images'
 import { Customization } from './customization/customization'
-import { Font } from './customization/font'
+import { Font, FontStyle } from './customization/font'
 import { ScreenOrientation } from './customization/screen_orientation'
 export {
     CameraPosition,
@@ -20,6 +20,7 @@ export {
     CustomizationImages,
     Customization,
     Font,
+    FontStyle,
     ScreenOrientation,
 }
 

package/www/cordova.js

@@ -2285,6 +2285,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   FaceSDK: () => (/* binding */ FaceSDK),
 /* harmony export */   FaceSDKVersion: () => (/* reexport safe */ _init_face_sdk_version__WEBPACK_IMPORTED_MODULE_8__.FaceSDKVersion),
 /* harmony export */   Font: () => (/* reexport safe */ _customization_font__WEBPACK_IMPORTED_MODULE_6__.Font),
+/* harmony export */   FontStyle: () => (/* reexport safe */ _customization_font__WEBPACK_IMPORTED_MODULE_6__.FontStyle),
 /* harmony export */   ImageQualityCharacteristic: () => (/* reexport safe */ _image_quality_image_quality_characteristic__WEBPACK_IMPORTED_MODULE_31__.ImageQualityCharacteristic),
 /* harmony export */   ImageQualityCharacteristicName: () => (/* reexport safe */ _image_quality_image_quality_characteristic_name__WEBPACK_IMPORTED_MODULE_30__.ImageQualityCharacteristicName),
 /* harmony export */   ImageQualityGroup: () => (/* reexport safe */ _image_quality_image_quality_group__WEBPACK_IMPORTED_MODULE_32__.ImageQualityGroup),

package/www/react-native/index.js

@@ -11,7 +11,7 @@ import { CustomizationColors } from './customization/customization_colors'
 import { CustomizationFonts } from './customization/customization_fonts'
 import { CustomizationImages } from './customization/customization_images'
 import { Customization } from './customization/customization'
-import { Font } from './customization/font'
+import { Font, FontStyle } from './customization/font'
 import { ScreenOrientation } from './customization/screen_orientation'
 export {
     CameraPosition,
@@ -20,6 +20,7 @@ export {
     CustomizationImages,
     Customization,
     Font,
+    FontStyle,
     ScreenOrientation,
 }
 

package/www/types/index.d.ts

@@ -3,7 +3,7 @@ import { CustomizationColors } from './customization/customization_colors'
 import { CustomizationFonts } from './customization/customization_fonts'
 import { CustomizationImages } from './customization/customization_images'
 import { Customization, CustomButtonTappedCompletion } from './customization/customization'
-import { Font } from './customization/font'
+import { Font, FontStyle } from './customization/font'
 import { ScreenOrientation } from './customization/screen_orientation'
 export {
     CameraPosition,
@@ -13,6 +13,7 @@ export {
     Customization,
     CustomButtonTappedCompletion,
     Font,
+    FontStyle,
     ScreenOrientation,
 }