Skip to content

M
Material
Commit 9d03ba4e by Daniel Dahan
Options

issue-997: Fixed NavigationDrawerController where swiping off d 

evice caused a partial correct state.
parent 5456cd7b
Showing with 64 additions and 9 deletions
CHANGELOG.md
## 2.12.19
* [issue-997](https://github.com/CosmicMind/Material/issues/977): Fixed NavigationDrawerController where swiping off device caused a partial correct state.
## 2.12.18 ## 2.12.18
* Fixed layout issues in CollectionView, where the sizing was not correctlly being initialized. * Fixed layout issues in CollectionView, where the sizing was not correctlly being initialized.
......
Material.podspec
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '2.12.18' s.version = '2.12.19'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'A UI/UX framework for creating beautiful applications.' s.summary = 'A UI/UX framework for creating beautiful applications.'
s.homepage = 'http://materialswift.com' s.homepage = 'http://materialswift.com'
......
Sources/iOS/NavigationDrawerController.swift
...@@ -138,6 +138,9 @@ public protocol NavigationDrawerControllerDelegate { ...@@ -138,6 +138,9 @@ public protocol NavigationDrawerControllerDelegate {
@objc(NavigationDrawerController) @objc(NavigationDrawerController)
open class NavigationDrawerController: TransitionController { open class NavigationDrawerController: TransitionController {
/// A boolean indicating if the panel is animating.
fileprivate var isAnimating = false
/** /**
A CGFloat property that is used internally to track A CGFloat property that is used internally to track
the original (x) position of the container view when panning. the original (x) position of the container view when panning.
...@@ -216,6 +219,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -216,6 +219,7 @@ open class NavigationDrawerController: TransitionController {
if nil != leftView { if nil != leftView {
isLeftViewEnabled = value isLeftViewEnabled = value
} }
if nil != rightView { if nil != rightView {
isRightViewEnabled = value isRightViewEnabled = value
} }
...@@ -429,10 +433,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -429,10 +433,10 @@ open class NavigationDrawerController: TransitionController {
v.frame.size.width = leftViewWidth v.frame.size.width = leftViewWidth
v.frame.size.height = view.bounds.height v.frame.size.height = view.bounds.height
leftViewThreshold = leftViewWidth / 2 leftViewThreshold = leftViewWidth / 2
if let vc = leftViewController { if let vc = leftViewController {
vc.view.frame = v.bounds
vc.view.frame.size.width = leftViewWidth vc.view.frame.size.width = leftViewWidth
vc.view.frame.size.height = v.bounds.height
vc.view.center = CGPoint(x: leftViewWidth / 2, y: v.bounds.height / 2)
} }
} }
...@@ -440,10 +444,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -440,10 +444,10 @@ open class NavigationDrawerController: TransitionController {
v.frame.size.width = rightViewWidth v.frame.size.width = rightViewWidth
v.frame.size.height = view.bounds.height v.frame.size.height = view.bounds.height
rightViewThreshold = view.bounds.width - rightViewWidth / 2 rightViewThreshold = view.bounds.width - rightViewWidth / 2
if let vc = rightViewController { if let vc = rightViewController {
vc.view.frame = v.bounds
vc.view.frame.size.width = rightViewWidth vc.view.frame.size.width = rightViewWidth
vc.view.frame.size.height = v.bounds.height
vc.view.center = CGPoint(x: rightViewWidth / 2, y: v.bounds.height / 2)
} }
} }
...@@ -527,6 +531,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -527,6 +531,7 @@ open class NavigationDrawerController: TransitionController {
v.bounds.size.width = width v.bounds.size.width = width
v.layer.position.x = -width / 2 v.layer.position.x = -width / 2
s.rootViewController.view.alpha = 1 s.rootViewController.view.alpha = 1
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -536,6 +541,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -536,6 +541,7 @@ open class NavigationDrawerController: TransitionController {
s.layoutSubviews() s.layoutSubviews()
s.hideView(container: v) s.hideView(container: v)
} }
} else { } else {
UIView.animate(withDuration: duration, UIView.animate(withDuration: duration,
animations: { [weak self, v = v] in animations: { [weak self, v = v] in
...@@ -546,6 +552,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -546,6 +552,7 @@ open class NavigationDrawerController: TransitionController {
v.bounds.size.width = width v.bounds.size.width = width
v.layer.position.x = width / 2 v.layer.position.x = width / 2
s.rootViewController.view.alpha = 0.5 s.rootViewController.view.alpha = 0.5
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -563,6 +570,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -563,6 +570,7 @@ open class NavigationDrawerController: TransitionController {
hideView(container: v) hideView(container: v)
v.layer.position.x = -v.bounds.width / 2 v.layer.position.x = -v.bounds.width / 2
rootViewController.view.alpha = 1 rootViewController.view.alpha = 1
} else { } else {
showView(container: v) showView(container: v)
v.layer.position.x = width / 2 v.layer.position.x = width / 2
...@@ -609,6 +617,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -609,6 +617,7 @@ open class NavigationDrawerController: TransitionController {
v.bounds.size.width = width v.bounds.size.width = width
v.layer.position.x = s.view.bounds.width + width / 2 v.layer.position.x = s.view.bounds.width + width / 2
s.rootViewController.view.alpha = 1 s.rootViewController.view.alpha = 1
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -618,6 +627,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -618,6 +627,7 @@ open class NavigationDrawerController: TransitionController {
s.layoutSubviews() s.layoutSubviews()
s.hideView(container: v) s.hideView(container: v)
} }
} else { } else {
UIView.animate(withDuration: duration, UIView.animate(withDuration: duration,
animations: { [weak self, v = v] in animations: { [weak self, v = v] in
...@@ -628,6 +638,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -628,6 +638,7 @@ open class NavigationDrawerController: TransitionController {
v.bounds.size.width = width v.bounds.size.width = width
v.layer.position.x = s.view.bounds.width - width / 2 v.layer.position.x = s.view.bounds.width - width / 2
s.rootViewController.view.alpha = 0.5 s.rootViewController.view.alpha = 0.5
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -645,6 +656,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -645,6 +656,7 @@ open class NavigationDrawerController: TransitionController {
hideView(container: v) hideView(container: v)
v.layer.position.x = view.bounds.width + v.bounds.width / 2 v.layer.position.x = view.bounds.width + v.bounds.width / 2
rootViewController.view.alpha = 1 rootViewController.view.alpha = 1
} else { } else {
showView(container: v) showView(container: v)
v.layer.position.x = view.bounds.width - width / 2 v.layer.position.x = view.bounds.width - width / 2
...@@ -684,6 +696,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -684,6 +696,10 @@ open class NavigationDrawerController: TransitionController {
leftView. Defaults to 0. leftView. Defaults to 0.
*/ */
open func openLeftView(velocity: CGFloat = 0) { open func openLeftView(velocity: CGFloat = 0) {
guard !isAnimating else {
return
}
guard isLeftViewEnabled else { guard isLeftViewEnabled else {
return return
} }
...@@ -692,6 +708,8 @@ open class NavigationDrawerController: TransitionController { ...@@ -692,6 +708,8 @@ open class NavigationDrawerController: TransitionController {
return return
} }
isAnimating = true
hideStatusBar() hideStatusBar()
showView(container: v) showView(container: v)
...@@ -707,11 +725,13 @@ open class NavigationDrawerController: TransitionController { ...@@ -707,11 +725,13 @@ open class NavigationDrawerController: TransitionController {
v.layer.position.x = v.bounds.width / 2 v.layer.position.x = v.bounds.width / 2
s.rootViewController.view.alpha = 0.5 s.rootViewController.view.alpha = 0.5
}) { [weak self] _ in }) { [weak self] _ in
guard let s = self else { guard let s = self else {
return return
} }
s.isAnimating = false
s.delegate?.navigationDrawerController?(navigationDrawerController: s, didOpen: .left) s.delegate?.navigationDrawerController?(navigationDrawerController: s, didOpen: .left)
} }
} }
...@@ -723,6 +743,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -723,6 +743,10 @@ open class NavigationDrawerController: TransitionController {
leftView. Defaults to 0. leftView. Defaults to 0.
*/ */
open func openRightView(velocity: CGFloat = 0) { open func openRightView(velocity: CGFloat = 0) {
guard !isAnimating else {
return
}
guard isRightViewEnabled else { guard isRightViewEnabled else {
return return
} }
...@@ -731,6 +755,8 @@ open class NavigationDrawerController: TransitionController { ...@@ -731,6 +755,8 @@ open class NavigationDrawerController: TransitionController {
return return
} }
isAnimating = true
hideStatusBar() hideStatusBar()
showView(container: v) showView(container: v)
...@@ -746,11 +772,14 @@ open class NavigationDrawerController: TransitionController { ...@@ -746,11 +772,14 @@ open class NavigationDrawerController: TransitionController {
v.layer.position.x = s.view.bounds.width - v.bounds.width / 2 v.layer.position.x = s.view.bounds.width - v.bounds.width / 2
s.rootViewController.view.alpha = 0.5 s.rootViewController.view.alpha = 0.5
}) { [weak self] _ in }) { [weak self] _ in
guard let s = self else { guard let s = self else {
return return
} }
s.isAnimating = false
s.delegate?.navigationDrawerController?(navigationDrawerController: s, didOpen: .right) s.delegate?.navigationDrawerController?(navigationDrawerController: s, didOpen: .right)
} }
} }
...@@ -762,6 +791,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -762,6 +791,10 @@ open class NavigationDrawerController: TransitionController {
leftView. Defaults to 0. leftView. Defaults to 0.
*/ */
open func closeLeftView(velocity: CGFloat = 0) { open func closeLeftView(velocity: CGFloat = 0) {
guard !isAnimating else {
return
}
guard isLeftViewEnabled else { guard isLeftViewEnabled else {
return return
} }
...@@ -770,7 +803,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -770,7 +803,7 @@ open class NavigationDrawerController: TransitionController {
return return
} }
isUserInteractionEnabled = true isAnimating = true
delegate?.navigationDrawerController?(navigationDrawerController: self, willClose: .left) delegate?.navigationDrawerController?(navigationDrawerController: self, willClose: .left)
...@@ -782,6 +815,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -782,6 +815,7 @@ open class NavigationDrawerController: TransitionController {
v.layer.position.x = -v.bounds.width / 2 v.layer.position.x = -v.bounds.width / 2
s.rootViewController.view.alpha = 1 s.rootViewController.view.alpha = 1
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -790,6 +824,9 @@ open class NavigationDrawerController: TransitionController { ...@@ -790,6 +824,9 @@ open class NavigationDrawerController: TransitionController {
s.hideView(container: v) s.hideView(container: v)
s.toggleStatusBar() s.toggleStatusBar()
s.isAnimating = false
s.isUserInteractionEnabled = true
s.delegate?.navigationDrawerController?(navigationDrawerController: s, didClose: .left) s.delegate?.navigationDrawerController?(navigationDrawerController: s, didClose: .left)
} }
} }
...@@ -801,6 +838,10 @@ open class NavigationDrawerController: TransitionController { ...@@ -801,6 +838,10 @@ open class NavigationDrawerController: TransitionController {
leftView. Defaults to 0. leftView. Defaults to 0.
*/ */
open func closeRightView(velocity: CGFloat = 0) { open func closeRightView(velocity: CGFloat = 0) {
guard !isAnimating else {
return
}
guard isRightViewEnabled else { guard isRightViewEnabled else {
return return
} }
...@@ -809,7 +850,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -809,7 +850,7 @@ open class NavigationDrawerController: TransitionController {
return return
} }
isUserInteractionEnabled = true isAnimating = true
delegate?.navigationDrawerController?(navigationDrawerController: self, willClose: .right) delegate?.navigationDrawerController?(navigationDrawerController: self, willClose: .right)
...@@ -821,6 +862,7 @@ open class NavigationDrawerController: TransitionController { ...@@ -821,6 +862,7 @@ open class NavigationDrawerController: TransitionController {
v.layer.position.x = s.view.bounds.width + v.bounds.width / 2 v.layer.position.x = s.view.bounds.width + v.bounds.width / 2
s.rootViewController.view.alpha = 1 s.rootViewController.view.alpha = 1
}) { [weak self, v = v] _ in }) { [weak self, v = v] _ in
guard let s = self else { guard let s = self else {
return return
...@@ -829,6 +871,9 @@ open class NavigationDrawerController: TransitionController { ...@@ -829,6 +871,9 @@ open class NavigationDrawerController: TransitionController {
s.hideView(container: v) s.hideView(container: v)
s.toggleStatusBar() s.toggleStatusBar()
s.isAnimating = false
s.isUserInteractionEnabled = true
s.delegate?.navigationDrawerController?(navigationDrawerController: s, didClose: .right) s.delegate?.navigationDrawerController?(navigationDrawerController: s, didClose: .right)
} }
} }
...@@ -1144,6 +1189,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate { ...@@ -1144,6 +1189,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate {
showView(container: v) showView(container: v)
delegate?.navigationDrawerController?(navigationDrawerController: self, didBeginPanAt: point, position: .left) delegate?.navigationDrawerController?(navigationDrawerController: self, didBeginPanAt: point, position: .left)
case .changed: case .changed:
let w = v.bounds.width let w = v.bounds.width
let translationX = recognizer.translation(in: v).x let translationX = recognizer.translation(in: v).x
...@@ -1158,17 +1204,19 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate { ...@@ -1158,17 +1204,19 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate {
} }
delegate?.navigationDrawerController?(navigationDrawerController: self, didChangePanAt: point, position: .left) delegate?.navigationDrawerController?(navigationDrawerController: self, didChangePanAt: point, position: .left)
case .ended, .cancelled, .failed: case .ended, .cancelled, .failed:
let p = recognizer.velocity(in: recognizer.view) let p = recognizer.velocity(in: recognizer.view)
let x = p.x >= 500 || p.x <= -500 ? p.x : 0 let x = p.x >= 1000 || p.x <= -1000 ? p.x : 0
delegate?.navigationDrawerController?(navigationDrawerController: self, didEndPanAt: point, position: .left) delegate?.navigationDrawerController?(navigationDrawerController: self, didEndPanAt: point, position: .left)
if v.frame.origin.x <= -leftViewWidth + leftViewThreshold || x < -500 { if v.frame.origin.x <= -leftViewWidth + leftViewThreshold || x < -1000 {
closeLeftView(velocity: x) closeLeftView(velocity: x)
} else { } else {
openLeftView(velocity: x) openLeftView(velocity: x)
} }
case .possible:break case .possible:break
} }
} }
...@@ -1198,6 +1246,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate { ...@@ -1198,6 +1246,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate {
showView(container: v) showView(container: v)
delegate?.navigationDrawerController?(navigationDrawerController: self, didBeginPanAt: point, position: .right) delegate?.navigationDrawerController?(navigationDrawerController: self, didBeginPanAt: point, position: .right)
case .changed: case .changed:
let w = v.bounds.width let w = v.bounds.width
let translationX = recognizer.translation(in: v).x let translationX = recognizer.translation(in: v).x
...@@ -1212,6 +1261,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate { ...@@ -1212,6 +1261,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate {
} }
delegate?.navigationDrawerController?(navigationDrawerController: self, didChangePanAt: point, position: .right) delegate?.navigationDrawerController?(navigationDrawerController: self, didChangePanAt: point, position: .right)
case .ended, .cancelled, .failed: case .ended, .cancelled, .failed:
let p = recognizer.velocity(in: recognizer.view) let p = recognizer.velocity(in: recognizer.view)
let x = p.x >= 1000 || p.x <= -1000 ? p.x : 0 let x = p.x >= 1000 || p.x <= -1000 ? p.x : 0
...@@ -1223,6 +1273,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate { ...@@ -1223,6 +1273,7 @@ extension NavigationDrawerController: UIGestureRecognizerDelegate {
} else { } else {
openRightView(velocity: x) openRightView(velocity: x)
} }
case .possible:break case .possible:break
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment