Merge pull request #22 from Athlee/develop-v0.1.2

[ATHImagePickerController] Develop 0.1.2

Source/ATHImagePickerAssetsViewController.swift

@@ -188,6 +188,8 @@ extension ATHImagePickerAssetsViewController: PhotoCachable {
   }
 }
 
+// MARK: - UIScrollView management
+
 extension ATHImagePickerAssetsViewController {
   public func scrollViewDidScroll(_ scrollView: UIScrollView) {
     if scrollView == collectionView {
@@ -204,6 +206,8 @@ extension ATHImagePickerAssetsViewController {
   }
 }
 
+// MARK: - UICollectionView management
+
 extension ATHImagePickerAssetsViewController: UICollectionViewDataSource, UICollectionViewDelegate {
   public func numberOfSections(in collectionView: UICollectionView) -> Int {
     return 1

Source/ATHImagePickerCaptureViewController.swift

@@ -35,6 +35,7 @@ final public class ATHImagePickerCaptureViewController: UIViewController, PhotoC
   }
 
   public var videoInput: AVCaptureDeviceInput?
+
   public var imageOutput: AVCaptureStillImageOutput?
 
   public var focusView: UIView?
@@ -63,19 +64,19 @@ final public class ATHImagePickerCaptureViewController: UIViewController, PhotoC
 
       switch flashMode {
       case .on:
-        let image = /*config.assets?.flashOnImage ??*/
+        let image = config.assets?.flashOnImage ??
           UIImage(named: "Flash", in: bundle, compatibleWith: nil)
 
         flashButton.setImage(image, for: .normal)
 
       case .off:
-        let image = /*config.assets?.flashOffImage ??*/
+        let image = config.assets?.flashOffImage ??
           UIImage(named: "FlashOff", in: bundle, compatibleWith: nil)
 
         flashButton.setImage(image, for: .normal)
 
       case .auto:
-        let image = /*config.assets?.flashAutoImage ??*/
+        let image = config.assets?.flashAutoImage ??
           UIImage(named: "FlashAuto", in: bundle, compatibleWith: nil)
 
         flashButton.setImage(image, for: .normal)
@@ -162,12 +163,11 @@ final public class ATHImagePickerCaptureViewController: UIViewController, PhotoC
     statusBarAnimation = config.statusBarConfig.statusBarAnimation
 
     let bundle = Bundle(for: self.classForCoder)
-    let image = /*config.assets?.switchCameraIcon ??*/
+    let image = config.assets?.switchCameraIcon ??
       UIImage(named: "FlipCamera", in: bundle, compatibleWith: nil)
     switchButton.setImage(image, for: .normal)
   }
 
-
   // MARK: - IBActions
 
   @IBAction func recognizedTapGesture(_ rec: UITapGestureRecognizer) {

Source/ATHImagePickerPreviewViewController.swift

@@ -33,7 +33,7 @@ public protocol PreviewController: FloatingViewLayout {
 
 open class ATHImagePickerPreviewViewController: UIViewController, EmbededController, PreviewController, Cropable {
 
-  // MARK: - Outlets
+  // MARK: Outlets
 
   @IBOutlet weak var cropContainerView: UIView!
 
@@ -64,7 +64,7 @@ open class ATHImagePickerPreviewViewController: UIViewController, EmbededControl
 
   open var allowPanOutside = false
 
-  // MARK: - PickerController properties
+  // MARK: PickerController properties
 
   public var image: UIImage? {
     didSet {
@@ -74,11 +74,11 @@ open class ATHImagePickerPreviewViewController: UIViewController, EmbededControl
     }
   }
 
-  // MARK: - EmbededController properties
+  // MARK: EmbededController properties
 
   internal weak var holder: SelectionController!
 
-  // MARK: - Cropable properties
+  // MARK: Cropable properties
 
   public var cropView = UIScrollView()
   public var childContainerView = UIView()
@@ -97,7 +97,7 @@ open class ATHImagePickerPreviewViewController: UIViewController, EmbededControl
     return CropableScrollViewDelegate(cropable: self)
   }()
 
-  // MARK: - Properties
+  // MARK: Properties
 
   fileprivate var isZooming = false
   fileprivate var isChecking = false
@@ -121,7 +121,7 @@ open class ATHImagePickerPreviewViewController: UIViewController, EmbededControl
     }
   }
 
-  // MARK: - Life cycle
+  // MARK: Life cycle
 
   override open func viewDidLoad() {
     super.viewDidLoad()
@@ -144,6 +144,21 @@ open class ATHImagePickerPreviewViewController: UIViewController, EmbededControl
       addedRecognizers = true
       addGestureRecognizers()
     }
+
+    // Prevent instant velocity behavior.
+    if state == .unfolded {
+      previousPoint = nil
+    }
+  }
+
+  // MARK: Touches
+
+  open override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+    holder.isScrollEnabled = false
+  }
+
+  open override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+    holder.isScrollEnabled = true
   }
 }