Merge pull request #82 from zhxnlai/swift3

Swift 3.0 Compatibility

Author: AndrewSB

ZLSwipeableViewSwift/Direction.swift

@@ -18,7 +18,7 @@ public func ==(lhs: Direction, rhs: Direction) -> Bool {
 /**
  *  Swiped direction.
  */
-public struct Direction : OptionSetType, CustomStringConvertible {
+public struct Direction : OptionSet, CustomStringConvertible {
 
     public var rawValue: UInt
 
@@ -35,7 +35,7 @@ public struct Direction : OptionSetType, CustomStringConvertible {
     public static let Vertical: Direction = [Up, Down]
     public static let All: Direction = [Horizontal, Vertical]
 
-    public static func fromPoint(point: CGPoint) -> Direction {
+    public static func fromPoint(_ point: CGPoint) -> Direction {
         switch (point.x, point.y) {
         case let (x, y) where abs(x) >= abs(y) && x > 0:
             return .Right
@@ -73,4 +73,4 @@ public struct Direction : OptionSetType, CustomStringConvertible {
         }
     }
 
-}
+}

ZLSwipeableViewSwift/Scheduler.swift

@@ -13,19 +13,19 @@ class Scheduler : NSObject {
     typealias Action = () -> Void
     typealias EndCondition = () -> Bool
 
-    var timer: NSTimer?
+    var timer: Timer?
     var action: Action?
     var endCondition: EndCondition?
 
-    func scheduleRepeatedly(action: Action, interval: NSTimeInterval, endCondition: EndCondition)  {
+    func scheduleRepeatedly(_ action: @escaping Action, interval: TimeInterval, endCondition: @escaping EndCondition)  {
         guard timer == nil && interval > 0 else { return }
         self.action = action
         self.endCondition = endCondition
-        timer = NSTimer.scheduledTimerWithTimeInterval(interval, target: self, selector: #selector(Scheduler.doAction(_:)), userInfo: nil, repeats: true)
+        timer = Timer.scheduledTimer(timeInterval: interval, target: self, selector: #selector(Scheduler.doAction(_:)), userInfo: nil, repeats: true)
     }
 
-    func doAction(timer: NSTimer) {
-        guard let action = action, let endCondition = endCondition where !endCondition() else {
+    func doAction(_ timer: Timer) {
+        guard let action = action, let endCondition = endCondition , !endCondition() else {
             timer.invalidate()
             self.timer = nil
             self.action = nil
@@ -35,4 +35,4 @@ class Scheduler : NSObject {
         action()
     }
 
-}
+}

ZLSwipeableViewSwift/ViewManager.swift

@@ -13,26 +13,26 @@ class ViewManager : NSObject {
     // Snapping -> [Moving]+ -> Snapping
     // Snapping -> [Moving]+ -> Swiping -> Snapping
     enum State {
-        case Snapping(CGPoint), Moving(CGPoint), Swiping(CGPoint, CGVector)
+        case snapping(CGPoint), moving(CGPoint), swiping(CGPoint, CGVector)
     }
 
     var state: State {
         didSet {
-            if case .Snapping(_) = oldValue,  case let .Moving(point) = state {
+            if case .snapping(_) = oldValue,  case let .moving(point) = state {
                 unsnapView()
                 attachView(toPoint: point)
-            } else if case .Snapping(_) = oldValue,  case let .Swiping(origin, direction) = state {
+            } else if case .snapping(_) = oldValue,  case let .swiping(origin, direction) = state {
                 unsnapView()
                 attachView(toPoint: origin)
                 pushView(fromPoint: origin, inDirection: direction)
-            } else if case .Moving(_) = oldValue, case let .Moving(point) = state {
+            } else if case .moving(_) = oldValue, case let .moving(point) = state {
                 moveView(toPoint: point)
-            } else if case .Moving(_) = oldValue, case let .Snapping(point) = state {
+            } else if case .moving(_) = oldValue, case let .snapping(point) = state {
                 detachView()
                 snapView(point)
-            } else if case .Moving(_) = oldValue, case let .Swiping(origin, direction) = state {
+            } else if case .moving(_) = oldValue, case let .swiping(origin, direction) = state {
                 pushView(fromPoint: origin, inDirection: direction)
-            } else if case .Swiping(_, _) = oldValue, case let .Snapping(point) = state {
+            } else if case .swiping(_, _) = oldValue, case let .snapping(point) = state {
                 unpushView()
                 detachView()
                 snapView(point)
@@ -41,22 +41,22 @@ class ViewManager : NSObject {
     }
 
     /// To be added to view and removed
-    private class ZLPanGestureRecognizer: UIPanGestureRecognizer { }
-    private class ZLTapGestureRecognizer: UITapGestureRecognizer { }
+    fileprivate class ZLPanGestureRecognizer: UIPanGestureRecognizer { }
+    fileprivate class ZLTapGestureRecognizer: UITapGestureRecognizer { }
 
-    static private let anchorViewWidth = CGFloat(1000)
-    private var anchorView = UIView(frame: CGRect(x: 0, y: 0, width: anchorViewWidth, height: anchorViewWidth))
+    static fileprivate let anchorViewWidth = CGFloat(1000)
+    fileprivate var anchorView = UIView(frame: CGRect(x: 0, y: 0, width: anchorViewWidth, height: anchorViewWidth))
 
-    private var snapBehavior: UISnapBehavior!
-    private var viewToAnchorViewAttachmentBehavior: UIAttachmentBehavior!
-    private var anchorViewToPointAttachmentBehavior: UIAttachmentBehavior!
-    private var pushBehavior: UIPushBehavior!
+    fileprivate var snapBehavior: UISnapBehavior!
+    fileprivate var viewToAnchorViewAttachmentBehavior: UIAttachmentBehavior!
+    fileprivate var anchorViewToPointAttachmentBehavior: UIAttachmentBehavior!
+    fileprivate var pushBehavior: UIPushBehavior!
 
-    private let view: UIView
-    private let containerView: UIView
-    private let miscContainerView: UIView
-    private let animator: UIDynamicAnimator
-    private weak var swipeableView: ZLSwipeableView?
+    fileprivate let view: UIView
+    fileprivate let containerView: UIView
+    fileprivate let miscContainerView: UIView
+    fileprivate let animator: UIDynamicAnimator
+    fileprivate weak var swipeableView: ZLSwipeableView?
 
     init(view: UIView, containerView: UIView, index: Int, miscContainerView: UIView, animator: UIDynamicAnimator, swipeableView: ZLSwipeableView) {
         self.view = view
@@ -71,16 +71,16 @@ class ViewManager : NSObject {
         view.addGestureRecognizer(ZLPanGestureRecognizer(target: self, action: #selector(ViewManager.handlePan(_:))))
         view.addGestureRecognizer(ZLTapGestureRecognizer(target: self, action: #selector(ViewManager.handleTap(_:))))
         miscContainerView.addSubview(anchorView)
-        containerView.insertSubview(view, atIndex: index)
+        containerView.insertSubview(view, at: index)
     }
 
-    static func defaultSnappingState(view: UIView) -> State {
-        return .Snapping(view.convertPoint(view.center, fromView: view.superview))
+    static func defaultSnappingState(_ view: UIView) -> State {
+        return .snapping(view.convert(view.center, from: view.superview))
     }
 
     func snappingStateAtContainerCenter() -> State {
         guard let swipeableView = swipeableView else { return ViewManager.defaultSnappingState(view) }
-        return .Snapping(containerView.convertPoint(swipeableView.center, fromView: swipeableView.superview))
+        return .snapping(containerView.convert(swipeableView.center, from: swipeableView.superview))
     }
 
     deinit {
@@ -98,7 +98,7 @@ class ViewManager : NSObject {
         }
 
         for gestureRecognizer in view.gestureRecognizers! {
-            if gestureRecognizer.isKindOfClass(ZLPanGestureRecognizer.classForCoder()) {
+            if gestureRecognizer.isKind(of: ZLPanGestureRecognizer.classForCoder()) {
                 view.removeGestureRecognizer(gestureRecognizer)
             }
         }
@@ -107,108 +107,108 @@ class ViewManager : NSObject {
         view.removeFromSuperview()
     }
 
-    func handlePan(recognizer: UIPanGestureRecognizer) {
+    func handlePan(_ recognizer: UIPanGestureRecognizer) {
         guard let swipeableView = swipeableView else { return }
 
-        let translation = recognizer.translationInView(containerView)
-        let location = recognizer.locationInView(containerView)
-        let velocity = recognizer.velocityInView(containerView)
+        let translation = recognizer.translation(in: containerView)
+        let location = recognizer.location(in: containerView)
+        let velocity = recognizer.velocity(in: containerView)
         let movement = Movement(location: location, translation: translation, velocity: velocity)
 
         switch recognizer.state {
-        case .Began:
-            guard case .Snapping(_) = state else { return }
-            state = .Moving(location)
-            swipeableView.didStart?(view: view, atLocation: location)
-        case .Changed:
-            guard case .Moving(_) = state else { return }
-            state = .Moving(location)
-            swipeableView.swiping?(view: view, atLocation: location, translation: translation)
-        case .Ended, .Cancelled:
-            guard case .Moving(_) = state else { return }
-            if swipeableView.shouldSwipeView(view: view, movement: movement, swipeableView: swipeableView) {
+        case .began:
+            guard case .snapping(_) = state else { return }
+            state = .moving(location)
+            swipeableView.didStart?(view, location)
+        case .changed:
+            guard case .moving(_) = state else { return }
+            state = .moving(location)
+            swipeableView.swiping?(view, location, translation)
+        case .ended, .cancelled:
+            guard case .moving(_) = state else { return }
+            if swipeableView.shouldSwipeView(view, movement, swipeableView) {
                 let directionVector = CGVector(point: translation.normalized * max(velocity.magnitude, swipeableView.minVelocityInPointPerSecond))
-                state = .Swiping(location, directionVector)
+                state = .swiping(location, directionVector)
                 swipeableView.swipeView(view, location: location, directionVector: directionVector)
             } else {
                 state = snappingStateAtContainerCenter()
-                swipeableView.didCancel?(view: view)
+                swipeableView.didCancel?(view)
             }
-            swipeableView.didEnd?(view: view, atLocation: location)
+            swipeableView.didEnd?(view, location)
         default:
             break
         }
     }
 
-    func handleTap(recognizer: UITapGestureRecognizer) {
-        guard let swipeableView = swipeableView, topView = swipeableView.topView()  else { return }
+    func handleTap(_ recognizer: UITapGestureRecognizer) {
+        guard let swipeableView = swipeableView, let topView = swipeableView.topView()  else { return }
 
-        let location = recognizer.locationInView(containerView)
-        swipeableView.didTap?(view: topView, atLocation: location)
+        let location = recognizer.location(in: containerView)
+        swipeableView.didTap?(topView, location)
     }
 
-    private func snapView(point: CGPoint) {
-        snapBehavior = UISnapBehavior(item: view, snapToPoint: point)
+    fileprivate func snapView(_ point: CGPoint) {
+        snapBehavior = UISnapBehavior(item: view, snapTo: point)
         snapBehavior!.damping = 0.75
         addBehavior(snapBehavior)
     }
 
-    private func unsnapView() {
+    fileprivate func unsnapView() {
         guard let snapBehavior = snapBehavior else { return }
         removeBehavior(snapBehavior)
     }
 
-    private func attachView(toPoint point: CGPoint) {
+    fileprivate func attachView(toPoint point: CGPoint) {
         anchorView.center = point
-        anchorView.backgroundColor = UIColor.blueColor()
-        anchorView.hidden = true
+        anchorView.backgroundColor = UIColor.blue
+        anchorView.isHidden = true
 
         // attach aView to anchorView
         let p = view.center
-        viewToAnchorViewAttachmentBehavior = UIAttachmentBehavior(item: view, offsetFromCenter: UIOffset(horizontal: -(p.x - point.x), vertical: -(p.y - point.y)), attachedToItem: anchorView, offsetFromCenter: UIOffsetZero)
+        viewToAnchorViewAttachmentBehavior = UIAttachmentBehavior(item: view, offsetFromCenter: UIOffset(horizontal: -(p.x - point.x), vertical: -(p.y - point.y)), attachedTo: anchorView, offsetFromCenter: UIOffset.zero)
         viewToAnchorViewAttachmentBehavior!.length = 0
 
         // attach anchorView to point
-        anchorViewToPointAttachmentBehavior = UIAttachmentBehavior(item: anchorView, offsetFromCenter: UIOffsetZero, attachedToAnchor: point)
+        anchorViewToPointAttachmentBehavior = UIAttachmentBehavior(item: anchorView, offsetFromCenter: UIOffset.zero, attachedToAnchor: point)
         anchorViewToPointAttachmentBehavior!.damping = 100
         anchorViewToPointAttachmentBehavior!.length = 0
 
         addBehavior(viewToAnchorViewAttachmentBehavior!)
         addBehavior(anchorViewToPointAttachmentBehavior!)
     }
 
-    private func moveView(toPoint point: CGPoint) {
+    fileprivate func moveView(toPoint point: CGPoint) {
         guard let _ = viewToAnchorViewAttachmentBehavior, let toPoint = anchorViewToPointAttachmentBehavior else { return }
         toPoint.anchorPoint = point
     }
 
-    private func detachView() {
+    fileprivate func detachView() {
         guard let viewToAnchorViewAttachmentBehavior = viewToAnchorViewAttachmentBehavior, let anchorViewToPointAttachmentBehavior = anchorViewToPointAttachmentBehavior else { return }
         removeBehavior(viewToAnchorViewAttachmentBehavior)
         removeBehavior(anchorViewToPointAttachmentBehavior)
     }
 
-    private func pushView(fromPoint point: CGPoint, inDirection direction: CGVector) {
+    fileprivate func pushView(fromPoint point: CGPoint, inDirection direction: CGVector) {
         guard let _ = viewToAnchorViewAttachmentBehavior, let anchorViewToPointAttachmentBehavior = anchorViewToPointAttachmentBehavior  else { return }
 
         removeBehavior(anchorViewToPointAttachmentBehavior)
 
-        pushBehavior = UIPushBehavior(items: [anchorView], mode: .Instantaneous)
+        pushBehavior = UIPushBehavior(items: [anchorView], mode: .instantaneous)
         pushBehavior.pushDirection = direction
         addBehavior(pushBehavior)
     }
 
-    private func unpushView() {
+    fileprivate func unpushView() {
         guard let pushBehavior = pushBehavior else { return }
         removeBehavior(pushBehavior)
     }
 
-    private func addBehavior(behavior: UIDynamicBehavior) {
+    fileprivate func addBehavior(_ behavior: UIDynamicBehavior) {
         animator.addBehavior(behavior)
     }
 
-    private func removeBehavior(behavior: UIDynamicBehavior) {
+    fileprivate func removeBehavior(_ behavior: UIDynamicBehavior) {
         animator.removeBehavior(behavior)
     }
 
-}
+}