Merge pull request #274 from kitasuke/swift3.0

kitasuke · web-flow · commit 85cb861b6647 · 2016-09-17T20:34:30.000-07:00
Swift3.0
diff --git a/Example/PagingMenuControllerDemo/PagingMenuViewController.swift b/Example/PagingMenuControllerDemo/PagingMenuViewController.swift
@@ -24,16 +24,23 @@ class PagingMenuViewController: UIViewController {
 
 extension PagingMenuViewController: PagingMenuControllerDelegate {
     // MARK: - PagingMenuControllerDelegate
-
-    func willMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController) {
+    func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {
+        print(previousMenuController)
+        print(menuController)
     }
-
-    func didMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController) {
+    
+    func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {
+        print(previousMenuController)
+        print(menuController)
     }
     
-    func willMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {
+    func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {
+        print(previousMenuItemView)
+        print(menuItemView)
     }
     
-    func didMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {
+    func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {
+        print(previousMenuItemView)
+        print(menuItemView)
     }
 }
diff --git a/Pod/Classes/MenuView.swift b/Pod/Classes/MenuView.swift
@@ -97,7 +97,7 @@ open class MenuView: UIScrollView {
     
     // MARK: - Internal method
     
-    internal func moveToMenu(_ page: Int, animated: Bool = true) {
+    internal func move(toPage page: Int, animated: Bool = true) {
         // hide menu view when constructing itself
         if !animated {
             alpha = 0
@@ -109,10 +109,10 @@ open class MenuView: UIScrollView {
         
         if let previousMenuItemView = previousMenuItemView,
             page != previousPage {
-            viewDelegate?.willMoveToMenuItemView(menuItemView, previousMenuItemView: previousMenuItemView)
+            viewDelegate?.willMove(toMenuItem: menuItemView, fromMenuItem: previousMenuItemView)
         }
         
-        updateCurrentPage(page)
+        update(currentPage: page)
         
         let duration = animated ? menuOptions.animationDuration : 0
         UIView.animate(withDuration: duration, animations: { [unowned self] () -> Void in
@@ -140,7 +140,7 @@ open class MenuView: UIScrollView {
             
             if let previousMenuItemView = previousMenuItemView,
                 page != previousPage {
-                self!.viewDelegate?.didMoveToMenuItemView(self!.currentMenuItemView, previousMenuItemView: previousMenuItemView)
+                self!.viewDelegate?.didMove(toMenuItem: self!.currentMenuItemView, fromMenuItem: previousMenuItemView)
             }
         }
     }
@@ -340,7 +340,7 @@ extension MenuView: Pagable {
     var nextPage: Int {
         return currentPage + 1 > menuItemCount - 1 ? 0 : currentPage + 1
     }
-    func updateCurrentPage(_ page: Int) {
+    func update(currentPage page: Int) {
         currentIndex = page
     }
 }
diff --git a/Pod/Classes/PagingMenuController.swift b/Pod/Classes/PagingMenuController.swift
@@ -9,17 +9,17 @@
 import UIKit
 
 public protocol PagingMenuControllerDelegate: class {
-    func willMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController)
-    func didMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController)
-    func willMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView)
-    func didMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView)
+    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 willMoveToPageMenuController(menuController: UIViewController, previousMenuController: UIViewController) {}
-    func didMoveToPageMenuController(menuController: UIViewController, previousMenuController: UIViewController) {}
-    func willMoveToMenuItemView(menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {}
-    func didMoveToMenuItemView(menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {}
+    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) {}
 }
 
 internal let MinimumSupportedViewCount = 1
@@ -33,7 +33,7 @@ open class PagingMenuController: UIViewController, PagingValidator {
             
             menuView.delegate = self
             menuView.viewDelegate = delegate
-            menuView.updateCurrentPage(options.defaultPage)
+            menuView.update(currentPage: options.defaultPage)
             view.addSubview(menuView)
         }
     }
@@ -89,7 +89,7 @@ open class PagingMenuController: UIViewController, PagingValidator {
                 // reset selected menu item view position
                 switch menuOptions.displayMode {
                 case .standard, .infinite:
-                    self.moveToMenuPage(menuView.currentPage)
+                    self.move(toPage: menuView.currentPage)
                 default: break
                 }
                 }, completion: nil)
@@ -110,7 +110,7 @@ open class PagingMenuController: UIViewController, PagingValidator {
         setupMenuView()
         setupMenuController()
         
-        moveToMenuPage(currentPage, animated: false)
+        move(toPage: currentPage, animated: false)
     }
     
     fileprivate func setupMenuView() {
@@ -128,12 +128,12 @@ open class PagingMenuController: UIViewController, PagingValidator {
         case .menuView: return
         default: break
         }
-
+        
         constructPagingViewController()
         layoutPagingViewController()
     }
     
-    open func moveToMenuPage(_ page: Int, animated: Bool = true) {
+    open func move(toPage page: Int, animated: Bool = true) {
         switch options.componentType {
         case .menuView, .all:
             // ignore an unexpected page number
@@ -142,15 +142,15 @@ open class PagingMenuController: UIViewController, PagingValidator {
             let lastPage = menuView.currentPage
             guard page != lastPage else {
                 // place views on appropriate position
-                menuView.moveToMenu(page, animated: animated)
+                menuView.move(toPage: page, animated: animated)
                 pagingViewController?.positionMenuController()
                 return
             }
             
             switch options.componentType {
             case .all: break
             default:
-                menuView.moveToMenu(page, animated: animated)
+                menuView.move(toPage: page, animated: animated)
                 return
             }
         case .pagingController:
@@ -159,17 +159,17 @@ open class PagingMenuController: UIViewController, PagingValidator {
         }
         
         guard let pagingViewController = pagingViewController,
-            let previousViewController = pagingViewController.currentViewController else { return }
+            let previousPagingViewController = pagingViewController.currentViewController else { return }
         
         // hide paging views if it's moving to far away
         hidePagingMenuControllers(page)
         
         let nextPage = page % pagingViewController.controllers.count
         let nextPagingViewController = pagingViewController.controllers[nextPage]
-        delegate?.willMoveToPageMenuController(nextPagingViewController, previousMenuController: previousViewController)
-        menuView?.moveToMenu(page)
+        delegate?.willMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)
+        menuView?.move(toPage: page)
         
-        pagingViewController.updateCurrentPage(nextPage)
+        pagingViewController.update(currentPage: nextPage)
         pagingViewController.currentViewController = nextPagingViewController
         
         let duration = animated ? options.animationDuration : 0
@@ -182,7 +182,7 @@ open class PagingMenuController: UIViewController, PagingValidator {
                 // show paging views
                 self?.showPagingMenuControllers()
                 
-                self?.delegate?.didMoveToPageMenuController(nextPagingViewController, previousMenuController: previousViewController)
+                self?.delegate?.didMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)
         }
     }
     
@@ -291,7 +291,7 @@ extension PagingMenuController: UIScrollViewDelegate {
         default: return
         }
         
-        moveToMenuPage(nextPage)
+        move(toPage: nextPage)
     }
     
     public func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
@@ -301,7 +301,7 @@ extension PagingMenuController: UIScrollViewDelegate {
         }
         
         let nextPage = nextPageFromCurrentPoint
-        moveToMenuPage(nextPage)
+        move(toPage: nextPage)
     }
 }
 
@@ -418,7 +418,7 @@ extension PagingMenuController: GestureHandler {
             newPage = page
         }
         
-        moveToMenuPage(newPage)
+        move(toPage: newPage)
     }
     
     internal func handleSwipeGesture(_ recognizer: UISwipeGestureRecognizer) {
@@ -438,7 +438,7 @@ extension PagingMenuController: GestureHandler {
         default: return
         }
         
-        moveToMenuPage(newPage)
+        move(toPage: newPage)
     }
 }
 
diff --git a/Pod/Classes/PagingViewController.swift b/Pod/Classes/PagingViewController.swift
@@ -32,7 +32,7 @@ open class PagingViewController: UIViewController {
         
         super.init(nibName: nil, bundle: nil)
         
-        updateCurrentPage(options.defaultPage)
+        update(currentPage: options.defaultPage)
         setup()
     }
     
@@ -63,7 +63,7 @@ open class PagingViewController: UIViewController {
         constructPagingViewControllers()
         layoutPagingViewControllers()
         
-        updateCurrentPage(options.defaultPage)
+        update(currentPage: options.defaultPage)
         currentViewController = controllers[currentPage]
         hideVisibleControllers()
     }
@@ -91,9 +91,9 @@ open class PagingViewController: UIViewController {
     fileprivate func constructPagingViewControllers() {
         for (index, controller) in controllers.enumerated() {
             // construct three child view controllers at a maximum, previous(optional), current and next(optional)
-            if !shouldLoadPage(index) {
+            if !shouldLoad(page: index) {
                 // remove unnecessary child view controllers
-                if isVisibleController(controller) {
+                if isVisible(controller: controller) {
                     controller.willMove(toParentViewController: nil)
                     controller.view!.removeFromSuperview()
                     controller.removeFromParentViewController()
@@ -104,7 +104,7 @@ open class PagingViewController: UIViewController {
             }
             
             // ignore if it's already added
-            if isVisibleController(controller) {
+            if isVisible(controller: controller) {
                 continue
             }
             
@@ -130,7 +130,7 @@ open class PagingViewController: UIViewController {
         
         var viewsDictionary: [String: AnyObject] = ["contentScrollView": contentScrollView]
         for (index, controller) in controllers.enumerated() {
-            if !shouldLoadPage(index) {
+            if !shouldLoad(page: index) {
                 continue
             }
             
@@ -207,7 +207,7 @@ extension PagingViewController: Pagable {
         
         return currentPage + 1 > menuOptions.itemsOptions.count - 1 ? 0 : currentPage + 1
     }
-    func updateCurrentPage(_ page: Int) {
+    func update(currentPage page: Int) {
         currentIndex = page
     }
 }
@@ -228,7 +228,7 @@ extension PagingViewController: ViewCleanable {
 }
 
 extension PagingViewController: PageLoadable {
-    func shouldLoadPage(_ page: Int) -> Bool {
+    func shouldLoad(page page: Int) -> Bool {
         switch (options.menuControllerSet, options.lazyLoadingPage) {
         case (.single, _),
              (_, .one):
@@ -247,7 +247,7 @@ extension PagingViewController: PageLoadable {
         return true
     }
     
-    func isVisibleController(_ controller: UIViewController) -> Bool {
+    func isVisible(controller controller: UIViewController) -> Bool {
         return self.childViewControllers.contains(controller)
     }
     
diff --git a/Pod/Classes/Protocols/Pagable.swift b/Pod/Classes/Protocols/Pagable.swift
@@ -12,9 +12,9 @@ protocol Pagable {
     var currentPage: Int { get }
     var previousPage: Int { get }
     var nextPage: Int { get }
-    func updateCurrentPage(_ page: Int)
+    func update(currentPage page: Int)
 }
 
 extension Pagable {
-    func updateCurrentPage(_ page: Int) {}
+    func update(currentPage page: Int) {}
 }
diff --git a/Pod/Classes/Protocols/PageLoadable.swift b/Pod/Classes/Protocols/PageLoadable.swift
@@ -9,8 +9,8 @@
 import Foundation
 
 protocol PageLoadable {
-    func shouldLoadPage(_ page: Int) -> Bool
-    func isVisibleController(_ controller: UIViewController) -> Bool
+    func shouldLoad(page page: Int) -> Bool
+    func isVisible(controller controller: UIViewController) -> Bool
     func showVisibleControllers()
     func hideVisibleControllers()
 }

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,23 @@ class PagingMenuViewController: UIViewController {`
`24`	`24`
`25`	`25`	`extension PagingMenuViewController: PagingMenuControllerDelegate {`
`26`	`26`	`// MARK: - PagingMenuControllerDelegate`
`27`		`-`
`28`		`- func willMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController) {`
	`27`	`+ func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {`
	`28`	`+ print(previousMenuController)`
	`29`	`+ print(menuController)`
`29`	`30`	`}`
`30`		`-`
`31`		`- func didMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController) {`
	`31`	`+`
	`32`	`+ func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {`
	`33`	`+ print(previousMenuController)`
	`34`	`+ print(menuController)`
`32`	`35`	`}`
`33`	`36`
`34`		`- func willMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {`
	`37`	`+ func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {`
	`38`	`+ print(previousMenuItemView)`
	`39`	`+ print(menuItemView)`
`35`	`40`	`}`
`36`	`41`
`37`		`- func didMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {`
	`42`	`+ func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {`
	`43`	`+ print(previousMenuItemView)`
	`44`	`+ print(menuItemView)`
`38`	`45`	`}`
`39`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ open class MenuView: UIScrollView {`
`97`	`97`
`98`	`98`	`// MARK: - Internal method`
`99`	`99`
`100`		`- internal func moveToMenu(_ page: Int, animated: Bool = true) {`
	`100`	`+ internal func move(toPage page: Int, animated: Bool = true) {`
`101`	`101`	`// hide menu view when constructing itself`
`102`	`102`	`if !animated {`
`103`	`103`	`alpha = 0`
`@@ -109,10 +109,10 @@ open class MenuView: UIScrollView {`
`109`	`109`
`110`	`110`	`if let previousMenuItemView = previousMenuItemView,`
`111`	`111`	`page != previousPage {`
`112`		`- viewDelegate?.willMoveToMenuItemView(menuItemView, previousMenuItemView: previousMenuItemView)`
	`112`	`+ viewDelegate?.willMove(toMenuItem: menuItemView, fromMenuItem: previousMenuItemView)`
`113`	`113`	`}`
`114`	`114`
`115`		`- updateCurrentPage(page)`
	`115`	`+ update(currentPage: page)`
`116`	`116`
`117`	`117`	`let duration = animated ? menuOptions.animationDuration : 0`
`118`	`118`	`UIView.animate(withDuration: duration, animations: { [unowned self] () -> Void in`
`@@ -140,7 +140,7 @@ open class MenuView: UIScrollView {`
`140`	`140`
`141`	`141`	`if let previousMenuItemView = previousMenuItemView,`
`142`	`142`	`page != previousPage {`
`143`		`- self!.viewDelegate?.didMoveToMenuItemView(self!.currentMenuItemView, previousMenuItemView: previousMenuItemView)`
	`143`	`+ self!.viewDelegate?.didMove(toMenuItem: self!.currentMenuItemView, fromMenuItem: previousMenuItemView)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -340,7 +340,7 @@ extension MenuView: Pagable {`
`340`	`340`	`var nextPage: Int {`
`341`	`341`	`return currentPage + 1 > menuItemCount - 1 ? 0 : currentPage + 1`
`342`	`342`	`}`
`343`		`- func updateCurrentPage(_ page: Int) {`
	`343`	`+ func update(currentPage page: Int) {`
`344`	`344`	`currentIndex = page`
`345`	`345`	`}`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,17 @@`
`9`	`9`	`import UIKit`
`10`	`10`
`11`	`11`	`public protocol PagingMenuControllerDelegate: class {`
`12`		`- func willMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController)`
`13`		`- func didMoveToPageMenuController(_ menuController: UIViewController, previousMenuController: UIViewController)`
`14`		`- func willMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView)`
`15`		`- func didMoveToMenuItemView(_ menuItemView: MenuItemView, previousMenuItemView: MenuItemView)`
	`12`	`+ func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController)`
	`13`	`+ func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController)`
	`14`	`+ func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView)`
	`15`	`+ func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public extension PagingMenuControllerDelegate {`
`19`		`- func willMoveToPageMenuController(menuController: UIViewController, previousMenuController: UIViewController) {}`
`20`		`- func didMoveToPageMenuController(menuController: UIViewController, previousMenuController: UIViewController) {}`
`21`		`- func willMoveToMenuItemView(menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {}`
`22`		`- func didMoveToMenuItemView(menuItemView: MenuItemView, previousMenuItemView: MenuItemView) {}`
	`19`	`+ func willMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {}`
	`20`	`+ func didMove(toMenu menuController: UIViewController, fromMenu previousMenuController: UIViewController) {}`
	`21`	`+ func willMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {}`
	`22`	`+ func didMove(toMenuItem menuItemView: MenuItemView, fromMenuItem previousMenuItemView: MenuItemView) {}`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`internal let MinimumSupportedViewCount = 1`
`@@ -33,7 +33,7 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`33`	`33`
`34`	`34`	`menuView.delegate = self`
`35`	`35`	`menuView.viewDelegate = delegate`
`36`		`- menuView.updateCurrentPage(options.defaultPage)`
	`36`	`+ menuView.update(currentPage: options.defaultPage)`
`37`	`37`	`view.addSubview(menuView)`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -89,7 +89,7 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`89`	`89`	`// reset selected menu item view position`
`90`	`90`	`switch menuOptions.displayMode {`
`91`	`91`	`case .standard, .infinite:`
`92`		`- self.moveToMenuPage(menuView.currentPage)`
	`92`	`+ self.move(toPage: menuView.currentPage)`
`93`	`93`	`default: break`
`94`	`94`	`}`
`95`	`95`	`}, completion: nil)`
`@@ -110,7 +110,7 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`110`	`110`	`setupMenuView()`
`111`	`111`	`setupMenuController()`
`112`	`112`
`113`		`- moveToMenuPage(currentPage, animated: false)`
	`113`	`+ move(toPage: currentPage, animated: false)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`fileprivate func setupMenuView() {`
`@@ -128,12 +128,12 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`128`	`128`	`case .menuView: return`
`129`	`129`	`default: break`
`130`	`130`	`}`
`131`		`-`
	`131`	`+`
`132`	`132`	`constructPagingViewController()`
`133`	`133`	`layoutPagingViewController()`
`134`	`134`	`}`
`135`	`135`
`136`		`- open func moveToMenuPage(_ page: Int, animated: Bool = true) {`
	`136`	`+ open func move(toPage page: Int, animated: Bool = true) {`
`137`	`137`	`switch options.componentType {`
`138`	`138`	`case .menuView, .all:`
`139`	`139`	`// ignore an unexpected page number`
`@@ -142,15 +142,15 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`142`	`142`	`let lastPage = menuView.currentPage`
`143`	`143`	`guard page != lastPage else {`
`144`	`144`	`// place views on appropriate position`
`145`		`- menuView.moveToMenu(page, animated: animated)`
	`145`	`+ menuView.move(toPage: page, animated: animated)`
`146`	`146`	`pagingViewController?.positionMenuController()`
`147`	`147`	`return`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`switch options.componentType {`
`151`	`151`	`case .all: break`
`152`	`152`	`default:`
`153`		`- menuView.moveToMenu(page, animated: animated)`
	`153`	`+ menuView.move(toPage: page, animated: animated)`
`154`	`154`	`return`
`155`	`155`	`}`
`156`	`156`	`case .pagingController:`
`@@ -159,17 +159,17 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`guard let pagingViewController = pagingViewController,`
`162`		`- let previousViewController = pagingViewController.currentViewController else { return }`
	`162`	`+ let previousPagingViewController = pagingViewController.currentViewController else { return }`
`163`	`163`
`164`	`164`	`// hide paging views if it's moving to far away`
`165`	`165`	`hidePagingMenuControllers(page)`
`166`	`166`
`167`	`167`	`let nextPage = page % pagingViewController.controllers.count`
`168`	`168`	`let nextPagingViewController = pagingViewController.controllers[nextPage]`
`169`		`- delegate?.willMoveToPageMenuController(nextPagingViewController, previousMenuController: previousViewController)`
`170`		`- menuView?.moveToMenu(page)`
	`169`	`+ delegate?.willMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)`
	`170`	`+ menuView?.move(toPage: page)`
`171`	`171`
`172`		`- pagingViewController.updateCurrentPage(nextPage)`
	`172`	`+ pagingViewController.update(currentPage: nextPage)`
`173`	`173`	`pagingViewController.currentViewController = nextPagingViewController`
`174`	`174`
`175`	`175`	`let duration = animated ? options.animationDuration : 0`
`@@ -182,7 +182,7 @@ open class PagingMenuController: UIViewController, PagingValidator {`
`182`	`182`	`// show paging views`
`183`	`183`	`self?.showPagingMenuControllers()`
`184`	`184`
`185`		`- self?.delegate?.didMoveToPageMenuController(nextPagingViewController, previousMenuController: previousViewController)`
	`185`	`+ self?.delegate?.didMove(toMenu: nextPagingViewController, fromMenu: previousPagingViewController)`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`@@ -291,7 +291,7 @@ extension PagingMenuController: UIScrollViewDelegate {`
`291`	`291`	`default: return`
`292`	`292`	`}`
`293`	`293`
`294`		`- moveToMenuPage(nextPage)`
	`294`	`+ move(toPage: nextPage)`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`public func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {`
`@@ -301,7 +301,7 @@ extension PagingMenuController: UIScrollViewDelegate {`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`let nextPage = nextPageFromCurrentPoint`
`304`		`- moveToMenuPage(nextPage)`
	`304`	`+ move(toPage: nextPage)`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`@@ -418,7 +418,7 @@ extension PagingMenuController: GestureHandler {`
`418`	`418`	`newPage = page`
`419`	`419`	`}`
`420`	`420`
`421`		`- moveToMenuPage(newPage)`
	`421`	`+ move(toPage: newPage)`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`internal func handleSwipeGesture(_ recognizer: UISwipeGestureRecognizer) {`
`@@ -438,7 +438,7 @@ extension PagingMenuController: GestureHandler {`
`438`	`438`	`default: return`
`439`	`439`	`}`
`440`	`440`
`441`		`- moveToMenuPage(newPage)`
	`441`	`+ move(toPage: newPage)`
`442`	`442`	`}`
`443`	`443`	`}`
`444`	`444`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ open class PagingViewController: UIViewController {`
`32`	`32`
`33`	`33`	`super.init(nibName: nil, bundle: nil)`
`34`	`34`
`35`		`- updateCurrentPage(options.defaultPage)`
	`35`	`+ update(currentPage: options.defaultPage)`
`36`	`36`	`setup()`
`37`	`37`	`}`
`38`	`38`
`@@ -63,7 +63,7 @@ open class PagingViewController: UIViewController {`
`63`	`63`	`constructPagingViewControllers()`
`64`	`64`	`layoutPagingViewControllers()`
`65`	`65`
`66`		`- updateCurrentPage(options.defaultPage)`
	`66`	`+ update(currentPage: options.defaultPage)`
`67`	`67`	`currentViewController = controllers[currentPage]`
`68`	`68`	`hideVisibleControllers()`
`69`	`69`	`}`
`@@ -91,9 +91,9 @@ open class PagingViewController: UIViewController {`
`91`	`91`	`fileprivate func constructPagingViewControllers() {`
`92`	`92`	`for (index, controller) in controllers.enumerated() {`
`93`	`93`	`// construct three child view controllers at a maximum, previous(optional), current and next(optional)`
`94`		`- if !shouldLoadPage(index) {`
	`94`	`+ if !shouldLoad(page: index) {`
`95`	`95`	`// remove unnecessary child view controllers`
`96`		`- if isVisibleController(controller) {`
	`96`	`+ if isVisible(controller: controller) {`
`97`	`97`	`controller.willMove(toParentViewController: nil)`
`98`	`98`	`controller.view!.removeFromSuperview()`
`99`	`99`	`controller.removeFromParentViewController()`
`@@ -104,7 +104,7 @@ open class PagingViewController: UIViewController {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// ignore if it's already added`
`107`		`- if isVisibleController(controller) {`
	`107`	`+ if isVisible(controller: controller) {`
`108`	`108`	`continue`
`109`	`109`	`}`
`110`	`110`
`@@ -130,7 +130,7 @@ open class PagingViewController: UIViewController {`
`130`	`130`
`131`	`131`	`var viewsDictionary: [String: AnyObject] = ["contentScrollView": contentScrollView]`
`132`	`132`	`for (index, controller) in controllers.enumerated() {`
`133`		`- if !shouldLoadPage(index) {`
	`133`	`+ if !shouldLoad(page: index) {`
`134`	`134`	`continue`
`135`	`135`	`}`
`136`	`136`
`@@ -207,7 +207,7 @@ extension PagingViewController: Pagable {`
`207`	`207`
`208`	`208`	`return currentPage + 1 > menuOptions.itemsOptions.count - 1 ? 0 : currentPage + 1`
`209`	`209`	`}`
`210`		`- func updateCurrentPage(_ page: Int) {`
	`210`	`+ func update(currentPage page: Int) {`
`211`	`211`	`currentIndex = page`
`212`	`212`	`}`
`213`	`213`	`}`
`@@ -228,7 +228,7 @@ extension PagingViewController: ViewCleanable {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`extension PagingViewController: PageLoadable {`
`231`		`- func shouldLoadPage(_ page: Int) -> Bool {`
	`231`	`+ func shouldLoad(page page: Int) -> Bool {`
`232`	`232`	`switch (options.menuControllerSet, options.lazyLoadingPage) {`
`233`	`233`	`case (.single, _),`
`234`	`234`	`(_, .one):`
`@@ -247,7 +247,7 @@ extension PagingViewController: PageLoadable {`
`247`	`247`	`return true`
`248`	`248`	`}`
`249`	`249`
`250`		`- func isVisibleController(_ controller: UIViewController) -> Bool {`
	`250`	`+ func isVisible(controller controller: UIViewController) -> Bool {`
`251`	`251`	`return self.childViewControllers.contains(controller)`
`252`	`252`	`}`
`253`	`253`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ protocol Pagable {`
`12`	`12`	`var currentPage: Int { get }`
`13`	`13`	`var previousPage: Int { get }`
`14`	`14`	`var nextPage: Int { get }`
`15`		`- func updateCurrentPage(_ page: Int)`
	`15`	`+ func update(currentPage page: Int)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`extension Pagable {`
`19`		`- func updateCurrentPage(_ page: Int) {}`
	`19`	`+ func update(currentPage page: Int) {}`
`20`	`20`	`}`