Fix issues and update example

Yalantis · Apr 17, 2017 · 9d313f6 · 9d313f6
1 parent 52cf039
commit 9d313f6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/Example/Koloda/BackgroundAnimationViewController.swift b/Example/Koloda/BackgroundAnimationViewController.swift
@@ -81,6 +81,10 @@ extension BackgroundAnimationViewController: KolodaViewDelegate {
 // MARK: KolodaViewDataSource
 extension BackgroundAnimationViewController: KolodaViewDataSource {
 
+    func kolodaSpeedThatCardShouldDrag(_ koloda: KolodaView) -> DragSpeed {
+        return .default
+    }
+
     func kolodaNumberOfCards(_ koloda: KolodaView) -> Int {
         return numberOfCards
     }

diff --git a/Example/Koloda/ViewController.swift b/Example/Koloda/ViewController.swift
@@ -77,6 +77,10 @@ extension ViewController: KolodaViewDataSource {
         return dataSource.count
     }
 
+    func kolodaSpeedThatCardShouldDrag(_ koloda: KolodaView) -> DragSpeed {
+        return .default
+    }
+
     func koloda(_ koloda: KolodaView, viewForCardAt index: Int) -> UIView {
         return UIImageView(image: dataSource[Int(index)])
     }

diff --git a/Pod/Classes/KolodaView/DraggableCardView/DraggableCardView.swift b/Pod/Classes/KolodaView/DraggableCardView/DraggableCardView.swift
@@ -41,6 +41,7 @@ private let cardResetAnimationSpringBounciness: CGFloat = 10.0
 private let cardResetAnimationSpringSpeed: CGFloat = 20.0
 private let cardResetAnimationKey = "resetPositionAnimation"
 private let cardResetAnimationDuration: TimeInterval = 0.2
+internal var cardSwipeActionAnimationDuration: TimeInterval = DragSpeed.default.rawValue
 
 public class DraggableCardView: UIView, UIGestureRecognizerDelegate {
 
@@ -55,7 +56,6 @@ public class DraggableCardView: UIView, UIGestureRecognizerDelegate {
     private var dragBegin = false
     private var dragDistance = CGPoint.zero
     private var swipePercentageMargin: CGFloat = 0.0
-    private var cardSwipeActionAnimationDuration: TimeInterval = DragSpeed.default.rawValue
 
 
     //MARK: Lifecycle

diff --git a/Pod/Classes/KolodaView/KolodaView.swift b/Pod/Classes/KolodaView/KolodaView.swift
@@ -579,7 +579,7 @@ open class KolodaView: UIView, DraggableCardDelegate {
             return super.point(inside: point, with: event)
         }
 
-        if super.pointInside(point, withEvent: event) {
+        if super.point(inside: point, with: event) {
             return visibleCards.count > 0
         }
         else {