Add iOS 15 and Xcode 13 compatibility

- Add compatibility with iOS 15 and Xcode 13. - Fix Camera UI on iOS 15. - Minor bug fixes and demo improvements.
Pixelnetica · Oct 24, 2021 · b0d49fa · b0d49fa
1 parent 78ae41a
commit b0d49fa
Show file tree

Hide file tree

Showing 9 changed files with 276 additions and 43 deletions.
diff --git a/DocScanningSDK.framework/DocScanningSDK b/DocScanningSDK.framework/DocScanningSDK
diff --git a/DocScanningSDK.framework/Info.plist b/DocScanningSDK.framework/Info.plist
diff --git a/DocScanningSDK.framework/_CodeSignature/CodeResources b/DocScanningSDK.framework/_CodeSignature/CodeResources
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Headers/DocScanningSDK.h</key>
+		<data>
+		PaKmfjYHxIEOYbd9JLtmgy6i+dM=
+		</data>
+		<key>Headers/PxAutoshotDetector.h</key>
+		<data>
+		sQ4OSYlJleAHJf4raFINPAytiC4=
+		</data>
+		<key>Headers/PxDocCutout.h</key>
+		<data>
+		4edMJomx4KwTZUwDohX0xjGOl1A=
+		</data>
+		<key>Headers/PxException.h</key>
+		<data>
+		gT+eAoRbJOXPx8m0i5Il+kUFqms=
+		</data>
+		<key>Headers/PxImageWriter.h</key>
+		<data>
+		4eHRewgIdu8slcYZoBY33FmfC0w=
+		</data>
+		<key>Headers/PxLicense.h</key>
+		<data>
+		rvkvss1crzvjV6nlZiHrVUtsNAg=
+		</data>
+		<key>Headers/PxMetaImage.h</key>
+		<data>
+		wgWfy2v/BqZdyzu2fB+yxp6iDW0=
+		</data>
+		<key>Headers/PxSDK.h</key>
+		<data>
+		6gx0YZfc/iz+SB1SALv4b2nbNtU=
+		</data>
+		<key>Headers/PxSDKTypes.h</key>
+		<data>
+		O1ECJNEUCl6F/fnsBzyfCarCb1M=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		HJvweXdnXPCXJBHFe1OphF5ksUE=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/DocScanningSDK.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			PaKmfjYHxIEOYbd9JLtmgy6i+dM=
+			</data>
+			<key>hash2</key>
+			<data>
+			dLYrQagzIucpUXN3KNEDYGpZpcZpLF6HPozCZk8lr3s=
+			</data>
+		</dict>
+		<key>Headers/PxAutoshotDetector.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			sQ4OSYlJleAHJf4raFINPAytiC4=
+			</data>
+			<key>hash2</key>
+			<data>
+			FZ8lwZSZvKkJEPRA1NxsP3F47PZ9TtcglxaYZznkyS4=
+			</data>
+		</dict>
+		<key>Headers/PxDocCutout.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			4edMJomx4KwTZUwDohX0xjGOl1A=
+			</data>
+			<key>hash2</key>
+			<data>
+			JOVh1Z/Kp/cc0loHHufap/zbJO0W+pEJdnQDuzD1Oj8=
+			</data>
+		</dict>
+		<key>Headers/PxException.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			gT+eAoRbJOXPx8m0i5Il+kUFqms=
+			</data>
+			<key>hash2</key>
+			<data>
+			Y5gsdZxZ1JAbs9uw85njwz7QGzOxkZ2NIQxordSWavY=
+			</data>
+		</dict>
+		<key>Headers/PxImageWriter.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			4eHRewgIdu8slcYZoBY33FmfC0w=
+			</data>
+			<key>hash2</key>
+			<data>
+			jlewNL0QtwhrlUf1uulWeFT8Rh6pjUV0z0yi2pIAB8Q=
+			</data>
+		</dict>
+		<key>Headers/PxLicense.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			rvkvss1crzvjV6nlZiHrVUtsNAg=
+			</data>
+			<key>hash2</key>
+			<data>
+			Hco2IeT48WB7aZuX4IaswBW/saX9voLR27oE9lKrgEY=
+			</data>
+		</dict>
+		<key>Headers/PxMetaImage.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			wgWfy2v/BqZdyzu2fB+yxp6iDW0=
+			</data>
+			<key>hash2</key>
+			<data>
+			76s86KUVR0yQoH2uQFRHJe2OitDNbyaehtONBxxf6Rk=
+			</data>
+		</dict>
+		<key>Headers/PxSDK.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			6gx0YZfc/iz+SB1SALv4b2nbNtU=
+			</data>
+			<key>hash2</key>
+			<data>
+			f8uVhMYjLvSuCtrj/cqzBAe3Mkr80WhPIe0NUbArWgA=
+			</data>
+		</dict>
+		<key>Headers/PxSDKTypes.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			O1ECJNEUCl6F/fnsBzyfCarCb1M=
+			</data>
+			<key>hash2</key>
+			<data>
+			yQzbM68Gs0Vf/6jW+7tXTlQCFLhdmmLZoXYh4JO/d+4=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/Example-DocScanningSDK-iOS.xcodeproj/project.pbxproj b/Example-DocScanningSDK-iOS.xcodeproj/project.pbxproj
@@ -32,7 +32,7 @@
 		3B99E69F1C21946000516D7D /* UIActionSheet+Blocks.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B99E69E1C21946000516D7D /* UIActionSheet+Blocks.m */; };
 		3B99E6A31C21AA4D00516D7D /* CameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3B99E6A11C21AA4D00516D7D /* CameraViewController.m */; };
 		3B99E6A41C21AA4D00516D7D /* CameraViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3B99E6A21C21AA4D00516D7D /* CameraViewController.xib */; };
-		3BA0AC5E1C2C155D00B8B8AE /* OverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BA0AC5D1C2C155D00B8B8AE /* OverlayView.m */; };
+		3BA0AC5E1C2C155D00B8B8AE /* CameraOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BA0AC5D1C2C155D00B8B8AE /* CameraOverlayView.m */; };
 		3BBC3F701DB691C100B53B11 /* TextTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3BBC3F6E1DB691C100B53B11 /* TextTableViewCell.m */; };
 		3BBC3F711DB691C100B53B11 /* TextTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3BBC3F6F1DB691C100B53B11 /* TextTableViewCell.xib */; };
 		9B40D1691DB6C78D00BC556C /* IQNSArray+Sort.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B40D1471DB6C78D00BC556C /* IQNSArray+Sort.m */; };
@@ -147,8 +147,8 @@
 		3B99E6A01C21AA4D00516D7D /* CameraViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraViewController.h; sourceTree = "<group>"; };
 		3B99E6A11C21AA4D00516D7D /* CameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraViewController.m; sourceTree = "<group>"; };
 		3B99E6A21C21AA4D00516D7D /* CameraViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CameraViewController.xib; sourceTree = "<group>"; };
-		3BA0AC5C1C2C155D00B8B8AE /* OverlayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayView.h; sourceTree = "<group>"; };
-		3BA0AC5D1C2C155D00B8B8AE /* OverlayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlayView.m; sourceTree = "<group>"; };
+		3BA0AC5C1C2C155D00B8B8AE /* CameraOverlayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraOverlayView.h; sourceTree = "<group>"; };
+		3BA0AC5D1C2C155D00B8B8AE /* CameraOverlayView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraOverlayView.m; sourceTree = "<group>"; };
 		3BBC3F6D1DB691C100B53B11 /* TextTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTableViewCell.h; sourceTree = "<group>"; };
 		3BBC3F6E1DB691C100B53B11 /* TextTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextTableViewCell.m; sourceTree = "<group>"; };
 		3BBC3F6F1DB691C100B53B11 /* TextTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TextTableViewCell.xib; sourceTree = "<group>"; };
@@ -461,8 +461,8 @@
 				CE4CA012134DE0CC004485B0 /* MainWindow.xib */,
 				CEF7A5291671D122007D93F2 /* MyImageView.h */,
 				CEF7A52A1671D122007D93F2 /* MyImageView.m */,
-				3BA0AC5C1C2C155D00B8B8AE /* OverlayView.h */,
-				3BA0AC5D1C2C155D00B8B8AE /* OverlayView.m */,
+				3BA0AC5C1C2C155D00B8B8AE /* CameraOverlayView.h */,
+				3BA0AC5D1C2C155D00B8B8AE /* CameraOverlayView.m */,
 				CEF7A5121671CE0B007D93F2 /* PageEditorController.h */,
 				CEF7A5131671CE0B007D93F2 /* PageEditorController.m */,
 				CEF7A5141671CE0B007D93F2 /* PageEditorController.xib */,
@@ -719,7 +719,7 @@
 				9B40D16C1DB6C78D00BC556C /* IQUIView+Hierarchy.m in Sources */,
 				CEF7A52B1671D122007D93F2 /* MyImageView.m in Sources */,
 				3B99E69F1C21946000516D7D /* UIActionSheet+Blocks.m in Sources */,
-				3BA0AC5E1C2C155D00B8B8AE /* OverlayView.m in Sources */,
+				3BA0AC5E1C2C155D00B8B8AE /* CameraOverlayView.m in Sources */,
 				9B40D16E1DB6C78D00BC556C /* IQUIWindow+Hierarchy.m in Sources */,
 				E3F03CEB1FE63C5800F20099 /* WebViewDelegate.m in Sources */,
 				3BBC3F701DB691C100B53B11 /* TextTableViewCell.m in Sources */,
@@ -919,7 +919,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 4XL92P45YN;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -933,7 +933,7 @@
 				INFOPLIST_FILE = "PhotoSlider/Example-DocScanningSDK-iOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.5.1;
+				MARKETING_VERSION = 2.5.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lstdc++",
@@ -962,7 +962,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 4XL92P45YN;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -975,7 +975,7 @@
 				INFOPLIST_FILE = "PhotoSlider/Example-DocScanningSDK-iOS-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.5.1;
+				MARKETING_VERSION = 2.5.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lstdc++",

diff --git a/PhotoSlider/OverlayView.h → PhotoSlider/CameraOverlayView.h b/PhotoSlider/OverlayView.h → PhotoSlider/CameraOverlayView.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface OverlayView : UIView
+@interface CameraOverlayView : UIView
 /*! Create rect and animate it */
 - (void) setCornersTopLeft:(CGPoint) topLeft andTopRight:(CGPoint) topRight andBottomLeft:(CGPoint) bottomLeft andBottomRight:(CGPoint) bottomRight andColor:(UIColor*) color;
 /*! Display rect */

diff --git a/PhotoSlider/OverlayView.m → PhotoSlider/CameraOverlayView.m b/PhotoSlider/OverlayView.m → PhotoSlider/CameraOverlayView.m
@@ -6,10 +6,10 @@
 //
 //
 
-#import "OverlayView.h"
+#import "CameraOverlayView.h"
 #import <QuartzCore/QuartzCore.h>
 
-@interface OverlayView()
+@interface CameraOverlayView()
 @property (nonatomic, strong) CAShapeLayer *topLayer;
 @property (nonatomic, strong) CAShapeLayer *bottomLayer;
 @property (nonatomic, strong) CAShapeLayer *leftLayer;
@@ -20,7 +20,7 @@ @interface OverlayView()
 @property(nonatomic,assign) BOOL clearMode;
 @end
 
-@implementation OverlayView //CAShapeLayer *blueCircleLayer
+@implementation CameraOverlayView //CAShapeLayer *blueCircleLayer
 CGPoint pts_[4];
 
 

diff --git a/PhotoSlider/CameraViewController.m b/PhotoSlider/CameraViewController.m
@@ -8,12 +8,12 @@
 
 #import "CameraViewController.h"
 #import "CameraView.h"
-#import "OverlayView.h"
+#import "CameraOverlayView.h"
 #import "CircularProgressView.h"
 
 @interface CameraViewController () <CameraViewDelegate, UIGestureRecognizerDelegate>
 @property (nonatomic, weak) IBOutlet CameraView *camView;
-@property (nonatomic, weak) IBOutlet OverlayView *overlayView;
+@property (nonatomic, weak) IBOutlet CameraOverlayView *overlayView;
 @property (nonatomic, weak) AVCaptureVideoPreviewLayer *captureVideoPreviewLayer;
 @property (nonatomic, weak) IBOutlet UILabel *label;
 @property (nonatomic, weak) IBOutlet UILabel *labelForDocArea;