interaction changed

ahmetkgunay · Jul 11, 2017 · d00b527 · d00b527
1 parent a4eed81
commit d00b527
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/AKGPushAnimator/AKGPushAnimator/AKGInteractionAnimator.swift b/AKGPushAnimator/AKGPushAnimator/AKGInteractionAnimator.swift
@@ -34,8 +34,9 @@ public class AKGInteractionAnimator: UIPercentDrivenInteractiveTransition {
             transitionInProgress = true
             navigationController.popViewController(animated: true)
         case .changed:
-            let const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width)
-            shouldCompleteTransition = const > 0.4 || velocity.x > UIScreen.main.bounds.width
+            var const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width * 1.0)
+            const = min(1.0, max(0.0, const))
+            shouldCompleteTransition = const > 0.5 || velocity.x > UIScreen.main.bounds.width
             update(const)
         case .cancelled, .ended:
             transitionInProgress = false

diff --git a/Examples/AKGPushAnimatorDemo/AKGPushAnimator/AKGPushAnimator/AKGInteractionAnimator.swift b/Examples/AKGPushAnimatorDemo/AKGPushAnimator/AKGPushAnimator/AKGInteractionAnimator.swift
@@ -34,8 +34,9 @@ public class AKGInteractionAnimator: UIPercentDrivenInteractiveTransition {
             transitionInProgress = true
             navigationController.popViewController(animated: true)
         case .changed:
-            let const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width)
-            shouldCompleteTransition = const > 0.4 || velocity.x > UIScreen.main.bounds.width
+            var const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width * 1.0)
+            const = min(1.0, max(0.0, const))
+            shouldCompleteTransition = const > 0.5 || velocity.x > UIScreen.main.bounds.width
             update(const)
         case .cancelled, .ended:
             transitionInProgress = false

diff --git a/Source/AKGInteractionAnimator.swift b/Source/AKGInteractionAnimator.swift
@@ -34,8 +34,9 @@ public class AKGInteractionAnimator: UIPercentDrivenInteractiveTransition {
             transitionInProgress = true
             navigationController.popViewController(animated: true)
         case .changed:
-            let const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width)
-            shouldCompleteTransition = const > 0.4 || velocity.x > UIScreen.main.bounds.width
+            var const = CGFloat(viewTranslation.x / UIScreen.main.bounds.width * 1.0)
+            const = min(1.0, max(0.0, const))
+            shouldCompleteTransition = const > 0.5 || velocity.x > UIScreen.main.bounds.width
             update(const)
         case .cancelled, .ended:
             transitionInProgress = false