Skip to content

Commit

Permalink
Merge pull request #185 from BlinkID/jenkins/master-build
Browse files Browse the repository at this point in the history
Automatically built release by Jenkins
  • Loading branch information
dgust6 authored Jul 26, 2018
2 parents 0a26d87 + d658d13 commit 027fd6c
Show file tree
Hide file tree
Showing 687 changed files with 1,181 additions and 1,074 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Release notes

## 4.0.1
- Bugfixes
- Calling `reconfigureRecognizers` before showing camera now correctly applies supplied recognizers
- Fixed autorotation of overlays and `MBRecognizerRunnerViewController`
- Fixed localization issues with some overlays
- Fixed constraint errors on `MBDocumentVerificationOverlayViewController`

- Updates and additions
- Added `reconfigureRecognizers` method to `MBBaseOverlayViewController`, enabling it on all it's subclasses

## 4.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:
Expand Down
Binary file modified MicroBlink.bundle/Info.plist
Binary file not shown.
2 changes: 0 additions & 2 deletions MicroBlink.bundle/en.strings
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@
"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";

"photopay_time_restricted_license_key" = "Using time-limited license!";
10 changes: 10 additions & 0 deletions MicroBlink.framework/Headers/MBBarcodeOverlaySettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,18 @@ NS_ASSUME_NONNULL_BEGIN
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 displayBarcodeDots;

/**
* If YES; view finder will be displayed
*
* Default: YES
*/
@property (nonatomic, assign) BOOL displayViewfinder;

@end
Expand Down
26 changes: 25 additions & 1 deletion MicroBlink.framework/Headers/MBBaseOverlaySettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ MB_CLASS_AVAILABLE_IOS(8.0)
/**
* Default: UIInterfaceOrientationMaskPortrait
*/
@property (nonatomic, assign) NSUInteger supportedOrientations;
@property (nonatomic, assign) UIInterfaceOrientationMask supportedOrientations;

/**
* Full path to the sound file which is played when the valid result is scanned.
Expand All @@ -47,11 +47,35 @@ MB_CLASS_AVAILABLE_IOS(8.0)
*/
@property (nonatomic, assign) BOOL displayCancelButton;

/**
* Returns/sets cancel button text that is shown if displayCancelButton is on.
*
* Default: string defined by "photopay_close"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *cancelButtonText;

/**
* Default: YES.
*/
@property (nonatomic, assign) BOOL displayTorchButton;

/**
* Returns/sets torch on button text that is shown if displayTorchButton is on.
*
* Default: string defined by "photopay_light_on"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *torchOnButtonText;

/**
* Returns/sets torch off button text that is shown if displayTorchButton is on.
*
* Default: string defined by "photopay_light_off"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *torchOffButtonText;

@end

NS_ASSUME_NONNULL_END
5 changes: 5 additions & 0 deletions MicroBlink.framework/Headers/MBBaseOverlayViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
MB_CLASS_AVAILABLE_IOS(8.0)
@interface MBBaseOverlayViewController : MBOverlayViewController

/**
* Reconfigures current recognizer collection to new recognizer collection. Use this method to reconfigure what you wish to scan.
*/
- (void)reconfigureRecognizers:(MBRecognizerCollection *)recognizerCollection;

@end

NS_ASSUME_NONNULL_END
3 changes: 3 additions & 0 deletions MicroBlink.framework/Headers/MBCustomOverlayViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ MB_CLASS_AVAILABLE_IOS(8.0)
*/
@property (nonatomic, assign) NSUInteger supportedOrientations;

/**
* Reconfigures current recognizer collection to new recognizer collection. Use this method to reconfigure what you wish to scan.
*/
- (void)reconfigureRecognizers:(MBRecognizerCollection *)recognizerCollection;

@end
Expand Down
14 changes: 13 additions & 1 deletion MicroBlink.framework/Headers/MBDocumentOverlaySettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,22 @@ MB_CLASS_AVAILABLE_IOS(8.0)
@interface MBDocumentOverlaySettings : MBBaseOcrOverlaySettings

/**
* Gets/sets tootlip text that is defines under document view finder
* Gets/sets tootlip text that is defines under document view finder.
*
* Default: string defined by "photopay_id_position_tooltip"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *tooltipText;

/**
* Returns/sets glare status message that is shown if glare detection is turned on
* and it is shown if glare is detected.
*
* Default: string defined by "photopay_glare_status"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *glareStatusMessage;

/**
* Gets/sets tooltip visibility
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,48 @@ MB_CLASS_AVAILABLE_IOS(8.0)
/**
* Returns/sets user instructions that are shown above camera preview while the first side of the
* document is being scanned.
*
* Default: string defined by "photopay_front_verification_document"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *firstSideInstructions;

/**
* Returns/sets user instructions that are shown above camera preview while the second side of the
* document is being scanned.
*
* Default: string defined by "photopay_back_verification_document"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *secondSideInstructions;

/**
* Returns/sets splash message that is shown before scanning the first side of the document,
* while starting camera.
*
* Default: string defined by "photopay_front_splash_verification_document"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *firstSideSplashMessage;

/**
* Returns/sets splash message that is shown before scanning the second side of the document,
* while starting camera.
*
* Default: string defined by "photopay_back_splash_verification_document"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *secondSideSplashMessage;

/**
* Returns/sets glare status message that is shown if glare detection is turned on
* and it is shown if glare is detected.
*
* Default: string defined by "photopay_glare_status"
* key in strings file in Microblink.bundle
*/
@property(nonatomic, strong) NSString *glareStatusMessage;

/**
* Returns/sets splash image which is shown below splash message, before scanning the first side of
* the document, while starting camera.
Expand Down
10 changes: 10 additions & 0 deletions MicroBlink.framework/Headers/PPMicroBlinkDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@ MB_LOCALIZED_DEFAULT_STRING(key), nil), \
##__VA_ARGS__]
#endif

#ifndef MB_LOCALIZED_PROPERTY_GETTER
// note - this might return nil if frameworkBundle is nil!
#define MB_LOCALIZED_PROPERTY_GETTER(propertyName, key) \
if (propertyName) { \
return propertyName; \
} else { \
return MB_LOCALIZED(key); \
}
#endif

#ifdef __cplusplus
#define PP_EXTERN extern "C" __attribute__((visibility("default")))
#else
Expand Down
Binary file modified MicroBlink.framework/Info.plist
Binary file not shown.
4 changes: 2 additions & 2 deletions MicroBlink.framework/MicroBlink
Git LFS file not shown
44 changes: 22 additions & 22 deletions MicroBlink.framework/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</data>
<key>Headers/MBBarcodeOverlaySettings.h</key>
<data>
TJbkp8L2vcKiWqdTZCxyqgfrVMw=
UMYN30bejIsBy5SsEZPohb6w97M=
</data>
<key>Headers/MBBarcodeOverlayViewController.h</key>
<data>
Expand Down Expand Up @@ -102,11 +102,11 @@
</data>
<key>Headers/MBBaseOverlaySettings.h</key>
<data>
E9zGTmK4w0LaGjL3d0zfUY3YxL4=
WdytmHWrdISiASbJrQVV30k3imM=
</data>
<key>Headers/MBBaseOverlayViewController.h</key>
<data>
oO19CN5viDYBWodk3lia1LVZpx0=
dQJiU8ZZIm4S+TsVdFB31Fjz81k=
</data>
<key>Headers/MBBlinkIDEntities.h</key>
<data>
Expand Down Expand Up @@ -190,7 +190,7 @@
</data>
<key>Headers/MBCustomOverlayViewController.h</key>
<data>
57ovNFJm2EjMnQWIRcjC2ibjzp0=
II5Qw8o7D/VAIsLP+g11VLo26fI=
</data>
<key>Headers/MBCzechiaCombinedRecognizer.h</key>
<data>
Expand Down Expand Up @@ -322,7 +322,7 @@
</data>
<key>Headers/MBDocumentOverlaySettings.h</key>
<data>
CuKGk6DhXfpavjQrtuKS8Wok+no=
vC+0c+Y9An/xU5dpsgJh0f3wP1o=
</data>
<key>Headers/MBDocumentOverlayViewController.h</key>
<data>
Expand All @@ -346,7 +346,7 @@
</data>
<key>Headers/MBDocumentVerificationOverlaySettings.h</key>
<data>
OXI2rHKrGjAoB97CmezTrwXtBSY=
Uc1aBbEJQvBCqx2Icl+KTqwcUdk=
</data>
<key>Headers/MBDocumentVerificationOverlayViewController.h</key>
<data>
Expand Down Expand Up @@ -1214,11 +1214,11 @@
</data>
<key>Headers/PPMicroBlinkDefines.h</key>
<data>
R7L06bZfIBS7EOFa5cC/DbR4ZbE=
iLU8D8oejxsZXnWup4B/TVJm2Eo=
</data>
<key>Info.plist</key>
<data>
irUxxei+ZclJmpljmPevmHAzmbs=
/DMHxZgAykTObWuoTJzI/TfDPic=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -1396,11 +1396,11 @@
<dict>
<key>hash</key>
<data>
TJbkp8L2vcKiWqdTZCxyqgfrVMw=
UMYN30bejIsBy5SsEZPohb6w97M=
</data>
<key>hash2</key>
<data>
/Awsxse/NAwBh+YAgmupNxmGjvYZnEEpQ5yyNfDims0=
E+Awksld+RGOmXBxTHLVFyLIFPWN4wYeTP6swROXKhg=
</data>
</dict>
<key>Headers/MBBarcodeOverlayViewController.h</key>
Expand Down Expand Up @@ -1495,22 +1495,22 @@
<dict>
<key>hash</key>
<data>
E9zGTmK4w0LaGjL3d0zfUY3YxL4=
WdytmHWrdISiASbJrQVV30k3imM=
</data>
<key>hash2</key>
<data>
P5PSjS5ANrZDMCkD5OmV7B7LnhYapGoWp5K6L4l7Yds=
2EnLHr1C1krv7eHq9g/xAqSt6qaMOFAA9SuQNWpbZus=
</data>
</dict>
<key>Headers/MBBaseOverlayViewController.h</key>
<dict>
<key>hash</key>
<data>
oO19CN5viDYBWodk3lia1LVZpx0=
dQJiU8ZZIm4S+TsVdFB31Fjz81k=
</data>
<key>hash2</key>
<data>
vwgU3xw+iEpXPSKk3ikG43NIhopSpMTB1OpBWqOMP/g=
r0VbZHjkTb9kJjVAy2dbrIMHZk3nzz1EBcn0tWVQFGA=
</data>
</dict>
<key>Headers/MBBlinkIDEntities.h</key>
Expand Down Expand Up @@ -1737,11 +1737,11 @@
<dict>
<key>hash</key>
<data>
57ovNFJm2EjMnQWIRcjC2ibjzp0=
II5Qw8o7D/VAIsLP+g11VLo26fI=
</data>
<key>hash2</key>
<data>
nTGMFnt2decFRI15sko/M6lycm7JYKUwbz+2TnWkrIE=
yhv07axUUrdL0QKkVSBp90Td17yEm1XylFt/Me5ARq8=
</data>
</dict>
<key>Headers/MBCzechiaCombinedRecognizer.h</key>
Expand Down Expand Up @@ -2100,11 +2100,11 @@
<dict>
<key>hash</key>
<data>
CuKGk6DhXfpavjQrtuKS8Wok+no=
vC+0c+Y9An/xU5dpsgJh0f3wP1o=
</data>
<key>hash2</key>
<data>
CnKKtj2ObZ9+hsmImEsFteonSJRrIeIBeRs+/8W3hWg=
vRDHjKqtAYqbQLldt3Yce8f/cbNfWtCDeCnb7An4xeQ=
</data>
</dict>
<key>Headers/MBDocumentOverlayViewController.h</key>
Expand Down Expand Up @@ -2166,11 +2166,11 @@
<dict>
<key>hash</key>
<data>
OXI2rHKrGjAoB97CmezTrwXtBSY=
Uc1aBbEJQvBCqx2Icl+KTqwcUdk=
</data>
<key>hash2</key>
<data>
yzQOGTd2Zp+SctJdH9AGLK+5xd9+ZfV7X9vDOnBMS1c=
HsuqVnOriyt4tKpu4RhBWpYMdtSPgJ7YarnvAOmfLQM=
</data>
</dict>
<key>Headers/MBDocumentVerificationOverlayViewController.h</key>
Expand Down Expand Up @@ -4553,11 +4553,11 @@
<dict>
<key>hash</key>
<data>
R7L06bZfIBS7EOFa5cC/DbR4ZbE=
iLU8D8oejxsZXnWup4B/TVJm2Eo=
</data>
<key>hash2</key>
<data>
Dc3TkXU61/+ofj8U9PYIOBfSVDgnYBo6Q07rKWotK7M=
1RcExkAASufAzz9NQBHClG43MZ9jLDVePsH0N2p+yp8=
</data>
</dict>
<key>Modules/module.modulemap</key>
Expand Down
4 changes: 2 additions & 2 deletions PPBlinkID.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "PPBlinkID"
s.version = "4.0.0"
s.version = "((VERSION))"
s.summary = "A delightful component for barcode scanning"
s.homepage = "http://microblink.com"

Expand Down Expand Up @@ -32,7 +32,7 @@ Pod::Spec.new do |s|

s.source = {
:git => 'https://github.com/BlinkID/blinkid-ios.git',
:tag => 'v4.0.0'
:tag => 'v((VERSION))'
}

s.platform = :ios
Expand Down
10 changes: 10 additions & 0 deletions Release notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Release notes

## 4.0.1
- Bugfixes
- Calling `reconfigureRecognizers` before showing camera now correctly applies supplied recognizers
- Fixed autorotation of overlays and `MBRecognizerRunnerViewController`
- Fixed localization issues with some overlays
- Fixed constraint errors on `MBDocumentVerificationOverlayViewController`

- Updates and additions
- Added `reconfigureRecognizers` method to `MBBaseOverlayViewController`, enabling it on all it's subclasses

## 4.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:
Expand Down
Loading

0 comments on commit 027fd6c

Please sign in to comment.