Merge pull request #92 from jwogan5/master

[MOD-2465] : Added ability to prevent rotation of scanner
tidev · Nov 5, 2018 · 13f75ee · 13f75ee
2 parents 1717bc6 + 26c71c5
commit 13f75ee
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/ios/Classes/TiBarcodeModule.m b/ios/Classes/TiBarcodeModule.m
@@ -60,6 +60,7 @@ - (void)capture:(id)args
   BOOL animate = [TiUtils boolValue:[args objectForKey:@"animate"] def:YES];
   BOOL showCancel = [TiUtils boolValue:@"showCancel" properties:args def:YES];
   BOOL showRectangle = [TiUtils boolValue:@"showRectangle" properties:args def:YES];
+  BOOL preventRotation = [TiUtils boolValue:@"preventRotation" properties:args def: NO];
 
   NSMutableArray *acceptedFormats = [self metaDataObjectListFromFormtArray:[args objectForKey:@"acceptedFormats"]];
   _overlayViewProxy = [args objectForKey:@"overlay"];
@@ -80,7 +81,7 @@ - (void)capture:(id)args
     [self rememberProxy:_overlayViewProxy];
     overlayView = [self prepareOverlayWithProxy:_overlayViewProxy];
   }
-  _barcodeViewController = [[TiBarcodeViewController alloc] initWithObjectTypes:acceptedFormats delegate:self showCancel:showCancel showRectangle:showRectangle withOverlay:overlayView];
+  _barcodeViewController = [[TiBarcodeViewController alloc] initWithObjectTypes:acceptedFormats delegate:self showCancel:showCancel showRectangle:showRectangle withOverlay:overlayView preventRotation:preventRotation];
   [[_barcodeViewController scanner] setCamera:_selectedCamera ?: MTBCameraBack error:&cameraError];
 
   if (_displayedMessage != nil) {

diff --git a/ios/Classes/TiBarcodeViewController.h b/ios/Classes/TiBarcodeViewController.h
@@ -18,6 +18,7 @@
   @private
   TiOverlayView *_overlayView;
   BOOL _showRectangle;
+  BOOL _preventRotation;
 }
 
 - (TiOverlayView *)overlayView;
@@ -26,7 +27,8 @@
                  delegate:(id<TiOverlayViewDelegate>)delegate
                showCancel:(BOOL)shouldShowCancel
             showRectangle:(BOOL)shouldShowRectangle
-              withOverlay:(UIView *)overlay;
+              withOverlay:(UIView *)overlay
+          preventRotation:(BOOL)preventRotation;
 
 @property (nonatomic, strong) MTBBarcodeScanner *scanner;
 

diff --git a/ios/Classes/TiBarcodeViewController.m b/ios/Classes/TiBarcodeViewController.m
@@ -21,6 +21,7 @@ - (instancetype)initWithObjectTypes:(NSArray *)objectTypes
                          showCancel:(BOOL)shouldShowCancel
                       showRectangle:(BOOL)shouldShowRectangle
                         withOverlay:(UIView *)overlay
+                    preventRotation:(BOOL)preventRotation
 {
   self = [super init];
   if (self) {
@@ -34,6 +35,7 @@ - (instancetype)initWithObjectTypes:(NSArray *)objectTypes
                                             withOverlay:overlay];
     _showRectangle = shouldShowRectangle;
     _overlayView.delegate = delegate;
+    _preventRotation = preventRotation;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(handleDeviceRotation:)
@@ -84,6 +86,17 @@ - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation
   return [[[[TiApp app] controller] topContainerController] preferredInterfaceOrientationForPresentation];
 }
 
+- (BOOL)shouldAutorotate
+{
+  [super shouldAutorotate];
+
+  if (_preventRotation) {
+    return NO;
+  }
+
+  return YES;
+}
+
 - (void)handleDeviceRotation:(NSNotification *)notification
 {
   if (_showRectangle) {

diff --git a/ios/manifest b/ios/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.3
+version: 2.0.4
 apiversion: 2
 architectures: armv7 i386 x86_64 arm64
 description: Lets you process 1D/2D barcodes.