fix swipe logic and refactoring

horitaku46 · Mar 20, 2018 · f8621ac · f8621ac
1 parent 82958b3
commit f8621ac
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/BlowinSwiper/BlowinSwipeable.swift b/BlowinSwiper/BlowinSwipeable.swift
@@ -16,7 +16,7 @@ public protocol BlowinSwipeable: class {
 public extension BlowinSwipeable where Self: UIViewController {
 
     public func configureSwipeBack(isLowSensitivity: Bool = false) {
-        guard let navigationController = self.navigationController else { return }
+        guard let navigationController = navigationController else { return }
         blowinSwiper = BlowinSwiper(navigationController: navigationController)
         blowinSwiper?.isLowSensitivity = isLowSensitivity
         navigationController.delegate = blowinSwiper
@@ -28,6 +28,8 @@ public extension BlowinSwipeable where Self: UIViewController {
         guard let scrollView = scrollView else { return }
         if scrollView.contentOffset.x == 0 {
             blowinSwiper?.isShouldRecognizeSimultaneously = true
+        } else {
+            blowinSwiper?.isShouldRecognizeSimultaneously = false
         }
     }
 

diff --git a/BlowinSwiper/BlowinSwiper.swift b/BlowinSwiper/BlowinSwiper.swift
@@ -27,6 +27,7 @@ public final class BlowinSwiper: NSObject {
     private var navigationController: UINavigationController?
     private var percentDriven = UIPercentDrivenInteractiveTransition()
     private var isInteractivePop = false
+    private var isDecideBack = false
 
     public init(navigationController: UINavigationController?) {
         super.init()
@@ -39,6 +40,9 @@ public final class BlowinSwiper: NSObject {
     }
 
     @objc private func handlePanGesture(_ gesture: UIPanGestureRecognizer) {
+        // order not to the extra swipe during transition.
+        if isDecideBack { return }
+
         guard let view = gesture.view else {
             return
         }
@@ -59,10 +63,13 @@ public final class BlowinSwiper: NSObject {
             let percent = translation.x > 0 ? translation.x / view.bounds.width : 0
             percentDriven.update(percent)
 
-        case .ended, .cancelled:
-            isInteractivePop = false
-            let maxWidth = view.bounds.width / 3
-            velocity.x > Const.maxSwipeVelocityX || translation.x > maxWidth ? percentDriven.finish() : percentDriven.cancel()
+        case .ended, .failed, .cancelled:
+            if isInteractivePop {
+                isInteractivePop = false
+                let maxWidth = view.bounds.width / 3
+                isDecideBack = velocity.x > Const.maxSwipeVelocityX || translation.x > maxWidth
+                isDecideBack ? percentDriven.finish() : percentDriven.cancel()
+            }
 
         default:
             break
@@ -76,17 +83,18 @@ extension BlowinSwiper: UIGestureRecognizerDelegate {
         return navigationController?.viewControllers.count ?? 0 > 1
     }
 
-    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer,
+                                  shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         return isShouldRecognizeSimultaneously
     }
 }
 
 extension BlowinSwiper: UINavigationControllerDelegate {
 
     public func navigationController(_ navigationController: UINavigationController,
-                              animationControllerFor operation: UINavigationControllerOperation,
-                              from fromVC: UIViewController,
-                              to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+                                     animationControllerFor operation: UINavigationControllerOperation,
+                                     from fromVC: UIViewController,
+                                     to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
         switch operation {
         case .pop:
             return PopAnimatedTransitioning(isInteractivePop: isInteractivePop)
@@ -97,7 +105,7 @@ extension BlowinSwiper: UINavigationControllerDelegate {
     }
 
     public func navigationController(_ navigationController: UINavigationController,
-                              interactionControllerFor animationController: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+                                     interactionControllerFor animationController: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
         return isInteractivePop ? percentDriven : nil
     }
 }
diff --git a/Example/Sources/Controllers/Color/ColorViewController.swift b/Example/Sources/Controllers/Color/ColorViewController.swift
@@ -21,7 +21,6 @@ final class ColorViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         view.backgroundColor = backgroundColor
     }
 }
diff --git a/Example/Sources/Controllers/First/FirstViewController.swift b/Example/Sources/Controllers/First/FirstViewController.swift
@@ -21,7 +21,7 @@ final class FirstViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        navigationItem.titleView = UILabel.navigationItemTitle("FIrst")
+        navigationItem.titleView = UILabel.navigationItemTitle("First")
         view.backgroundColor = UIColor(hex: ColorHex.green)
 
         let rightShowBarButtonItem = UIBarButtonItem(title: "Show",

diff --git a/Example/Sources/Controllers/Menu/MenuViewController.swift b/Example/Sources/Controllers/Menu/MenuViewController.swift
@@ -50,30 +50,29 @@ final class MenuViewController: UIViewController, BlowinSwipeable {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-
         // Enable scrolling by putting finger back during swipe back
         swipeMenuView.contentScrollView?.isScrollEnabled = true
+    }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         configureSwipeBack(isLowSensitivity: true)
         enabledRecognizeSimultaneously(scrollView: swipeMenuView.contentScrollView)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-
         // Stop the scrollView while swiping back
         swipeMenuView.contentScrollView?.isScrollEnabled = false
     }
 
     override func viewDidDisappear(_ animated: Bool) {
         super.viewDidDisappear(animated)
-
         disabledRecognizeSimultaneously()
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
         super.viewWillTransition(to: size, with: coordinator)
-
         swipeMenuView.willChangeOrientation()
     }
 

diff --git a/Example/Sources/Controllers/Second/SecondViewController.swift b/Example/Sources/Controllers/Second/SecondViewController.swift
@@ -27,9 +27,7 @@ final class SecondViewController: UIViewController, BlowinSwipeable {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         navigationItem.titleView = UILabel.navigationItemTitle("Second")
-
         view.backgroundColor = UIColor(hex: ColorHex.purple)
 
         let leftBackBarButtonItem = UIBarButtonItem(title: "←",
@@ -39,8 +37,8 @@ final class SecondViewController: UIViewController, BlowinSwipeable {
         navigationItem.setLeftBarButton(leftBackBarButtonItem, animated: true)
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
         configureSwipeBack()
     }
 

diff --git a/Example/Sources/Controllers/TabBar/NavigationController.swift b/Example/Sources/Controllers/TabBar/NavigationController.swift
@@ -16,7 +16,6 @@ final class NavigationController: UINavigationController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         navigationBar.barTintColor = .darkGray
         navigationBar.tintColor = .white