Merge pull request #53 from PDF417/jenkins/master-build

Jenkins/master build
PDF417 · Aug 6, 2018 · 480d8b0 · 480d8b0
2 parents cfee06d + bca08c2
commit 480d8b0
Show file tree

Hide file tree

Showing 428 changed files with 19,503 additions and 68,972 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.4
 
 install: true
 before_install: ./travis/before_script.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Release notes
 
+## 7.1.0
+
+- Bug fixes
+    - fixed crash when changing recognizers on the fly
+
+- Minor API changes
+    - removed `uiSettings` property from `MBBarcodeOverlaySettings` and it no longer has `recognizerCollection` property
+    - `MBBarcodeOverlayViewController` has new `init` which has `(MBRecognizerCollection *)recognizerCollection` as parameter and `andDelegate` parameter has been renamed to `delegate`
+    - `MBOverlayViewControllerInterface` has been removed; when creating custom overlay view controller, `MBCustomOverlayViewController` has to be inherited
+        - please check our updated Samples
+    - `MBBarcodeOverlayViewControllerDelegate` methods has been renamed to `barcodeOverlayViewControllerDidFinishScanning` and `barcodeOverlayViewControllerDidTapClose`
+
 ## 7.0.0
 
 - new API, which is not backward compatible. Please check [README](README.md) and updated demo applications for more information, but the gist of it is:

diff --git a/MicroBlink.bundle/Info.plist b/MicroBlink.bundle/Info.plist
diff --git a/MicroBlink.bundle/en.strings b/MicroBlink.bundle/en.strings
@@ -9,4 +9,11 @@
 "photopay_close" = "Cancel";
 "photopay_light_on" = "Light";
 "photopay_light_off" = "Light";
-"photopay_camera_permission_denied" = "{font:@Medium}%@{/font} does not have permission to use the camera.\n\nPlease go to:\n• {font:@Medium}Settings{/font}\n• {font:@Medium}%@{/font}\n• Make sure that {font:@Medium}Camera{/font} is enabled";
+"photopay_camera_permission_denied" = "{font:@Medium}%@{/font} does not have permission to use the camera.\n\nPlease go to:\n• {font:@Medium}Settings{/font}\n• {font:@Medium}%@{/font}\n• Make sure that {font:@Medium}Camera{/font} is enabled";
+"photopay_id_position_tooltip" = "Position ID card in this Frame";
+"photopay_glare_status" = "Slightly move ID to eliminate glare.";
+
+"photopay_front_verification_document" = "Place the front side of the document in the frame and wait for automatic scan.";
+"photopay_back_verification_document" = "Place the back side of the document in the frame and wait for automatic scan.";
+"photopay_front_splash_verification_document" = "Document front side";
+"photopay_back_splash_verification_document" = "Document back side";
diff --git a/MicroBlink.framework/Headers/MBBarcodeEntities.h b/MicroBlink.framework/Headers/MBBarcodeEntities.h
@@ -0,0 +1,19 @@
+//
+//  MicroBlink.h
+//  MicroBlinkFramework
+//
+//  Created by Dino Gustin on 06/06/18.
+//  Copyright (c) 2012 MicroBlink Ltd. All rights reserved.
+//
+
+// Pdf417
+#import "MBPdf417Recognizer.h"
+#import "MBPdf417RecognizerResult.h"
+
+// SimNumber
+#import "MBSimNumberRecognizer.h"
+#import "MBSimNumberRecognizerResult.h"
+
+// Barcode
+#import "MBBarcodeRecognizer.h"
+#import "MBBarcodeRecognizerResult.h"
diff --git a/MicroBlink.framework/Headers/MBBarcodeOverlaySettings.h b/MicroBlink.framework/Headers/MBBarcodeOverlaySettings.h
@@ -1,33 +1,33 @@
 //
-//  MBBarcodeOverlaySettings.h
-//  MicroBlinkDev
+//  MBBarcodeUISettings.h
+//  MicroBlink
 //
-//  Created by Jura Skrlec on 16/01/2018.
+//  Created by Dino Gustin on 04/05/2018.
 //
 
-#import "MBSettings.h"
+#import "MBBaseOverlaySettings.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 /**
- * Settings class containing parameters for Barcode UI
+ * Settings class containing UI information
  */
-PP_CLASS_AVAILABLE_IOS(8.0)
-@interface MBBarcodeOverlaySettings : MBSettings
+MB_CLASS_AVAILABLE_IOS(8.0)
+@interface MBBarcodeOverlaySettings : MBBaseOverlaySettings
 
 /**
  * If YES, viewfinder (4 corner markers) will move when payslip is detected
  *
  * Default: YES
  */
-@property (nonatomic, assign) BOOL viewfinderMoveable;
+@property (nonatomic, assign) BOOL displayBarcodeDots;
 
 /**
- * If YES; barcode dots will be displayed if detected.
+ * If YES; view finder will be displayed
  *
  * Default: YES
  */
-@property (nonatomic, assign) BOOL displayBarcodeDots;
+@property (nonatomic, assign) BOOL displayViewfinder;
 
 @end
 

diff --git a/MicroBlink.framework/Headers/MBBarcodeOverlayViewController.h b/MicroBlink.framework/Headers/MBBarcodeOverlayViewController.h
@@ -6,22 +6,18 @@
 //  Copyright (c) 2015 MicroBlink Ltd. All rights reserved.
 //
 
-#import "MBModernBaseOverlayViewController.h"
+#import "MBBaseOverlayViewController.h"
+#import "MBBarcodeOverlaySettings.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @protocol MBBarcodeOverlayViewControllerDelegate;
 
-@class MBSettings;
 @class MBBarcodeOverlaySettings;
+@class MBRecognizerCollection;
 
-PP_CLASS_AVAILABLE_IOS(8.0)
-@interface MBBarcodeOverlayViewController : MBModernBaseOverlayViewController
-
-/**
- * Supported orientations mask
- */
-@property (nonatomic, assign) UIInterfaceOrientationMask hudMask;
+MB_CLASS_AVAILABLE_IOS(8.0) MB_FINAL
+@interface MBBarcodeOverlayViewController : MBBaseOverlayViewController
 
 /**
  * Common settings
@@ -36,11 +32,13 @@ PP_CLASS_AVAILABLE_IOS(8.0)
 /**
  * Designated intializer.
  *
- *  @param settings MBSettings object
+ *  @param settings MBBarcodeOverlaySettings object
+ *
+ *  @param recognizerCollection MBRecognizerCollection object
  *
  *  @return initialized overlayViewController
  */
-- (instancetype)initWithSettings:(MBBarcodeOverlaySettings *)settings andDelegate:(id<MBBarcodeOverlayViewControllerDelegate>)delegate;
+- (instancetype)initWithSettings:(MBBarcodeOverlaySettings *)settings recognizerCollection:(MBRecognizerCollection *)recognizerCollection delegate:(nonnull id<MBBarcodeOverlayViewControllerDelegate>)delegate;
 
 @end
 

diff --git a/MicroBlink.framework/Headers/MBBarcodeOverlayViewControllerDelegate.h b/MicroBlink.framework/Headers/MBBarcodeOverlayViewControllerDelegate.h
@@ -8,7 +8,8 @@
 
 #import <Foundation/Foundation.h>
 #import "MBBarcodeOverlayViewController.h"
-#import "MBScanningRecognizerRunnerViewController.h"
+#import "MBRecognizerRunnerViewController.h"
+#import "MBRecognizerResult.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/MicroBlink.framework/Headers/MBBarcodeRecognizer.h b/MicroBlink.framework/Headers/MBBarcodeRecognizer.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PPMicroBlinkDefines.h"
+#import "MBMicroBlinkDefines.h"
 #import "MBRecognizer.h"
 #import "MBBarcodeRecognizerResult.h"
 #import "MBMicroBlinkInitialization.h"
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
  * MBBarcodeRecognizer is used for scanning most of 1D barcode formats, and 2D format
  * such as Aztec, DataMatrix and QR code
  */
-PP_CLASS_AVAILABLE_IOS(6.0)
+MB_CLASS_AVAILABLE_IOS(8.0) MB_FINAL
 @interface MBBarcodeRecognizer : MBRecognizer<NSCopying>
 
 MB_INIT
@@ -33,7 +33,7 @@ MB_INIT
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanAztec;
+@property (nonatomic, assign) BOOL scanAztecCode;
 
 /**
  * Set this to YES to scan Code 128 1D barcodes
@@ -61,42 +61,42 @@ MB_INIT
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanEAN13;
+@property (nonatomic, assign) BOOL scanEan13;
 
 /**
  * Set this to YES to scan EAN8 barcodes
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanEAN8;
+@property (nonatomic, assign) BOOL scanEan8;
 
 /**
  * Set this to YES to scan ITF barcodes
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanITF;
+@property (nonatomic, assign) BOOL scanItf;
 
 /**
  * Set this to YES to scan QR barcodes
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanQR;
+@property (nonatomic, assign) BOOL scanQrCode;
 
 /**
  * Set this to YES to scan UPCA barcodes
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanUPCA;
+@property (nonatomic, assign) BOOL scanUpca;
 
 /**
  * Set this to YES to scan UPCE barcodes
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL scanUPCE;
+@property (nonatomic, assign) BOOL scanUpce;
 
 /**
  * Set this to YES to scan Pdf417 barcodes
@@ -108,10 +108,9 @@ MB_INIT
 /**
  * Set this to YES to allow slower, but better image processing.
  *
- * Defailt: YES
- *
+ * Default: YES
  */
-@property (nonatomic, assign) BOOL useSlowerThoroughScan;
+@property (nonatomic, assign) BOOL slowerThoroughScan;
 
 /**
 * Allow enabling the autodetection of image scale when scanning barcodes.
@@ -120,12 +119,16 @@ MB_INIT
 * resolution images but slows down the recognition process.
 *
 * NOTE: This setting is applied only for Code39 and Code128 barcode scanning.
+*
+ * Default: YES
 */
 @property (nonatomic, assign) BOOL autoScaleDetection;
 
 /**
 * Enable reading code39 barcode contents as extended data. For more information about code39
 * extended data (a.k.a. full ASCII mode), see https://en.wikipedia.org/wiki/Code_39#Full_ASCII_Code_39
+*
+* Default: NO
 */
 @property (nonatomic, assign) BOOL readCode39AsExtendedData;
 
@@ -156,7 +159,7 @@ MB_INIT
  *
  * Default: NO
  */
-@property (nonatomic, assign) BOOL allowNullQuietZone;
+@property (nonatomic, assign) BOOL nullQuietZoneAllowed;
 
 @end
 

diff --git a/MicroBlink.framework/Headers/MBBarcodeRecognizerResult.h b/MicroBlink.framework/Headers/MBBarcodeRecognizerResult.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PPMicroBlinkDefines.h"
+#import "MBMicroBlinkDefines.h"
 #import "MBRecognizerResult.h"
 #import "MBBarcodeResult.h"
 
@@ -17,26 +17,26 @@ NS_ASSUME_NONNULL_BEGIN
  * Result of MBBarcodeRecognizer; is used for scanning most of 1D barcode formats, and 2D format
  * such as Aztec, DataMatrix and QR code
  */
-PP_CLASS_AVAILABLE_IOS(6.0)
+MB_CLASS_AVAILABLE_IOS(8.0)
 @interface MBBarcodeRecognizerResult : MBRecognizerResult<NSCopying>
 
-- (instancetype)init NS_UNAVAILABLE;
+MB_INIT_UNAVAILABLE
 
 /**
  * Byte array with result of the scan
  */
-- (NSData *_Nullable)data;
+@property(nonatomic, strong, readonly, nullable) NSData* rawData;
 
 /**
  * Retrieves string content of scanned data
  */
-- (NSString *)stringData;
+@property(nonatomic, strong, readonly, nullable) NSString* stringData;
 
 /**
  * Flag indicating uncertain scanning data
  * E.g obtained from damaged barcode.
  */
-- (BOOL)isUncertain;
+@property(nonatomic, assign, readonly) BOOL uncertain;
 
 /**
  * Method which gives string representation for a given PPBarcodeType enum value.

diff --git a/MicroBlink.framework/Headers/MBBarcodeUIComponents.h b/MicroBlink.framework/Headers/MBBarcodeUIComponents.h
@@ -0,0 +1,23 @@
+//
+//  MicroBlink.h
+//  MicroBlinkFramework
+//
+//  Created by Dino Gustin on 06/06/18.
+//  Copyright (c) 2012 MicroBlink Ltd. All rights reserved.
+//
+
+// Overlay delegates
+#import "MBBarcodeOverlayViewControllerDelegate.h"
+
+// Overlays
+#import "MBBarcodeOverlayViewController.h"
+#import "MBBarcodeOverlaySettings.h"
+#import "MBCustomOverlayViewController.h"
+
+// Overlay subviews
+#import "MBDotsSubview.h"
+#import "MBDotsResultSubview.h"
+#import "MBModernViewfinderSubview.h"
+#import "MBTapToFocusSubview.h"
+#import "MBResultSubview.h"
+#import "MBGlareStatusSubview.h"
diff --git a/MicroBlink.framework/Headers/MBBaseBarcodeOverlayViewController.h b/MicroBlink.framework/Headers/MBBaseBarcodeOverlayViewController.h