New Smart Selfie Capture

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 * Fixed missing idType on Document Verification Jobs
+* Introduce screens for the new Enhanced Selfie Capture Enrollment and Authentication Products.
 
 ## 10.2.17
 

Example/Podfile.lock

@@ -51,7 +51,7 @@ SPEC CHECKSUMS:
   lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
   netfox: 9d5cc727fe7576c4c7688a2504618a156b7d44b7
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
-  SmileID: 44fef36001a02aa7362368e8a3f1127c03751166
+  SmileID: dc04628f6e1572fc6e407649bfd05f91647ed947
   SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
   ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 

Example/SmileID/BiometricKYC/BiometricKycWithIdInputScreen.swift

@@ -6,7 +6,7 @@ struct BiometricKycWithIdInputScreen: View {
     let delegate: BiometricKycResultDelegate
 
     @State private var selectedCountry: CountryInfo?
-    @ObservedObject var viewModel: BiometricKycWithIdInputScreenViewModel
+    @StateObject var viewModel: BiometricKycWithIdInputScreenViewModel
 
     var body: some View {
         switch viewModel.step {
@@ -19,25 +19,27 @@ struct BiometricKycWithIdInputScreen: View {
             }
                 .frame(maxWidth: .infinity)
         case .idTypeSelection(let countryList):
-            SearchableDropdownSelector(
-                items: countryList,
-                selectedItem: selectedCountry,
-                itemDisplayName: { $0.name },
-                onItemSelected: { selectedCountry = $0 }
-            )
-            if let selectedCountry = selectedCountry {
-                RadioGroupSelector(
-                    title: "Select ID Type",
-                    items: selectedCountry.availableIdTypes,
-                    itemDisplayName: { $0.label },
-                    onItemSelected: { idType in
-                        viewModel.onIdTypeSelected(
-                            country: selectedCountry.countryCode,
-                            idType: idType.idTypeKey,
-                            requiredFields: idType.requiredFields ?? []
-                        )
-                    }
+            VStack {
+                SearchableDropdownSelector(
+                    items: countryList,
+                    selectedItem: selectedCountry,
+                    itemDisplayName: { $0.name },
+                    onItemSelected: { selectedCountry = $0 }
                 )
+                if let selectedCountry = selectedCountry {
+                    RadioGroupSelector(
+                        title: "Select ID Type",
+                        items: selectedCountry.availableIdTypes,
+                        itemDisplayName: { $0.label },
+                        onItemSelected: { idType in
+                            viewModel.onIdTypeSelected(
+                                country: selectedCountry.countryCode,
+                                idType: idType.idTypeKey,
+                                requiredFields: idType.requiredFields ?? []
+                            )
+                        }
+                    )
+                }
             }
         case .consent(let country, let idType, let requiredFields):
             SmileID.consentScreen(

Example/SmileID/EnhancedKYC/EnhancedKycWithIdInputScreen.swift

@@ -18,25 +18,27 @@ struct EnhancedKycWithIdInputScreen: View {
             }
             .frame(maxWidth: .infinity)
         case .idTypeSelection(let countryList):
-            SearchableDropdownSelector(
-                items: countryList,
-                selectedItem: selectedCountry,
-                itemDisplayName: { $0.name },
-                onItemSelected: { selectedCountry = $0 }
-            )
-            if let selectedCountry = selectedCountry {
-                RadioGroupSelector(
-                    title: "Select ID Type",
-                    items: selectedCountry.availableIdTypes,
-                    itemDisplayName: { $0.label },
-                    onItemSelected: { idType in
-                        viewModel.onIdTypeSelected(
-                            country: selectedCountry.countryCode,
-                            idType: idType.idTypeKey,
-                            requiredFields: idType.requiredFields ?? []
-                        )
-                    }
+            VStack {
+                SearchableDropdownSelector(
+                    items: countryList,
+                    selectedItem: selectedCountry,
+                    itemDisplayName: { $0.name },
+                    onItemSelected: { selectedCountry = $0 }
                 )
+                if let selectedCountry = selectedCountry {
+                    RadioGroupSelector(
+                        title: "Select ID Type",
+                        items: selectedCountry.availableIdTypes,
+                        itemDisplayName: { $0.label },
+                        onItemSelected: { idType in
+                            viewModel.onIdTypeSelected(
+                                country: selectedCountry.countryCode,
+                                idType: idType.idTypeKey,
+                                requiredFields: idType.requiredFields ?? []
+                            )
+                        }
+                    )
+                }
             }
         case .consent(let country, let idType, let requiredFields):
             SmileID.consentScreen(

Example/SmileID/Home/HomeView.swift

@@ -7,19 +7,19 @@ struct HomeView: View {
     @StateObject var viewModel: HomeViewModel
 
     init(config: Config) {
-        _viewModel =  StateObject(wrappedValue: HomeViewModel(config: config))
+        _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",
@@ -28,17 +28,17 @@ struct HomeView: View {
                             },
                             content: {
                                 SmileID.smartSelfieEnrollmentScreen(
-                                    userId: viewModel.smartSelfieEnrollmentUserId,
+                                    userId: viewModel.newUserId,
                                     jobId: viewModel.newJobId,
                                     allowAgentMode: true,
                                     delegate: SmartSelfieEnrollmentDelegate(
-                                        userId: viewModel.smartSelfieEnrollmentUserId,
+                                        userId: viewModel.newUserId,
                                         onEnrollmentSuccess: viewModel.onSmartSelfieEnrollment,
                                         onError: viewModel.didError
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "smart_selfie_authentication",
                             name: "SmartSelfie™ Authentication",
@@ -47,11 +47,45 @@ struct HomeView: View {
                             },
                             content: {
                                 SmartSelfieAuthWithUserIdEntry(
-                                    initialUserId: viewModel.smartSelfieEnrollmentUserId,
+                                    initialUserId: viewModel.lastSelfieEnrollmentUserId ?? "",
+                                    delegate: viewModel
+                                )
+                            }
+                        )
+                        ProductCell(
+                            image: "smart_selfie_enroll",
+                            name: "SmartSelfie™ Enrollment (Enhanced)",
+                            onClick: {
+                                viewModel.onProductClicked()
+                            },
+                            content: {
+                                SmileID.smartSelfieEnrollmentScreen(
+                                    userId: viewModel.newUserId,
+                                    jobId: viewModel.newJobId,
+                                    allowAgentMode: true,
+                                    useStrictMode: true,
+                                    delegate: SmartSelfieEnrollmentDelegate(
+                                        userId: viewModel.newUserId,
+                                        onEnrollmentSuccess: viewModel.onSmartSelfieEnrollment,
+                                        onError: viewModel.didError
+                                    )
+                                )
+                            }
+                        )
+                        ProductCell(
+                            image: "smart_selfie_authentication",
+                            name: "SmartSelfie™ Authentication (Enhanced)",
+                            onClick: {
+                                viewModel.onProductClicked()
+                            },
+                            content: {
+                                SmartSelfieAuthWithUserIdEntry(
+                                    initialUserId: viewModel.lastSelfieEnrollmentUserId ?? "",
+                                    useStrictMode: true,
                                     delegate: viewModel
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "enhanced_kyc",
                             name: "Enhanced KYC",
@@ -67,7 +101,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "biometric",
                             name: "Biometric KYC",
@@ -83,7 +117,7 @@ struct HomeView: View {
                                     )
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "document",
                             name: "\nDocument Verification",
@@ -97,7 +131,7 @@ struct HomeView: View {
                                     delegate: viewModel
                                 )
                             }
-                        ),
+                        )
                         ProductCell(
                             image: "enhanced_doc_v",
                             name: "Enhanced Document Verification",
@@ -112,10 +146,8 @@ struct HomeView: View {
                                 )
                             }
                         )
-                    ].map {
-                        AnyView($0)
                     }
-                )
+                }
 
                 Text("Partner \(viewModel.partnerId) - Version \(version) - Build \(build)")
                     .font(SmileID.theme.body)
@@ -164,14 +196,17 @@ struct SmartSelfieEnrollmentDelegate: SmartSelfieResultDelegate {
 
 private struct SmartSelfieAuthWithUserIdEntry: View {
     let initialUserId: String
+    var useStrictMode: Bool = false
     let delegate: SmartSelfieResultDelegate
+
     @State private var userId: String?
 
     var body: some View {
         if let userId {
             SmileID.smartSelfieAuthenticationScreen(
                 userId: userId,
                 allowAgentMode: true,
+                useStrictMode: useStrictMode,
                 delegate: delegate
             )
         } else {
@@ -262,9 +297,9 @@ private struct MyVerticalGrid: View {
             ScrollView {
                 VStack(alignment: .leading, spacing: 8) {
                     let numRows = (items.count + maxColumns - 1) / maxColumns
-                    ForEach(0 ..< numRows) { rowIndex in
+                    ForEach(0 ..< numRows, id: \.self) { rowIndex in
                         HStack(spacing: 16) {
-                            ForEach(0 ..< maxColumns) { columnIndex in
+                            ForEach(0 ..< maxColumns, id: \.self) { columnIndex in
                                 let itemIndex = rowIndex * maxColumns + columnIndex
                                 let width = geo.size.width / CGFloat(maxColumns)
                                 if itemIndex < items.count {

Example/SmileID/Home/HomeViewModel.swift

@@ -19,7 +19,10 @@ class HomeViewModel: ObservableObject,
     @Published var partnerId: String
     var networkMonitor = NetworkMonitor.shared
 
-    @Published private(set) var smartSelfieEnrollmentUserId = generateUserId()
+    var lastSelfieEnrollmentUserId: String? {
+        guard let value = UIPasteboard.general.string else { return nil }
+        return value.hasPrefix("user-") ? value : nil
+    }
     @Published private(set) var newUserId: String = generateUserId()
     @Published private(set) var newJobId: String = generateJobId()
 

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
@@ -41,8 +41,24 @@ struct ProductCell: View {
                 .frame(maxWidth: .infinity)
                 .background(SmileID.theme.accent)
                 .cornerRadius(8)
-                .sheet(isPresented: $isPresented, content: { AnyView(content())
-                })
+                .fullScreenCover(
+                    isPresented: $isPresented,
+                    content: {
+                        NavigationView {
+                            content()
+                                .toolbar {
+                                    ToolbarItem(placement: .cancellationAction) {
+                                        Button {
+                                            isPresented = false
+                                        } label: {
+                                            Text(SmileIDResourcesHelper.localizedString(for: "Action.Cancel"))
+                                                .foregroundColor(SmileID.theme.accent)
+                                        }
+                                    }
+                                }
+                        }
+                    }
+                )
             }
         )
     }

Example/SmileID/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

Example/SmileID/WelcomeScreen.swift

@@ -24,7 +24,7 @@ struct WelcomeScreen: View {
                 .padding(.vertical)
 
             Text("To begin testing, you need to add a configuration from the Smile Portal")
-                .font(EpilogueFont.regular(with: 16))
+                .font(DMSansFont.regular(with: 16))
                 .foregroundColor(SmileID.theme.onLight)
                 .padding(.vertical)