Merge pull request #104 from hyperoslo/fix/swipe-animations

Fix gesture animations
hyperoslo · Mar 3, 2018 · d4a57a2 · d4a57a2
2 parents 91b13f2 + 35b361b
commit d4a57a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/Animations/DissolveAnimation.swift b/Source/Animations/DissolveAnimation.swift
@@ -67,7 +67,7 @@ extension DissolveAnimation {
     if view.layer.animationKeys() == nil {
       if view.superview != nil {
         let ratio = offsetRatio > 0.0 ? offsetRatio : (1.0 + offsetRatio)
-        view.alpha = min(0.0, max(1.0, ratio))
+        view.alpha = max(0.0, min(1.0, ratio))
       }
     }
   }

diff --git a/Source/Animations/PopAnimation.swift b/Source/Animations/PopAnimation.swift
@@ -75,7 +75,7 @@ extension PopAnimation {
     if view.layer.animationKeys() == nil {
       if view.superview != nil {
         let ratio = offsetRatio > 0.0 ? offsetRatio : (1.0 + offsetRatio)
-        view.alpha = min(0.0, max(1.0, ratio))
+        view.alpha = max(0.0, min(1.0, ratio))
       }
     }
   }

diff --git a/Source/Animations/TransitionAnimation.swift b/Source/Animations/TransitionAnimation.swift
@@ -90,7 +90,7 @@ extension TransitionAnimation {
         let startY = position.yInFrame(superview.bounds)
         let dy = destination.yInFrame(superview.bounds) - startY
 
-        let ratio = min(0.0, max(1.0, offsetRatio > 0.0 ? offsetRatio : (1.0 + offsetRatio)))
+        let ratio = max(0.0, min(1.0, offsetRatio > 0.0 ? offsetRatio : (1.0 + offsetRatio)))
         let offsetX = dx * ratio
         let offsetY = dy * ratio