Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| aea7592d85 | |||
| 87edaf1d32 | |||
| d14a8d66b3 | |||
| 36e8131965 | |||
| 58318a638d |
@@ -22,6 +22,7 @@ class MainViewController: UIViewController {
|
||||
super.viewDidLoad()
|
||||
setupSideMenu()
|
||||
updateUI(settings: SideMenuSettings())
|
||||
updateMenus()
|
||||
}
|
||||
|
||||
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
|
||||
|
||||
@@ -211,11 +211,9 @@ private extension SideMenuPresentationController {
|
||||
if config.presentationStyle.menuOnTop {
|
||||
addShadow(to: presentedViewController.view)
|
||||
presentedViewController.view.layer.zPosition = 1
|
||||
presentingViewController.view.layer.zPosition = 0
|
||||
} else {
|
||||
addShadow(to: presentingViewController.view)
|
||||
presentingViewController.view.layer.zPosition = 1
|
||||
presentedViewController.view.layer.zPosition = 0
|
||||
presentedViewController.view.layer.zPosition = -1
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
import Foundation
|
||||
|
||||
@objcMembers
|
||||
public class SideMenuPresentationStyle {
|
||||
open class SideMenuPresentationStyle {
|
||||
/// Background color behind the views and status bar color
|
||||
public var backgroundColor: UIColor = .black
|
||||
/// The starting alpha value of the menu before it appears
|
||||
|
||||
@@ -106,7 +106,9 @@ open class UISideMenuNavigationController: UINavigationController {
|
||||
open var settings = SideMenuSettings() {
|
||||
didSet {
|
||||
setupBlur()
|
||||
setupSwipeGestures()
|
||||
if !enableSwipeGestures {
|
||||
removeSwipeGesture()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -405,12 +407,8 @@ extension UISideMenuNavigationController: SideMenuTransitionControllerDelegate {
|
||||
}
|
||||
|
||||
internal func sideMenuTransitionController(_ transitionController: SideMenuTransitionController, didPresent viewController: UIViewController) {
|
||||
guard !presentingViewControllerUserInteractionEnabled else { return }
|
||||
|
||||
let panGesture = UIPanGestureRecognizer()
|
||||
panGesture.cancelsTouchesInView = false
|
||||
panGesture.addTarget(self, action: #selector(handleDismissMenuPan(_:)))
|
||||
view.superview?.addGestureRecognizer(panGesture)
|
||||
removeSwipeGesture()
|
||||
swipeToDismissGesture = addDismissPanGesture(to: view.superview)
|
||||
|
||||
let tapGestureRecognizer = UITapGestureRecognizer()
|
||||
tapGestureRecognizer.addTarget(self, action: #selector(handleDismissMenuTap(_:)))
|
||||
@@ -579,7 +577,6 @@ private extension UISideMenuNavigationController {
|
||||
modalPresentationStyle = .overFullScreen
|
||||
|
||||
setupBlur()
|
||||
setupSwipeGestures()
|
||||
registerForNotifications()
|
||||
}
|
||||
|
||||
@@ -626,13 +623,10 @@ private extension UISideMenuNavigationController {
|
||||
}
|
||||
}
|
||||
|
||||
func setupSwipeGestures() {
|
||||
func removeSwipeGesture() {
|
||||
if let swipeToDismissGesture = swipeToDismissGesture {
|
||||
swipeToDismissGesture.view?.removeGestureRecognizer(swipeToDismissGesture)
|
||||
}
|
||||
if enableSwipeGestures {
|
||||
swipeToDismissGesture = addDismissPanGesture(to: view)
|
||||
}
|
||||
}
|
||||
|
||||
func registerForNotifications() {
|
||||
@@ -661,7 +655,8 @@ private extension UISideMenuNavigationController {
|
||||
}
|
||||
}
|
||||
|
||||
@discardableResult func addDismissPanGesture(to view: UIView) -> UIPanGestureRecognizer {
|
||||
@discardableResult func addDismissPanGesture(to view: UIView?) -> UIPanGestureRecognizer? {
|
||||
guard enableSwipeGestures, let view = view else { return nil }
|
||||
return UIPanGestureRecognizer {
|
||||
$0.cancelsTouchesInView = false
|
||||
$0.addTarget(self, action: #selector(handleDismissMenuPan(_:)))
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "SideMenu"
|
||||
s.version = "6.0.4"
|
||||
s.version = "6.0.6"
|
||||
s.summary = "Simple side menu control for iOS in Swift inspired by Facebook. Right and Left sides. No coding required."
|
||||
|
||||
# This description is used to generate tags and improve search results.
|
||||
|
||||
Reference in New Issue
Block a user