diff --git a/Example/MainViewController.swift b/Example/MainViewController.swift index aedcb6a..1acbb93 100644 --- a/Example/MainViewController.swift +++ b/Example/MainViewController.swift @@ -98,7 +98,7 @@ class MainViewController: UIViewController { } } -extension MainViewController: UISideMenuNavigationControllerDelegate { +extension MainViewController: SideMenuNavigationControllerDelegate { func sideMenuWillAppear(menu: SideMenuNavigationController, animated: Bool) { print("SideMenu Appearing! (animated: \(animated))") diff --git a/Pod/Classes/Deprecations.swift b/Pod/Classes/Deprecations.swift index 1d4a9b6..3320a0c 100644 --- a/Pod/Classes/Deprecations.swift +++ b/Pod/Classes/Deprecations.swift @@ -20,43 +20,43 @@ extension SideMenuManager { set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuPresentMode: SideMenuPresentationStyle { get { return .viewSlideOut } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuPushStyle: SideMenuPushStyle { get { return .default } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAllowPushOfSameClassTwice: Bool { get { return true } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuWidth: CGFloat { get { return 0 } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationPresentDuration: Double { get { return 0.35 } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationDismissDuration: Double { get { return 0.35 } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationCompleteGestureDuration: Double { get { return 0.35 } set {} @@ -98,7 +98,7 @@ extension SideMenuManager { set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuPresentingViewControllerUserInteractionEnabled: Bool { get { return false } set {} @@ -110,73 +110,73 @@ extension SideMenuManager { set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuFadeStatusBar: Bool { get { return true } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationOptions: UIView.AnimationOptions { get { return .curveEaseInOut } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationCompletionCurve: UIView.AnimationCurve { get { return .easeIn } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationUsingSpringWithDamping: CGFloat { get { return 1 } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAnimationInitialSpringVelocity: CGFloat { get { return 1 } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuDismissOnPush: Bool { get { return true } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuAlwaysAnimate: Bool { get { return false } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuDismissWhenBackgrounded: Bool { get { return true } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuBlurEffectStyle: UIBlurEffect.Style? { get { return nil } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public weak var menuLeftSwipeToDismissGesture: UIPanGestureRecognizer? { get { return nil } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public weak var menuRightSwipeToDismissGesture: UIPanGestureRecognizer? { get { return nil } set {} } - @available(*, deprecated, message: "This property has been moved to the UISideMenuNavigationController class.") + @available(*, deprecated, message: "This property has been moved to the SideMenuNavigationController class.") public var menuEnableSwipeGestures: Bool { get { return true } set {} @@ -209,3 +209,6 @@ extension SideMenuPresentationStyle { @available(*, deprecated, renamed: "SideMenuNavigationController") public typealias UISideMenuNavigationController = SideMenuNavigationController + +@available(*, deprecated, renamed: "SideMenuNavigationControllerDelegate") +public typealias UISideMenuNavigationControllerDelegate = SideMenuNavigationControllerDelegate diff --git a/Pod/Classes/Print.swift b/Pod/Classes/Print.swift index e1ca68f..91aa3b0 100644 --- a/Pod/Classes/Print.swift +++ b/Pod/Classes/Print.swift @@ -9,8 +9,8 @@ import Foundation internal enum Print: String { case cannotPush = "Attempt to push a View Controller from %@ where its navigationController == nil. It must be embedded in a UINavigationController for this to work.", - emptyMenu = "The menu doesn't have a view controller to show! UISideMenuNavigationController needs a view controller to display just like a UINavigationController.", - menuAlreadyAssigned = "%@ was already assigned to the %@ of %@. When using multiple SideMenuManagers you may want to use new instances of UISideMenuNavigationController instead of existing instances to avoid crashes if the menu is presented more than once.", + emptyMenu = "The menu doesn't have a view controller to show! SideMenuNavigationController needs a view controller to display just like a UINavigationController.", + menuAlreadyAssigned = "%@ was already assigned to the %@ of %@. When using multiple SideMenuManagers you may want to use new instances of SideMenuNavigationController instead of existing instances to avoid crashes if the menu is presented more than once.", menuInUse = "%@ cannot be modified while it's presented.", panGestureAdded = "%@ was called before %@ or %@ was set. Gestures will not work without a menu.", property = "A menu's %@ property can only be changed when it is hidden.", diff --git a/Pod/Classes/SideMenuManager.swift b/Pod/Classes/SideMenuManager.swift index 7595942..8e17900 100644 --- a/Pod/Classes/SideMenuManager.swift +++ b/Pod/Classes/SideMenuManager.swift @@ -221,7 +221,7 @@ private extension SideMenuManager { } } -extension SideMenuManager: UISideMenuNavigationControllerTransitionDelegate { +extension SideMenuManager: SideMenuNavigationControllerTransitionDelegate { internal func sideMenuTransitionDidDismiss(menu: Menu) { defer { switching = false } diff --git a/Pod/Classes/SideMenuNavigationController.swift b/Pod/Classes/SideMenuNavigationController.swift index 7fbfc7a..658e405 100644 --- a/Pod/Classes/SideMenuNavigationController.swift +++ b/Pod/Classes/SideMenuNavigationController.swift @@ -1,5 +1,5 @@ // -// UISideMenuNavigationController.swift +// SideMenuNavigationController.swift // // Created by Jon Kent on 1/14/16. // Copyright © 2016 Jon Kent. All rights reserved. @@ -16,14 +16,14 @@ import UIKit subMenu } -@objc public protocol UISideMenuNavigationControllerDelegate { +@objc public protocol SideMenuNavigationControllerDelegate { @objc optional func sideMenuWillAppear(menu: SideMenuNavigationController, animated: Bool) @objc optional func sideMenuDidAppear(menu: SideMenuNavigationController, animated: Bool) @objc optional func sideMenuWillDisappear(menu: SideMenuNavigationController, animated: Bool) @objc optional func sideMenuDidDisappear(menu: SideMenuNavigationController, animated: Bool) } -internal protocol UISideMenuNavigationControllerTransitionDelegate: class { +internal protocol SideMenuNavigationControllerTransitionDelegate: class { func sideMenuTransitionDidDismiss(menu: Menu) } @@ -79,8 +79,8 @@ open class SideMenuNavigationController: UINavigationController { private var rotating: Bool = false private var transitionController: SideMenuTransitionController? - /// Delegate for receiving appear and disappear related events. If `nil` the visible view controller that displays a `UISideMenuNavigationController` automatically receives these events. - internal weak var sideMenuDelegate: UISideMenuNavigationControllerDelegate? + /// Delegate for receiving appear and disappear related events. If `nil` the visible view controller that displays a `SideMenuNavigationController` automatically receives these events. + internal weak var sideMenuDelegate: SideMenuNavigationControllerDelegate? /// The swipe to dismiss gesture. open private(set) weak var swipeToDismissGesture: UIPanGestureRecognizer? = nil @@ -540,12 +540,12 @@ internal extension SideMenuNavigationController { private extension SideMenuNavigationController { - weak var activeDelegate: UISideMenuNavigationControllerDelegate? { + weak var activeDelegate: SideMenuNavigationControllerDelegate? { guard !view.isHidden else { return nil } if let sideMenuDelegate = sideMenuDelegate { return sideMenuDelegate } - return visibleViewController(from: presentingViewController) as? UISideMenuNavigationControllerDelegate + return visibleViewController(from: presentingViewController) as? SideMenuNavigationControllerDelegate } func visibleViewController(from: UIViewController?) -> UIViewController? {