Refactor Selfie Submission and New Submission UX

Example/SmileID/Home/HomeView.swift

@@ -10,16 +10,16 @@ struct HomeView: View {
         _viewModel = StateObject(wrappedValue: HomeViewModel(config: config))
     }
 
+    let columns = [GridItem(.flexible()), GridItem(.flexible())]
+
     var body: some View {
         NavigationView {
             VStack(spacing: 24) {
                 Text("Test Our Products")
                     .font(SmileID.theme.header2)
                     .foregroundColor(.black)
-
-                MyVerticalGrid(
-                    maxColumns: 2,
-                    items: [
+                ScrollView(showsIndicators: false) {
+                    LazyVGrid(columns: columns) {
                         ProductCell(
                             image: "smart_selfie_enroll",
                             name: "SmartSelfie™ Enrollment",
@@ -38,7 +38,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "smart_selfie_authentication",
                             name: "SmartSelfie™ Authentication",
@@ -51,7 +51,7 @@ struct HomeView: View {
                                     delegate: viewModel
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "smart_selfie_enroll",
                             name: "SmartSelfie™ Enrollment (Strict Mode)",
@@ -71,7 +71,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "smart_selfie_authentication",
                             name: "SmartSelfie™ Authentication (Strict Mode)",
@@ -85,7 +85,7 @@ struct HomeView: View {
                                     delegate: viewModel
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "enhanced_kyc",
                             name: "Enhanced KYC",
@@ -101,7 +101,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "biometric",
                             name: "Biometric KYC",
@@ -117,7 +117,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "document",
                             name: "\nDocument Verification",
@@ -131,7 +131,7 @@ struct HomeView: View {
                                     delegate: viewModel
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "enhanced_doc_v",
                             name: "Enhanced Document Verification",
@@ -146,10 +146,8 @@ struct HomeView: View {
                                 )
                             }
                         )
-                    ].map {
-                        AnyView($0)
                     }
-                )
+                }
 
                 Text("Partner \(viewModel.partnerId) - Version \(version) - Build \(build)")
                     .font(SmileID.theme.body)

Example/SmileID/Home/ProductCell.swift

@@ -1,18 +1,18 @@
 import SmileID
 import SwiftUI
 
-struct ProductCell: View {
+struct ProductCell<Content: View>: View {
     let image: String
     let name: String
     let onClick: (() -> Void)?
-    @ViewBuilder let content: () -> any View
+    @ViewBuilder let content: () -> Content
     @State private var isPresented: Bool = false
 
     init(
         image: String,
         name: String,
         onClick: (() -> Void)? = nil,
-        @ViewBuilder content: @escaping () -> any View
+        @ViewBuilder content: @escaping () -> Content
     ) {
         self.image = image
         self.name = name
@@ -44,7 +44,10 @@ struct ProductCell: View {
                 .fullScreenCover(
                     isPresented: $isPresented,
                     content: {
-                        AnyView(content())
+                        NavigationView {
+                            content()
+                        }
+                        .environment(\.modalMode, $isPresented)
                     }
                 )
             }

Sources/SmileID/Classes/FaceDetector/FaceDetectorV2.swift

@@ -67,12 +67,14 @@ class FaceDetectorV2: NSObject {
                 let faceObservation = faceDetections.first,
                 let faceQualityObservation = faceQualityObservations.first
             else {
-                self.resultDelegate?.faceDetector(self, didFailWithError: FaceDetectorError.noFaceDetected)
+                self.resultDelegate?.faceDetector(
+                    self, didFailWithError: FaceDetectorError.noFaceDetected)
                 return
             }
 
             let convertedBoundingBox =
-                self.viewDelegate?.convertFromMetadataToPreviewRect(rect: faceObservation.boundingBox) ?? .zero
+                self.viewDelegate?.convertFromMetadataToPreviewRect(
+                    rect: faceObservation.boundingBox) ?? .zero
 
             let uiImage = UIImage(pixelBuffer: imageBuffer)
             let brightness = self.calculateBrightness(uiImage)
@@ -166,7 +168,10 @@ class FaceDetectorV2: NSObject {
         }
 
         let croppedImage = UIImage(cgImage: croppedCGImage)
-        guard let resizedImage = croppedImage.pixelBuffer(width: cropSize.width, height: cropSize.height) else {
+        guard
+            let resizedImage = croppedImage.pixelBuffer(
+                width: cropSize.width, height: cropSize.height)
+        else {
             throw FaceDetectorError.unableToCropImage
         }
 

Sources/SmileID/Classes/FaceDetector/FaceValidator.swift

@@ -17,7 +17,7 @@ final class FaceValidator {
     // MARK: Constants
     private let selfieQualityThreshold: Float = 0.5
     private let luminanceThreshold: ClosedRange<Int> = 80...200
-    private let faceBoundsMultiplier: CGFloat = 1.2
+    private let faceBoundsMultiplier: CGFloat = 1.5
     private let faceBoundsThreshold: CGFloat = 50
 
     init() {}
@@ -125,8 +125,6 @@ final class FaceValidator {
         _ isAcceptableBrightness: Bool,
         _ isAcceptableSelfieQuality: Bool
     ) -> Bool {
-        return isAcceptableBounds &&
-        isAcceptableBrightness &&
-        isAcceptableSelfieQuality
+        return isAcceptableBounds && isAcceptableBrightness && isAcceptableSelfieQuality
     }
 }

Sources/SmileID/Classes/FaceDetector/LivenessCheckManager.swift

@@ -61,17 +61,25 @@ class LivenessCheckManager: ObservableObject {
 
     /// Resets the task timer to the initial timeout duration.
     private func resetTaskTimer() {
-        stopTaskTimer()
-        taskTimer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: false) { _ in
-            self.elapsedTime += 1
-            if self.elapsedTime == self.taskTimeoutDuration {
-                self.handleTaskTimeout()
-            }
+        guard taskTimer == nil else { return }
+        DispatchQueue.main.async {
+            self.taskTimer = Timer.scheduledTimer(
+                timeInterval: 1.0, target: self, selector: #selector(self.taskTimerFired),
+                userInfo: nil,
+                repeats: true)
+        }
+    }
+
+    @objc private func taskTimerFired() {
+        self.elapsedTime += 1
+        if self.elapsedTime == self.taskTimeoutDuration {
+            self.handleTaskTimeout()
         }
     }
 
     /// Stops the current task timer.
     private func stopTaskTimer() {
+        guard taskTimer != nil else { return }
         taskTimer?.invalidate()
         taskTimer = nil
     }

Sources/SmileID/Classes/Helpers/NavigationHelper.swift

@@ -16,3 +16,14 @@ extension View {
         }
     }
 }
+
+public struct ModalModeKey: EnvironmentKey {
+    public static let defaultValue = Binding<Bool>.constant(false)
+}
+
+extension EnvironmentValues {
+    public var modalMode: Binding<Bool> {
+        get { self[ModalModeKey.self] }
+        set { self[ModalModeKey.self] = newValue }
+    }
+}

Sources/SmileID/Classes/Helpers/SmileIDResourcesHelper.swift

@@ -76,6 +76,7 @@ public class SmileIDResourcesHelper {
     public static var ConsentContactDetails = SmileIDResourcesHelper.image("ConsentContactDetails")!
     public static var ConsentDocumentInfo = SmileIDResourcesHelper.image("ConsentDocumentInfo")!
     public static var ConsentPersonalInfo = SmileIDResourcesHelper.image("ConsentPersonalInfo")!
+    public static var Loader = SmileIDResourcesHelper.image("Loader")!
 
     /// Size of font.
     public static let pointSize: CGFloat = 16

Sources/SmileID/Classes/Networking/Models/FailureReason.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+public enum FailureReason {
+    case activeLivenessTimedOut
+
+    var key: String {
+        switch self {
+        case .activeLivenessTimedOut: return "mobile_active_liveness_timed_out"
+        }
+    }
+}