Skip to content

Commit aca53a1

Browse files
juraskrlecjuraskrlec
committed
Update Samples and size report v5.0.0
1 parent e98b18e commit aca53a1

File tree

41 files changed

+530
-487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+530
-487
lines changed

‎Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -20,11 +20,10 @@
2020
3159A5C11CF4A5E900641A11 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C01CF4A5E900641A11 /* libc++.tbd */; };
2121
3159A5C31CF4A5F100641A11 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C21CF4A5F100641A11 /* libiconv.tbd */; };
2222
3159A5C51CF4A5F400641A11 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3159A5C41CF4A5F400641A11 /* Accelerate.framework */; };
23+
A261AE9B2624677E00B6BF9F /* BlinkInput.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A261AE992624677700B6BF9F /* BlinkInput.xcframework */; };
24+
A261AE9C2624677E00B6BF9F /* BlinkInput.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A261AE992624677700B6BF9F /* BlinkInput.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2325
A2FE13611F7503C200C6F1EA /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A2FE13601F7503C200C6F1EA /* libz.tbd */; };
2426
B403EE7820F4D0EC00EE5235 /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = B403EE7720F4D0EC00EE5235 /* license.txt */; };
25-
B4CCA03322AE4BCD00C76715 /* Microblink.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B4CCA03122AE4BCD00C76715 /* Microblink.bundle */; };
26-
B4CCA03422AE4BD500C76715 /* Microblink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03022AE4BCD00C76715 /* Microblink.framework */; };
27-
B4CCA03522AE4BD500C76715 /* Microblink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4CCA03022AE4BCD00C76715 /* Microblink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2827
/* End PBXBuildFile section */
2928

3029
/* Begin PBXCopyFilesBuildPhase section */
@@ -34,7 +33,7 @@
3433
dstPath = "";
3534
dstSubfolderSpec = 10;
3635
files = (
37-
B4CCA03522AE4BD500C76715 /* Microblink.framework in Embed Frameworks */,
36+
A261AE9C2624677E00B6BF9F /* BlinkInput.xcframework in Embed Frameworks */,
3837
);
3938
name = "Embed Frameworks";
4039
runOnlyForDeploymentPostprocessing = 0;
@@ -59,10 +58,9 @@
5958
3159A5C01CF4A5E900641A11 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
6059
3159A5C21CF4A5F100641A11 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
6160
3159A5C41CF4A5F400641A11 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
61+
A261AE992624677700B6BF9F /* BlinkInput.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = BlinkInput.xcframework; path = ../../BlinkInput.xcframework; sourceTree = "<group>"; };
6262
A2FE13601F7503C200C6F1EA /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
6363
B403EE7720F4D0EC00EE5235 /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
64-
B4CCA03022AE4BCD00C76715 /* Microblink.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Microblink.framework; path = ../../Microblink.framework; sourceTree = "<group>"; };
65-
B4CCA03122AE4BCD00C76715 /* Microblink.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Microblink.bundle; path = ../../Microblink.bundle; sourceTree = "<group>"; };
6664
/* End PBXFileReference section */
6765

6866
/* Begin PBXFrameworksBuildPhase section */
@@ -72,10 +70,10 @@
7270
files = (
7371
A2FE13611F7503C200C6F1EA /* libz.tbd in Frameworks */,
7472
3159A5C31CF4A5F100641A11 /* libiconv.tbd in Frameworks */,
75-
B4CCA03422AE4BD500C76715 /* Microblink.framework in Frameworks */,
7673
3159A5C11CF4A5E900641A11 /* libc++.tbd in Frameworks */,
7774
3159A5C51CF4A5F400641A11 /* Accelerate.framework in Frameworks */,
7875
18CC81FD1B697133000F6DA5 /* AudioToolbox.framework in Frameworks */,
76+
A261AE9B2624677E00B6BF9F /* BlinkInput.xcframework in Frameworks */,
7977
18CC81F91B697106000F6DA5 /* AVFoundation.framework in Frameworks */,
8078
18CC81F71B697101000F6DA5 /* CoreMedia.framework in Frameworks */,
8179
);
@@ -130,11 +128,10 @@
130128
189EA8DE1AADE7FE005732C3 /* Frameworks */ = {
131129
isa = PBXGroup;
132130
children = (
131+
A261AE992624677700B6BF9F /* BlinkInput.xcframework */,
133132
A2FE13601F7503C200C6F1EA /* libz.tbd */,
134133
3159A5C21CF4A5F100641A11 /* libiconv.tbd */,
135134
3159A5C01CF4A5E900641A11 /* libc++.tbd */,
136-
B4CCA03122AE4BCD00C76715 /* Microblink.bundle */,
137-
B4CCA03022AE4BCD00C76715 /* Microblink.framework */,
138135
3159A5C41CF4A5F400641A11 /* Accelerate.framework */,
139136
18CC81FC1B697133000F6DA5 /* AudioToolbox.framework */,
140137
18CC81F81B697106000F6DA5 /* AVFoundation.framework */,
@@ -148,7 +145,8 @@
148145
children = (
149146
B403EE7720F4D0EC00EE5235 /* license.txt */,
150147
);
151-
path = License;
148+
name = License;
149+
path = ../../License;
152150
sourceTree = "<group>";
153151
};
154152
/* End PBXGroup section */
@@ -178,7 +176,7 @@
178176
187391FB1AA4B1060031D6C9 /* Project object */ = {
179177
isa = PBXProject;
180178
attributes = {
181-
LastUpgradeCheck = 1130;
179+
LastUpgradeCheck = 1240;
182180
ORGANIZATIONNAME = MicroBlink;
183181
TargetAttributes = {
184182
187392021AA4B1060031D6C9 = {
@@ -215,7 +213,6 @@
215213
187392171AA4B1070031D6C9 /* LaunchScreen.xib in Resources */,
216214
186226B71AB1B0A6002D71E5 /* en.strings in Resources */,
217215
187392141AA4B1070031D6C9 /* Images.xcassets in Resources */,
218-
B4CCA03322AE4BCD00C76715 /* Microblink.bundle in Resources */,
219216
);
220217
runOnlyForDeploymentPostprocessing = 0;
221218
};
@@ -285,6 +282,7 @@
285282
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
286283
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
287284
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
285+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
288286
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
289287
CLANG_WARN_STRICT_PROTOTYPES = YES;
290288
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -311,7 +309,7 @@
311309
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
312310
GCC_WARN_UNUSED_FUNCTION = YES;
313311
GCC_WARN_UNUSED_VARIABLE = YES;
314-
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
312+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
315313
MTL_ENABLE_DEBUG_INFO = YES;
316314
ONLY_ACTIVE_ARCH = YES;
317315
SDKROOT = iphoneos;
@@ -342,6 +340,7 @@
342340
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
343341
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
344342
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
343+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
345344
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
346345
CLANG_WARN_STRICT_PROTOTYPES = YES;
347346
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -360,7 +359,7 @@
360359
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
361360
GCC_WARN_UNUSED_FUNCTION = YES;
362361
GCC_WARN_UNUSED_VARIABLE = YES;
363-
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
362+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
364363
MTL_ENABLE_DEBUG_INFO = NO;
365364
SDKROOT = iphoneos;
366365
TARGETED_DEVICE_FAMILY = "1,2";
@@ -372,10 +371,15 @@
372371
isa = XCBuildConfiguration;
373372
buildSettings = {
374373
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
374+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
375375
DEVELOPMENT_TEAM = CQTJWP89J7;
376376
FRAMEWORK_SEARCH_PATHS = ../../;
377377
INFOPLIST_FILE = "BlinkInput-sample/Info.plist";
378-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
378+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
379+
LD_RUNPATH_SEARCH_PATHS = (
380+
"$(inherited)",
381+
"@executable_path/Frameworks",
382+
);
379383
PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample;
380384
PRODUCT_NAME = "$(TARGET_NAME)";
381385
};
@@ -385,10 +389,15 @@
385389
isa = XCBuildConfiguration;
386390
buildSettings = {
387391
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
392+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
388393
DEVELOPMENT_TEAM = CQTJWP89J7;
389394
FRAMEWORK_SEARCH_PATHS = ../../;
390395
INFOPLIST_FILE = "BlinkInput-sample/Info.plist";
391-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
396+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
397+
LD_RUNPATH_SEARCH_PATHS = (
398+
"$(inherited)",
399+
"@executable_path/Frameworks",
400+
);
392401
PRODUCT_BUNDLE_IDENTIFIER = com.microblink.blinkinput.sample;
393402
PRODUCT_NAME = "$(TARGET_NAME)";
394403
};

‎Samples/BlinkInput-sample-ObjC/BlinkInput-sample.xcodeproj/xcshareddata/xcschemes/BlinkInput-sample.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1130"
3+
LastUpgradeVersion = "1240"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "NO"

‎Samples/BlinkInput-sample-ObjC/BlinkInput-sample/AppDelegate.m‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "AppDelegate.h"
10-
#import <Microblink/Microblink.h>
10+
#import <BlinkInput/BlinkInput.h>
1111

1212
@interface AppDelegate ()
1313

@@ -20,8 +20,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
2020
// Override point for customization after application launch.
2121

2222
/** First, set license key as soon as possible */
23-
// Valid until: 2020-10-23
24-
[[MBMicroblinkSDK sharedInstance] setLicenseResource:@"license" withExtension:@"txt" inSubdirectory:@"" forBundle:[NSBundle mainBundle]];
23+
// Valid until: 2022-02-06
24+
[[MBIMicroblinkSDK sharedInstance] setLicenseResource:@"license" withExtension:@"txt" inSubdirectory:@"" forBundle:[NSBundle mainBundle] errorCallback:^(MBILicenseError licenseError) {
25+
26+
}];
2527
return YES;
2628
}
2729

‎Samples/BlinkInput-sample-ObjC/BlinkInput-sample/License/license.txt‎

-180 Bytes
Binary file not shown.

‎Samples/BlinkInput-sample-ObjC/BlinkInput-sample/ViewController.m‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,42 @@
88

99
#import "ViewController.h"
1010

11-
#import <Microblink/Microblink.h>
11+
#import <BlinkInput/BlinkInput.h>
1212

13-
@interface ViewController () <MBBarcodeOverlayViewControllerDelegate>
13+
@interface ViewController () <MBIBarcodeOverlayViewControllerDelegate>
1414

15-
@property (nonatomic, strong) MBRawParser *rawParser;
16-
@property (nonatomic, strong) MBParserGroupProcessor *parserGroupProcessor;
17-
@property (nonatomic, strong) MBBlinkInputRecognizer *blinkInputRecognizer;
15+
@property (nonatomic, strong) MBIRawParser *rawParser;
16+
@property (nonatomic, strong) MBIParserGroupProcessor *parserGroupProcessor;
17+
@property (nonatomic, strong) MBIBlinkInputRecognizer *blinkInputRecognizer;
1818

1919
@end
2020

2121
@implementation ViewController
2222

2323
- (IBAction)didTapScan:(id)sender {
2424

25-
MBBarcodeOverlaySettings* settings = [[MBBarcodeOverlaySettings alloc] init];
25+
MBIBarcodeOverlaySettings* settings = [[MBIBarcodeOverlaySettings alloc] init];
2626

27-
self.rawParser = [[MBRawParser alloc] init];
28-
self.parserGroupProcessor = [[MBParserGroupProcessor alloc] initWithParsers:@[self.rawParser]];
29-
self.blinkInputRecognizer = [[MBBlinkInputRecognizer alloc] initWithProcessors:@[self.parserGroupProcessor]];
27+
self.rawParser = [[MBIRawParser alloc] init];
28+
self.parserGroupProcessor = [[MBIParserGroupProcessor alloc] initWithParsers:@[self.rawParser]];
29+
self.blinkInputRecognizer = [[MBIBlinkInputRecognizer alloc] initWithProcessors:@[self.parserGroupProcessor]];
3030

3131
/** Create recognizer collection */
32-
MBRecognizerCollection *recognizerCollection = [[MBRecognizerCollection alloc] initWithRecognizers:@[self.blinkInputRecognizer]];
32+
MBIRecognizerCollection *recognizerCollection = [[MBIRecognizerCollection alloc] initWithRecognizers:@[self.blinkInputRecognizer]];
3333

34-
MBBarcodeOverlayViewController *overlayVC = [[MBBarcodeOverlayViewController alloc] initWithSettings:settings recognizerCollection:recognizerCollection delegate:self];
35-
UIViewController<MBRecognizerRunnerViewController>* recognizerRunnerViewController = [MBViewControllerFactory recognizerRunnerViewControllerWithOverlayViewController:overlayVC];
34+
MBIBarcodeOverlayViewController *overlayVC = [[MBIBarcodeOverlayViewController alloc] initWithSettings:settings recognizerCollection:recognizerCollection delegate:self];
35+
UIViewController<MBIRecognizerRunnerViewController>* recognizerRunnerViewController = [MBIViewControllerFactory recognizerRunnerViewControllerWithOverlayViewController:overlayVC];
3636

3737
/** Present the recognizer runner view controller. You can use other presentation methods as well (instead of presentViewController) */
3838
[self presentViewController:recognizerRunnerViewController animated:YES completion:nil];
3939
}
4040

41-
#pragma mark - MBBarcodeOverlayViewControllerDelegate
41+
#pragma mark - MBIBarcodeOverlayViewControllerDelegate
4242

43-
- (void)barcodeOverlayViewControllerDidFinishScanning:(MBBarcodeOverlayViewController *)barcodeOverlayViewController state:(MBRecognizerResultState)state {
43+
- (void)barcodeOverlayViewControllerDidFinishScanning:(MBIBarcodeOverlayViewController *)barcodeOverlayViewController state:(MBIRecognizerResultState)state {
4444

4545
// check for valid state
46-
if (state == MBRecognizerResultStateValid) {
46+
if (state == MBIRecognizerResultStateValid) {
4747

4848
// first, pause scanning until we process all the results
4949
[barcodeOverlayViewController.recognizerRunnerViewController pauseScanning];
@@ -58,15 +58,15 @@ - (void)barcodeOverlayViewControllerDidFinishScanning:(MBBarcodeOverlayViewContr
5858
// Show result on the initial screen
5959
self.labelResult.text = weakSelf.rawParser.result.rawText;
6060

61-
MBOcrLayout* ocrLayout = weakSelf.parserGroupProcessor.result.ocrLayout;
61+
MBIOcrLayout* ocrLayout = weakSelf.parserGroupProcessor.result.ocrLayout;
6262
NSLog(@"Dimensions of ocrLayout are %@", NSStringFromCGRect(ocrLayout.box));
6363

6464
[barcodeOverlayViewController.recognizerRunnerViewController resumeScanningAndResetState:YES];
6565
});
6666
}
6767
}
6868

69-
- (void)barcodeOverlayViewControllerDidTapClose:(MBBarcodeOverlayViewController *)barcodeOverlayViewController {
69+
- (void)barcodeOverlayViewControllerDidTapClose:(MBIBarcodeOverlayViewController *)barcodeOverlayViewController {
7070
// As scanning view controller is presented full screen and modally, dismiss it
7171
[self dismissViewControllerAnimated:YES completion:nil];
7272
}

0 commit comments

Comments
 (0)