fixes iOS 12.+ crushes, Add libs to x86_64

tjwoon · Aug 30, 2019 · 8406903 · 8406903
1 parent fc5dcc3
commit 8406903
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/android/libs/x86_64/libiconv.so b/android/libs/x86_64/libiconv.so
diff --git a/android/libs/x86_64/libzbarjni.so b/android/libs/x86_64/libzbarjni.so
diff --git a/ios/CsZBar.m b/ios/CsZBar.m
@@ -35,6 +35,24 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interface
 
 #pragma mark - Plugin API
 
++ (UIView*) searchToolbarFrom:(UIView*) topView {
+    UIView* result = nil;
+    for (UIView* testView in topView.subviews) {
+        if([testView isKindOfClass:[UIToolbar class]]){
+            result = testView;
+            break;
+        } else {
+            if ([testView.subviews count] > 0){
+                result = [self searchToolbarFrom:testView];
+                if (result != nil){
+                    break;
+                }
+            }
+        }
+    }
+    return result;
+};
+
 - (void)scan: (CDVInvokedUrlCommand*)command; 
 {
     if (self.scanInProgress) {
@@ -49,7 +67,7 @@ - (void)scan: (CDVInvokedUrlCommand*)command;
         self.scanReader = [AlmaZBarReaderViewController new];
 
         self.scanReader.readerDelegate = self;
-        self.scanReader.supportedOrientationsMask = ZBarOrientationMask(UIInterfaceOrientationPortrait);
+        self.scanReader.supportedOrientationsMask = ZBarOrientationMask(UIInterfaceOrientationPortrait || UIDeviceOrientationLandscapeRight || UIDeviceOrientationLandscapeLeft);
 
         // Get user parameters
         NSDictionary *params = (NSDictionary*) [command argumentAtIndex:0];
@@ -72,16 +90,22 @@ - (void)scan: (CDVInvokedUrlCommand*)command;
         }
 
         // Hack to hide the bottom bar's Info button... originally based on http://stackoverflow.com/a/16353530
-	NSInteger infoButtonIndex;
-        if ([[[UIDevice currentDevice] systemVersion] compare:@"10.0" options:NSNumericSearch] != NSOrderedAscending) {
-            infoButtonIndex = 1;
-        } else {
-            infoButtonIndex = 3;
+
+        UIView* testView = self.scanReader.view;
+        UIView* toolBar = [[self class] searchToolbarFrom:testView];
+
+        for (UIBarButtonItem* item  in ((UIToolbar*)toolBar).items) {
+            if (item.customView != nil){
+                if([item.customView isKindOfClass:[UIButton class]]){
+                    UIButton* but = (UIButton*)item.customView;
+                    if (but.buttonType == UIButtonTypeInfoLight
+                        || but.buttonType == UIButtonTypeInfoDark){
+                        but.hidden = YES;
+                    }
+                }
+            }
         }
-        UIView *infoButton = [[[[[self.scanReader.view.subviews objectAtIndex:2] subviews] objectAtIndex:0] subviews] objectAtIndex:infoButtonIndex];
-        [infoButton setHidden:YES];
 
-        //UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem]; [button setTitle:@"Press Me" forState:UIControlStateNormal]; [button sizeToFit]; [self.view addSubview:button];
         CGRect screenRect = [[UIScreen mainScreen] bounds];
         CGFloat screenWidth = screenRect.size.width;
         CGFloat screenHeight = screenRect.size.height;

diff --git a/plugin.xml b/plugin.xml
@@ -57,6 +57,8 @@
         <source-file src="android/libs/arm64-v8a/libzbarjni.so" target-dir="libs/arm64-v8a" />s
         <source-file src="android/libs/x86/libiconv.so" target-dir="libs/x86" />
         <source-file src="android/libs/x86/libzbarjni.so" target-dir="libs/x86" />
+        <source-file src="android/libs/x86_64/libiconv.so" target-dir="libs/x86_64" />
+        <source-file src="android/libs/x86_64/libzbarjni.so" target-dir="libs/x86_64" />
         <source-file src="android/res/drawable/camera_flash.png" target-dir="res/drawable"/>
         <source-file src="android/res/drawable/camera_flash.png" target-dir="res/drawable-hdpi"/>
         <source-file src="android/res/drawable/camera_flash.png" target-dir="res/drawable-ldpi"/>