Implement onMove closure

Author: kitasuke

Example/PagingMenuControllerDemo/PagingMenuViewController.swift

@@ -17,34 +17,22 @@ class PagingMenuViewController: UIViewController {
         // Do any additional setup after loading the view, typically from a nib.
 
         let pagingMenuController = self.childViewControllers.first as! PagingMenuController
-        pagingMenuController.delegate = self
         pagingMenuController.setup(options)
-    }
-}
-
-extension PagingMenuViewController: PagingMenuControllerDelegate {
-    // MARK: - PagingMenuControllerDelegate
-    func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {
-        print(#function)
-        print(previousMenuController)
-        print(menuController)
-    }
-    
-    func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {
-        print(#function)
-        print(previousMenuController)
-        print(menuController)
-    }
-    
-    func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {
-        print(#function)
-        print(previousMenuItemView)
-        print(menuItemView)
-    }
-    
-    func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {
-        print(#function)
-        print(previousMenuItemView)
-        print(menuItemView)
+        pagingMenuController.onMove = { state in
+            switch state {
+            case let .willMoveController(menuController, previousMenuController):
+                print(previousMenuController)
+                print(menuController)
+            case let .didMoveController(menuController, previousMenuController):
+                print(previousMenuController)
+                print(menuController)
+            case let .willMoveItem(menuItemView, previousMenuItemView):
+                print(previousMenuItemView)
+                print(menuItemView)
+            case let .didMoveItem(menuItemView, previousMenuItemView):
+                print(previousMenuItemView)
+                print(menuItemView)
+            }
+        }
     }
 }

Pod/Classes/MenuView.swift

@@ -11,8 +11,8 @@ import UIKit
 open class MenuView: UIScrollView {
     public fileprivate(set) var currentMenuItemView: MenuItemView!
 
-    weak internal var viewDelegate: PagingMenuControllerDelegate?
     internal fileprivate(set) var menuItemViews = [MenuItemView]()
+    internal var onMove: ((MenuMoveState) -> Void)?
 
     fileprivate var menuOptions: MenuViewCustomizable!
     fileprivate var sortedMenuItemViews = [MenuItemView]()
@@ -115,7 +115,7 @@ open class MenuView: UIScrollView {
 
         if let previousMenuItemView = previousMenuItemView,
             page != previousPage {
-            viewDelegate?.willMove(toMenuItem: menuItemView, fromMenuItem: previousMenuItemView)
+            onMove?(.willMoveItem(to: menuItemView, from: previousMenuItemView))
         }
 
         update(currentPage: page)
@@ -146,7 +146,7 @@ open class MenuView: UIScrollView {
 
             if let previousMenuItemView = previousMenuItemView,
                 page != previousPage {
-                self!.viewDelegate?.didMove(toMenuItem: self!.currentMenuItemView, fromMenuItem: previousMenuItemView)
+                self!.onMove?(.didMoveItem(to: self!.currentMenuItemView, from: previousMenuItemView))
             }
         }
     }

Pod/Classes/PagingMenuController.swift

@@ -8,37 +8,23 @@
 
 import UIKit
 
-public protocol PagingMenuControllerDelegate: class {
-    func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController)
-    func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController)
-    func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView)
-    func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView)
-}
-
-public extension PagingMenuControllerDelegate {
-    func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {}
-    func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {}
-    func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {}
-    func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {}
+public enum MenuMoveState {
+    case willMoveController(to: UIViewController, from: UIViewController)
+    case didMoveController(to: UIViewController, from: UIViewController)
+    case willMoveItem(to: MenuItemView, from: MenuItemView)
+    case didMoveItem(to: MenuItemView, from: MenuItemView)
 }
 
 internal let MinimumSupportedViewCount = 1
 internal let VisiblePagingViewNumber = 3
 
 open class PagingMenuController: UIViewController {
-    weak public var delegate: PagingMenuControllerDelegate? {
-        didSet {
-            guard let menuView = menuView else { return }
-            
-            menuView.viewDelegate = delegate
-        }
-    }
     public fileprivate(set) var menuView: MenuView? {
         didSet {
             guard let menuView = menuView else { return }
 
             menuView.delegate = self
-            menuView.viewDelegate = delegate
+            menuView.onMove = onMove
             menuView.update(currentPage: options.defaultPage)
             view.addSubview(menuView)
         }
@@ -53,6 +39,13 @@ open class PagingMenuController: UIViewController {
             pagingViewController.didMove(toParentViewController: self)
         }
     }
+    public var onMove: ((MenuMoveState) -> Void)? {
+        didSet {
+            guard let menuView = menuView else { return }
+            
+            menuView.onMove = onMove
+        }
+    }
 
     fileprivate var options: PagingMenuControllerCustomizable! {
         didSet {
@@ -172,7 +165,7 @@ open class PagingMenuController: UIViewController {
 
         let nextPage = page % pagingViewController.controllers.count
         let nextPagingViewController = pagingViewController.controllers[nextPage]
-        delegate?.willMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)
+        onMove?(.willMoveController(to: nextPagingViewController, from: previousPagingViewController))
         menuView?.move(toPage: page)
 
         pagingViewController.update(currentPage: nextPage)
@@ -188,7 +181,7 @@ open class PagingMenuController: UIViewController {
                 // show paging views
                 self?.showPagingMenuControllers()
 
-                self?.delegate?.didMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)
+                self?.onMove?(.didMoveController(to: nextPagingViewController, from: previousPagingViewController))
         }
     }