diff --git a/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.h b/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.h index 865eaaef2..8e52106cf 100644 --- a/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.h +++ b/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.h @@ -34,8 +34,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)updateScanWarnings:(ALWarningState)warningState; -- (void)updateWarningPosition:(CGFloat)newPosition; - - (void)updateBrightness:(CGFloat)brightness forModule:(id)anylineModule ignoreTooDark:(BOOL)ignoreTooDark; - (void)updateBrightness:(CGFloat)brightness forModule:(id)anylineModule; diff --git a/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.m b/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.m index 7071c13ef..ef255df09 100644 --- a/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.m +++ b/AnylineExamples/Anyline Demo App/DemoApp Source/ALBaseScanViewController.m @@ -106,6 +106,7 @@ - (void)installScanView:(ALScanView *)scanView { - (void)addWarningSubview { ALWarningView *warningView = [[ALWarningView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 70)]; warningView.center = CGPointMake(self.view.center.x, 0); + self.warningView = warningView; [self.view addSubview:warningView]; self.warningView.alpha = 0; @@ -146,10 +147,6 @@ - (void)updateScanWarnings:(ALWarningState)warningState { [self.warningView showWarning:warningState]; } -- (void)updateWarningPosition:(CGFloat)newPosition { - self.warningView.center = CGPointMake(self.warningView.center.x, newPosition); -} - // MARK: - anylineDidFindResult - (void)anylineDidFindResult:(NSString *)result @@ -487,7 +484,12 @@ - (void)scanViewMotionExceededThreshold:(ALScanView *)scanView { } - (void)scanView:(ALScanView *)scanView updatedCutoutWithPluginID:(NSString *)pluginID frame:(CGRect)frame { - [self updateWarningPosition:frame.origin.y + frame.size.height + scanView.frame.origin.y + 80]; + CGFloat xPos = (frame.origin.x + (frame.size.width/2)); + CGFloat yPos = frame.origin.y + frame.size.height + scanView.frame.origin.y + 80; + if (_isOrientationFlipped) { + yPos = frame.origin.y; + } + self.warningView.center = CGPointMake(xPos, yPos); } - (void)scanView:(ALScanView *)scanView encounteredError:(NSError *)error { diff --git a/AnylineExamples/Anyline Demo App/Info.plist b/AnylineExamples/Anyline Demo App/Info.plist index ed07606d1..5fc29a306 100755 --- a/AnylineExamples/Anyline Demo App/Info.plist +++ b/AnylineExamples/Anyline Demo App/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 43.0.0-preview.2 + 43.0.0-rc.1 CFBundleSignature ???? CFBundleVersion diff --git a/AnylineExamples/Anyline Examples Source/Tire/ViewController/ALTireViewController.swift b/AnylineExamples/Anyline Examples Source/Tire/ViewController/ALTireViewController.swift index 6f36ac304..fa4e4d825 100644 --- a/AnylineExamples/Anyline Examples Source/Tire/ViewController/ALTireViewController.swift +++ b/AnylineExamples/Anyline Examples Source/Tire/ViewController/ALTireViewController.swift @@ -62,8 +62,10 @@ class ALTireViewController: ALBaseScanViewController { let scanView = try ALScanViewFactory.withConfigFilePath(path, delegate: self) self.scanViewPlugin = scanView.scanViewPlugin as? ALScanViewPlugin self.installScanView(scanView) + scanView.delegate = self scanView.startCamera() self.scanView = scanView + } catch { if (self.popWithAlert(onError: error)) { return diff --git a/AnylineExamples/AnylineExamples.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AnylineExamples/AnylineExamples.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/AnylineExamples/AnylineExamples.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Documentation/html/Categories/NSArray+ALJSONExtras.html b/Documentation/html/Categories/NSArray+ALJSONExtras.html index 5207a3abb..b9eabc50e 100644 --- a/Documentation/html/Categories/NSArray+ALJSONExtras.html +++ b/Documentation/html/Categories/NSArray+ALJSONExtras.html @@ -106,7 +106,7 @@

Overview