Merge pull request #2 from prolificinteractive/bugfix/instant_hide_an…

…imation

[Bugfix] Instant Hide Animation

Example/Velar.xcodeproj/project.pbxproj

@@ -698,6 +698,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B74458D812EA17F503470BCD /* Pods-Velar_Tests.debug.xcconfig */;
 			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -720,6 +721,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB4E23AEF5C67035F11856B9 /* Pods-Velar_Tests.release.xcconfig */;
 			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",

Velar.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Velar'
-  s.version          = '0.1.2'
+  s.version          = '0.1.3'
   s.summary          = 'A custom alert view presenter.'
 
   s.description      = <<-DESC

Velar/Classes/Base View/BaseView.swift

@@ -66,6 +66,11 @@ internal class BaseView: UIView {
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        modalViewDismisser.viewHeight = frame.height
+    }
 }
 
 private extension BaseView {

Velar/Classes/Helper Classes/ModalViewDismisser.swift

@@ -13,11 +13,11 @@ internal class ModalViewDismisser: Dismissable {
     var canDismiss: Bool {
         return  (modalView.center.y - (viewHeight / 2)) > dismissThreshold
     }
-
+
+    var viewHeight: CGFloat
+
     private var modalView: UIView
-
-    private var viewHeight: CGFloat
-
+
     private var dismissThreshold: CGFloat
 
     private var verticalMover: VerticalMovable

Velar/Classes/Helper Classes/ViewPresenter.swift

@@ -11,22 +11,23 @@ import UIKit
 internal class ViewPresenter: Presentable {
 
     var view: UIView? = nil
-    
+
     private var viewConstraintGenerator: ConstraintGenerator
 
     private var verticalMover: VerticalMovable
 
     private weak var superView: UIView?
 
     init(superView: UIView?, viewConstraintGenerator: ConstraintGenerator, verticalMover: VerticalMovable) {
+
         self.viewConstraintGenerator = viewConstraintGenerator
         self.verticalMover = verticalMover
         self.superView = superView
     }
 
     func present(view: UIView, animate: Bool) {
         self.view = view
-        
+
         viewConstraintGenerator.constraint(subView: view, top: 0, leading: 0, bottom: 0, trailing: 0)
 
         superView?.layoutIfNeeded()

Velar/Classes/Protocols/Dismissable.swift

@@ -11,6 +11,8 @@ import Foundation
 internal protocol Dismissable {
 
     var canDismiss: Bool { get }
-
+
+    var viewHeight: CGFloat { get set }
+
     func dismiss(animate: Bool, completion: (()->())?)
 }

Velar/Classes/VelarPresenter/VelarPresenter.swift

@@ -27,7 +27,7 @@ public class VelarPresenter {
 
     /// Animator for changing view alpha.
     public var alphaAnimator: AlphaAnimatable = {
-        return AlphaAnimator(showAlpha: 1, hideAlpha: 0, duration: 0.25)
+        return AlphaAnimator(showAlpha: 1, hideAlpha: 0, duration: 0.35)
     }()
 
     /// The speed of the show and hide modal animation.
@@ -134,8 +134,10 @@ extension VelarPresenter: PanGestureAdderDelegate {
 
 private extension VelarPresenter {
 
-    @objc func backgroundViewSelected() {
-        hide(animate: true)
+    @objc func backgroundViewSelected(recognizer: UIGestureRecognizer) {
+        if !baseView.modalView.frame.contains(recognizer.location(in: baseView)) {
+            hide(animate: true)
+        }
     }
 }