GitHub/SideMenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some refactoring and added in .subMenu to the list of behaviors.

Browse Source
This commit is contained in:
jonkykong
2017-01-24 21:14:55 -08:00
parent 08145abacb
commit fbb692cd61
2 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pod/Classes/SideMenuManager.swift
+42 -29
View File
@@ -18,19 +18,20 @@
open class SideMenuManager : NSObject {
@objc public enum MenuPushBehavior : Int {
case defaultBehavior
case popWhenPossible
case replace
case preserve
case preserveAndHideBackButton
@objc public enum MenuPushStyle : Int {
case defaultBehavior,
popWhenPossible,
replace,
preserve,
preserveAndHideBackButton,
subMenu
}
@objc public enum MenuPresentMode : Int {
case menuSlideIn
case viewSlideOut
case viewSlideInOut
case menuDissolveIn
case menuSlideIn,
viewSlideOut,
viewSlideInOut,
menuDissolveIn
}
// Bounds which has been allocated for the app on the whole device screen
@@ -42,14 +43,15 @@ open class SideMenuManager : NSObject {
/**
The push behavior of the menu.
There are six modes in MenuPushBehavior:
- defaultBehavior: The view controller is simply pushed into the stack.
- popWhenPossible: Pops to any view controller already in the navigation stack instead of the view controller being pushed if they share the same class.
- preserve: Retrieves each already created view controller to front when called.
- preserveAndHideBackButton: Retrieves each already created view controller to front when called, and hides the back button.
- replace: Releases the current view controller and pushes the new view controller. Hides the back button by default.
There are six modes in MenuPushStyle:
- defaultBehavior: The view controller is pushed onto the stack.
- popWhenPossible: If a view controller already in the stack is of the same class as the pushed view controller, the stack is instead popped back to the existing view controller. This behavior can help users from getting lost in a deep navigation stack.
- preserve: If a view controller already in the stack is of the same class as the pushed view controller, the existing view controller is pushed to the end of the stack. This behavior is similar to a UITabBarController.
- preserveAndHideBackButton: Same as .preserve and back buttons are automatically hidden.
- replace: Any existing view controllers are released from the stack and replaced with the pushed view controller. Back buttons are automatically hidden. This behavior is ideal if view controllers require a lot of memory or their state doesn't need to be preserved..
- subMenu: Unlike all other behaviors that push using the menu's presentingViewController, this behavior pushes view controllers within the menu. Use this behavior if you want to display a sub menu.
*/
open static var menuPushBehavior: MenuPushBehavior = .defaultBehavior
open static var menuPushStyle: MenuPushStyle = .defaultBehavior
/**
The presentation mode of the menu.
@@ -107,31 +109,42 @@ open class SideMenuManager : NSObject {
/// Draws the `menuAnimationBackgroundColor` behind the status bar. Default is true.
open static var menuFadeStatusBar = true
/// When true, pushViewController called within the menu it will push the new view controller inside of the menu. Otherwise, it is pushed on the menu's presentingViewController. Default is false.
open static var menuAllowSubmenus: Bool = false
/// -Warning: Deprecated. Use `menuPushBehavior = .popWhenPossible` instead.
@available(*, deprecated, renamed: "menuPushBehavior", message: "Use `menuPushBehavior = .popWhenPossible` instead.")
open static var menuAllowPopIfPossible: Bool {
/// -Warning: Deprecated. Use `menuPushStyle = .subMenu` instead.
@available(*, deprecated, renamed: "menuPushStyle", message: "Use `menuPushStyle = .subMenu` instead.")
open static var menuAllowSubmenus: Bool {
get {
return menuPushBehavior == .popWhenPossible
return menuPushStyle == .subMenu
}
set {
if newValue {
menuPushBehavior = .popWhenPossible
menuPushStyle = .subMenu
}
}
}
/// -Warning: Deprecated. Use `menuPushBehavior = .replace` instead.
@available(*, deprecated, renamed: "menuPushBehavior", message: "Use `menuPushBehavior = .replace` instead.")
open static var menuReplaceOnPush: Bool {
/// -Warning: Deprecated. Use `menuPushStyle = .popWhenPossible` instead.
@available(*, deprecated, renamed: "menuPushStyle", message: "Use `menuPushStyle = .popWhenPossible` instead.")
open static var menuAllowPopIfPossible: Bool {
get {
return menuPushBehavior == .replace
return menuPushStyle == .popWhenPossible
}
set {
if newValue {
menuPushBehavior = .replace
menuPushStyle = .popWhenPossible
}
}
}
/// -Warning: Deprecated. Use `menuPushStyle = .replace` instead.
@available(*, deprecated, renamed: "menuPushStyle", message: "Use `menuPushStyle = .replace` instead.")
open static var menuReplaceOnPush: Bool {
get {
return menuPushStyle == .replace
}
set {
if newValue {
menuPushStyle = .replace
}
}
}
Pod/Classes/UISideMenuNavigationController.swift
+14 -28
View File
@@ -119,7 +119,7 @@ open class UISideMenuNavigationController: UINavigationController {
}
override open func pushViewController(_ viewController: UIViewController, animated: Bool) {
guard viewControllers.count > 0 && !SideMenuManager.menuAllowSubmenus else {
guard viewControllers.count > 0 && SideMenuManager.menuPushStyle != .subMenu else {
// NOTE: pushViewController is called by init(rootViewController: UIViewController)
// so we must perform the normal super method in this case.
super.pushViewController(viewController, animated: animated)
@@ -152,56 +152,42 @@ open class UISideMenuNavigationController: UINavigationController {
return
}
switch SideMenuManager.menuPushBehavior {
case .defaultBehavior:
navigationController.pushViewController(viewController, animated: animated)
CATransaction.commit()
return
switch SideMenuManager.menuPushStyle {
case .subMenu, .defaultBehavior: break // .subMenu handled earlier, .defaultBehavior falls through to end
case .popWhenPossible:
for subViewController in navigationController.viewControllers {
for subViewController in navigationController.viewControllers.reversed() {
if type(of: subViewController) == type(of: viewController) {
navigationController.popToViewController(subViewController, animated: animated)
CATransaction.commit()
return
}
}
case .preserve:
case .preserve, .preserveAndHideBackButton:
var viewControllers = navigationController.viewControllers
let filtered = viewControllers.filter { preservedViewController in type(of: preservedViewController) == type(of: viewController) }
if let preservedViewController = filtered.first {
viewControllers = viewControllers.filter { subViewController in subViewController !== preservedViewController }
viewControllers.append(preservedViewController)
navigationController.setViewControllers(viewControllers, animated: animated)
CATransaction.commit()
return
}
navigationController.pushViewController(viewController, animated: animated)
CATransaction.commit()
return
case .preserveAndHideBackButton:
var viewControllers = navigationController.viewControllers
let filtered = viewControllers.filter { preservedViewController in type(of: preservedViewController) == type(of: viewController) }
if let preservedViewController = filtered.first {
if let preservedViewController = filtered.last {
viewControllers = viewControllers.filter { subViewController in subViewController !== preservedViewController }
if SideMenuManager.menuPushStyle == .preserveAndHideBackButton {
preservedViewController.navigationItem.hidesBackButton = true
}
viewControllers.append(preservedViewController)
navigationController.setViewControllers(viewControllers, animated: animated)
CATransaction.commit()
return
}
if SideMenuManager.menuPushStyle == .preserveAndHideBackButton {
viewController.navigationItem.hidesBackButton = true
navigationController.pushViewController(viewController, animated: animated)
CATransaction.commit()
return
}
case .replace:
var viewControllers = navigationController.viewControllers
viewControllers.removeLast()
viewController.navigationItem.hidesBackButton = true
viewControllers.append(viewController)
navigationController.setViewControllers(viewControllers, animated: animated)
navigationController.setViewControllers([viewController], animated: animated)
CATransaction.commit()
return
}
navigationController.pushViewController(viewController, animated: animated)
CATransaction.commit()
}
}