Skip to content

Create 2 properties to disable closing pan and tap gesture #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eikebartels wants to merge 4 commits into from
Closed

Create 2 properties to disable closing pan and tap gesture #76

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bea33c
added property "closingTapGestureEnabled" to disable closing TapGestu…
eikebartels Oct 19, 2016
ce77802
manage closingTapGestureEnabled login in didSet
eikebartels Oct 19, 2016
fe0238f
added property "closingPanGestureEnabled" to disable closing pan gesture
eikebartels Oct 19, 2016
2639731
fixed issue in set drawer state switch for "self.closingPanGestureEna…
eikebartels Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 101 additions & 79 deletions KYDrawerController/Classes/KYDrawerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/*
Copyright (c) 2015 Kyohei Yamaguchi. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
Copyright (c) 2015 Kyohei Yamaguchi. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

import UIKit

Expand All @@ -39,15 +39,15 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
@objc public enum DrawerState: Int {
case opened, closed
}

/**************************************************************************/
// MARK: - Properties
/**************************************************************************/

@IBInspectable public var containerViewMaxAlpha: CGFloat = 0.2

@IBInspectable public var drawerAnimationDuration: TimeInterval = 0.25

@IBInspectable public var mainSegueIdentifier: String?

@IBInspectable public var drawerSegueIdentifier: String?
Expand All @@ -67,13 +67,25 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
view.addGestureRecognizer(self.containerViewTapGesture)
return view
}()

/// Returns `true` if `beginAppearanceTransition()` has been called with `true` as the first parameter, and `false`
/// if the first parameter is `false`. Returns `nil` if appearance transition is not in progress.
private var _isAppearing: Bool?

public var screenEdgePanGestureEnabled = true

public var closingPanGestureEnabled = true

public var closingTapGestureEnabled = true{
didSet{
if closingTapGestureEnabled {
_containerView.addGestureRecognizer(self.containerViewTapGesture)
}else {
_containerView.removeGestureRecognizer(self.containerViewTapGesture)
}
}
}

public private(set) lazy var screenEdgePanGesture: UIScreenEdgePanGestureRecognizer = {
let gesture = UIScreenEdgePanGestureRecognizer(
target: self,
Expand All @@ -95,7 +107,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
gesture.delegate = self
return gesture
}()

public private(set) lazy var containerViewTapGesture: UITapGestureRecognizer = {
let gesture = UITapGestureRecognizer(
target: self,
Expand Down Expand Up @@ -126,7 +138,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
@IBInspectable public var drawerWidth: CGFloat = 280 {
didSet { _drawerWidthConstraint?.constant = drawerWidth }
}

public var displayingViewController: UIViewController? {
switch drawerState {
case .closed:
Expand All @@ -135,21 +147,21 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
return drawerViewController
}
}

public var mainViewController: UIViewController! {
didSet {
if let oldController = oldValue {
oldController.willMove(toParentViewController: nil)
oldController.view.removeFromSuperview()
oldController.removeFromParentViewController()
}

guard let mainViewController = mainViewController else { return }
addChildViewController(mainViewController)

mainViewController.view.translatesAutoresizingMaskIntoConstraints = false
view.insertSubview(mainViewController.view, at: 0)

let viewDictionary = ["mainView" : mainViewController.view!]
view.addConstraints(
NSLayoutConstraint.constraints(
Expand All @@ -167,7 +179,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
views: viewDictionary
)
)

mainViewController.didMove(toParentViewController: self)
}
}
Expand All @@ -179,16 +191,16 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
oldController.view.removeFromSuperview()
oldController.removeFromParentViewController()
}

guard let drawerViewController = drawerViewController else { return }
addChildViewController(drawerViewController)

drawerViewController.view.layer.shadowColor = UIColor.black.cgColor
drawerViewController.view.layer.shadowOpacity = 0.4
drawerViewController.view.layer.shadowRadius = 5.0
drawerViewController.view.translatesAutoresizingMaskIntoConstraints = false
_containerView.addSubview(drawerViewController.view)

let itemAttribute: NSLayoutAttribute
let toItemAttribute: NSLayoutAttribute
switch drawerDirection {
Expand All @@ -199,7 +211,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
itemAttribute = .left
toItemAttribute = .right
}

_drawerWidthConstraint = NSLayoutConstraint(
item: drawerViewController.view,
attribute: NSLayoutAttribute.width,
Expand All @@ -221,7 +233,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
constant: 0
)
_containerView.addConstraint(_drawerConstraint)

let viewDictionary = ["drawerView" : drawerViewController.view!]
_containerView.addConstraints(
NSLayoutConstraint.constraints(
Expand Down Expand Up @@ -291,81 +303,91 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
performSegue(withIdentifier: drawerSegueID, sender: self)
}
}

override open func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
displayingViewController?.beginAppearanceTransition(true, animated: animated)
}

override open func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
displayingViewController?.endAppearanceTransition()
}

override open func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
displayingViewController?.beginAppearanceTransition(false, animated: animated)
}

override open func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
displayingViewController?.endAppearanceTransition()
}

// We will manually call `mainViewController` or `drawerViewController`'s
// view appearance methods.
override open var shouldAutomaticallyForwardAppearanceMethods: Bool {
get {
return false
}
}

/**************************************************************************/
// MARK: - Public Method
/**************************************************************************/

public func setDrawerState(_ state: DrawerState, animated: Bool) {
_containerView.isHidden = false
let duration: TimeInterval = animated ? drawerAnimationDuration : 0

let isAppearing = state == .opened
if _isAppearing != isAppearing {
_isAppearing = isAppearing
drawerViewController?.beginAppearanceTransition(isAppearing, animated: animated)
mainViewController?.beginAppearanceTransition(!isAppearing, animated: animated)
}

UIView.animate(withDuration: duration,
delay: 0,
options: .curveEaseOut,
animations: { () -> Void in
switch state {
case .closed:
self._drawerConstraint.constant = 0
self._containerView.backgroundColor = UIColor(white: 0, alpha: 0)
case .opened:
let constant: CGFloat
switch self.drawerDirection {
case .left:
constant = self.drawerWidth
case .right:
constant = -self.drawerWidth
}
self._drawerConstraint.constant = constant
self._containerView.backgroundColor = UIColor(
white: 0
, alpha: self.containerViewMaxAlpha
)
}
self._containerView.layoutIfNeeded()
}) { (finished: Bool) -> Void in
if state == .closed {
self._containerView.isHidden = true
}
self.drawerViewController?.endAppearanceTransition()
self.mainViewController?.endAppearanceTransition()
self._isAppearing = nil
self.delegate?.drawerController?(self, stateChanged: state)
delay: 0,
options: .curveEaseOut,
animations: { () -> Void in
switch state {
case .closed:
self._drawerConstraint.constant = 0
self._containerView.backgroundColor = UIColor(white: 0, alpha: 0)
case .opened:
let constant: CGFloat
switch self.drawerDirection {
case .left:
constant = self.drawerWidth
case .right:
constant = -self.drawerWidth
}
self._drawerConstraint.constant = constant
self._containerView.backgroundColor = UIColor(
white: 0
, alpha: self.containerViewMaxAlpha
)
}
self._containerView.layoutIfNeeded()
}) { (finished: Bool) -> Void in

switch state {
case .closed where !self.closingPanGestureEnabled:
self.view.addGestureRecognizer(self.panGesture)
case .closed:
self._containerView.isHidden = true
break
case .opened where !self.closingPanGestureEnabled:
self.view.removeGestureRecognizer(self.panGesture)
break
default: break
}

self.drawerViewController?.endAppearanceTransition()
self.mainViewController?.endAppearanceTransition()
self._isAppearing = nil
self.delegate?.drawerController?(self, stateChanged: state)
}
}

Expand Down Expand Up @@ -415,7 +437,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
drawerViewController?.beginAppearanceTransition(isAppearing, animated: true)
mainViewController?.beginAppearanceTransition(!isAppearing, animated: true)
}

_panStartLocation = sender.location(in: view)
_panDelta = delta
case .ended, .cancelled:
Expand Down Expand Up @@ -443,7 +465,7 @@ open class KYDrawerController: UIViewController, UIGestureRecognizerDelegate {
default:
return touch.view == gestureRecognizer.view
}
}

}
}