iPad fix

- Fixed demo application load image on iPad
Pixelnetica · Oct 14, 2019 · b53bf33 · b53bf33
1 parent ffdb214
commit b53bf33
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/DocScanningSDK.framework/strip-DSSDK.sh b/DocScanningSDK.framework/strip-DSSDK.sh
@@ -0,0 +1,4 @@
+#! /bin/sh
+mkdir -p $(dirname "$2")
+lipo -remove i386 "$1" -o "$2"
+lipo -remove x86_64 "$2" -o "$2"
diff --git a/Example-DocScanningSDK-iOS.xcodeproj/project.pbxproj b/Example-DocScanningSDK-iOS.xcodeproj/project.pbxproj
@@ -919,7 +919,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 4XL92P45YN;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -961,7 +961,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 4XL92P45YN;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/PhotoSlider/Base.lproj/PhotoSliderViewController.xib b/PhotoSlider/Base.lproj/PhotoSliderViewController.xib
@@ -17,6 +17,7 @@
                 <outlet property="rotateRight" destination="XAm-mW-HJ4" id="c2v-98-mfN"/>
                 <outlet property="saveButton" destination="39" id="46"/>
                 <outlet property="settingsButton" destination="6H1-RX-pj7" id="pbR-Rl-H1F"/>
+                <outlet property="toolBar" destination="22" id="MfB-VY-iPU"/>
                 <outlet property="view" destination="6" id="7"/>
             </connections>
         </placeholder>

diff --git a/PhotoSlider/PhotoSliderViewController.h b/PhotoSlider/PhotoSliderViewController.h
@@ -22,6 +22,7 @@
 @property (nonatomic, weak) IBOutlet UIBarButtonItem *settingsButton;
 @property (nonatomic, weak) IBOutlet UIButton *rotateLeft;
 @property (nonatomic, weak) IBOutlet UIButton *rotateRight;
+@property (nonatomic, weak) IBOutlet UIView *toolBar;
 @property (nonatomic, strong) PxMetaImage* inpImage;
 @property (nonatomic, strong) PxMetaImage* outImage;
 

diff --git a/PhotoSlider/PhotoSliderViewController.m b/PhotoSlider/PhotoSliderViewController.m
@@ -221,6 +221,9 @@ - (IBAction)loadAction:(id)sender
 									  preferredStyle:UIAlertControllerStyleActionSheet
 									  ];
 
+	actionSheet.popoverPresentationController.barButtonItem = self.loadButton;
+//	actionSheet.popoverPresentationController.sourceView = self.toolBar;
+
 	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
 		@strongify(self)
 		[self dismissViewControllerAnimated:YES completion:nil];

diff --git a/PhotoSlider/SettingsViewController.xib b/PhotoSlider/SettingsViewController.xib
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4352" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>