Commit fc115a33 by Daniel Dahan

development: issue-592: fixed NavigationDrawerController regression, where…

development: issue-592: fixed NavigationDrawerController regression, where transitioning the rootViewController would go behind the contentViewController
parent e6fa7abd
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '2.3.6'
s.version = '2.3.7'
s.license = 'BSD-3-Clause'
s.summary = 'Material is an animation and graphics framework that is used to create beautiful applications.'
s.homepage = 'http://materialswift.com'
......
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.3.6</string>
<string>2.3.7</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -415,18 +415,15 @@ open class NavigationDrawerController: RootController, UIGestureRecognizerDelega
prepare()
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepare method
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open override func prepare() {
super.prepare()
prepareContentViewController()
prepareLeftView()
prepareRightView()
open override func transition(to viewController: UIViewController, duration: TimeInterval = 0.5, options: UIViewAnimationOptions = [], animations: (() -> Void)? = nil, completion: ((Bool) -> Void)? = nil) {
super.transition(to: viewController, duration: duration, options: options, animations: animations) { [weak self, completion = completion] (result) in
guard let s = self else {
return
}
s.view.sendSubview(toBack: s.contentViewController.view)
completion?(result)
}
}
/// Layout subviews.
......@@ -471,6 +468,20 @@ open class NavigationDrawerController: RootController, UIGestureRecognizerDelega
}
/**
Prepares the view instance when intialized. When subclassing,
it is recommended to override the prepare method
to initialize property values and other setup operations.
The super.prepare method should always be called immediately
when subclassing.
*/
open override func prepare() {
super.prepare()
prepareContentViewController()
prepareLeftView()
prepareRightView()
}
/**
A method that is used to set the width of the leftView when
opened. This is the recommended method of setting the leftView
width.
......
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