Commit 11f9e26e by Daniel Dahan

Merge pull request #430 from mohpor/development

Fixed the stutter in navigation bar- cleaned logs
parents 55a765cf 5cbf734f
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -313,8 +313,6 @@ public class NavigationBar : UINavigationBar { ...@@ -313,8 +313,6 @@ public class NavigationBar : UINavigationBar {
public override func sizeThatFits(size: CGSize) -> CGSize { public override func sizeThatFits(size: CGSize) -> CGSize {
var result: CGSize = intrinsicContentSize() var result: CGSize = intrinsicContentSize()
result.height += statusbarOffset() result.height += statusbarOffset()
print(MaterialDevice.isPortrait, result.height)
return result return result
} }
......
...@@ -1096,12 +1096,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel ...@@ -1096,12 +1096,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
v.animating = true v.animating = true
} }
self?.statusBarHidden = false self?.statusBarHidden = false
self?.setNeedsStatusBarAppearanceUpdate()
}) { [weak self] _ in }) { [weak self] _ in
if let v: NavigationBar = (self?.rootViewController as? NavigationController)?.navigationBar as? NavigationBar { if let v: NavigationBar = (self?.rootViewController as? NavigationController)?.navigationBar as? NavigationBar {
v.animating = false v.animating = false
} }
} }
self.setNeedsStatusBarAppearanceUpdate()
delegate?.sideNavigationStatusBarHiddenState?(self, hidden: false) delegate?.sideNavigationStatusBarHiddenState?(self, hidden: false)
} }
} }
...@@ -1117,12 +1118,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel ...@@ -1117,12 +1118,13 @@ public class SideNavigationController : UIViewController, UIGestureRecognizerDel
v.animating = true v.animating = true
} }
self?.statusBarHidden = true self?.statusBarHidden = true
self?.setNeedsStatusBarAppearanceUpdate()
}) { [weak self] _ in }) { [weak self] _ in
if let v: NavigationBar = (self?.rootViewController as? NavigationController)?.navigationBar as? NavigationBar { if let v: NavigationBar = (self?.rootViewController as? NavigationController)?.navigationBar as? NavigationBar {
v.animating = false v.animating = false
} }
} }
self.setNeedsStatusBarAppearanceUpdate()
delegate?.sideNavigationStatusBarHiddenState?(self, hidden: true) delegate?.sideNavigationStatusBarHiddenState?(self, hidden: true)
} }
} }
......
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