<FIX> iOS 13 navigation

Author: iMhdi

Example/MBDocCapture.xcodeproj/project.pbxproj

@@ -151,7 +151,7 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = L4QNEF5BYM;
+						DevelopmentTeam = 3KP92HUCY4;
 						LastSwiftMigration = 0900;
 					};
 				};
@@ -161,6 +161,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -370,7 +371,7 @@
 			baseConfigurationReference = 69C18151CF8697B4DFD43821 /* Pods-MBDocCapture_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = L4QNEF5BYM;
+				DEVELOPMENT_TEAM = 3KP92HUCY4;
 				INFOPLIST_FILE = MBDocCapture/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -387,7 +388,7 @@
 			baseConfigurationReference = 4A501EB817244E784075C859 /* Pods-MBDocCapture_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = L4QNEF5BYM;
+				DEVELOPMENT_TEAM = AZ7KRNMEKM;
 				INFOPLIST_FILE = MBDocCapture/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name             = 'MBDocCapture'
-    spec.version          = '0.1.3'
+    spec.version          = '0.1.4'
     spec.summary          = 'MBDocCapture makes it easy to add document scanning functionalities to your iOS.'
 
     spec.description      = <<-DESC

Example/Pods/Target Support Files/MBDocCapture/Info.plist

@@ -28,7 +28,7 @@ import UIKit
 import AVFoundation
 
 /// The `EditScanViewController` offers an interface for the user to edit the detected rectangle.
-final class EditScanViewController: UIViewController {
+final class EditScanViewController: UIViewController, UIAdaptivePresentationControllerDelegate {
 
     lazy private var imageView: UIImageView = {
         let imageView = UIImageView()
@@ -51,7 +51,7 @@ final class EditScanViewController: UIViewController {
     lazy private var nextButton: UIBarButtonItem = {
         let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: bundle(), value: "Next", comment: "")
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(pushReviewController))
-        button.tintColor = navigationController?.navigationBar.tintColor
+        button.tintColor = .white
         return button
     }()
 
@@ -86,6 +86,11 @@ final class EditScanViewController: UIViewController {
         title = NSLocalizedString("mbdoccapture.scan_edit_title", tableName: nil, bundle: bundle(), value: "Trimming", comment: "")
         navigationItem.rightBarButtonItem = nextButton
 
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = false
+            navigationController?.presentationController?.delegate = self
+        }
+        
         zoomGestureController = ZoomGestureController(image: image, rectView: rectView)
 
         let touchDown = UILongPressGestureRecognizer(target: zoomGestureController, action: #selector(zoomGestureController.handle(pan:)))
@@ -135,6 +140,10 @@ final class EditScanViewController: UIViewController {
         NSLayoutConstraint.activate(rectViewConstraints + imageViewConstraints)
     }
 
+    func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
+        return false
+    }
+    
     // MARK: - Actions
 
     @objc func pushReviewController() {

MBDocCapture.podspec

@@ -94,8 +94,7 @@ public final class ImageScannerController: UINavigationController {
 
         self.imageScannerDelegate = delegate
 
-        navigationBar.tintColor = .black
-        navigationBar.isTranslucent = false
+        navigationBar.tintColor = .white
         self.view.addSubview(blackFlashView)
         setupConstraints()
 

MBDocCapture/Classes/ViewControllers/EditScanViewController.swift

@@ -27,7 +27,7 @@
 import UIKit
 
 /// The `ReviewViewController` offers an interface to review the image after it has been cropped and deskwed according to the passed in rectangle.
-final class ReviewViewController: UIViewController {
+final class ReviewViewController: UIViewController, UIAdaptivePresentationControllerDelegate {
 
     private var rotationAngle = Measurement<UnitAngle>(value: 0, unit: .degrees)
     private var enhancedImageIsAvailable = false
@@ -61,7 +61,7 @@ final class ReviewViewController: UIViewController {
     lazy private var doneButton: UIBarButtonItem = {
         let title = NSLocalizedString("mbdoccapture.next_button", tableName: nil, bundle: bundle(), value: "Next", comment: "")
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(finishScan))
-        button.tintColor = navigationController?.navigationBar.tintColor
+        button.tintColor = .white
         return button
     }()
 
@@ -87,6 +87,11 @@ final class ReviewViewController: UIViewController {
         setupToolbar()
         setupConstraints()
 
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = false
+            navigationController?.presentationController?.delegate = self
+        }
+        
         title = NSLocalizedString("mbdoccapture.scan_review_title", tableName: nil, bundle: bundle(), value: "Confirmation", comment: "")
         navigationItem.rightBarButtonItem = doneButton
     }
@@ -105,6 +110,10 @@ final class ReviewViewController: UIViewController {
         navigationController?.setToolbarHidden(true, animated: true)
     }
 
+    func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
+        return false
+    }
+    
     // MARK: Setups
 
     private func setupViews() {
@@ -149,7 +158,7 @@ final class ReviewViewController: UIViewController {
         reloadImage()
 
         if isCurrentlyDisplayingEnhancedImage {
-            enhanceButton.tintColor = UIColor(red: 64 / 255, green: 159 / 255, blue: 255 / 255, alpha: 1.0)
+            enhanceButton.tintColor = UIColor(red: 64 / 255.0, green: 159 / 255.0, blue: 255 / 255.0, alpha: 1.0)
         } else {
             enhanceButton.tintColor = .white
         }

MBDocCapture/Classes/ViewControllers/ImageScannerController.swift

@@ -28,7 +28,7 @@ import UIKit
 import AVFoundation
 
 /// The `ScannerViewController` offers an interface to give feedback to the user regarding rectangles that are detected. It also gives the user the opportunity to capture an image with a detected rectangle.
-final class ScannerViewController: UIViewController {
+final class ScannerViewController: UIViewController, UIAdaptivePresentationControllerDelegate {
 
     private var prepOverlayView: UIView!
 
@@ -40,13 +40,7 @@ final class ScannerViewController: UIViewController {
 
     /// The view that draws the detected rectangles.
     private let rectView = RectangleView()
-    
-    /// The visual effect (blur) view used on the navigation bar
-    private let visualEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
-    
-    /// The original bar style that was set by the host app
-    private var originalBarStyle: UIBarStyle?
-    
+            
     lazy private var shutterButton: ShutterButton = {
         let button = ShutterButton()
         button.translatesAutoresizingMaskIntoConstraints = false
@@ -93,9 +87,7 @@ final class ScannerViewController: UIViewController {
 
         captureSessionManager = CaptureSessionManager(videoPreviewLayer: videoPreviewLayer)
         captureSessionManager?.delegate = self
-        
-        originalBarStyle = navigationController?.navigationBar.barStyle
-        
+                
         NotificationCenter.default.addObserver(self, selector: #selector(subjectAreaDidChange), name: NSNotification.Name.AVCaptureDeviceSubjectAreaDidChange, object: nil)
         //        NotificationCenter.default.addObserver(self, selector: #selector(updateCameraOrientation), name: UIDevice.orientationDidChangeNotification, object: nil)
     }
@@ -108,14 +100,7 @@ final class ScannerViewController: UIViewController {
         rectView.removeRectangle()
         captureSessionManager?.start()
         UIApplication.shared.isIdleTimerDisabled = true
-        
-        navigationController?.navigationBar.isTranslucent = true
-        navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
-        navigationController?.navigationBar.addSubview(visualEffectView)
-        navigationController?.navigationBar.sendSubviewToBack(visualEffectView)
-        
-        navigationController?.navigationBar.barStyle = .blackTranslucent
-        
+                
         navigationController?.setToolbarHidden(true, animated: false)
 
         if CaptureSession.current.isScanningTwoFacedDocument {
@@ -134,20 +119,11 @@ final class ScannerViewController: UIViewController {
         super.viewDidLayoutSubviews()
 
         videoPreviewLayer.frame = view.layer.bounds
-        
-        let statusBarHeight = UIApplication.shared.statusBarFrame.size.height
-        let visualEffectRect = self.navigationController?.navigationBar.bounds.insetBy(dx: 0, dy: -(statusBarHeight)).offsetBy(dx: 0, dy: -statusBarHeight)
-        
-        visualEffectView.frame = visualEffectRect ?? CGRect.zero
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         UIApplication.shared.isIdleTimerDisabled = false
-        
-        visualEffectView.removeFromSuperview()
-        navigationController?.navigationBar.isTranslucent = false
-        navigationController?.navigationBar.barStyle = originalBarStyle ?? .default
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
@@ -183,6 +159,11 @@ final class ScannerViewController: UIViewController {
 
     private func setupNavigationBar() {
         navigationItem.setLeftBarButton(cancelButton, animated: false)
+        
+        if #available(iOS 13.0, *) {
+            isModalInPresentation = false
+            navigationController?.presentationController?.delegate = self
+        }
     }
 
     private func setupConstraints() {
@@ -219,6 +200,10 @@ final class ScannerViewController: UIViewController {
         NSLayoutConstraint.activate(rectViewConstraints + shutterButtonConstraints + activityIndicatorConstraints)
     }
 
+    func presentationControllerShouldDismiss(_ presentationController: UIPresentationController) -> Bool {
+        return false
+    }
+    
     // MARK: - Tap to Focus
 
     /// Called when the AVCaptureDevice detects that the subject area has changed significantly. When it's called, we reset the focus so the camera is no longer out of focus.