From a9393ede8616c5ff5ff42090dc141fa728df5ced Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sat, 12 Oct 2019 14:55:24 +0200
Subject: [PATCH 01/20] Updated default team

---
 ALCameraViewController.xcodeproj/project.pbxproj          | 7 ++++---
 .../xcshareddata/IDEWorkspaceChecks.plist                 | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 ALCameraViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 720f06f0..9fe78544 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -283,7 +283,7 @@
 					};
 					FAF0583E1B31618D008E5592 = {
 						CreatedOnToolsVersion = 6.3.2;
-						DevelopmentTeam = 2466624KEK;
+						DevelopmentTeam = 9E43V6CC9L;
 						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
@@ -294,6 +294,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -548,7 +549,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 2466624KEK;
+				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -564,7 +565,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = 2466624KEK;
+				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
diff --git a/ALCameraViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ALCameraViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/ALCameraViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

From 05d896f35aa0518ea558b8c5acd162a30401ab9a Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sat, 12 Oct 2019 14:57:25 +0200
Subject: [PATCH 02/20] Upgraded to Swift 5

---
 .../project.pbxproj                           |  6 ++--
 .../Utilities/Utilities.swift                 |  2 +-
 .../Utilities/VolumeControl.swift             |  2 +-
 .../ViewController/CameraViewController.swift |  8 ++---
 .../CameraViewControllerConstraint.swift      | 32 +++++++++----------
 .../ConfirmViewController.swift               |  4 +--
 .../PhotoLibraryViewController.swift          |  4 +--
 ALCameraViewController/Views/CameraView.swift |  4 +--
 .../Views/PermissionsView.swift               | 12 +++----
 Example/AppDelegate.swift                     |  2 +-
 10 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 9fe78544..19c21023 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -284,7 +284,7 @@
 					FAF0583E1B31618D008E5592 = {
 						CreatedOnToolsVersion = 6.3.2;
 						DevelopmentTeam = 9E43V6CC9L;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1110;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -556,7 +556,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -572,7 +572,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/ALCameraViewController/Utilities/Utilities.swift b/ALCameraViewController/Utilities/Utilities.swift
index 804ad970..707cc5c7 100644
--- a/ALCameraViewController/Utilities/Utilities.swift
+++ b/ALCameraViewController/Utilities/Utilities.swift
@@ -68,7 +68,7 @@ internal func errorWithKey(_ key: String, domain: String) -> NSError {
     return error
 }
 
-internal func normalizedRect(_ rect: CGRect, orientation: UIImageOrientation) -> CGRect {
+internal func normalizedRect(_ rect: CGRect, orientation: UIImage.Orientation) -> CGRect {
     let normalizedX = rect.origin.x
     let normalizedY = rect.origin.y
     
diff --git a/ALCameraViewController/Utilities/VolumeControl.swift b/ALCameraViewController/Utilities/VolumeControl.swift
index 36172f8a..f66e2bc6 100644
--- a/ALCameraViewController/Utilities/VolumeControl.swift
+++ b/ALCameraViewController/Utilities/VolumeControl.swift
@@ -27,7 +27,7 @@ public class VolumeControl {
     init(view: UIView, onVolumeChange: VolumeChangeAction?) {
         self.onVolumeChange = onVolumeChange
         view.addSubview(volumeView)
-        view.sendSubview(toBack: volumeView)
+        view.sendSubviewToBack(volumeView)
         
         try? AVAudioSession.sharedInstance().setActive(true)
         NotificationCenter.default.addObserver(self, selector: #selector(volumeChanged), name: NSNotification.Name(rawValue: changeKey), object: nil)
diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index d9e07099..03a5b157 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -56,7 +56,7 @@ open class CameraViewController: UIViewController {
     
     var animationDuration: TimeInterval = 0.5
     var animationSpring: CGFloat = 0.5
-    var rotateAnimation: UIViewAnimationOptions = .curveLinear
+    var rotateAnimation: UIView.AnimationOptions = .curveLinear
     
     var cameraButtonEdgeConstraint: NSLayoutConstraint?
     var cameraButtonGravityConstraint: NSLayoutConstraint?
@@ -349,7 +349,7 @@ open class CameraViewController: UIViewController {
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(rotateCameraView),
-            name: NSNotification.Name.UIDeviceOrientationDidChange,
+            name: UIDevice.orientationDidChangeNotification,
             object: nil)
     }
     
@@ -631,12 +631,12 @@ open class CameraViewController: UIViewController {
 
     private func showSpinner() -> UIActivityIndicatorView {
         let spinner = UIActivityIndicatorView()
-        spinner.activityIndicatorViewStyle = .white
+        spinner.style = .white
         spinner.center = view.center
         spinner.startAnimating()
         
         view.addSubview(spinner)
-        view.bringSubview(toFront: spinner)
+        view.bringSubviewToFront(spinner)
         
         return spinner
     }
diff --git a/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift b/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
index 37e518c9..7998f038 100644
--- a/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
+++ b/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
@@ -44,7 +44,7 @@ extension CameraViewController {
     func configCameraButtonEdgeConstraint(_ statusBarOrientation: UIInterfaceOrientation) {
         view.autoRemoveConstraint(cameraButtonEdgeConstraint)
         
-        let attribute : NSLayoutAttribute = {
+        let attribute : NSLayoutConstraint.Attribute = {
             switch statusBarOrientation {
             case .portrait: return .bottomMargin
             case .landscapeRight: return .rightMargin
@@ -72,7 +72,7 @@ extension CameraViewController {
      */
     func configCameraButtonGravityConstraint(_ portrait: Bool) {
         view.autoRemoveConstraint(cameraButtonGravityConstraint)
-        let attribute : NSLayoutAttribute = portrait ? .centerX : .centerY
+        let attribute : NSLayoutConstraint.Attribute = portrait ? .centerX : .centerY
         cameraButtonGravityConstraint = NSLayoutConstraint(
             item: cameraButton,
             attribute: attribute,
@@ -100,8 +100,8 @@ extension CameraViewController {
      */
     func configContainerEdgeConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
         
-        let attributeOne : NSLayoutAttribute
-        let attributeTwo : NSLayoutAttribute
+        let attributeOne : NSLayoutConstraint.Attribute
+        let attributeTwo : NSLayoutConstraint.Attribute
         
         switch statusBarOrientation {
         case .portrait:
@@ -149,7 +149,7 @@ extension CameraViewController {
      * orientation of the device.
      */
     func configContainerGravityConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
-        let attributeCenter : NSLayoutAttribute = statusBarOrientation.isPortrait ? .centerY : .centerX
+        let attributeCenter : NSLayoutConstraint.Attribute = statusBarOrientation.isPortrait ? .centerY : .centerX
         containerButtonsGravityConstraint = NSLayoutConstraint(
             item: containerSwapLibraryButton,
             attribute: attributeCenter,
@@ -179,8 +179,8 @@ extension CameraViewController {
      */
     func configSwapButtonEdgeConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
         
-        let attributeOne : NSLayoutAttribute
-        let attributeTwo : NSLayoutAttribute
+        let attributeOne : NSLayoutConstraint.Attribute
+        let attributeTwo : NSLayoutConstraint.Attribute
 
         switch statusBarOrientation {
         case .portrait:
@@ -249,7 +249,7 @@ extension CameraViewController {
      */
     func configCloseButtonEdgeConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
         
-        let attribute : NSLayoutAttribute = {
+        let attribute : NSLayoutConstraint.Attribute = {
             switch statusBarOrientation {
             case .portrait: return .left
             case .landscapeRight, .landscapeLeft: return .centerX
@@ -278,7 +278,7 @@ extension CameraViewController {
      */
     func configCloseButtonGravityConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
         
-        let attribute : NSLayoutAttribute
+        let attribute : NSLayoutConstraint.Attribute
         let constant : CGFloat
         
         switch statusBarOrientation {
@@ -331,8 +331,8 @@ extension CameraViewController {
      */
     func configLibraryEdgeButtonConstraint(_ statusBarOrientation : UIInterfaceOrientation) {
 
-        let attributeOne : NSLayoutAttribute
-        let attributeTwo : NSLayoutAttribute
+        let attributeOne : NSLayoutConstraint.Attribute
+        let attributeTwo : NSLayoutConstraint.Attribute
         
         switch statusBarOrientation {
         case .portrait:
@@ -401,7 +401,7 @@ extension CameraViewController {
         view.autoRemoveConstraint(flashButtonEdgeConstraint)
         
         let constraintRight = statusBarOrientation == .portrait || statusBarOrientation == .landscapeRight
-        let attribute : NSLayoutAttribute = constraintRight ? .topMargin : .bottomMargin
+        let attribute : NSLayoutConstraint.Attribute = constraintRight ? .topMargin : .bottomMargin
         
         flashButtonEdgeConstraint = NSLayoutConstraint(
             item: flashButton,
@@ -425,7 +425,7 @@ extension CameraViewController {
         view.autoRemoveConstraint(flashButtonGravityConstraint)
         
         let constraintRight = statusBarOrientation == .portrait || statusBarOrientation == .landscapeLeft
-        let attribute : NSLayoutAttribute = constraintRight ? .right : .left
+        let attribute : NSLayoutConstraint.Attribute = constraintRight ? .right : .left
         
         flashButtonGravityConstraint = NSLayoutConstraint(
             item: flashButton,
@@ -466,7 +466,7 @@ extension CameraViewController {
      */
     func configCameraOverlayCenterConstraint(_ portrait: Bool) {
         view.autoRemoveConstraint(cameraOverlayCenterConstraint)
-        let attribute : NSLayoutAttribute = portrait ? .centerY : .centerX
+        let attribute : NSLayoutConstraint.Attribute = portrait ? .centerY : .centerX
         cameraOverlayCenterConstraint = NSLayoutConstraint(
             item: cameraOverlay,
             attribute: attribute,
@@ -494,7 +494,7 @@ extension CameraViewController {
      the view will be pinned.
      */
     func configCameraOverlayEdgeOneContraint(_ portrait: Bool, padding: CGFloat) {
-        let attribute : NSLayoutAttribute = portrait ? .left : .bottom
+        let attribute : NSLayoutConstraint.Attribute = portrait ? .left : .bottom
         cameraOverlayEdgeOneConstraint = NSLayoutConstraint(
             item: cameraOverlay,
             attribute: attribute,
@@ -513,7 +513,7 @@ extension CameraViewController {
      the view will be pinned.
      */
     func configCameraOverlayEdgeTwoConstraint(_ portrait: Bool, padding: CGFloat) {
-        let attributeTwo : NSLayoutAttribute = portrait ? .right : .top
+        let attributeTwo : NSLayoutConstraint.Attribute = portrait ? .right : .top
         cameraOverlayEdgeTwoConstraint = NSLayoutConstraint(
             item: cameraOverlay,
             attribute: attributeTwo,
diff --git a/ALCameraViewController/ViewController/ConfirmViewController.swift b/ALCameraViewController/ViewController/ConfirmViewController.swift
index 5c7fb257..55d091cc 100644
--- a/ALCameraViewController/ViewController/ConfirmViewController.swift
+++ b/ALCameraViewController/ViewController/ConfirmViewController.swift
@@ -273,12 +273,12 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 	
 	func showSpinner() -> UIActivityIndicatorView {
 		let spinner = UIActivityIndicatorView()
-		spinner.activityIndicatorViewStyle = .white
+		spinner.style = .white
 		spinner.center = view.center
 		spinner.startAnimating()
 		
 		view.addSubview(spinner)
-		view.bringSubview(toFront: spinner)
+		view.bringSubviewToFront(spinner)
 		
 		return spinner
 	}
diff --git a/ALCameraViewController/ViewController/PhotoLibraryViewController.swift b/ALCameraViewController/ViewController/PhotoLibraryViewController.swift
index 8bdc9cd6..28c06f50 100644
--- a/ALCameraViewController/ViewController/PhotoLibraryViewController.swift
+++ b/ALCameraViewController/ViewController/PhotoLibraryViewController.swift
@@ -40,10 +40,10 @@ public class PhotoLibraryViewController: UIViewController {
         
         setNeedsStatusBarAppearanceUpdate()
         
-        let buttonImage = UIImage(named: "libraryCancel", in: CameraGlobals.shared.bundle, compatibleWith: nil)?.withRenderingMode(UIImageRenderingMode.alwaysOriginal)
+        let buttonImage = UIImage(named: "libraryCancel", in: CameraGlobals.shared.bundle, compatibleWith: nil)?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal)
         
         navigationItem.leftBarButtonItem = UIBarButtonItem(image: buttonImage,
-                                                           style: UIBarButtonItemStyle.plain,
+                                                           style: UIBarButtonItem.Style.plain,
                                                            target: self,
                                                            action: #selector(dismissLibrary))
         
diff --git a/ALCameraViewController/Views/CameraView.swift b/ALCameraViewController/Views/CameraView.swift
index b008924b..771d378c 100644
--- a/ALCameraViewController/Views/CameraView.swift
+++ b/ALCameraViewController/Views/CameraView.swift
@@ -119,9 +119,9 @@ public class CameraView: UIView {
         focusView.alpha = 0
         focusView.transform = CGAffineTransform(scaleX: 1.2, y: 1.2)
         
-        bringSubview(toFront: focusView)
+        bringSubviewToFront(focusView)
         
-        UIView.animateKeyframes(withDuration: 1.5, delay: 0, options: UIViewKeyframeAnimationOptions(), animations: {
+        UIView.animateKeyframes(withDuration: 1.5, delay: 0, options: UIView.KeyframeAnimationOptions(), animations: {
             
             UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.15, animations: { [weak self] in
                 self?.focusView.alpha = 1
diff --git a/ALCameraViewController/Views/PermissionsView.swift b/ALCameraViewController/Views/PermissionsView.swift
index d814558b..4e30dab3 100644
--- a/ALCameraViewController/Views/PermissionsView.swift
+++ b/ALCameraViewController/Views/PermissionsView.swift
@@ -39,7 +39,7 @@ internal class PermissionsView: UIView {
         descriptionLabel.text = description
         
         closeButton.action = completion
-        closeButton.setImage(UIImage(named: "retakeButton", in: CameraGlobals.shared.bundle, compatibleWith: nil), for: UIControlState())
+        closeButton.setImage(UIImage(named: "retakeButton", in: CameraGlobals.shared.bundle, compatibleWith: nil), for: UIControl.State())
         closeButton.sizeToFit()
         
         let size = view.frame.size
@@ -69,13 +69,13 @@ internal class PermissionsView: UIView {
         let icon = UIImage(named: "permissionsIcon", in: CameraGlobals.shared.bundle, compatibleWith: nil)!
         iconView.image = icon
         
-        settingsButton.contentEdgeInsets = UIEdgeInsetsMake(6, 12, 6, 12)
-        settingsButton.setTitle(localizedString("permissions.settings"), for: UIControlState())
-        settingsButton.setTitleColor(UIColor.white, for: UIControlState())
+        settingsButton.contentEdgeInsets = UIEdgeInsets.init(top: 6, left: 12, bottom: 6, right: 12)
+        settingsButton.setTitle(localizedString("permissions.settings"), for: UIControl.State())
+        settingsButton.setTitleColor(UIColor.white, for: UIControl.State())
         settingsButton.layer.cornerRadius = 4
         settingsButton.titleLabel?.font = UIFont(name: "AppleSDGothicNeo-Regular", size: 14)
         settingsButton.backgroundColor = UIColor(red: 52.0/255.0, green: 183.0/255.0, blue: 250.0/255.0, alpha: 1)
-        settingsButton.addTarget(self, action: #selector(PermissionsView.openSettings), for: UIControlEvents.touchUpInside)
+        settingsButton.addTarget(self, action: #selector(PermissionsView.openSettings), for: UIControl.Event.touchUpInside)
         
         addSubview(iconView)
         addSubview(titleLabel)
@@ -84,7 +84,7 @@ internal class PermissionsView: UIView {
     }
     
     @objc func openSettings() {
-        if let appSettings = URL(string: UIApplicationOpenSettingsURLString) {
+        if let appSettings = URL(string: UIApplication.openSettingsURLString) {
             UIApplication.shared.openURL(appSettings)
         }
     }
diff --git a/Example/AppDelegate.swift b/Example/AppDelegate.swift
index c8de81bf..85e656c0 100644
--- a/Example/AppDelegate.swift
+++ b/Example/AppDelegate.swift
@@ -13,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         let viewController = ViewController(nibName: "ViewController", bundle: Bundle.main)
         
         window = UIWindow(frame: UIScreen.main.bounds)

From f7e65bfbb27ded37eeafccb5bfab89a8b780332d Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sat, 12 Oct 2019 15:03:37 +0200
Subject: [PATCH 03/20] Changed default settings for testing project

---
 Example/ViewController.swift | 28 ++++++------------
 Example/ViewController.xib   | 55 +++++++++++++-----------------------
 2 files changed, 28 insertions(+), 55 deletions(-)

diff --git a/Example/ViewController.swift b/Example/ViewController.swift
index e4c6aa1b..4c666c4e 100644
--- a/Example/ViewController.swift
+++ b/Example/ViewController.swift
@@ -10,28 +10,29 @@ import UIKit
 
 class ViewController: UIViewController {
 
-    var libraryEnabled: Bool = true
-    var croppingEnabled: Bool = false
-    var allowResizing: Bool = true
-    var allowMoving: Bool = false
     var minimumSize: CGSize = CGSize(width: 60, height: 60)
 
     var croppingParameters: CroppingParameters {
-        return CroppingParameters(isEnabled: croppingEnabled, allowResizing: allowResizing, allowMoving: allowMoving, minimumSize: minimumSize)
+        return CroppingParameters(isEnabled: croppingSwitch.isOn, allowResizing: resizableSwitch.isOn, allowMoving: movableSwitch.isOn, minimumSize: minimumSize)
     }
     
     @IBOutlet weak var imageView: UIImageView!
     @IBOutlet weak var croppingParametersView: UIView!
     @IBOutlet weak var minimumSizeLabel: UILabel!
-
+    @IBOutlet weak var librarySwitch: UISwitch!
+    @IBOutlet weak var croppingSwitch: UISwitch!
+    @IBOutlet weak var resizableSwitch: UISwitch!
+    @IBOutlet weak var movableSwitch: UISwitch!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
 		
 		self.imageView.contentMode = .scaleAspectFit
+        croppingParametersView.isHidden = !croppingSwitch.isOn
     }
     
     @IBAction func openCamera(_ sender: Any) {
-        let cameraViewController = CameraViewController(croppingParameters: croppingParameters, allowsLibraryAccess: libraryEnabled) { [weak self] image, asset in
+        let cameraViewController = CameraViewController(croppingParameters: croppingParameters, allowsLibraryAccess: librarySwitch.isOn) { [weak self] image, asset in
             self?.imageView.image = image
             self?.dismiss(animated: true, completion: nil)
         }
@@ -48,23 +49,10 @@ class ViewController: UIViewController {
         present(libraryViewController, animated: true, completion: nil)
     }
     
-    @IBAction func libraryChanged(_ sender: Any) {
-        libraryEnabled = !libraryEnabled
-    }
-    
     @IBAction func croppingChanged(_ sender: UISwitch) {
-        croppingEnabled = sender.isOn
         croppingParametersView.isHidden = !sender.isOn
     }
 
-    @IBAction func resizingChanged(_ sender: UISwitch) {
-        allowResizing = sender.isOn
-    }
-
-    @IBAction func movingChanged(_ sender: UISwitch) {
-        allowMoving = sender.isOn
-    }
-
     @IBAction func minimumSizeChanged(_ sender: UISlider) {
         let newValue = sender.value
         minimumSize = CGSize(width: CGFloat(newValue), height: CGFloat(newValue))
diff --git a/Example/ViewController.xib b/Example/ViewController.xib
index 969010cb..1048f940 100644
--- a/Example/ViewController.xib
+++ b/Example/ViewController.xib
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_0" 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="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
-    <customFonts key="customFonts">
-        <array key="AppleSDGothicNeo.ttc">
-            <string>AppleSDGothicNeo-Regular</string>
-        </array>
-    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController" customModule="ALCameraViewController" customModuleProvider="target">
             <connections>
                 <outlet property="croppingParametersView" destination="aZk-39-lei" id="iih-He-zYC"/>
+                <outlet property="croppingSwitch" destination="kvv-7d-Re7" id="Oea-n7-b2h"/>
                 <outlet property="imageView" destination="I4G-in-XtY" id="U1I-c7-fHk"/>
+                <outlet property="librarySwitch" destination="JPj-mG-Hu1" id="XhS-vQ-zgb"/>
                 <outlet property="minimumSizeLabel" destination="DXi-q2-e5s" id="NxY-Mc-zZv"/>
+                <outlet property="movableSwitch" destination="DSI-Wk-w93" id="Mwf-6o-bj5"/>
+                <outlet property="resizableSwitch" destination="k5h-ry-m8S" id="5Qs-hD-SsK"/>
                 <outlet property="view" destination="iN0-l3-epB" id="NQI-AD-Uhb"/>
             </connections>
         </placeholder>
@@ -32,10 +29,10 @@
                     <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QHP-Db-zQM">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="118"/>
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="98"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cgD-PF-WNE">
-                            <rect key="frame" x="70" y="48" width="41" height="29"/>
+                            <rect key="frame" x="70" y="28" width="41" height="29"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <state key="normal" title="Library">
                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -45,13 +42,13 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cropping" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3e8-yb-h3L">
-                            <rect key="frame" x="258" y="85" width="53.5" height="17"/>
+                            <rect key="frame" x="258" y="65" width="53.5" height="17"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YHP-W6-S2W">
-                            <rect key="frame" x="15" y="48" width="45" height="29"/>
+                            <rect key="frame" x="15" y="28" width="45" height="29"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <state key="normal" title="Camera">
                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -60,20 +57,17 @@
                                 <action selector="openCamera:" destination="-1" eventType="touchUpInside" id="vnV-la-3gw"/>
                             </connections>
                         </button>
-                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="kvv-7d-Re7">
-                            <rect key="frame" x="260.5" y="48" width="51" height="31"/>
+                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kvv-7d-Re7">
+                            <rect key="frame" x="260.5" y="28" width="51" height="31"/>
                             <connections>
                                 <action selector="croppingChanged:" destination="-1" eventType="valueChanged" id="fjU-Hs-bwf"/>
                             </connections>
                         </switch>
                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JPj-mG-Hu1">
-                            <rect key="frame" x="176" y="48" width="51" height="31"/>
-                            <connections>
-                                <action selector="libraryChanged:" destination="-1" eventType="valueChanged" id="Bt6-HK-b05"/>
-                            </connections>
+                            <rect key="frame" x="176" y="28" width="51" height="31"/>
                         </switch>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Library Access" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VFc-CF-Vtc">
-                            <rect key="frame" x="158" y="85" width="84.5" height="17"/>
+                            <rect key="frame" x="158" y="65" width="84.5" height="17"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -99,11 +93,7 @@
                     <rect key="frame" x="0.0" y="470" width="320" height="98"/>
                     <subviews>
                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="k5h-ry-m8S">
-                            <rect key="frame" x="15" y="28" width="51" height="31"/>
-                            <connections>
-                                <action selector="libraryChanged:" destination="-1" eventType="valueChanged" id="LKB-0U-NRn"/>
-                                <action selector="resizingChanged:" destination="-1" eventType="valueChanged" id="veN-be-OGb"/>
-                            </connections>
+                            <rect key="frame" x="15.5" y="28" width="51" height="31"/>
                         </switch>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="isResizable" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="In7-Or-H5s">
                             <rect key="frame" x="8" y="65" width="64" height="17"/>
@@ -121,21 +111,16 @@
                             </connections>
                         </slider>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Minimum size: 60" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DXi-q2-e5s">
-                            <rect key="frame" x="185" y="64" width="105.5" height="17"/>
+                            <rect key="frame" x="184.5" y="64" width="105.5" height="17"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="DSI-Wk-w93">
-                            <rect key="frame" x="96" y="28" width="51" height="31"/>
-                            <connections>
-                                <action selector="libraryChanged:" destination="-1" eventType="valueChanged" id="wgu-jE-pwk"/>
-                                <action selector="movingChanged:" destination="-1" eventType="valueChanged" id="VNQ-EU-Pcc"/>
-                                <action selector="resizingChanged:" destination="-1" eventType="valueChanged" id="dWI-k0-WsG"/>
-                            </connections>
+                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DSI-Wk-w93">
+                            <rect key="frame" x="96.5" y="28" width="51" height="31"/>
                         </switch>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="isMovable" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YNR-ru-Naw">
-                            <rect key="frame" x="91" y="65" width="59" height="17"/>
+                            <rect key="frame" x="91.5" y="65" width="59" height="17"/>
                             <fontDescription key="fontDescription" name="AppleSDGothicNeo-Regular" family="Apple SD Gothic Neo" pointSize="14"/>
                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>

From 76a72f904b098d05fc5dfdfc087b19e6cf58f262 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sat, 12 Oct 2019 15:26:56 +0200
Subject: [PATCH 04/20] Removed cropping overlay when taking picture

---
 .../ViewController/CameraViewController.swift | 25 +-----
 .../CameraViewControllerConstraint.swift      | 89 +------------------
 .../Views/CropOverlay.swift                   |  1 +
 3 files changed, 4 insertions(+), 111 deletions(-)

diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index 03a5b157..44f17295 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -78,23 +78,12 @@ open class CameraViewController: UIViewController {
     
     var flashButtonEdgeConstraint: NSLayoutConstraint?
     var flashButtonGravityConstraint: NSLayoutConstraint?
-    
-    var cameraOverlayEdgeOneConstraint: NSLayoutConstraint?
-    var cameraOverlayEdgeTwoConstraint: NSLayoutConstraint?
-    var cameraOverlayWidthConstraint: NSLayoutConstraint?
-    var cameraOverlayCenterConstraint: NSLayoutConstraint?
-    
+
     let cameraView : CameraView = {
         let cameraView = CameraView()
         cameraView.translatesAutoresizingMaskIntoConstraints = false
         return cameraView
     }()
-
-    let cameraOverlay : CropOverlay = {
-        let cameraOverlay = CropOverlay()
-        cameraOverlay.translatesAutoresizingMaskIntoConstraints = false
-        return cameraOverlay
-    }()
     
     let cameraButton : UIButton = {
         let button = UIButton(frame: CGRect(x: 0, y: 0, width: 64, height: 64))
@@ -170,8 +159,6 @@ open class CameraViewController: UIViewController {
         self.allowVolumeButtonCapture = allowVolumeButtonCapture
         super.init(nibName: nil, bundle: nil)
         onCompletion = completion
-        cameraOverlay.isHidden = !croppingParameters.isEnabled
-        cameraOverlay.isUserInteractionEnabled = false
         libraryButton.isEnabled = allowsLibraryAccess
         libraryButton.isHidden = !allowsLibraryAccess
 		swapButton.isEnabled = allowsSwapCameraOrientation
@@ -199,7 +186,6 @@ open class CameraViewController: UIViewController {
         super.loadView()
         view.backgroundColor = UIColor.black
         [cameraView,
-            cameraOverlay,
             cameraButton,
             closeButton,
             flashButton,
@@ -247,14 +233,7 @@ open class CameraViewController: UIViewController {
         
         configFlashEdgeButtonConstraint(statusBarOrientation)
         configFlashGravityButtonConstraint(statusBarOrientation)
-        
-        let padding : CGFloat = portrait ? 16.0 : -16.0
-        removeCameraOverlayEdgesConstraints()
-        configCameraOverlayEdgeOneContraint(portrait, padding: padding)
-        configCameraOverlayEdgeTwoConstraint(portrait, padding: padding)
-        configCameraOverlayWidthConstraint(portrait)
-        configCameraOverlayCenterConstraint(portrait)
-        
+                
         rotate(actualInterfaceOrientation: statusBarOrientation)
         
         super.updateViewConstraints()
diff --git a/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift b/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
index 7998f038..b0523b1a 100644
--- a/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
+++ b/ALCameraViewController/ViewController/CameraViewControllerConstraint.swift
@@ -437,92 +437,5 @@ extension CameraViewController {
             constant: constraintRight ? -8 : 8)
         view.addConstraint(flashButtonGravityConstraint!)
     }
-    
-    /**
-     * Used to create a perfect square for CameraOverlay.
-     * This method will determinate the size of CameraOverlay,
-     * if portrait, it will use the width of superview to
-     * determinate the height of the view. Else if landscape,
-     * it uses the height of the superview to create the width
-     * of the CameraOverlay.
-     */
-    func configCameraOverlayWidthConstraint(_ portrait: Bool) {
-        view.autoRemoveConstraint(cameraOverlayWidthConstraint)
-        cameraOverlayWidthConstraint = NSLayoutConstraint(
-            item: cameraOverlay,
-            attribute: portrait ? .height : .width,
-            relatedBy: .equal,
-            toItem: cameraOverlay,
-            attribute: portrait ? .width : .height,
-            multiplier: 1.0,
-            constant: 0)
-        view.addConstraint(cameraOverlayWidthConstraint!)
-    }
-    
-    /**
-     * This method will center the relative position of
-     * CameraOverlay, based on the biggest size of the
-     * superview.
-     */
-    func configCameraOverlayCenterConstraint(_ portrait: Bool) {
-        view.autoRemoveConstraint(cameraOverlayCenterConstraint)
-        let attribute : NSLayoutConstraint.Attribute = portrait ? .centerY : .centerX
-        cameraOverlayCenterConstraint = NSLayoutConstraint(
-            item: cameraOverlay,
-            attribute: attribute,
-            relatedBy: .equal,
-            toItem: view,
-            attribute: attribute,
-            multiplier: 1.0,
-            constant: 0)
-        view.addConstraint(cameraOverlayCenterConstraint!)
-    }
-    
-    /**
-     * Remove the CameraOverlay constraints to be updated when
-     * the device was rotated.
-     */
-    func removeCameraOverlayEdgesConstraints() {
-        view.autoRemoveConstraint(cameraOverlayEdgeOneConstraint)
-        view.autoRemoveConstraint(cameraOverlayEdgeTwoConstraint)
-    }
-    
-    /**
-     * It needs to get a determined smallest size of the screen
-     to create the smallest size to be used on CameraOverlay.
-     It uses the orientation of the screen to determinate where
-     the view will be pinned.
-     */
-    func configCameraOverlayEdgeOneContraint(_ portrait: Bool, padding: CGFloat) {
-        let attribute : NSLayoutConstraint.Attribute = portrait ? .left : .bottom
-        cameraOverlayEdgeOneConstraint = NSLayoutConstraint(
-            item: cameraOverlay,
-            attribute: attribute,
-            relatedBy: .equal,
-            toItem: view,
-            attribute: attribute,
-            multiplier: 1.0,
-            constant: padding)
-        view.addConstraint(cameraOverlayEdgeOneConstraint!)
-    }
-    
-    /**
-     * It needs to get a determined smallest size of the screen
-     to create the smallest size to be used on CameraOverlay.
-     It uses the orientation of the screen to determinate where
-     the view will be pinned.
-     */
-    func configCameraOverlayEdgeTwoConstraint(_ portrait: Bool, padding: CGFloat) {
-        let attributeTwo : NSLayoutConstraint.Attribute = portrait ? .right : .top
-        cameraOverlayEdgeTwoConstraint = NSLayoutConstraint(
-            item: cameraOverlay,
-            attribute: attributeTwo,
-            relatedBy: .equal,
-            toItem: view,
-            attribute: attributeTwo,
-            multiplier: 1.0,
-            constant: -padding)
-        view.addConstraint(cameraOverlayEdgeTwoConstraint!)
-    }
-    
+
 }
diff --git a/ALCameraViewController/Views/CropOverlay.swift b/ALCameraViewController/Views/CropOverlay.swift
index 862ece42..35da8f33 100644
--- a/ALCameraViewController/Views/CropOverlay.swift
+++ b/ALCameraViewController/Views/CropOverlay.swift
@@ -186,6 +186,7 @@ internal class CropOverlay: UIView {
 
                 let minimumFrame = CGRect(x: newFrame.origin.x, y: newFrame.origin.y, width: max(newFrame.size.width, minimumSize.width + 2 * outterGap), height: max(newFrame.size.height, minimumSize.height + 2 * outterGap))
 				frame = minimumFrame
+                print(frame)
 				layoutSubviews()
 
 				gestureRecognizer.setTranslation(CGPoint.zero, in: self)

From 8d549a9313c537c1068629e8ea39165c04fc668f Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sat, 12 Oct 2019 15:33:58 +0200
Subject: [PATCH 05/20] Removed unused focus view

---
 .../ViewController/CameraViewController.swift |  3 +-
 ALCameraViewController/Views/CameraView.swift | 58 +------------------
 2 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index 44f17295..cdf394fb 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -233,7 +233,7 @@ open class CameraViewController: UIViewController {
         
         configFlashEdgeButtonConstraint(statusBarOrientation)
         configFlashGravityButtonConstraint(statusBarOrientation)
-                
+
         rotate(actualInterfaceOrientation: statusBarOrientation)
         
         super.updateViewConstraints()
@@ -252,7 +252,6 @@ open class CameraViewController: UIViewController {
         super.viewDidLoad()
         setupActions()
         checkPermissions()
-        cameraView.configureFocus()
         cameraView.configureZoom()
     }
 
diff --git a/ALCameraViewController/Views/CameraView.swift b/ALCameraViewController/Views/CameraView.swift
index 771d378c..4b0b203e 100644
--- a/ALCameraViewController/Views/CameraView.swift
+++ b/ALCameraViewController/Views/CameraView.swift
@@ -18,9 +18,7 @@ public class CameraView: UIView {
     var preview: AVCaptureVideoPreviewLayer!
     
     let cameraQueue = DispatchQueue(label: "com.zero.ALCameraViewController.Queue")
-    
-    let focusView = CropOverlay(frame: CGRect(x: 0, y: 0, width: 80, height: 80))
-    
+
     public var currentPosition = CameraGlobals.shared.defaultCameraPosition
     
     public func startSession() {
@@ -81,65 +79,11 @@ public class CameraView: UIView {
         super.layoutSubviews()
         preview?.frame = bounds
     }
-    
-    public func configureFocus() {
-        
-        if let gestureRecognizers = gestureRecognizers {
-            gestureRecognizers.forEach({ removeGestureRecognizer($0) })
-        }
-        
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(focus(gesture:)))
-        addGestureRecognizer(tapGesture)
-        isUserInteractionEnabled = true
-        addSubview(focusView)
-        
-        focusView.isHidden = true
-        
-        let lines = focusView.horizontalLines + focusView.verticalLines + focusView.outerLines
-        
-        lines.forEach { line in
-            line.alpha = 0
-        }
-    }
 
     public func configureZoom() {
         let pinchGesture = UIPinchGestureRecognizer(target: self, action: #selector(pinch(gesture:)))
         addGestureRecognizer(pinchGesture)
     }
-    
-    @objc internal func focus(gesture: UITapGestureRecognizer) {
-        let point = gesture.location(in: self)
-        
-        guard focusCamera(toPoint: point) else {
-            return
-        }
-        
-        focusView.isHidden = false
-        focusView.center = point
-        focusView.alpha = 0
-        focusView.transform = CGAffineTransform(scaleX: 1.2, y: 1.2)
-        
-        bringSubviewToFront(focusView)
-        
-        UIView.animateKeyframes(withDuration: 1.5, delay: 0, options: UIView.KeyframeAnimationOptions(), animations: {
-            
-            UIView.addKeyframe(withRelativeStartTime: 0, relativeDuration: 0.15, animations: { [weak self] in
-                self?.focusView.alpha = 1
-                self?.focusView.transform = CGAffineTransform.identity
-            })
-            
-            UIView.addKeyframe(withRelativeStartTime: 0.80, relativeDuration: 0.20, animations: { [weak self] in
-                self?.focusView.alpha = 0
-                self?.focusView.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
-            })
-            
-            
-            }, completion: { [weak self] finished in
-                if finished {
-                    self?.focusView.isHidden = true
-                }
-        })
-    }
 
     @objc internal func pinch(gesture: UIPinchGestureRecognizer) {
         guard let device = device else { return }

From 6f60f65f9328ccb1d78409919e47b6a6a9925b16 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 11:29:29 +0200
Subject: [PATCH 06/20] Updated crop overlay class to fix iOS 13 panning issue

---
 .../project.pbxproj                           |  10 +-
 .../ConfirmViewController.swift               | 307 +++++++------
 .../ViewController/ConfirmViewController.xib  |  76 +---
 .../Views/CropOverlay.swift                   | 422 ++++++++++--------
 4 files changed, 437 insertions(+), 378 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 19c21023..c333610b 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
 		7AC96FA21F5B5166003E53F4 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
+		7AD3B52D23521955002BAD73 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3B52C23521955002BAD73 /* CropOverlay.swift */; };
 		7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */; };
 		C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665431C73A47C00EB9751 /* SingleImageSaver.swift */; };
 		C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665451C73A94100EB9751 /* CameraGlobals.swift */; };
@@ -32,7 +33,6 @@
 		C482A00F1CAEB18D00541D08 /* ImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAB50BEE1B413E8C009905B9 /* ImageCell.swift */; };
 		C482A0101CAEB18D00541D08 /* PermissionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */; };
 		C482A0111CAEB18D00541D08 /* CameraView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAF058671B3175C5008E5592 /* CameraView.swift */; };
-		C482A0121CAEB18D00541D08 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA787F1B1B4326F100B6B86E /* CropOverlay.swift */; };
 		C482A0141CAEB1B100541D08 /* CameraView.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA8231371B3BF8F700A837BE /* CameraView.strings */; };
 		C482A0151CAEB1B100541D08 /* CameraViewAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA5FA3441B3AFEB300497C62 /* CameraViewAssets.xcassets */; };
 		C484580B1D0AA44400ECDB15 /* UIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBFE097C1CAF1D1A00A8C637 /* UIViewExtensions.swift */; };
@@ -45,7 +45,6 @@
 		FA5FA3431B3AFA2B00497C62 /* PermissionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */; };
 		FA5FA3451B3AFEB300497C62 /* CameraViewAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA5FA3441B3AFEB300497C62 /* CameraViewAssets.xcassets */; };
 		FA778A411B8319D8005807E7 /* image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = FA778A401B8319D8005807E7 /* image.jpg */; };
-		FA787F1C1B4326F100B6B86E /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA787F1B1B4326F100B6B86E /* CropOverlay.swift */; };
 		FA7E6B9B1B429012000E1B14 /* ConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA7E6B9A1B429012000E1B14 /* ConfirmViewController.swift */; };
 		FA8231381B3BF8F700A837BE /* CameraView.strings in Resources */ = {isa = PBXBuildFile; fileRef = FA8231371B3BF8F700A837BE /* CameraView.strings */; };
 		FA82313A1B3C296C00A837BE /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA8231391B3C296C00A837BE /* Utilities.swift */; };
@@ -62,6 +61,7 @@
 
 /* Begin PBXFileReference section */
 		7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CroppingParameters.swift; sourceTree = "<group>"; };
+		7AD3B52C23521955002BAD73 /* CropOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CropOverlay.swift; sourceTree = "<group>"; };
 		7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		C40665431C73A47C00EB9751 /* SingleImageSaver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SingleImageSaver.swift; sourceTree = "<group>"; };
 		C40665451C73A94100EB9751 /* CameraGlobals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CameraGlobals.swift; sourceTree = "<group>"; };
@@ -79,7 +79,6 @@
 		FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PermissionsView.swift; sourceTree = "<group>"; };
 		FA5FA3441B3AFEB300497C62 /* CameraViewAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = CameraViewAssets.xcassets; sourceTree = "<group>"; };
 		FA778A401B8319D8005807E7 /* image.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = image.jpg; sourceTree = "<group>"; };
-		FA787F1B1B4326F100B6B86E /* CropOverlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CropOverlay.swift; sourceTree = "<group>"; };
 		FA7E6B9A1B429012000E1B14 /* ConfirmViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfirmViewController.swift; sourceTree = "<group>"; };
 		FA8231371B3BF8F700A837BE /* CameraView.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; path = CameraView.strings; sourceTree = "<group>"; };
 		FA8231391B3C296C00A837BE /* Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = Utilities.swift; sourceTree = "<group>"; tabWidth = 4; };
@@ -141,7 +140,7 @@
 				FAB50BEE1B413E8C009905B9 /* ImageCell.swift */,
 				FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */,
 				FAF058671B3175C5008E5592 /* CameraView.swift */,
-				FA787F1B1B4326F100B6B86E /* CropOverlay.swift */,
+				7AD3B52C23521955002BAD73 /* CropOverlay.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -359,7 +358,6 @@
 				C482A00F1CAEB18D00541D08 /* ImageCell.swift in Sources */,
 				C482A0101CAEB18D00541D08 /* PermissionsView.swift in Sources */,
 				C482A0111CAEB18D00541D08 /* CameraView.swift in Sources */,
-				C482A0121CAEB18D00541D08 /* CropOverlay.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -382,12 +380,12 @@
 				EBFE097D1CAF1D1A00A8C637 /* UIViewExtensions.swift in Sources */,
 				C40665481C73B72D00EB9751 /* SingleImageFetcher.swift in Sources */,
 				FAF058471B31618D008E5592 /* ViewController.swift in Sources */,
+				7AD3B52D23521955002BAD73 /* CropOverlay.swift in Sources */,
 				FAF058681B3175C5008E5592 /* CameraView.swift in Sources */,
 				C4D9BA471CA73163004F70F7 /* UIButtonExtensions.swift in Sources */,
 				C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */,
 				FAF058451B31618D008E5592 /* AppDelegate.swift in Sources */,
 				C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */,
-				FA787F1C1B4326F100B6B86E /* CropOverlay.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ALCameraViewController/ViewController/ConfirmViewController.swift b/ALCameraViewController/ViewController/ConfirmViewController.swift
index 55d091cc..a8cd1ce9 100644
--- a/ALCameraViewController/ViewController/ConfirmViewController.swift
+++ b/ALCameraViewController/ViewController/ConfirmViewController.swift
@@ -9,14 +9,21 @@
 import UIKit
 import Photos
 
-public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
+public class ConfirmViewController: UIViewController {
 	
 	let imageView = UIImageView()
 	@IBOutlet weak var scrollView: UIScrollView!
-	@IBOutlet weak var cropOverlay: CropOverlay!
 	@IBOutlet weak var cancelButton: UIButton!
 	@IBOutlet weak var confirmButton: UIButton!
-	@IBOutlet weak var centeringView: UIView!
+	@IBOutlet weak var centeredView: UIView!
+
+    private let cropOverlay = CropOverlay()
+    private var spinner: UIActivityIndicatorView? = nil
+    private var cropOverlayLeftConstraint = NSLayoutConstraint()
+    private var cropOverlayTopConstraint = NSLayoutConstraint()
+    private var cropOverlayWidthConstraint = NSLayoutConstraint()
+    private var cropOverlayHeightConstraint = NSLayoutConstraint()
+    private var isFirstLayout = true
 	
     var croppingParameters: CroppingParameters {
         didSet {
@@ -25,8 +32,45 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
         }
     }
 
-	var verticalPadding: CGFloat = 30
-	var horizontalPadding: CGFloat = 30
+    private var scrollViewVisibleSize: CGSize {
+        let contentInset = scrollView.contentInset
+        let scrollViewSize = scrollView.bounds.standardized.size
+        let width = scrollViewSize.width - contentInset.left - contentInset.right
+        let height = scrollViewSize.height - contentInset.top - contentInset.bottom
+        return CGSize(width:width, height:height)
+    }
+
+    private var scrollViewCenter: CGPoint {
+        let scrollViewSize = scrollViewVisibleSize
+        return CGPoint(x: scrollViewSize.width / 2.0,
+                       y: scrollViewSize.height / 2.0)
+    }
+
+    private let cropOverlayDefaultPadding: CGFloat = 20
+    private var cropOverlayDefaultFrame: CGRect {
+        let buttonsViewGap: CGFloat = 20 * 2 + 64
+        let centeredViewBounds: CGRect
+        if view.bounds.size.height > view.bounds.size.width {
+            centeredViewBounds = CGRect(x: 0,
+                                        y: 0,
+                                        width: view.bounds.size.width,
+                                        height: view.bounds.size.height - buttonsViewGap)
+        } else {
+            centeredViewBounds = CGRect(x: 0,
+                                        y: 0,
+                                        width: view.bounds.size.width - buttonsViewGap,
+                                        height: view.bounds.size.height)
+        }
+        
+        let cropOverlayWidth = min(centeredViewBounds.size.width, centeredViewBounds.size.height) - 2 * cropOverlayDefaultPadding
+        let cropOverlayX = centeredViewBounds.size.width / 2 - cropOverlayWidth / 2
+        let cropOverlayY = centeredViewBounds.size.height / 2 - cropOverlayWidth / 2
+
+        return CGRect(x: cropOverlayX,
+                      y: cropOverlayY,
+                      width: cropOverlayWidth,
+                      height: cropOverlayWidth)
+    }
 	
 	public var onComplete: CameraViewCompletion?
 
@@ -63,17 +107,11 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 		super.viewDidLoad()
 
 		view.backgroundColor = UIColor.black
-		
-		scrollView.addSubview(imageView)
-		scrollView.delegate = self
-		scrollView.maximumZoomScale = 1
-		
-        cropOverlay.isHidden = true
-        cropOverlay.isResizable = croppingParameters.allowResizing
-        cropOverlay.isMovable = croppingParameters.allowMoving
-        cropOverlay.minimumSize = croppingParameters.minimumSize
 
-		let spinner = showSpinner()
+        loadScrollView()
+        loadCropOverlay()
+
+		showSpinner()
 		
 		disable()
 		
@@ -83,82 +121,86 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 				.setTargetSize(largestPhotoSize())
 				.onSuccess { [weak self] image in
 					self?.configureWithImage(image)
-					self?.hideSpinner(spinner)
+					self?.hideSpinner()
 					self?.enable()
 				}
 				.onFailure { [weak self] error in
-					self?.hideSpinner(spinner)
+					self?.hideSpinner()
 				}
 				.fetch()
 		} else if let image = image {
 			configureWithImage(image)
-			hideSpinner(spinner)
+			hideSpinner()
 			enable()
 		}
 	}
-	
-	public override func viewWillLayoutSubviews() {
-		super.viewWillLayoutSubviews()
-		let scale = calculateMinimumScale(view.frame.size)
-		let frame = croppingParameters.isEnabled ? cropOverlay.frame : view.bounds
-		
-		scrollView.contentInset = calculateScrollViewInsets(frame)
-		scrollView.minimumZoomScale = scale
-		scrollView.zoomScale = scale
-		centerScrollViewContents()
-	}
-	
-	public override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
-		super.viewWillTransition(to: size, with: coordinator)
-		
-		let scale = calculateMinimumScale(size)
-		var frame = view.bounds
-		
-		if croppingParameters.isEnabled {
-			frame = cropOverlay.frame
-			let centeringFrame = centeringView.frame
-			var origin: CGPoint
-			
-			if size.width > size.height { // landscape
-				let offset = (size.width - centeringFrame.height)
-				let expectedX = (centeringFrame.height/2 - frame.height/2) + offset
-				origin = CGPoint(x: expectedX, y: frame.origin.x)
-			} else {
-				let expectedY = (centeringFrame.width/2 - frame.width/2)
-				origin = CGPoint(x: frame.origin.y, y: expectedY)
-			}
-			
-			frame.origin = origin
-		} else {
-			frame.size = size
-		}
-		
-		let insets = calculateScrollViewInsets(frame)
-		
-		coordinator.animate(alongsideTransition: { [weak self] context in
-			self?.scrollView.contentInset = insets
-			self?.scrollView.minimumZoomScale = scale
-			self?.scrollView.zoomScale = scale
-			self?.centerScrollViewContents()
-			self?.centerImageViewOnRotate()
-			}, completion: nil)
-	}
+
+    public override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+
+        if isFirstLayout {
+            isFirstLayout = false
+            activateCropOverlayConstraint()
+            spinner?.center = centeredView.center
+        }
+    }
+
+    private func activateCropOverlayConstraint() {
+        cropOverlayLeftConstraint.constant = cropOverlayDefaultFrame.origin.x
+        cropOverlayTopConstraint.constant = cropOverlayDefaultFrame.origin.y
+        cropOverlayWidthConstraint.constant = cropOverlayDefaultFrame.size.width
+        cropOverlayHeightConstraint.constant = cropOverlayDefaultFrame.size.height
+
+        cropOverlayLeftConstraint.isActive = true
+        cropOverlayTopConstraint.isActive = true
+        cropOverlayWidthConstraint.isActive = true
+        cropOverlayHeightConstraint.isActive = true
+    }
+
+    private func loadScrollView() {
+        scrollView.addSubview(imageView)
+        scrollView.delegate = self
+        scrollView.maximumZoomScale = 1
+    }
+
+    private func prepareScrollView() {
+        let scale = calculateMinimumScale(view.bounds.size)
+
+        scrollView.minimumZoomScale = scale
+        scrollView.zoomScale = scale
+
+        centerScrollViewContent()
+    }
+
+    private func loadCropOverlay() {
+        cropOverlay.translatesAutoresizingMaskIntoConstraints = false
+        view.addSubview(cropOverlay)
+
+        cropOverlayLeftConstraint = cropOverlay.leftAnchor.constraint(equalTo: view.leftAnchor, constant: 0)
+        cropOverlayTopConstraint = cropOverlay.topAnchor.constraint(equalTo: view.topAnchor, constant: 0)
+        cropOverlayWidthConstraint = cropOverlay.widthAnchor.constraint(equalToConstant: 0)
+        cropOverlayHeightConstraint = cropOverlay.heightAnchor.constraint(equalToConstant: 0)
+
+        cropOverlay.delegate = self
+        cropOverlay.isHidden = !croppingParameters.isEnabled
+        cropOverlay.isResizable = croppingParameters.allowResizing
+        cropOverlay.isMovable = croppingParameters.allowMoving
+        cropOverlay.minimumSize = croppingParameters.minimumSize
+    }
 	
 	private func configureWithImage(_ image: UIImage) {
-		cropOverlay.isHidden = !croppingParameters.isEnabled
-		
 		buttonActions()
 		
 		imageView.image = image
 		imageView.sizeToFit()
-		view.setNeedsLayout()
+        prepareScrollView()
 	}
 	
 	private func calculateMinimumScale(_ size: CGSize) -> CGFloat {
 		var _size = size
 		
 		if croppingParameters.isEnabled {
-			_size = cropOverlay.frame.size
+            _size = cropOverlayDefaultFrame.size
 		}
 		
 		guard let image = imageView.image else {
@@ -171,39 +213,32 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 		return min(scaleWidth, scaleHeight)
 	}
 	
-	private func calculateScrollViewInsets(_ frame: CGRect) -> UIEdgeInsets {
-		let bottom = view.frame.height - (frame.origin.y + frame.height)
-		let right = view.frame.width - (frame.origin.x + frame.width)
-		let insets = UIEdgeInsets(top: frame.origin.y, left: frame.origin.x, bottom: bottom, right: right)
-		return insets
-	}
-	
-	private func centerImageViewOnRotate() {
-		if croppingParameters.isEnabled {
-			let size = cropOverlay.frame.size
-			let scrollInsets = scrollView.contentInset
-			let imageSize = imageView.frame.size
-			var contentOffset = CGPoint(x: -scrollInsets.left, y: -scrollInsets.top)
-			contentOffset.x -= (size.width - imageSize.width) / 2
-			contentOffset.y -= (size.height - imageSize.height) / 2
-			scrollView.contentOffset = contentOffset
-		}
-	}
-	
-	private func centerScrollViewContents() {
-		let size = croppingParameters.isEnabled ? cropOverlay.frame.size : scrollView.frame.size
-		let imageSize = imageView.frame.size
-		var imageOrigin = CGPoint.zero
-		
-		if imageSize.width < size.width {
-			imageOrigin.x = (size.width - imageSize.width) / 2
-		}
-		
-		if imageSize.height < size.height {
-			imageOrigin.y = (size.height - imageSize.height) / 2
-		}
-		
-		imageView.frame.origin = imageOrigin
+	private func centerScrollViewContent() {
+        guard let image = imageView.image else {
+            return
+        }
+
+        let imgViewSize = imageView.frame.size
+        let imageSize = image.size
+
+        var realImgSize: CGSize
+        if imageSize.width / imageSize.height > imgViewSize.width / imgViewSize.height {
+            realImgSize = CGSize(width: imgViewSize.width,height: imgViewSize.width / imageSize.width * imageSize.height)
+        } else {
+            realImgSize = CGSize(width: imgViewSize.height / imageSize.height * imageSize.width, height: imgViewSize.height)
+        }
+
+        var frame = CGRect.zero
+        frame.size = realImgSize
+        imageView.frame = frame
+
+        let screenSize  = scrollView.frame.size
+        let offx = screenSize.width > realImgSize.width ? (screenSize.width - realImgSize.width) / 2 : 0
+        let offy = screenSize.height > realImgSize.height ? (screenSize.height - realImgSize.height) / 2 : 0
+        scrollView.contentInset = UIEdgeInsets(top: offy,
+                                               left: offx,
+                                               bottom: offy,
+                                               right: offx)
 	}
 	
 	private func buttonActions() {
@@ -225,17 +260,17 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 		
 		imageView.isHidden = true
 		
-		let spinner = showSpinner()
+		showSpinner()
 		
 		if let asset = asset {
 			var fetcher = SingleImageFetcher()
 				.onSuccess { [weak self] image in
 					self?.onComplete?(image, self?.asset)
-					self?.hideSpinner(spinner)
+					self?.hideSpinner()
 					self?.enable()
 				}
 				.onFailure { [weak self] error in
-					self?.hideSpinner(spinner)
+					self?.hideSpinner()
 					self?.showNoImageScreen(error)
 				}
 				.setAsset(asset)
@@ -258,34 +293,24 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 			}
 			
 			onComplete?(newImage, nil)
-			hideSpinner(spinner)
+			hideSpinner()
 			enable()
 		}
 	}
 	
-	public func viewForZooming(in scrollView: UIScrollView) -> UIView? {
-		return imageView
-	}
-	
-	public func scrollViewDidZoom(_ scrollView: UIScrollView) {
-		centerScrollViewContents()
-	}
-	
-	func showSpinner() -> UIActivityIndicatorView {
-		let spinner = UIActivityIndicatorView()
-		spinner.style = .white
-		spinner.center = view.center
-		spinner.startAnimating()
-		
-		view.addSubview(spinner)
-		view.bringSubviewToFront(spinner)
-		
-		return spinner
-	}
+	func showSpinner() {
+		spinner = UIActivityIndicatorView()
+		spinner!.style = .white
+        spinner!.center = centeredView.center
+		spinner!.startAnimating()
+		
+		view.addSubview(spinner!)
+		view.bringSubviewToFront(spinner!)
+    }
 	
-	func hideSpinner(_ spinner: UIActivityIndicatorView) {
-		spinner.stopAnimating()
-		spinner.removeFromSuperview()
+	func hideSpinner() {
+		spinner?.stopAnimating()
+		spinner?.removeFromSuperview()
 	}
 	
 	func disable() {
@@ -305,10 +330,7 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 	}
 	
 	private func makeProportionalCropRect() -> CGRect {
-		var cropRect = CGRect(x: cropOverlay.frame.origin.x + cropOverlay.outterGap,
-		                      y: cropOverlay.frame.origin.y + cropOverlay.outterGap,
-		                      width: cropOverlay.frame.size.width - 2 * cropOverlay.outterGap,
-		                      height: cropOverlay.frame.size.height - 2 * cropOverlay.outterGap)
+        var cropRect = cropOverlay.croppedRect
         cropRect.origin.x += scrollView.contentOffset.x - imageView.frame.origin.x
         cropRect.origin.y += scrollView.contentOffset.y - imageView.frame.origin.y
 
@@ -326,6 +348,27 @@ public class ConfirmViewController: UIViewController, UIScrollViewDelegate {
 	
 }
 
+extension ConfirmViewController: UIScrollViewDelegate {
+
+    public func viewForZooming(in scrollView: UIScrollView) -> UIView? {
+        return imageView
+    }
+
+    public func scrollViewDidZoom(_ scrollView: UIScrollView) {
+        centerScrollViewContent()
+    }
+}
+
+extension ConfirmViewController: CropOverlayDelegate {
+
+    func didMoveCropOverlay(newFrame: CGRect) {
+        cropOverlayLeftConstraint.constant = newFrame.origin.x
+        cropOverlayTopConstraint.constant = newFrame.origin.y
+        cropOverlayWidthConstraint.constant = newFrame.size.width
+        cropOverlayHeightConstraint.constant = newFrame.size.height
+    }
+}
+
 extension UIImage {
 	func crop(rect: CGRect) -> UIImage {
 
diff --git a/ALCameraViewController/ViewController/ConfirmViewController.xib b/ALCameraViewController/ViewController/ConfirmViewController.xib
index c3f3a9dc..705c686b 100644
--- a/ALCameraViewController/ViewController/ConfirmViewController.xib
+++ b/ALCameraViewController/ViewController/ConfirmViewController.xib
@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_0" 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" colorMatched="YES">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ConfirmViewController" customModule="ALCameraViewController" customModuleProvider="target">
             <connections>
                 <outlet property="cancelButton" destination="yRi-ES-LfN" id="PUm-mc-H7R"/>
-                <outlet property="centeringView" destination="KYd-D9-K5d" id="CmX-BA-VtZ"/>
+                <outlet property="centeredView" destination="KYd-D9-K5d" id="CmX-BA-VtZ"/>
                 <outlet property="confirmButton" destination="ASf-ZD-cIs" id="mpH-Eg-IbA"/>
-                <outlet property="cropOverlay" destination="lnA-tb-Sap" id="34E-zk-Axd"/>
                 <outlet property="scrollView" destination="oUR-U3-uEM" id="rF0-ZM-RmA"/>
                 <outlet property="view" destination="iN0-l3-epB" id="FcS-Dy-kqF"/>
             </connections>
@@ -28,19 +23,11 @@
                 <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oUR-U3-uEM">
                     <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                 </scrollView>
-                <view hidden="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KYd-D9-K5d">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="474"/>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lnA-tb-Sap" customClass="CropOverlay" customModule="ALCameraViewController" customModuleProvider="target">
-                    <rect key="frame" x="15" y="92" width="290" height="290"/>
-                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="lnA-tb-Sap" secondAttribute="height" multiplier="1:1" id="lv8-l9-lJq"/>
-                    </constraints>
+                <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KYd-D9-K5d">
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="464"/>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ASf-ZD-cIs">
-                    <rect key="frame" x="74" y="474" width="64" height="64"/>
+                    <rect key="frame" x="20" y="484" width="64" height="64"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="64" id="J7n-mn-Ebe"/>
                         <constraint firstAttribute="width" constant="64" id="YWt-e6-Bvy"/>
@@ -48,7 +35,7 @@
                     <state key="normal" image="confirmButton"/>
                 </button>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yRi-ES-LfN">
-                    <rect key="frame" x="198" y="474" width="64" height="64"/>
+                    <rect key="frame" x="236" y="484" width="64" height="64"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="64" id="FdJ-mW-Tx6"/>
                         <constraint firstAttribute="width" constant="64" id="urS-JS-i1S"/>
@@ -58,41 +45,31 @@
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="centerY" secondItem="KYd-D9-K5d" secondAttribute="centerY" id="1uu-Bd-bz3"/>
+                <constraint firstItem="ASf-ZD-cIs" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="1AT-7k-2QI"/>
                 <constraint firstAttribute="trailing" secondItem="oUR-U3-uEM" secondAttribute="trailing" id="7A6-HH-MEu"/>
-                <constraint firstAttribute="bottom" secondItem="yRi-ES-LfN" secondAttribute="bottom" constant="30" id="7jo-lC-34t"/>
+                <constraint firstAttribute="bottom" secondItem="yRi-ES-LfN" secondAttribute="bottom" constant="20" id="7jo-lC-34t"/>
                 <constraint firstItem="ASf-ZD-cIs" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" constant="-45" id="89L-rE-rmd"/>
                 <constraint firstAttribute="bottom" secondItem="oUR-U3-uEM" secondAttribute="bottom" id="8mU-82-Hf6"/>
                 <constraint firstItem="oUR-U3-uEM" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="92s-g3-wfK"/>
                 <constraint firstItem="KYd-D9-K5d" firstAttribute="leading" secondItem="yRi-ES-LfN" secondAttribute="trailing" id="CcA-mG-BLU"/>
-                <constraint firstItem="yRi-ES-LfN" firstAttribute="top" secondItem="KYd-D9-K5d" secondAttribute="bottom" id="Ck2-xk-HbG"/>
+                <constraint firstItem="yRi-ES-LfN" firstAttribute="top" secondItem="KYd-D9-K5d" secondAttribute="bottom" constant="20" id="Ck2-xk-HbG"/>
                 <constraint firstItem="oUR-U3-uEM" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Cuy-cw-jOk"/>
-                <constraint firstAttribute="bottom" secondItem="ASf-ZD-cIs" secondAttribute="bottom" constant="30" id="DZ5-WA-3ZQ"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="top" relation="greaterThanOrEqual" secondItem="oUR-U3-uEM" secondAttribute="top" constant="100" id="GAL-ck-d0B"/>
+                <constraint firstAttribute="bottom" secondItem="ASf-ZD-cIs" secondAttribute="bottom" constant="20" id="DZ5-WA-3ZQ"/>
                 <constraint firstAttribute="bottom" secondItem="yRi-ES-LfN" secondAttribute="bottom" constant="60" id="H4a-3r-r5r"/>
                 <constraint firstItem="oUR-U3-uEM" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="J3N-Vr-euu"/>
                 <constraint firstAttribute="trailing" secondItem="KYd-D9-K5d" secondAttribute="trailing" id="JLk-PT-5kn"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="P5N-Xh-C1z"/>
+                <constraint firstAttribute="trailing" secondItem="yRi-ES-LfN" secondAttribute="trailing" constant="20" id="M7P-T7-qoy"/>
                 <constraint firstItem="ASf-ZD-cIs" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="30" id="Rwi-4K-QRb"/>
                 <constraint firstItem="ASf-ZD-cIs" firstAttribute="bottom" secondItem="yRi-ES-LfN" secondAttribute="top" constant="-60" id="TLl-L0-yLb"/>
-                <constraint firstItem="ASf-ZD-cIs" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" constant="-54" id="WSF-pa-4wb"/>
                 <constraint firstAttribute="trailing" secondItem="KYd-D9-K5d" secondAttribute="trailing" id="YBv-2a-KdQ"/>
                 <constraint firstItem="KYd-D9-K5d" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Yhb-Y3-ngX"/>
                 <constraint firstItem="KYd-D9-K5d" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="aj9-Xh-WHL"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="leading" secondItem="oUR-U3-uEM" secondAttribute="leading" priority="999" constant="100" id="bRR-fN-fEb"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="centerY" secondItem="KYd-D9-K5d" secondAttribute="centerY" id="dbm-T2-OgB"/>
-                <constraint firstAttribute="bottom" secondItem="lnA-tb-Sap" secondAttribute="bottom" constant="15" id="eMF-sY-QhQ"/>
-                <constraint firstAttribute="trailing" secondItem="lnA-tb-Sap" secondAttribute="trailing" constant="15" id="efC-ff-52c"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="centerX" secondItem="KYd-D9-K5d" secondAttribute="centerX" id="fPc-8D-E0O"/>
                 <constraint firstItem="KYd-D9-K5d" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="hPp-8q-A1p"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="centerX" secondItem="KYd-D9-K5d" secondAttribute="centerX" id="hpa-Qn-uzT"/>
                 <constraint firstItem="ASf-ZD-cIs" firstAttribute="top" secondItem="KYd-D9-K5d" secondAttribute="bottom" id="iar-0y-gBe"/>
                 <constraint firstAttribute="bottom" secondItem="oUR-U3-uEM" secondAttribute="bottom" id="iw9-Cg-Kkk"/>
                 <constraint firstItem="oUR-U3-uEM" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="kDN-mM-6KE"/>
-                <constraint firstItem="yRi-ES-LfN" firstAttribute="leading" secondItem="ASf-ZD-cIs" secondAttribute="trailing" constant="60" id="m1F-XR-hgU"/>
                 <constraint firstAttribute="trailing" secondItem="oUR-U3-uEM" secondAttribute="trailing" id="mL3-PM-TEd"/>
                 <constraint firstAttribute="bottom" secondItem="KYd-D9-K5d" secondAttribute="bottom" id="o6j-Qo-hB5"/>
-                <constraint firstItem="lnA-tb-Sap" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="ohf-4f-yKs"/>
                 <constraint firstItem="ASf-ZD-cIs" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" constant="-54" id="pNU-uB-Igt"/>
                 <constraint firstItem="yRi-ES-LfN" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="30" id="v0q-tU-ywG"/>
                 <constraint firstItem="KYd-D9-K5d" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="vnU-ey-3GX"/>
@@ -113,16 +90,6 @@
                     <exclude reference="vnU-ey-3GX"/>
                     <exclude reference="wTn-DN-uQO"/>
                     <exclude reference="wn3-We-BBK"/>
-                    <exclude reference="1uu-Bd-bz3"/>
-                    <exclude reference="GAL-ck-d0B"/>
-                    <exclude reference="P5N-Xh-C1z"/>
-                    <exclude reference="bRR-fN-fEb"/>
-                    <exclude reference="dbm-T2-OgB"/>
-                    <exclude reference="eMF-sY-QhQ"/>
-                    <exclude reference="efC-ff-52c"/>
-                    <exclude reference="fPc-8D-E0O"/>
-                    <exclude reference="hpa-Qn-uzT"/>
-                    <exclude reference="ohf-4f-yKs"/>
                     <exclude reference="7A6-HH-MEu"/>
                     <exclude reference="8mU-82-Hf6"/>
                     <exclude reference="92s-g3-wfK"/>
@@ -131,13 +98,11 @@
                     <exclude reference="DZ5-WA-3ZQ"/>
                     <exclude reference="Rwi-4K-QRb"/>
                     <exclude reference="TLl-L0-yLb"/>
-                    <exclude reference="WSF-pa-4wb"/>
                     <exclude reference="iar-0y-gBe"/>
                     <exclude reference="pNU-uB-Igt"/>
                     <exclude reference="7jo-lC-34t"/>
                     <exclude reference="Ck2-xk-HbG"/>
                     <exclude reference="H4a-3r-r5r"/>
-                    <exclude reference="m1F-XR-hgU"/>
                     <exclude reference="v0q-tU-ywG"/>
                     <exclude reference="xFS-1L-oa4"/>
                     <exclude reference="xFc-F1-V7I"/>
@@ -146,16 +111,12 @@
             <variation key="heightClass=compact">
                 <mask key="subviews">
                     <include reference="KYd-D9-K5d"/>
-                    <include reference="lnA-tb-Sap"/>
                 </mask>
                 <mask key="constraints">
                     <include reference="CcA-mG-BLU"/>
                     <include reference="Yhb-Y3-ngX"/>
                     <include reference="o6j-Qo-hB5"/>
                     <include reference="wTn-DN-uQO"/>
-                    <include reference="P5N-Xh-C1z"/>
-                    <include reference="eMF-sY-QhQ"/>
-                    <include reference="hpa-Qn-uzT"/>
                     <include reference="Rwi-4K-QRb"/>
                     <include reference="TLl-L0-yLb"/>
                     <include reference="pNU-uB-Igt"/>
@@ -165,20 +126,14 @@
             <variation key="heightClass=regular-widthClass=compact">
                 <mask key="subviews">
                     <include reference="KYd-D9-K5d"/>
-                    <include reference="lnA-tb-Sap"/>
                 </mask>
                 <mask key="constraints">
                     <include reference="JLk-PT-5kn"/>
                     <include reference="aj9-Xh-WHL"/>
                     <include reference="wn3-We-BBK"/>
-                    <include reference="1uu-Bd-bz3"/>
-                    <include reference="efC-ff-52c"/>
-                    <include reference="ohf-4f-yKs"/>
                     <include reference="DZ5-WA-3ZQ"/>
-                    <include reference="WSF-pa-4wb"/>
                     <include reference="7jo-lC-34t"/>
                     <include reference="Ck2-xk-HbG"/>
-                    <include reference="m1F-XR-hgU"/>
                 </mask>
             </variation>
             <variation key="heightClass=regular-widthClass=regular">
@@ -186,10 +141,6 @@
                     <include reference="YBv-2a-KdQ"/>
                     <include reference="hPp-8q-A1p"/>
                     <include reference="vnU-ey-3GX"/>
-                    <include reference="GAL-ck-d0B"/>
-                    <include reference="bRR-fN-fEb"/>
-                    <include reference="dbm-T2-OgB"/>
-                    <include reference="fPc-8D-E0O"/>
                     <include reference="7A6-HH-MEu"/>
                     <include reference="8mU-82-Hf6"/>
                     <include reference="92s-g3-wfK"/>
@@ -201,6 +152,7 @@
                     <include reference="xFc-F1-V7I"/>
                 </mask>
             </variation>
+            <point key="canvasLocation" x="131" y="154"/>
         </view>
     </objects>
     <resources>
diff --git a/ALCameraViewController/Views/CropOverlay.swift b/ALCameraViewController/Views/CropOverlay.swift
index 35da8f33..275fef19 100644
--- a/ALCameraViewController/Views/CropOverlay.swift
+++ b/ALCameraViewController/Views/CropOverlay.swift
@@ -1,216 +1,282 @@
 //
-//  CropOverlay.swift
+//  NewCropOverlay.swift
 //  ALCameraViewController
 //
-//  Created by Alex Littlejohn on 2015/06/30.
-//  Copyright (c) 2015 zero. All rights reserved.
+//  Created by Guillaume Bellut on 12/10/2019.
+//  Copyright © 2019 zero. All rights reserved.
 //
 
 import UIKit
 
+protocol CropOverlayDelegate: class {
+    func didMoveCropOverlay(newFrame: CGRect)
+}
+
 internal class CropOverlay: UIView {
 
-    var outerLines = [UIView]()
-    var horizontalLines = [UIView]()
-    var verticalLines = [UIView]()
-    
-    var topLeftCornerLines = [UIView]()
-    var topRightCornerLines = [UIView]()
-    var bottomLeftCornerLines = [UIView]()
-    var bottomRightCornerLines = [UIView]()
-
-    var cornerButtons = [UIButton]()
-
-    let cornerLineDepth: CGFloat = 3
-    let cornerLineWidth: CGFloat = 22.5
-    var cornerButtonWidth: CGFloat {
-        return self.cornerLineWidth * 2
+    private let buttons = [UIButton(),  // top left
+                           UIButton(),  // top right
+                           UIButton(),  // bottom left
+                           UIButton()]  // bottom right
+
+    private var cornerButtonWidth: CGFloat = 45
+
+    private let cornerLineDepth: CGFloat = 3
+    private var cornerLineLength: CGFloat {
+        return cornerButtonWidth / 2
     }
 
-    let lineWidth: CGFloat = 1
+    private let lineDepth: CGFloat = 1
 
-    let outterGapRatio: CGFloat = 1/3
-    var outterGap: CGFloat {
-        return self.cornerButtonWidth * self.outterGapRatio
+    private let outterGapRatio: CGFloat = 1/3
+    private var outterGap: CGFloat {
+        return cornerButtonWidth * self.outterGapRatio
     }
 
     var isResizable: Bool = false
     var isMovable: Bool = false
     var minimumSize: CGSize = CGSize.zero
+    weak var delegate: CropOverlayDelegate?
+
+    var croppedRect: CGRect {
+        return CGRect(x: frame.origin.x + outterGap,
+                      y: frame.origin.y + outterGap,
+                      width: frame.size.width - 2 * outterGap,
+                      height: frame.size.height - 2 * outterGap)
+    }
 
     internal override init(frame: CGRect) {
         super.init(frame: frame)
-        createLines()
+        setup()
     }
 
     internal required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
-        createLines()
+        setup()
     }
-    
-    override func layoutSubviews() {
-        
-        for i in 0..<outerLines.count {
-            let line = outerLines[i]
-            var lineFrame: CGRect
-            switch (i) {
-            case 0:
-                lineFrame = CGRect(x: outterGap, y: outterGap, width: bounds.width - outterGap * 2, height: lineWidth)
-                break
-            case 1:
-                lineFrame = CGRect(x: bounds.width - lineWidth - outterGap, y: outterGap, width: lineWidth, height: bounds.height - outterGap * 2)
-                break
-            case 2:
-                lineFrame = CGRect(x: outterGap, y: bounds.height - lineWidth - outterGap, width: bounds.width - outterGap * 2, height: lineWidth)
-                break
-            case 3:
-                lineFrame = CGRect(x: outterGap, y: outterGap, width: lineWidth, height: bounds.height - outterGap * 2)
-                break
-            default:
-                lineFrame = CGRect.zero
-                break
-            }
-            
-            line.frame = lineFrame
-        }
-        
-        let corners = [topLeftCornerLines, topRightCornerLines, bottomLeftCornerLines, bottomRightCornerLines]
-        for i in 0..<corners.count {
-            let corner = corners[i]
-			
-			var horizontalFrame: CGRect
-			var verticalFrame: CGRect
-			var buttonFrame: CGRect
-			let buttonSize = CGSize(width: cornerButtonWidth, height: cornerButtonWidth)
-			
-            switch (i) {
-			case 0:	// Top Left
-				verticalFrame = CGRect(x: outterGap, y: outterGap, width: cornerLineDepth, height: cornerLineWidth)
-				horizontalFrame = CGRect(x: outterGap, y: outterGap, width: cornerLineWidth, height: cornerLineDepth)
-				buttonFrame = CGRect(origin: CGPoint(x: 0, y: 0), size: buttonSize)
-			case 1:	// Top Right
-				verticalFrame = CGRect(x: bounds.width - cornerLineDepth - outterGap, y: outterGap, width: cornerLineDepth, height: cornerLineWidth)
-				horizontalFrame = CGRect(x: bounds.width - cornerLineWidth - outterGap, y: outterGap, width: cornerLineWidth, height: cornerLineDepth)
-				buttonFrame = CGRect(origin: CGPoint(x: bounds.width - cornerButtonWidth, y: 0), size: buttonSize)
-			case 2:	// Bottom Left
-				verticalFrame = CGRect(x: outterGap, y:  bounds.height - cornerLineWidth - outterGap, width: cornerLineDepth, height: cornerLineWidth)
-				horizontalFrame = CGRect(x: outterGap, y:  bounds.height - cornerLineDepth - outterGap, width: cornerLineWidth, height: cornerLineDepth)
-				buttonFrame = CGRect(origin: CGPoint(x: 0, y: bounds.height - cornerButtonWidth), size: buttonSize)
-			case 3:	// Bottom Right
-				verticalFrame = CGRect(x: bounds.width - cornerLineDepth - outterGap, y: bounds.height - cornerLineWidth - outterGap, width: cornerLineDepth, height: cornerLineWidth)
-				horizontalFrame = CGRect(x: bounds.width - cornerLineWidth - outterGap, y: bounds.height - cornerLineDepth - outterGap, width: cornerLineWidth, height: cornerLineDepth)
-				buttonFrame = CGRect(origin: CGPoint(x: bounds.width - cornerButtonWidth, y: bounds.height - cornerButtonWidth), size: buttonSize)
-
-            default:
-                verticalFrame = CGRect.zero
-                horizontalFrame = CGRect.zero
-				buttonFrame = CGRect.zero
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let view = super.hitTest(point, with: event)
+
+        if !isMovable && isResizable {
+            let isButton = buttons.reduce(false) { $1.hitTest(convert(point, to: $1), with: event) != nil || $0 }
+            if !isButton {
+                return nil
             }
-			
-            corner[0].frame = verticalFrame
-            corner[1].frame = horizontalFrame
-			cornerButtons[i].frame = buttonFrame
         }
-		
-		let lineThickness = lineWidth / UIScreen.main.scale
-		let vPadding = (bounds.height - outterGap * 2 - (lineThickness * CGFloat(horizontalLines.count))) / CGFloat(horizontalLines.count + 1)
-		let hPadding = (bounds.width - outterGap * 2 - (lineThickness * CGFloat(verticalLines.count))) / CGFloat(verticalLines.count + 1)
-		
-        for i in 0..<horizontalLines.count {
-            let hLine = horizontalLines[i]
-            let vLine = verticalLines[i]
-			
-			let vSpacing = (vPadding * CGFloat(i + 1)) + (lineThickness * CGFloat(i))
-			let hSpacing = (hPadding * CGFloat(i + 1)) + (lineThickness * CGFloat(i))
-			
-			hLine.frame = CGRect(x: outterGap, y: vSpacing + outterGap, width: bounds.width - outterGap * 2, height:  lineThickness)
-			vLine.frame = CGRect(x: hSpacing + outterGap, y: outterGap, width: lineThickness, height: bounds.height - outterGap * 2)
+
+        return view
+    }
+
+    private func setup() {
+        let panGesture = UIPanGestureRecognizer(target: self, action: #selector(move(gestureRecognizer:)))
+        addGestureRecognizer(panGesture)
+
+        loadButtons()
+        loadLines()
+    }
+
+    private func loadButtons() {
+        buttons.forEach {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            addSubview($0)
+
+            let panGesture = UIPanGestureRecognizer(target: self, action: #selector(move(gestureRecognizer:)))
+            $0.addGestureRecognizer(panGesture)
         }
-		
+
+        buttons[0].topAnchor.constraint(equalTo: topAnchor).isActive = true
+        buttons[0].leftAnchor.constraint(equalTo: leftAnchor).isActive = true
+        buttons[0].widthAnchor.constraint(equalToConstant: cornerButtonWidth).isActive = true
+        buttons[0].heightAnchor.constraint(equalTo: buttons[0].widthAnchor).isActive = true
+
+        buttons[1].topAnchor.constraint(equalTo: topAnchor).isActive = true
+        buttons[1].rightAnchor.constraint(equalTo: rightAnchor).isActive = true
+        buttons[1].widthAnchor.constraint(equalToConstant: cornerButtonWidth).isActive = true
+        buttons[1].heightAnchor.constraint(equalTo: buttons[1].widthAnchor).isActive = true
+
+        buttons[2].bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
+        buttons[2].leftAnchor.constraint(equalTo: leftAnchor).isActive = true
+        buttons[2].widthAnchor.constraint(equalToConstant: cornerButtonWidth).isActive = true
+        buttons[2].heightAnchor.constraint(equalTo: buttons[2].widthAnchor).isActive = true
+
+        buttons[3].bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
+        buttons[3].rightAnchor.constraint(equalTo: rightAnchor).isActive = true
+        buttons[3].widthAnchor.constraint(equalToConstant: cornerButtonWidth).isActive = true
+        buttons[3].heightAnchor.constraint(equalTo: buttons[3].widthAnchor).isActive = true
     }
-	
-    func createLines() {
-        
-        outerLines = [createLine(), createLine(), createLine(), createLine()]
-        horizontalLines = [createLine(), createLine()]
-        verticalLines = [createLine(), createLine()]
-        
-        topLeftCornerLines = [createLine(), createLine()]
-        topRightCornerLines = [createLine(), createLine()]
-        bottomLeftCornerLines = [createLine(), createLine()]
-        bottomRightCornerLines = [createLine(), createLine()]
-        
-		cornerButtons = [createButton(), createButton(), createButton(), createButton()]
-		
-		let dragGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(moveCropOverlay))
-		addGestureRecognizer(dragGestureRecognizer)
+
+    private func loadLines() {
+        loadBorders()
+        loadCornerLines()
     }
-    
-    func createLine() -> UIView {
-        let line = UIView()
-        line.backgroundColor = UIColor.white
-        addSubview(line)
-        return line
+
+    private func loadBorders() {
+        let borders = [UIView(),    // top
+                       UIView(),    // left
+                       UIView(),    // bottom
+                       UIView()]    // right
+
+        borders.forEach {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            addSubview($0)
+
+            $0.isUserInteractionEnabled = false
+            $0.backgroundColor = .white
+        }
+
+        borders[0].heightAnchor.constraint(equalToConstant: 1).isActive = true
+        borders[0].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+        borders[0].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+        borders[0].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+
+        borders[1].widthAnchor.constraint(equalToConstant: 1).isActive = true
+        borders[1].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+        borders[1].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+        borders[1].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+
+        borders[2].heightAnchor.constraint(equalToConstant: 1).isActive = true
+        borders[2].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+        borders[2].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+        borders[2].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+
+        borders[3].widthAnchor.constraint(equalToConstant: 1).isActive = true
+        borders[3].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+        borders[3].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+        borders[3].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
     }
-	
-	func createButton() -> UIButton {
-		let button = UIButton()
-		button.backgroundColor = UIColor.clear
-		
-		let dragGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(moveCropOverlay))
-		button.addGestureRecognizer(dragGestureRecognizer)
-
-		addSubview(button)
-		return button
-	}
-	
-	@objc func moveCropOverlay(gestureRecognizer: UIPanGestureRecognizer) {
-		if isResizable, let button = gestureRecognizer.view as? UIButton {
-			if gestureRecognizer.state == .began || gestureRecognizer.state == .changed {
-				let translation = gestureRecognizer.translation(in: self)
-				
-				var newFrame: CGRect
-				
-				switch button {
-				case cornerButtons[0]:	// Top Left
-                    newFrame = CGRect(x: frame.origin.x + translation.x, y: frame.origin.y + translation.y, width: frame.size.width - translation.x, height: frame.size.height - translation.y)
-				case cornerButtons[1]:	// Top Right
-					newFrame = CGRect(x: frame.origin.x, y: frame.origin.y + translation.y, width: frame.size.width + translation.x, height: frame.size.height - translation.y)
-				case cornerButtons[2]:	// Bottom Left
-					newFrame = CGRect(x: frame.origin.x + translation.x, y: frame.origin.y, width: frame.size.width - translation.x, height: frame.size.height + translation.y)
-				case cornerButtons[3]:	// Bottom Right
-					newFrame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width + translation.x, height: frame.size.height + translation.y)
-				default:
-					newFrame = CGRect.zero
-				}
-
-                let minimumFrame = CGRect(x: newFrame.origin.x, y: newFrame.origin.y, width: max(newFrame.size.width, minimumSize.width + 2 * outterGap), height: max(newFrame.size.height, minimumSize.height + 2 * outterGap))
-				frame = minimumFrame
-                print(frame)
-				layoutSubviews()
-
-				gestureRecognizer.setTranslation(CGPoint.zero, in: self)
-			}
-		} else if isMovable {
-			if gestureRecognizer.state == .began || gestureRecognizer.state == .changed {
-				let translation = gestureRecognizer.translation(in: self)
-				
-				gestureRecognizer.view!.center = CGPoint(x: gestureRecognizer.view!.center.x + translation.x, y: gestureRecognizer.view!.center.y + translation.y)
-				gestureRecognizer.setTranslation(CGPoint(x: 0, y: 0), in: self)
-			}
-		}
-	}
 
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        let view = super.hitTest(point, with: event)
+    private func loadCornerLines() {
+        let cornerLines = [UIView(), UIView(),  // top left
+                       UIView(), UIView(),  // top right
+                       UIView(), UIView(),  // bottom left
+                       UIView(), UIView()]  // bottom right
 
-        if !isMovable && isResizable && view != nil {
-            let isButton = cornerButtons.reduce(false) { $1.hitTest(convert(point, to: $1), with: event) != nil || $0 }
-            if !isButton {
-                return nil
+        cornerLines.forEach {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            addSubview($0)
+
+            $0.isUserInteractionEnabled = false
+            $0.backgroundColor = .white
+
+            let index = cornerLines.firstIndex(of: $0)!
+
+            if index % 2 == 0 {
+                $0.widthAnchor.constraint(equalToConstant: cornerLineDepth).isActive = true
+                $0.heightAnchor.constraint(equalToConstant: cornerLineLength).isActive = true
+
+                if index <= 3 {
+                    $0.topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+                } else {
+                    $0.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+                }
+
+                if index % 4 == 0 {
+                    $0.leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+                } else {
+                    $0.rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+                }
+            } else {
+                $0.widthAnchor.constraint(equalToConstant: cornerLineLength).isActive = true
+                $0.heightAnchor.constraint(equalToConstant: cornerLineDepth).isActive = true
+
+                if index <= 3 {
+                    $0.leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+                } else {
+                    $0.rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+                }
+
+                if index % 4 == 1 {
+                    $0.topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+                } else {
+                    $0.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+                }
             }
         }
+    }
 
-        return view
+    @objc func move(gestureRecognizer: UIPanGestureRecognizer) {
+        if isResizable, let button = gestureRecognizer.view as? UIButton {
+            if gestureRecognizer.state == .began || gestureRecognizer.state == .changed {
+                let translation = gestureRecognizer.translation(in: self)
+                let realMinimumSize = CGSize(width: minimumSize.width + 2 * outterGap,
+                                             height: minimumSize.height + 2 * outterGap)
+
+                var newFrame: CGRect
+
+                switch button {
+                case buttons[0]:    // Top Left
+                    let hasEnoughWidth = frame.size.width - translation.x >= realMinimumSize.width
+                    let hasEnoughHeight = frame.size.height - translation.y >= realMinimumSize.height
+
+                    let xPossibleTranslation = hasEnoughWidth ? translation.x : 0
+                    let yPossibleTranslation = hasEnoughHeight ? translation.y : 0
+
+                    newFrame = CGRect(x: frame.origin.x + xPossibleTranslation,
+                                      y: frame.origin.y + yPossibleTranslation,
+                                      width: frame.size.width - xPossibleTranslation,
+                                      height: frame.size.height - yPossibleTranslation)
+                case buttons[1]:    // Top Right
+                    let hasEnoughWidth = frame.size.width + translation.x >= realMinimumSize.width
+                    let hasEnoughHeight = frame.size.height - translation.y >= realMinimumSize.height
+
+                    let xPossibleTranslation = hasEnoughWidth ? translation.x : 0
+                    let yPossibleTranslation = hasEnoughHeight ? translation.y : 0
+
+                    newFrame = CGRect(x: frame.origin.x,
+                                      y: frame.origin.y + yPossibleTranslation,
+                                      width: frame.size.width + xPossibleTranslation,
+                                      height: frame.size.height - yPossibleTranslation)
+                case buttons[2]:    // Bottom Left
+                    let hasEnoughWidth = frame.size.width - translation.x >= realMinimumSize.width
+                    let hasEnoughHeight = frame.size.height + translation.y >= realMinimumSize.height
+
+                    let xPossibleTranslation = hasEnoughWidth ? translation.x : 0
+                    let yPossibleTranslation = hasEnoughHeight ? translation.y : 0
+
+                    newFrame = CGRect(x: frame.origin.x + xPossibleTranslation,
+                                      y: frame.origin.y,
+                                      width: frame.size.width - xPossibleTranslation,
+                                      height: frame.size.height + yPossibleTranslation)
+                case buttons[3]:    // Bottom Right
+                    let hasEnoughWidth = frame.size.width + translation.x >= realMinimumSize.width
+                    let hasEnoughHeight = frame.size.height + translation.y >= realMinimumSize.height
+
+                    let xPossibleTranslation = hasEnoughWidth ? translation.x : 0
+                    let yPossibleTranslation = hasEnoughHeight ? translation.y : 0
+
+                    newFrame = CGRect(x: frame.origin.x,
+                                      y: frame.origin.y,
+                                      width: frame.size.width + xPossibleTranslation,
+                                      height: frame.size.height + yPossibleTranslation)
+                default:
+                    newFrame = CGRect.zero
+                }
+
+                let minimumFrame = CGRect(x: newFrame.origin.x,
+                                          y: newFrame.origin.y,
+                                          width: max(newFrame.size.width,
+                                                     minimumSize.width + 2 * outterGap),
+                                          height: max(newFrame.size.height,
+                                                      minimumSize.height + 2 * outterGap))
+
+                gestureRecognizer.setTranslation(CGPoint.zero, in: self)
+                
+                delegate?.didMoveCropOverlay(newFrame: minimumFrame)
+            }
+        } else if isMovable {
+            if gestureRecognizer.state == .began || gestureRecognizer.state == .changed {
+                let translation = gestureRecognizer.translation(in: self)
+
+                let newFrame = CGRect(x: frame.origin.x + translation.x,
+                                      y: frame.origin.y + translation.y,
+                                      width: frame.size.width,
+                                      height: frame.size.height)
+
+                gestureRecognizer.setTranslation(CGPoint.zero, in: self)
+
+                delegate?.didMoveCropOverlay(newFrame: newFrame)
+            }
+        }
     }
 }

From 954ebdd126477b8062769451d9c446bde94c1726 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 15:53:03 +0200
Subject: [PATCH 07/20] Version 3.1

---
 ALCameraViewController.xcodeproj/project.pbxproj | 4 ++++
 CameraViewController/Info.plist                  | 2 +-
 Example/Supporting Files/Info.plist              | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index c333610b..9c02f1f9 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -407,6 +407,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -431,6 +432,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -551,6 +553,7 @@
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -567,6 +570,7 @@
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.alx.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
diff --git a/CameraViewController/Info.plist b/CameraViewController/Info.plist
index 737e8c48..ca23c84f 100644
--- a/CameraViewController/Info.plist
+++ b/CameraViewController/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.8</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Example/Supporting Files/Info.plist b/Example/Supporting Files/Info.plist
index 6d3c94b0..82ed5fb9 100644
--- a/Example/Supporting Files/Info.plist	
+++ b/Example/Supporting Files/Info.plist	
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.10</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

From a90bdeb2fb42c7d3c48fa3cd0a31affd54c72581 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 15:55:19 +0200
Subject: [PATCH 08/20] Updated podspec file

---
 ALCameraViewController.podspec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ALCameraViewController.podspec b/ALCameraViewController.podspec
index d7dd9899..c2a26ab3 100644
--- a/ALCameraViewController.podspec
+++ b/ALCameraViewController.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |spec|
-  spec.name               = "ALCameraViewController"
-  spec.version            = "3.0.3"
+  spec.name               = "ALCameraViewController-Tulleb"
+  spec.version            = "3.1"
   spec.summary            = "A camera view controller with custom image picker and image cropping."
-  spec.source             = { :git => "https://github.com/AlexLittlejohn/ALCameraViewController.git", :tag => spec.version.to_s }
+  spec.source             = { :git => "https://github.com/Tulleb/ALCameraViewController.git", :tag => spec.version.to_s }
   spec.requires_arc       = true
   spec.platform           = :ios, "8.0"
   spec.license            = "MIT"
   spec.source_files       = "ALCameraViewController/**/*.{swift}"
   spec.resources          = ["ALCameraViewController/ViewController/ConfirmViewController.xib", "ALCameraViewController/CameraViewAssets.xcassets", "ALCameraViewController/CameraView.strings"]
-  spec.homepage           = "https://github.com/AlexLittlejohn/ALCameraViewController"
-  spec.author             = { "Alex Littlejohn" => "alexlittlejohn@me.com" }
-  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '4.0' }
+  spec.homepage           = "https://github.com/Tulleb/ALCameraViewController"
+  spec.author             = { "Alex Littlejohn" => "alexlittlejohn@me.com", "Guillaume Bellut" => "guillaume@bellut.com" }
+  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
 end

From 4d20c18a60ca27075884a30bce270e4c27d062f9 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 15:58:37 +0200
Subject: [PATCH 09/20] Renamed podspec file

---
 ...iewController.podspec => ALCameraViewController-Tulleb.podspec | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ALCameraViewController.podspec => ALCameraViewController-Tulleb.podspec (100%)

diff --git a/ALCameraViewController.podspec b/ALCameraViewController-Tulleb.podspec
similarity index 100%
rename from ALCameraViewController.podspec
rename to ALCameraViewController-Tulleb.podspec

From cbb553a5d40775647916b2102ada478d87ca7798 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 15:58:54 +0200
Subject: [PATCH 10/20] Version 3.1 (2)

---
 ALCameraViewController.xcodeproj/project.pbxproj | 6 ++++--
 Example/Supporting Files/Info.plist              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 9c02f1f9..fa1681f1 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -423,7 +423,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -549,6 +549,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -566,6 +567,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
diff --git a/Example/Supporting Files/Info.plist b/Example/Supporting Files/Info.plist
index 82ed5fb9..c7a54026 100644
--- a/Example/Supporting Files/Info.plist	
+++ b/Example/Supporting Files/Info.plist	
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

From 76039f4698823c11e9fe7eab2891acabaa073cab Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:05:33 +0200
Subject: [PATCH 11/20] Updated podspec file

---
 .swift-version                        | 1 -
 ALCameraViewController-Tulleb.podspec | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 .swift-version

diff --git a/.swift-version b/.swift-version
deleted file mode 100644
index 5186d070..00000000
--- a/.swift-version
+++ /dev/null
@@ -1 +0,0 @@
-4.0
diff --git a/ALCameraViewController-Tulleb.podspec b/ALCameraViewController-Tulleb.podspec
index c2a26ab3..be45cdc1 100644
--- a/ALCameraViewController-Tulleb.podspec
+++ b/ALCameraViewController-Tulleb.podspec
@@ -4,11 +4,11 @@ Pod::Spec.new do |spec|
   spec.summary            = "A camera view controller with custom image picker and image cropping."
   spec.source             = { :git => "https://github.com/Tulleb/ALCameraViewController.git", :tag => spec.version.to_s }
   spec.requires_arc       = true
-  spec.platform           = :ios, "8.0"
+  spec.platform           = :ios, "9.0"
   spec.license            = "MIT"
   spec.source_files       = "ALCameraViewController/**/*.{swift}"
   spec.resources          = ["ALCameraViewController/ViewController/ConfirmViewController.xib", "ALCameraViewController/CameraViewAssets.xcassets", "ALCameraViewController/CameraView.strings"]
   spec.homepage           = "https://github.com/Tulleb/ALCameraViewController"
   spec.author             = { "Alex Littlejohn" => "alexlittlejohn@me.com", "Guillaume Bellut" => "guillaume@bellut.com" }
-  spec.pod_target_xcconfig = { 'SWIFT_VERSION' => '5.0' }
+  spec.swift_version      = '5.0'
 end

From 3adb18cf1d778f45fa78a85fb24328c1231c7a46 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:05:54 +0200
Subject: [PATCH 12/20] Version 3.1 (3)

---
 ALCameraViewController.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index fa1681f1..dbcec2c7 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -423,7 +423,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -549,7 +549,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -567,7 +567,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;

From 02820f0c2253c112111ea28f80b01d1d211542a6 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:08:36 +0200
Subject: [PATCH 13/20] Fixed warnings

---
 ALCameraViewController/Utilities/CameraShot.swift             | 2 ++
 ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift | 2 ++
 ALCameraViewController/Utilities/Utilities.swift              | 4 ++++
 .../ViewController/CameraViewController.swift                 | 2 +-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ALCameraViewController/Utilities/CameraShot.swift b/ALCameraViewController/Utilities/CameraShot.swift
index e4c62d6f..4ce0925c 100644
--- a/ALCameraViewController/Utilities/CameraShot.swift
+++ b/ALCameraViewController/Utilities/CameraShot.swift
@@ -48,6 +48,8 @@ public func takePhoto(_ stillImageOutput: AVCaptureStillImageOutput, videoOrient
                 image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .downMirrored)
             case .downMirrored:
                 image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .down)
+            @unknown default:
+                break
             }
         }
         
diff --git a/ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift b/ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift
index 43b10d67..3d626494 100644
--- a/ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift
+++ b/ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift
@@ -42,6 +42,8 @@ class PhotoLibraryAuthorizer {
                 self.onDeniedOrRestricted(completion: self.completion)
             }
             break
+        @unknown default:
+            break
         }
     }
 }
diff --git a/ALCameraViewController/Utilities/Utilities.swift b/ALCameraViewController/Utilities/Utilities.swift
index 707cc5c7..b9fb7e9a 100644
--- a/ALCameraViewController/Utilities/Utilities.swift
+++ b/ALCameraViewController/Utilities/Utilities.swift
@@ -86,6 +86,8 @@ internal func normalizedRect(_ rect: CGRect, orientation: UIImage.Orientation) -
         normalizedRect = CGRect(x: 1-normalizedY-normalizedHeight, y: normalizedX, width: normalizedHeight, height: normalizedWidth)
     case .right, .rightMirrored:
         normalizedRect = CGRect(x: normalizedY, y: 1-normalizedX-normalizedWidth, width: normalizedHeight, height: normalizedWidth)
+    @unknown default:
+        normalizedRect = .zero
     }
     
     return normalizedRect
@@ -100,6 +102,8 @@ internal func flashImage(_ mode: AVCaptureDevice.FlashMode) -> String {
         image = "flashOnIcon"
     case .off:
         image = "flashOffIcon"
+    @unknown default:
+        image = "flashOffIcon"
     }
     return image
 }
diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index cdf394fb..de1c909b 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -14,7 +14,7 @@ public typealias CameraViewCompletion = (UIImage?, PHAsset?) -> Void
 
 public extension CameraViewController {
     /// Provides an image picker wrapped inside a UINavigationController instance
-    public class func imagePickerViewController(croppingParameters: CroppingParameters, completion: @escaping CameraViewCompletion) -> UINavigationController {
+    class func imagePickerViewController(croppingParameters: CroppingParameters, completion: @escaping CameraViewCompletion) -> UINavigationController {
         let imagePicker = PhotoLibraryViewController()
         let navigationController = UINavigationController(rootViewController: imagePicker)
         

From 0a2fdcff9c3b8a3314a3e22020cbe7e9e00d02bf Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:14:56 +0200
Subject: [PATCH 14/20] Fixed second target issues

---
 ALCameraViewController.xcodeproj/project.pbxproj            | 6 ++++--
 ALCameraViewController/Utilities/VolumeControl.swift        | 2 +-
 .../ViewController/CameraViewController.swift               | 6 +++---
 .../ViewController/ConfirmViewController.swift              | 4 ++--
 ALCameraViewController/Views/PermissionsView.swift          | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index dbcec2c7..b1a436b6 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
 		7AC96FA21F5B5166003E53F4 /* CroppingParameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AC96FA11F5B5166003E53F4 /* CroppingParameters.swift */; };
 		7AD3B52D23521955002BAD73 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3B52C23521955002BAD73 /* CropOverlay.swift */; };
+		7AEE9B1D23536865001D3C59 /* CropOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AD3B52C23521955002BAD73 /* CropOverlay.swift */; };
 		7C6AF41F1FB340CA006CB4ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7C6AF41E1FB340CA006CB4ED /* LaunchScreen.xib */; };
 		C40665441C73A47C00EB9751 /* SingleImageSaver.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665431C73A47C00EB9751 /* SingleImageSaver.swift */; };
 		C40665461C73A94100EB9751 /* CameraGlobals.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40665451C73A94100EB9751 /* CameraGlobals.swift */; };
@@ -346,6 +347,7 @@
 				C482A0041CAEB18D00541D08 /* SingleImageSaver.swift in Sources */,
 				C482A0051CAEB18D00541D08 /* SingleImageFetcher.swift in Sources */,
 				1F3C56291F701CA7009667E9 /* CroppingParameters.swift in Sources */,
+				7AEE9B1D23536865001D3C59 /* CropOverlay.swift in Sources */,
 				C482A0061CAEB18D00541D08 /* Utilities.swift in Sources */,
 				C482A0071CAEB18D00541D08 /* CameraShot.swift in Sources */,
 				C482A0081CAEB18D00541D08 /* CameraGlobals.swift in Sources */,
@@ -405,7 +407,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CameraViewController/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
@@ -430,7 +432,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = CameraViewController/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
diff --git a/ALCameraViewController/Utilities/VolumeControl.swift b/ALCameraViewController/Utilities/VolumeControl.swift
index f66e2bc6..36172f8a 100644
--- a/ALCameraViewController/Utilities/VolumeControl.swift
+++ b/ALCameraViewController/Utilities/VolumeControl.swift
@@ -27,7 +27,7 @@ public class VolumeControl {
     init(view: UIView, onVolumeChange: VolumeChangeAction?) {
         self.onVolumeChange = onVolumeChange
         view.addSubview(volumeView)
-        view.sendSubviewToBack(volumeView)
+        view.sendSubview(toBack: volumeView)
         
         try? AVAudioSession.sharedInstance().setActive(true)
         NotificationCenter.default.addObserver(self, selector: #selector(volumeChanged), name: NSNotification.Name(rawValue: changeKey), object: nil)
diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index de1c909b..60c189aa 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -327,7 +327,7 @@ open class CameraViewController: UIViewController {
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(rotateCameraView),
-            name: UIDevice.orientationDidChangeNotification,
+            name: NSNotification.Name.UIDeviceOrientationDidChange,
             object: nil)
     }
     
@@ -609,12 +609,12 @@ open class CameraViewController: UIViewController {
 
     private func showSpinner() -> UIActivityIndicatorView {
         let spinner = UIActivityIndicatorView()
-        spinner.style = .white
+        spinner.activityIndicatorViewStyle = .white
         spinner.center = view.center
         spinner.startAnimating()
         
         view.addSubview(spinner)
-        view.bringSubviewToFront(spinner)
+        view.bringSubview(toFront: spinner)
         
         return spinner
     }
diff --git a/ALCameraViewController/ViewController/ConfirmViewController.swift b/ALCameraViewController/ViewController/ConfirmViewController.swift
index a8cd1ce9..2942af12 100644
--- a/ALCameraViewController/ViewController/ConfirmViewController.swift
+++ b/ALCameraViewController/ViewController/ConfirmViewController.swift
@@ -300,12 +300,12 @@ public class ConfirmViewController: UIViewController {
 	
 	func showSpinner() {
 		spinner = UIActivityIndicatorView()
-		spinner!.style = .white
+        spinner!.activityIndicatorViewStyle = .white
         spinner!.center = centeredView.center
 		spinner!.startAnimating()
 		
 		view.addSubview(spinner!)
-		view.bringSubviewToFront(spinner!)
+        view.bringSubview(toFront: spinner!)
     }
 	
 	func hideSpinner() {
diff --git a/ALCameraViewController/Views/PermissionsView.swift b/ALCameraViewController/Views/PermissionsView.swift
index 4e30dab3..b7a5593b 100644
--- a/ALCameraViewController/Views/PermissionsView.swift
+++ b/ALCameraViewController/Views/PermissionsView.swift
@@ -84,7 +84,7 @@ internal class PermissionsView: UIView {
     }
     
     @objc func openSettings() {
-        if let appSettings = URL(string: UIApplication.openSettingsURLString) {
+        if let appSettings = URL(string: UIApplicationOpenSettingsURLString) {
             UIApplication.shared.openURL(appSettings)
         }
     }

From 0b343e57a6747d4a041e69b21b0db1c75de890f4 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:15:50 +0200
Subject: [PATCH 15/20] Upgraded secondary target to Swift 5

---
 ALCameraViewController.xcodeproj/project.pbxproj            | 6 +++---
 ALCameraViewController/Utilities/VolumeControl.swift        | 2 +-
 .../ViewController/CameraViewController.swift               | 6 +++---
 .../ViewController/ConfirmViewController.swift              | 4 ++--
 ALCameraViewController/Views/PermissionsView.swift          | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index b1a436b6..8ccb9671 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -279,7 +279,7 @@
 				TargetAttributes = {
 					C4829FFA1CAEB16C00541D08 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1110;
 					};
 					FAF0583E1B31618D008E5592 = {
 						CreatedOnToolsVersion = 6.3.2;
@@ -414,7 +414,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -439,7 +439,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
diff --git a/ALCameraViewController/Utilities/VolumeControl.swift b/ALCameraViewController/Utilities/VolumeControl.swift
index 36172f8a..f66e2bc6 100644
--- a/ALCameraViewController/Utilities/VolumeControl.swift
+++ b/ALCameraViewController/Utilities/VolumeControl.swift
@@ -27,7 +27,7 @@ public class VolumeControl {
     init(view: UIView, onVolumeChange: VolumeChangeAction?) {
         self.onVolumeChange = onVolumeChange
         view.addSubview(volumeView)
-        view.sendSubview(toBack: volumeView)
+        view.sendSubviewToBack(volumeView)
         
         try? AVAudioSession.sharedInstance().setActive(true)
         NotificationCenter.default.addObserver(self, selector: #selector(volumeChanged), name: NSNotification.Name(rawValue: changeKey), object: nil)
diff --git a/ALCameraViewController/ViewController/CameraViewController.swift b/ALCameraViewController/ViewController/CameraViewController.swift
index 60c189aa..de1c909b 100644
--- a/ALCameraViewController/ViewController/CameraViewController.swift
+++ b/ALCameraViewController/ViewController/CameraViewController.swift
@@ -327,7 +327,7 @@ open class CameraViewController: UIViewController {
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(rotateCameraView),
-            name: NSNotification.Name.UIDeviceOrientationDidChange,
+            name: UIDevice.orientationDidChangeNotification,
             object: nil)
     }
     
@@ -609,12 +609,12 @@ open class CameraViewController: UIViewController {
 
     private func showSpinner() -> UIActivityIndicatorView {
         let spinner = UIActivityIndicatorView()
-        spinner.activityIndicatorViewStyle = .white
+        spinner.style = .white
         spinner.center = view.center
         spinner.startAnimating()
         
         view.addSubview(spinner)
-        view.bringSubview(toFront: spinner)
+        view.bringSubviewToFront(spinner)
         
         return spinner
     }
diff --git a/ALCameraViewController/ViewController/ConfirmViewController.swift b/ALCameraViewController/ViewController/ConfirmViewController.swift
index 2942af12..0226988a 100644
--- a/ALCameraViewController/ViewController/ConfirmViewController.swift
+++ b/ALCameraViewController/ViewController/ConfirmViewController.swift
@@ -300,12 +300,12 @@ public class ConfirmViewController: UIViewController {
 	
 	func showSpinner() {
 		spinner = UIActivityIndicatorView()
-        spinner!.activityIndicatorViewStyle = .white
+        spinner!.style = .white
         spinner!.center = centeredView.center
 		spinner!.startAnimating()
 		
 		view.addSubview(spinner!)
-        view.bringSubview(toFront: spinner!)
+        view.bringSubviewToFront(spinner!)
     }
 	
 	func hideSpinner() {
diff --git a/ALCameraViewController/Views/PermissionsView.swift b/ALCameraViewController/Views/PermissionsView.swift
index b7a5593b..4e30dab3 100644
--- a/ALCameraViewController/Views/PermissionsView.swift
+++ b/ALCameraViewController/Views/PermissionsView.swift
@@ -84,7 +84,7 @@ internal class PermissionsView: UIView {
     }
     
     @objc func openSettings() {
-        if let appSettings = URL(string: UIApplicationOpenSettingsURLString) {
+        if let appSettings = URL(string: UIApplication.openSettingsURLString) {
             UIApplication.shared.openURL(appSettings)
         }
     }

From 2b42de05d82915298b318217b86d8b90cd6e5ee0 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:19:14 +0200
Subject: [PATCH 16/20] Fixed build settings warnings

---
 ALCameraViewController.xcodeproj/project.pbxproj       | 10 +++++++---
 .../xcschemes/CameraViewController.xcscheme            |  8 +-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 8ccb9671..40726632 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -274,7 +274,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = zero;
 				TargetAttributes = {
 					C4829FFA1CAEB16C00541D08 = {
@@ -413,7 +413,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -438,7 +437,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.zero.CameraViewController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -449,6 +447,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -457,12 +456,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -503,6 +504,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -511,12 +513,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/ALCameraViewController.xcodeproj/xcshareddata/xcschemes/CameraViewController.xcscheme b/ALCameraViewController.xcodeproj/xcshareddata/xcschemes/CameraViewController.xcscheme
index f8654c4d..17d819a6 100644
--- a/ALCameraViewController.xcodeproj/xcshareddata/xcschemes/CameraViewController.xcscheme
+++ b/ALCameraViewController.xcodeproj/xcshareddata/xcschemes/CameraViewController.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,18 +26,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -53,8 +49,6 @@
             ReferencedContainer = "container:ALCameraViewController.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

From 1aca07c2670376fd5908ae9cfc91ce00a69b5215 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume@bellut.com>
Date: Sun, 13 Oct 2019 16:19:48 +0200
Subject: [PATCH 17/20] Version 3.1 (4)

---
 ALCameraViewController.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 40726632..8fcd1b27 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -424,7 +424,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -555,7 +555,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -573,7 +573,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;

From 3ee2e576966f03d7b0b7fc555c83b1eb5f3042ca Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume.bellut@edf.fr>
Date: Wed, 16 Oct 2019 13:43:11 +0200
Subject: [PATCH 18/20] Moved podspec back to original address

---
 ...ontroller-Tulleb.podspec => ALCameraViewController.podspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename ALCameraViewController-Tulleb.podspec => ALCameraViewController.podspec (84%)

diff --git a/ALCameraViewController-Tulleb.podspec b/ALCameraViewController.podspec
similarity index 84%
rename from ALCameraViewController-Tulleb.podspec
rename to ALCameraViewController.podspec
index be45cdc1..102a950f 100644
--- a/ALCameraViewController-Tulleb.podspec
+++ b/ALCameraViewController.podspec
@@ -1,5 +1,5 @@
 Pod::Spec.new do |spec|
-  spec.name               = "ALCameraViewController-Tulleb"
+  spec.name               = "ALCameraViewController"
   spec.version            = "3.1"
   spec.summary            = "A camera view controller with custom image picker and image cropping."
   spec.source             = { :git => "https://github.com/Tulleb/ALCameraViewController.git", :tag => spec.version.to_s }
@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
   spec.license            = "MIT"
   spec.source_files       = "ALCameraViewController/**/*.{swift}"
   spec.resources          = ["ALCameraViewController/ViewController/ConfirmViewController.xib", "ALCameraViewController/CameraViewAssets.xcassets", "ALCameraViewController/CameraView.strings"]
-  spec.homepage           = "https://github.com/Tulleb/ALCameraViewController"
+  spec.homepage           = "https://github.com/AlexLittlejohn/ALCameraViewController.git"
   spec.author             = { "Alex Littlejohn" => "alexlittlejohn@me.com", "Guillaume Bellut" => "guillaume@bellut.com" }
   spec.swift_version      = '5.0'
 end

From e1de4c2b9ae98b92cfed63373591910bb968db74 Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume.bellut@edf.fr>
Date: Wed, 16 Oct 2019 13:43:43 +0200
Subject: [PATCH 19/20] Version 3.1 (5)

---
 ALCameraViewController.xcodeproj/project.pbxproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
index 8fcd1b27..05e68f65 100644
--- a/ALCameraViewController.xcodeproj/project.pbxproj
+++ b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -424,7 +424,7 @@
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -555,7 +555,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -573,7 +573,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 9E43V6CC9L;
 				INFOPLIST_FILE = "Example/Supporting Files/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;

From 7d3a9fbd36f3291014f10bba0acf399666a85ebc Mon Sep 17 00:00:00 2001
From: Guillaume Bellut <guillaume.bellut@edf.fr>
Date: Wed, 16 Oct 2019 15:23:13 +0200
Subject: [PATCH 20/20] Improved crop overlay structure

---
 .../Views/CropOverlay.swift                   | 100 +++++++++---------
 1 file changed, 52 insertions(+), 48 deletions(-)

diff --git a/ALCameraViewController/Views/CropOverlay.swift b/ALCameraViewController/Views/CropOverlay.swift
index 275fef19..4501444d 100644
--- a/ALCameraViewController/Views/CropOverlay.swift
+++ b/ALCameraViewController/Views/CropOverlay.swift
@@ -18,6 +18,7 @@ internal class CropOverlay: UIView {
                            UIButton(),  // top right
                            UIButton(),  // bottom left
                            UIButton()]  // bottom right
+    private let precisionView = UIView()    // view containing lines
 
     private var cornerButtonWidth: CGFloat = 45
 
@@ -73,7 +74,7 @@ internal class CropOverlay: UIView {
         addGestureRecognizer(panGesture)
 
         loadButtons()
-        loadLines()
+        loadPrecisionView()
     }
 
     private func loadButtons() {
@@ -106,55 +107,32 @@ internal class CropOverlay: UIView {
         buttons[3].heightAnchor.constraint(equalTo: buttons[3].widthAnchor).isActive = true
     }
 
-    private func loadLines() {
-        loadBorders()
-        loadCornerLines()
-    }
-
-    private func loadBorders() {
-        let borders = [UIView(),    // top
-                       UIView(),    // left
-                       UIView(),    // bottom
-                       UIView()]    // right
+    private func loadPrecisionView() {
+        precisionView.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(precisionView)
 
-        borders.forEach {
-            $0.translatesAutoresizingMaskIntoConstraints = false
-            addSubview($0)
+        precisionView.isUserInteractionEnabled = false
+        precisionView.layer.borderWidth = 1
+        precisionView.layer.borderColor = UIColor.white.cgColor
 
-            $0.isUserInteractionEnabled = false
-            $0.backgroundColor = .white
-        }
+        precisionView.topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+        precisionView.leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+        precisionView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+        precisionView.rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
 
-        borders[0].heightAnchor.constraint(equalToConstant: 1).isActive = true
-        borders[0].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
-        borders[0].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
-        borders[0].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
-
-        borders[1].widthAnchor.constraint(equalToConstant: 1).isActive = true
-        borders[1].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
-        borders[1].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
-        borders[1].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
-
-        borders[2].heightAnchor.constraint(equalToConstant: 1).isActive = true
-        borders[2].leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
-        borders[2].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
-        borders[2].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
-
-        borders[3].widthAnchor.constraint(equalToConstant: 1).isActive = true
-        borders[3].topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
-        borders[3].bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
-        borders[3].rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+        loadCornerLines()
+        loadPrecisionLines()
     }
 
     private func loadCornerLines() {
         let cornerLines = [UIView(), UIView(),  // top left
-                       UIView(), UIView(),  // top right
-                       UIView(), UIView(),  // bottom left
-                       UIView(), UIView()]  // bottom right
+            UIView(), UIView(),  // top right
+            UIView(), UIView(),  // bottom left
+            UIView(), UIView()]  // bottom right
 
         cornerLines.forEach {
             $0.translatesAutoresizingMaskIntoConstraints = false
-            addSubview($0)
+            precisionView.addSubview($0)
 
             $0.isUserInteractionEnabled = false
             $0.backgroundColor = .white
@@ -166,35 +144,61 @@ internal class CropOverlay: UIView {
                 $0.heightAnchor.constraint(equalToConstant: cornerLineLength).isActive = true
 
                 if index <= 3 {
-                    $0.topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+                    $0.topAnchor.constraint(equalTo: precisionView.topAnchor, constant: -cornerLineDepth).isActive = true
                 } else {
-                    $0.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+                    $0.bottomAnchor.constraint(equalTo: precisionView.bottomAnchor, constant: cornerLineDepth).isActive = true
                 }
 
                 if index % 4 == 0 {
-                    $0.leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+                    $0.rightAnchor.constraint(equalTo: precisionView.leftAnchor).isActive = true
                 } else {
-                    $0.rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+                    $0.leftAnchor.constraint(equalTo: precisionView.rightAnchor).isActive = true
                 }
             } else {
                 $0.widthAnchor.constraint(equalToConstant: cornerLineLength).isActive = true
                 $0.heightAnchor.constraint(equalToConstant: cornerLineDepth).isActive = true
 
                 if index <= 3 {
-                    $0.leftAnchor.constraint(equalTo: leftAnchor, constant: outterGap).isActive = true
+                    $0.leftAnchor.constraint(equalTo: precisionView.leftAnchor, constant: -cornerLineDepth).isActive = true
                 } else {
-                    $0.rightAnchor.constraint(equalTo: rightAnchor, constant: -outterGap).isActive = true
+                    $0.rightAnchor.constraint(equalTo: precisionView.rightAnchor, constant: cornerLineDepth).isActive = true
                 }
 
                 if index % 4 == 1 {
-                    $0.topAnchor.constraint(equalTo: topAnchor, constant: outterGap).isActive = true
+                    $0.bottomAnchor.constraint(equalTo: precisionView.topAnchor).isActive = true
                 } else {
-                    $0.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -outterGap).isActive = true
+                    $0.topAnchor.constraint(equalTo: precisionView.bottomAnchor).isActive = true
                 }
             }
         }
     }
 
+    private func loadPrecisionLines() {
+        let centeredViews = [UIView(), UIView()]
+
+        centeredViews.forEach {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+            precisionView.addSubview($0)
+
+            $0.isUserInteractionEnabled = false
+
+            $0.layer.borderWidth = 1
+            $0.layer.borderColor = UIColor.white.cgColor
+        }
+
+        // Horizontal view
+        centeredViews[0].leftAnchor.constraint(equalTo: precisionView.leftAnchor).isActive = true
+        centeredViews[0].rightAnchor.constraint(equalTo: precisionView.rightAnchor).isActive = true
+        centeredViews[0].heightAnchor.constraint(equalTo: precisionView.heightAnchor, multiplier: 1/3).isActive = true
+        centeredViews[0].centerYAnchor.constraint(equalTo: precisionView.centerYAnchor).isActive = true
+
+        // Vertical view
+        centeredViews[1].topAnchor.constraint(equalTo: precisionView.topAnchor).isActive = true
+        centeredViews[1].bottomAnchor.constraint(equalTo: precisionView.bottomAnchor).isActive = true
+        centeredViews[1].widthAnchor.constraint(equalTo: precisionView.widthAnchor, multiplier: 1/3).isActive = true
+        centeredViews[1].centerXAnchor.constraint(equalTo: precisionView.centerXAnchor).isActive = true
+    }
+
     @objc func move(gestureRecognizer: UIPanGestureRecognizer) {
         if isResizable, let button = gestureRecognizer.view as? UIButton {
             if gestureRecognizer.state == .began || gestureRecognizer.state == .changed {