anyline-ocr-react-native-module 42.2.0 → 43.0.0

package/ios/ALNFCScanViewController.m

@@ -1,55 +1,76 @@
-//
-//  ALNFCScanViewController.m
-//  AnylineExamples
-//
-//  Created by Angela Brett on 08.10.19.
-//
-
-#import "ALNFCScanViewController.h"
 #import <Anyline/Anyline.h>
+#import "ALNFCScanViewController.h"
 #import "ALPluginHelper.h"
 
 
 API_AVAILABLE(ios(13.0))
-@interface ALNFCScanViewController () <ALNFCDetectorDelegate, ALIDPluginDelegate,ALScanViewPluginDelegate,ALInfoDelegate>
+@interface ALNFCScanViewController () <ALNFCDetectorDelegate, ALScanPluginDelegate, ALScanViewDelegate>
+
+@property (nonatomic, strong) ALPluginCallback callback;
+
+@property (nonatomic, strong) NSDictionary *config;
+
+@property (nonatomic, copy) NSString *licenseKey;
+
+@property (nonatomic, strong) ALScanView *scanView;
+
+@property (nonatomic, strong) ALScanViewPlugin *mrzScanViewPlugin;
 
-@property (nonatomic, strong) ALIDScanViewPlugin *mrzScanViewPlugin;
-@property (nonatomic, strong) ALIDScanPlugin *mrzScanPlugin;
-@property (nullable, nonatomic, strong) ALScanView *scanView;
 @property (nonatomic, strong) ALNFCDetector *nfcDetector;
-@property (nullable, nonatomic, strong) UIView *hintView;
 
-@property (nonatomic,strong) UIButton *doneButton;
+// the result from NFC scanning is retained while NFC reading is initiated, and the results aggregated later
+@property (nonatomic, strong) NSMutableDictionary *resultDict;
+
+// TODO: make sure the following use the `options` group in the uiConfig
+// BOOL showingLabel
+// UILabel scannedLabel
+// ALRoundedView
+// Segment
+@property (nonatomic, strong) ALJSONUIConfiguration *uiConfig;
+
+@property (nonatomic, strong) UIView *hintView;
+
+@property (nonatomic, strong) UILabel *hintViewLabel;
 
+@property (nonatomic, strong) NSLayoutConstraint *labelHorizontalOffsetConstraint;
+
+@property (nonatomic, strong) NSLayoutConstraint *labelVerticalOffsetConstraint;
+
+@property (nonatomic, strong) UIButton *doneButton;
+
+// keep the last values we read from the MRZ so we can retry reading NFC
+// if NFC failed for reasons other than getting these details wrong
+@property (nonatomic, copy) NSString *passportNumberForNFC;
+
+@property (nonatomic, strong) NSDate *dateOfBirth;
+
+@property (nonatomic, strong) NSDate *dateOfExpiry;
 
-//keep the last values we read from the MRZ so we can retry reading NFC if NFC failed for reasons other than getting these details wrong
-@property NSString *passportNumberForNFC;
-@property NSDate *dateOfBirth;
-@property NSDate *dateOfExpiry;
-@property (nonatomic, strong) NSDictionary *anylineConfig;
-@property (nonatomic, weak) id<ALPluginScanViewControllerDelegate> delegate;
-@property (nonatomic, strong) NSString *licensekey;
-@property (nonatomic, strong) ALJsonUIConfiguration *uiConfig;
-@property (nonatomic, strong) NSMutableDictionary *anylineResult;
 @property (nonatomic, strong) NSMutableArray<NSDictionary *> *detectedBarcodes;
 
+// not used
+@property (nonatomic, strong) NSString *cropAndTransformErrorMessage;
+
+// JPEG compression quality 0-100
+@property (nonatomic, assign) NSUInteger quality;
+
+
 @end
 
+
 @implementation ALNFCScanViewController
 
 - (instancetype)initWithLicensekey:(NSString *)licensekey
                      configuration:(NSDictionary *)anylineConfig
-                          uiConfig:(ALJsonUIConfiguration *)uiConfig
-                          delegate:(id<ALPluginScanViewControllerDelegate>)delegate {
-    self = [super init];
-    if(self) {
-        _licensekey = licensekey;
-        _delegate = delegate;
-        _anylineConfig = anylineConfig;
+                          uiConfig:(ALJSONUIConfiguration *)uiConfig
+                          finished:(ALPluginCallback)callback {
+    if (self = [super init]) {
+        _licenseKey = licensekey;
+        _callback = callback;
+        _config = anylineConfig;
         _uiConfig = uiConfig;
         
-        self.quality = 100;
-        self.nativeBarcodeEnabled = NO;
+        self.quality = 90;
         self.cropAndTransformErrorMessage = @"";
     }
     return self;
@@ -57,271 +78,379 @@ API_AVAILABLE(ios(13.0))
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
-    self.anylineResult = [[NSMutableDictionary alloc] init];
-    self.detectedBarcodes = [NSMutableArray array];
-       
-    self.doneButton = [ALPluginHelper createButtonForViewController:self config:self.uiConfig];
-    
-    self.title = @"Passport NFC";
-    CGFloat hintMargin = 7;
-    // Set the background color to black to have a nicer transition
-    self.view.backgroundColor = [UIColor blackColor];
-    
-    UILabel * hintViewLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-    UIView * hintView = [[UILabel alloc] initWithFrame:CGRectZero];
-    hintViewLabel.text = @"Scan MRZ";
-    [hintViewLabel sizeToFit];
-    [hintView addSubview:hintViewLabel];
-    hintView.frame = UIEdgeInsetsInsetRect(hintViewLabel.frame, UIEdgeInsetsMake(-hintMargin, -hintMargin, -hintMargin, -hintMargin));
-    hintView.center = CGPointMake(self.view.center.x, 0);
-    hintViewLabel.translatesAutoresizingMaskIntoConstraints = NO;
-    [hintViewLabel.centerYAnchor constraintEqualToAnchor:hintView.centerYAnchor constant:0].active = YES;
-    [hintViewLabel.centerXAnchor constraintEqualToAnchor:hintView.centerXAnchor constant:0].active = YES;
-    hintView.layer.cornerRadius = 8;
-    hintView.layer.masksToBounds = true;
-    hintView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
-    hintViewLabel.textColor = [UIColor whiteColor];
-    self.hintView = hintView;
-    [self.view addSubview:hintView];
-    
-    // Initializing the scan view. It's a UIView subclass. We set the frame to fill the whole screen
-    CGRect frame = [self scanViewFrame];
-    
-    NSDictionary *mrzConfigDict = [self.anylineConfig valueForKeyPath:@"viewPlugin.plugin.nfcPlugin.mrzConfig"];
-    
-    ALMRZConfig *mrzConfig;
-    if (mrzConfigDict) {
-        mrzConfig = [[ALMRZConfig alloc] initWithJsonDictionary:mrzConfigDict];
-    } else {
-        mrzConfig = [[ALMRZConfig alloc] init];
-        //we want to be quite confident of these fields to ensure we can read the NFC with them
-        ALMRZFieldConfidences *fieldConfidences = [[ALMRZFieldConfidences alloc] init];
-        fieldConfidences.documentNumber = 90;
-        fieldConfidences.dateOfBirth = 90;
-        fieldConfidences.dateOfExpiry = 90;
-        mrzConfig.idFieldConfidences = fieldConfidences;
-        
-        //Create fieldScanOptions to configure individual scannable fields
-        ALMRZFieldScanOptions *scanOptions = [[ALMRZFieldScanOptions alloc] init];
-        scanOptions.vizAddress = ALDefault;
-        scanOptions.vizDateOfIssue = ALDefault;
-        scanOptions.vizSurname = ALDefault;
-        scanOptions.vizGivenNames = ALDefault;
-        scanOptions.vizDateOfBirth = ALDefault;
-        scanOptions.vizDateOfExpiry = ALDefault;
-
-        //Set scanOptions for MRZConfig
-        mrzConfig.idFieldScanOptions = scanOptions;
-    }
 
+    // NOTE: NFCDetector can throw an exception if the AnylineSDK isn't initialized first
+    // as it will check the scope value of the license
     NSError *error = nil;
-
-    //Init the anyline sdk with your license key
-    [AnylineSDK setupWithLicenseKey:self.licensekey error:&error];
-    if (error) {
-        [self.delegate pluginScanViewController:nil
-                                didStopScanning:self
-                                          error:error];
+    [AnylineSDK setupWithLicenseKey:self.licenseKey error:&error];
+    if ([self showErrorAlertIfNeeded:error]) {
         return;
     }
-    //Init the anyline ID ScanPlugin with an ID, Licensekey, the delegate,
-    //  the MRZConfig (which will configure the scan Plugin for MRZ scanning), and an error
-    self.mrzScanPlugin = [[ALIDScanPlugin alloc] initWithPluginID:@"ModuleID" delegate:self idConfig:mrzConfig error:&error];
+
     if (@available(iOS 13.0, *)) {
-        self.nfcDetector=[[ALNFCDetector alloc] initWithDelegate:self];
+        self.nfcDetector = [self.class getNFCDetectorWithDelegate:self error:&error];
     } else {
-        // Fallback on earlier versions
+        error = [ALPluginHelper errorWithMessage:@"iOS 13.0 or newer is required to scan with MRZ / NFC."];
     }
-    NSAssert(self.mrzScanPlugin, @"Setup Error: %@", error.debugDescription);
-    [self.mrzScanPlugin addInfoDelegate:self];
-    
-    
-    self.mrzScanViewPlugin = [[ALIDScanViewPlugin alloc] initWithScanPlugin:self.mrzScanPlugin];
-    NSAssert(self.mrzScanViewPlugin, @"Setup Error: %@", error.debugDescription);
-    [self.mrzScanViewPlugin addScanViewPluginDelegate:self];
-    
-    
-    self.scanView = [[ALScanView alloc] initWithFrame:frame scanViewPlugin:self.mrzScanViewPlugin];
-    
-    self.scanView.flashButtonConfig.flashAlignment = ALFlashAlignmentTopLeft;
-    
-    // After setup is complete we add the scanView to the view of this view controller
+    if ([self showErrorAlertIfNeeded:error]) {
+        return;
+    }
+
     [self.view addSubview:self.scanView];
-    [self.view sendSubviewToBack:self.scanView];
-    
-    [[self view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[scanView]|" options:0 metrics:nil views:@{@"scanView" : self.scanView}]];
-    
-    id topGuide = self.topLayoutGuide;
-    [[self view] addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[topGuide]-0-[scanView]|" options:0 metrics:nil views:@{@"scanView" : self.scanView, @"topGuide" : topGuide}]];
+
+    self.resultDict = [[NSMutableDictionary alloc] init];
+    self.detectedBarcodes = [NSMutableArray array];
+
+    self.scanView = [ALScanViewFactory withJSONDictionary:self.config delegate:self error:&error];
+    self.scanView.delegate = self;
+
+    [self configureMRZPlugin];
+
+    if ([self showErrorAlertIfNeeded:error]) {
+        return;
+    }
+
+    self.mrzScanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+
+    self.scanView.supportedNativeBarcodeFormats = self.uiConfig.nativeBarcodeFormats;
+    self.scanView.delegate = self;
+    self.detectedBarcodes = [NSMutableArray array];
     
-    //Start Camera:
+    [self.view addSubview:self.scanView];
+
+    self.scanView.translatesAutoresizingMaskIntoConstraints = false;
+    [self.scanView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
+    [self.scanView.rightAnchor constraintEqualToAnchor:self.view.rightAnchor].active = YES;
+    [self.scanView.topAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.topAnchor].active = YES;
+    [self.scanView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor].active = YES;
+
     [self.scanView startCamera];
-}
 
-/*
- This method will be called once the view controller and its subviews have appeared on screen
- */
--(void)viewDidAppear:(BOOL)animated {
-    [super viewDidAppear:animated];
+    [self setupHintView];
 
-    // We use this subroutine to start Anyline. The reason it has its own subroutine is
-    // so that we can later use it to restart the scanning process.
-    [self startMRZScanning];
+    self.doneButton = [ALPluginHelper createButtonForViewController:self config:self.uiConfig];
 }
 
-- (void)updateHintPosition:(CGFloat)newPosition {
-    self.hintView.center = CGPointMake(self.hintView.center.x, newPosition);
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+
+    NSError *error;
+    [self startMRZScanning:&error];
+    [self showErrorAlertIfNeeded:error];
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
+- (void)viewDidDisappear:(BOOL)animated {
     [self stopMRZScanning];
+    [super viewDidDisappear:animated];
 }
 
-
-/*
-   This method is used to tell Anyline to start scanning. It gets called in
-   viewDidAppear to start scanning the moment the view appears. Once a result
-   is found scanning will stop automatically (you can change this behaviour
-   with cancelOnResult:). When the user dismisses self.identificationView this
-   method will get called again.
- */
-- (void)startMRZScanning {
-    [self startPlugin:self.mrzScanViewPlugin];
+- (void)startMRZScanning:(NSError **)error {
+    [self.mrzScanViewPlugin startWithError:error];
     self.hintView.hidden = NO;
 }
 
-/*
- Cancel scanning to allow the module to clean up
- */
 - (void)stopMRZScanning {
-    [self.mrzScanViewPlugin stopAndReturnError:nil];
+    [self.mrzScanViewPlugin stop];
     self.hintView.hidden = YES;
 }
 
-- (void)readNFCChip {
-    /*
-     This is where we start reading the NFC chip of the passport. We use data from the MRZ to authenticate with the chip.
-     */
-    [self.nfcDetector startNfcDetectionWithPassportNumber:self.passportNumberForNFC dateOfBirth:self.dateOfBirth expirationDate:self.dateOfExpiry];
+- (void)configureMRZPlugin {
+
+    ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+    if (![scanViewPlugin isKindOfClass:ALScanViewPlugin.class]) {
+        return;
+    }
+
+    ALCutoutConfig *cutoutConfig = scanViewPlugin.scanViewPluginConfig.cutoutConfig;
+    ALScanFeedbackConfig *scanFeedbackConfig = scanViewPlugin.scanViewPluginConfig.scanFeedbackConfig;
+
+    ALPluginConfig *pluginConfig = scanViewPlugin.scanPlugin.scanPluginConfig.pluginConfig;
+    ALMrzConfig *mrzConfig = pluginConfig.mrzConfig;
+
+    // a bit lengthy but this is how you properly change the config (mrzFieldScanOptions and mrzMinFieldConfidences)
+    // taking into account the readonly config fields
+    mrzConfig.mrzFieldScanOptions = [[ALMrzFieldScanOptions alloc] init];
+
+    mrzConfig.mrzFieldScanOptions.vizAddress = ALMrzScanOption.mrzScanOptionDefault;
+    mrzConfig.mrzFieldScanOptions.vizDateOfIssue = ALMrzScanOption.mrzScanOptionDefault;
+    mrzConfig.mrzFieldScanOptions.vizSurname = ALMrzScanOption.mrzScanOptionDefault;
+    mrzConfig.mrzFieldScanOptions.vizGivenNames = ALMrzScanOption.mrzScanOptionDefault;
+    mrzConfig.mrzFieldScanOptions.vizDateOfBirth = ALMrzScanOption.mrzScanOptionDefault;
+    mrzConfig.mrzFieldScanOptions.vizDateOfExpiry = ALMrzScanOption.mrzScanOptionDefault;
+
+    mrzConfig.mrzMinFieldConfidences = [[ALMrzMinFieldConfidences alloc] init];
+    mrzConfig.mrzMinFieldConfidences.documentNumber = @(90);
+    mrzConfig.mrzMinFieldConfidences.dateOfBirth = @(90);
+    mrzConfig.mrzMinFieldConfidences.dateOfExpiry = @(90);
+
+    NSError *error;
+    ALScanViewPluginConfig *scanViewPluginConfig = [ALScanViewPluginConfig withScanPluginConfig:[ALScanPluginConfig withPluginConfig:pluginConfig]
+                                                                                   cutoutConfig:cutoutConfig
+                                                                             scanFeedbackConfig:scanFeedbackConfig];
+    ALScanViewPlugin *updatedScanViewPlugin = [[ALScanViewPlugin alloc] initWithConfig:scanViewPluginConfig error:&error];
+    [self.scanView setScanViewPlugin:updatedScanViewPlugin error:&error];
+
+    // the delegate binding was lost when you recreated the ScanPlugin it so you have to bring it back here
+    scanViewPlugin = (ALScanViewPlugin *)self.scanView.scanViewPlugin;
+    scanViewPlugin.scanPlugin.delegate = self;
 }
 
-#pragma mark -- ALIDPluginDelegate
+// MARK: - ALIDPluginDelegate
+
+- (void)scanPlugin:(ALScanPlugin *)scanPlugin resultReceived:(ALScanResult *)scanResult {
+
+    CGFloat compressionQuality = self.quality / 100.0f;
+
+    // ACO just a failsafe for when cancelOnResult is not true
+    [self stopMRZScanning];
+
+    self.resultDict = [NSMutableDictionary dictionaryWithDictionary:scanResult.resultDictionary];
+
+    NSString *imagePath = [ALPluginHelper saveImageToFileSystem:scanResult.croppedImage
+                                             compressionQuality:compressionQuality];
+    self.resultDict[@"imagePath"] = imagePath;
+
+    imagePath = [ALPluginHelper saveImageToFileSystem:scanResult.fullSizeImage
+                                   compressionQuality:compressionQuality];
+
+    self.resultDict[@"fullImagePath"] = imagePath;
+
+    ALMrzResult *MRZResult = scanResult.pluginResult.mrzResult;
+    NSString *passportNumber = [MRZResult.documentNumber stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+    self.dateOfBirth = [ALPluginHelper formattedStringToDate:MRZResult.dateOfBirthObject];
+
+    self.dateOfExpiry = [ALPluginHelper formattedStringToDate:MRZResult.dateOfExpiryObject];
 
-/*
- This is the main delegate method Anyline uses to report its results from an ID plugin such as MRZ
- */
-- (void)anylineIDScanPlugin:(ALIDScanPlugin *)anylineIDScanPlugin didFindResult:(ALIDResult *)scanResult {
-    ALMRZIdentification *identification = (ALMRZIdentification*)scanResult.result;
-    
-    self.anylineResult = [[ALPluginHelper dictionaryForIDResult:scanResult detectedBarcodes:self.detectedBarcodes outline:self.scanView.scanViewPlugin.outline quality:_quality] mutableCopy];
-    
-    NSString *passportNumber = [[identification documentNumber] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-    NSDate *dateOfBirth = [identification dateOfBirthObject];
-    NSDate *dateOfExpiry = [identification dateOfExpiryObject];
-    //The passport number passed to the NFC chip must have a trailing < if there is one in the MRZ string.
-    NSString *mrzString = [identification mrzString];
     NSMutableString *passportNumberForNFC = [passportNumber mutableCopy];
-    NSRange passportNumberRange = [mrzString rangeOfString:passportNumber];
+    NSRange passportNumberRange = [MRZResult.mrzString rangeOfString:passportNumber];
     if (passportNumberRange.location != NSNotFound) {
-        if ([mrzString characterAtIndex:NSMaxRange(passportNumberRange)] == '<') {
+        if ([MRZResult.mrzString characterAtIndex:NSMaxRange(passportNumberRange)] == '<') {
             [passportNumberForNFC appendString:@"<"];
         }
     }
-    [self stopMRZScanning];
+
     self.passportNumberForNFC = passportNumberForNFC;
-    self.dateOfBirth = dateOfBirth;
-    self.dateOfExpiry = dateOfExpiry;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self readNFCChip];
-    });
+
+    [self.nfcDetector startNfcDetectionWithPassportNumber:self.passportNumberForNFC
+                                              dateOfBirth:self.dateOfBirth
+                                           expirationDate:self.dateOfExpiry];
 }
 
-#pragma mark -- ALNFCDetectorDelegate
+- (void)handleResult:(id _Nullable)resultObj {
+
+    NSMutableDictionary *resultDictionary = [NSMutableDictionary dictionaryWithDictionary:resultObj];
+    if (self.detectedBarcodes.count) {
+        resultDictionary[@"nativeBarcodesDetected"] = self.detectedBarcodes;
+    }
 
-/* This method is called after all the data has been read from the NFC chip.
- To display data as it is read instead of waiting until everything has been read, we could also implement nfcSucceededWithDataGroup1: or nfcSucceededWithDataGroup2: */
-- (void)nfcSucceededWithResult:(ALNFCResult * _Nonnull)nfcResult  API_AVAILABLE(ios(13.0)){
+    NSObject<ALScanViewPluginBase> *scanViewPluginBase = self.scanView.scanViewPlugin;
+    // TODO: handle this for composites: cancelOnResult = true? dismiss
+    if ([scanViewPluginBase isKindOfClass:ALScanViewPlugin.class]) {
+        ALScanViewPlugin *scanViewPlugin = (ALScanViewPlugin *)scanViewPluginBase;
+        BOOL cancelOnResult = scanViewPlugin.scanPlugin.scanPluginConfig.cancelOnResult;
+        if (cancelOnResult) {
+            [self dismissViewControllerAnimated:YES completion:nil];
+        }
+    } else if ([scanViewPluginBase isKindOfClass:ALViewPluginComposite.class]) {
+        // for composites, the cancelOnResult values for each child don't matter
+        [self dismissViewControllerAnimated:YES completion:nil];
+    }
+    self.callback(resultDictionary, nil);
+}
+
+- (void)doneButtonPressed:(id)sender {
+    [self stopMRZScanning];
+
+    __weak __block typeof(self) weakSelf = self;
+    [self dismissViewControllerAnimated:YES completion:^{
+        weakSelf.callback(nil, @"Canceled");
+    }];
+}
+
+// MARK: - ALNFCDetectorDelegate
+
+- (void)nfcSucceededWithResult:(ALNFCResult * _Nonnull)nfcResult API_AVAILABLE(ios(13.0)) {
+
+    // DataGroup1
+    NSMutableDictionary *dictResultDataGroup1 = [[NSMutableDictionary alloc] init];
+
+
+    [dictResultDataGroup1 setValue:[ALPluginHelper stringForDate:nfcResult.dataGroup1.dateOfBirth]
+                            forKey:@"dateOfBirth"];
+    [dictResultDataGroup1 setValue:[ALPluginHelper stringForDate:nfcResult.dataGroup1.dateOfExpiry]
+                            forKey:@"dateOfExpiry"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.documentNumber forKey:@"documentNumber"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.documentType forKey:@"documentType"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.firstName forKey:@"firstName"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.gender forKey:@"gender"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.issuingStateCode forKey:@"issuingStateCode"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.lastName forKey:@"lastName"];
+    [dictResultDataGroup1 setValue:nfcResult.dataGroup1.nationality forKey:@"nationality"];
+
+    [self.resultDict setObject:dictResultDataGroup1 forKey:@"dataGroup1"];
+
+    // DataGroup2
+    // ACO: we don't put the path into a separate 'dataGroup' category for the wrapper
+    NSString *imagePath = [ALPluginHelper saveImageToFileSystem:nfcResult.dataGroup2.faceImage
+                                             compressionQuality:self.quality / (CGFloat)100.0f];
+    if (imagePath) {
+        [self.resultDict setValue:imagePath forKey:@"imagePath"];
+    }
+
+    // SOD (Passport metadata)
+    NSMutableDictionary *dictResultSOD = [[NSMutableDictionary alloc] init];
+
+    [dictResultSOD setValue:nfcResult.sod.issuerCertificationAuthority forKey:@"issuerCertificationAuthority"];
+    [dictResultSOD setValue:nfcResult.sod.issuerCountry forKey:@"issuerCountry"];
+    [dictResultSOD setValue:nfcResult.sod.issuerOrganization forKey:@"issuerOrganization"];
+    [dictResultSOD setValue:nfcResult.sod.issuerOrganizationalUnit forKey:@"issuerOrganizationalUnit"];
+    [dictResultSOD setValue:nfcResult.sod.ldsHashAlgorithm forKey:@"ldsHashAlgorithm"];
+
+    // ACO need to disable this because AppStoreConnect produces a warning with this enabled:
+    // https://anyline.atlassian.net/browse/SDKY-1509?focusedCommentId=71554
+    // [dictResultSOB setValue:nfcResult.sod.signatureAlgorithm forKey:@"signatureAlgorithm"];
+
+    [dictResultSOD setValue:nfcResult.sod.validFromString forKey:@"validFromString"];
+    [dictResultSOD setValue:nfcResult.sod.validUntilString forKey:@"validUntilString"];
+
+    [self.resultDict setObject:dictResultSOD forKey:@"sod"];
+
+    __weak __block typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self.anylineResult setObject:[ALPluginHelper dictionaryForNFCResult:nfcResult quality:self.quality] forKey:@"nfcResult"];
-        [self handleResult:self.anylineResult result:nil];
+        [weakSelf handleResult:weakSelf.resultDict];
     });
 }
 
 - (void)nfcFailedWithError:(NSError * _Nonnull)error {
-    //In most cases we don't really need to do anything special here since the NFC UI already shows that it failed. We shouldn't get ALNFCTagErrorNFCNotSupported either because we check +readingAvailable before even showing NFC, so this is just an example of how else that situation could be handled.
     dispatch_async(dispatch_get_main_queue(), ^{
         if (error.code == ALNFCTagErrorNFCNotSupported) {
-            [self showAlertWithTitle:@"NFC Not Supported" message:@"NFC passport reading is not supported on this device."];
+            [self showAlertWithTitle:@"NFC Not Supported"
+                             message:@"NFC passport reading is not supported on this device."];
         }
-        if (error.code == ALNFCTagErrorResponseError || //error ALNFCTagErrorResponseError can mean the MRZ key was wrong
-            error.code == ALNFCTagErrorUnexpectedError) { //error ALNFCTagErrorUnexpectedError can mean the user pressed the 'Cancel' button while scanning. It could also mean the phone lost the connection with the NFC chip because it was moved.
-            [self startMRZScanning]; //run the MRZ scanner so we can try again.
+        if (error.code == ALNFCTagErrorResponseError || // MRZ key was likely wrong
+            error.code == ALNFCTagErrorUnexpectedError) {
+            // can mean the user pressed the 'Cancel' button while scanning, or the phone lost the
+            // connection with the NFC chip because it was moved
+            [self startMRZScanning:nil]; //run the MRZ scanner so we can try again.
         } else {
-            //the MRZ details are correct, but something else went wrong. We can try reading the NFC chip again without rescanning the MRZ.
-            [self readNFCChip];
-            
+            // the MRZ details are correct, but something else went wrong. We can try reading
+            // the NFC chip again without rescanning the MRZ.
+            __weak __block typeof(self) weakSelf = self;
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [weakSelf.nfcDetector startNfcDetectionWithPassportNumber:weakSelf.passportNumberForNFC
+                                                              dateOfBirth:weakSelf.dateOfBirth
+                                                           expirationDate:weakSelf.dateOfExpiry];
+            });
         }
     });
 }
 
+// MARK: - ALScanViewDelegate
 
-- (NSString *)stringForDate:(NSDate *)date {
-    if (!date) {
-        return @"Date not valid";
+- (void)scanView:(ALScanView *)scanView updatedCutoutWithPluginID:(NSString *)pluginID
+           frame:(CGRect)frame {
+
+    if (CGRectIsEmpty(frame)) {
+        return;
     }
-    
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT+0:00"]];
-    dateFormatter.dateStyle = NSDateFormatterMediumStyle;
-    dateFormatter.timeStyle = NSDateFormatterNoStyle;
-    
-    return [dateFormatter stringFromDate:date];
+
+    self.hintView.hidden = NO;
+
+    CGFloat xOffset = self.uiConfig.labelXPositionOffset;
+    CGFloat yOffset = self.uiConfig.labelYPositionOffset;
+
+    // takes into account that frame reported for a cutout is in relation to
+    // its scan view's coordinate system
+    yOffset += [self.scanView convertRect:frame toView:self.scanView.superview].origin.y;
+
+    self.labelHorizontalOffsetConstraint.constant = xOffset;
+    self.labelVerticalOffsetConstraint.constant = yOffset;
 }
 
-- (void)anylineScanViewPlugin:(ALAbstractScanViewPlugin *)anylineScanViewPlugin updatedCutout:(CGRect)cutoutRect {
-    [self updateHintPosition:cutoutRect.origin.y + self.scanView.frame.origin.y - 50];
+- (void)scanView:(ALScanView *)scanView didReceiveNativeBarcodeResult:(ALScanResult *)scanResult {
+    // for this implementation we just take the last detected (we can show a list of it)
+    [self.detectedBarcodes removeAllObjects];
+    [self.detectedBarcodes addObject:scanResult.resultDictionary];
 }
-- (void)startPlugin:(ALAbstractScanViewPlugin *)plugin {
-    NSError *error;
-    BOOL success = [plugin startAndReturnError:&error];
-    if( !success ) {
-        //sometimes this alert will show, sometimes the slightly-less-friendly one from the SDK will show instead.
-        [self showAlertWithTitle:@"Could not start scanning" message:error.localizedDescription];
+
+
+// MARK: - ALNFCDetector
+
++ (ALNFCDetector * _Nullable)getNFCDetectorWithDelegate:(id<ALNFCDetectorDelegate> _Nonnull)delegate
+                                                  error:(NSError * _Nullable * _Nullable)error API_AVAILABLE(ios(13.0)) {
+    ALNFCDetector *NFCDetector;
+    if (![ALNFCDetector readingAvailable]) {
+        if (error) {
+            *error = [ALPluginHelper errorWithMessage:@"NFC is not available for this device."];
+        }
+        return nil;
+    }
+    NFCDetector = [[ALNFCDetector alloc] initWithDelegate:delegate error:error];
+    if (!NFCDetector) {
+        return nil;
     }
+    return NFCDetector;
 }
+
+// MARK: - Alerts
+
 - (void)showAlertWithTitle:(NSString *)title message:(NSString *)message {
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
-                                                                             message:message
-                                                                      preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *dismissAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleCancel handler:nil];
-    [alertController addAction:dismissAction];
-    [self.navigationController presentViewController:alertController animated:YES completion:nil];
+    [ALPluginHelper showErrorAlertWithTitle:title message:message
+                   presentingViewController:self.navigationController];
 }
 
-- (CGRect)scanViewFrame {
-    CGRect frame = [[UIScreen mainScreen] bounds];
-      frame = CGRectMake(frame.origin.x, frame.origin.y + CGRectGetMaxY(self.navigationController.navigationBar.frame), frame.size.width, frame.size.height - CGRectGetMaxY(self.navigationController.navigationBar.frame));
-    return frame;
+- (BOOL)showErrorAlertIfNeeded:(NSError *)error {
+    return [ALPluginHelper showErrorAlertIfNeeded:error pluginCallback:self.callback];
 }
 
-- (void)handleResult:(NSDictionary *)dictResult result:(ALScanResult *)scanResult {
-    
-    [self.delegate pluginScanViewController:nil
-                                    didScan:dictResult
-                           continueScanning:!self.scanView.scanViewPlugin.scanViewPluginConfig.cancelOnResult];
-    
-    if (self.scanView.scanViewPlugin.scanViewPluginConfig.cancelOnResult) {
-        [self dismissViewControllerAnimated:YES completion:NULL];
+// MARK: - User Interface
+
+- (void)setupHintView {
+
+    UIView *hintView = [[UIView alloc] initWithFrame:CGRectZero];
+    hintView.layer.cornerRadius = 8;
+    hintView.layer.masksToBounds = true;
+    hintView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
+
+    hintView.translatesAutoresizingMaskIntoConstraints = NO;
+    [self.view addSubview:hintView];
+
+    self.labelHorizontalOffsetConstraint = [hintView.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor constant:0];
+
+    // at 0, the bottom of the label (container) should be touching the cutout top when the updatedCutoutRect report
+    // is made
+    self.labelVerticalOffsetConstraint = [hintView.bottomAnchor constraintEqualToAnchor:self.view.topAnchor constant:0];
+
+    self.labelHorizontalOffsetConstraint.active = YES;
+    self.labelVerticalOffsetConstraint.active = YES;
+
+    UILabel *hintViewLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+
+    hintViewLabel.text = @"Scan MRZ";
+    if (self.uiConfig.labelText.length) {
+        hintViewLabel.text = self.uiConfig.labelText;
     }
-    self.detectedBarcodes = [NSMutableArray array];
-}
 
-- (void)doneButtonPressed:(id)sender {
-    [self.scanView.scanViewPlugin stopAndReturnError:nil];
-    [self dismissViewControllerAnimated:YES completion:^{
-        [self.delegate pluginScanViewController:nil didStopScanning:sender];
-    }];
+    hintViewLabel.font = [UIFont fontWithName:@"HelveticaNeue"
+                                         size:self.uiConfig.labelSize];
+    hintViewLabel.textColor = self.uiConfig.labelColor;
+    hintViewLabel.textAlignment = NSTextAlignmentCenter;
+    hintViewLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    [hintViewLabel sizeToFit];
+    [hintView addSubview:hintViewLabel];
+
+    [hintViewLabel.centerXAnchor constraintEqualToAnchor:hintView.centerXAnchor].active = YES;
+    [hintViewLabel.centerYAnchor constraintEqualToAnchor:hintView.centerYAnchor].active = YES;
+
+    NSLayoutConstraint *cnst = [hintView.widthAnchor constraintGreaterThanOrEqualToAnchor:hintViewLabel.widthAnchor
+                                                                                 constant:20];
+    cnst.active = YES;
+    cnst = [hintView.heightAnchor constraintEqualToAnchor:hintViewLabel.heightAnchor constant:20];
+    cnst.active = YES;
+
+    self.hintView = hintView;
+    self.hintViewLabel = hintViewLabel;
 }
 
 @end