Commit 4108d345 by Daniel Dahan

updated for latest changes to Motion's iPhone X update

parent 9d03ba4e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0900" LastUpgradeVersion = "0920"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
......
Subproject commit 7128c6dec22076cc6e422ecddbc8d8b6a73988c0 Subproject commit f85a6744caf408f9a104e0363038dccf0d8ed3f6
...@@ -635,8 +635,8 @@ fileprivate extension Layout { ...@@ -635,8 +635,8 @@ fileprivate extension Layout {
- Parameter for view: A UIView. - Parameter for view: A UIView.
*/ */
class func updateConstraints(for view: UIView) { class func updateConstraints(for view: UIView) {
view.setNeedsUpdateConstraints()
view.updateConstraintsIfNeeded() view.updateConstraintsIfNeeded()
view.updateConstraints()
view.setNeedsLayout() view.setNeedsLayout()
view.layoutIfNeeded() view.layoutIfNeeded()
} }
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
*/ */
import UIKit import UIKit
import Motion
extension NavigationController { extension NavigationController {
/// Device status bar style. /// Device status bar style.
...@@ -137,7 +138,7 @@ open class NavigationController: UINavigationController { ...@@ -137,7 +138,7 @@ open class NavigationController: UINavigationController {
/// Calls the layout functions for the view heirarchy. /// Calls the layout functions for the view heirarchy.
open func layoutSubviews() { open func layoutSubviews() {
navigationBar.setNeedsUpdateConstraints() navigationBar.setNeedsUpdateConstraints()
navigationBar.updateConstraints() navigationBar.updateConstraintsIfNeeded()
navigationBar.setNeedsLayout() navigationBar.setNeedsLayout()
navigationBar.layoutIfNeeded() navigationBar.layoutIfNeeded()
} }
...@@ -180,10 +181,12 @@ extension NavigationController: UINavigationBarDelegate { ...@@ -180,10 +181,12 @@ extension NavigationController: UINavigationBarDelegate {
item.backButton.removeTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside) item.backButton.removeTarget(self, action: #selector(handle(backButton:)), for: .touchUpInside)
} }
}
internal extension NavigationController {
/// Handler for the backbutton. /// Handler for the backbutton.
@objc @objc
internal func handle(backButton: UIButton) { func handle(backButton: UIButton) {
popViewController(animated: true) popViewController(animated: true)
} }
} }
......
...@@ -216,12 +216,12 @@ fileprivate extension TabsController { ...@@ -216,12 +216,12 @@ fileprivate extension TabsController {
delegate?.tabsController?(tabsController: self, willSelect: viewController) delegate?.tabsController?(tabsController: self, willSelect: viewController)
} }
super.transition(to: viewController) { [weak self, viewController = viewController, completion = completion] (isFinished) in super.transition(to: viewController) { [weak self, viewController = viewController, completion = completion] (isFinishing) in
guard let s = self else { guard let s = self else {
return return
} }
completion?(isFinished) completion?(isFinishing)
if isTriggeredByUserInteraction { if isTriggeredByUserInteraction {
s.delegate?.tabsController?(tabsController: s, didSelect: viewController) s.delegate?.tabsController?(tabsController: s, didSelect: viewController)
...@@ -331,8 +331,8 @@ extension TabsController { ...@@ -331,8 +331,8 @@ extension TabsController {
s.tabBar.select(at: index) s.tabBar.select(at: index)
s.transition(to: s.viewControllers[index], isTriggeredByUserInteraction: false) { [weak self] (isFinished) in s.transition(to: s.viewControllers[index], isTriggeredByUserInteraction: false) { [weak self] (isFinishing) in
guard isFinished else { guard isFinishing else {
return return
} }
...@@ -361,8 +361,8 @@ extension TabsController: TabBarDelegate, _TabBarDelegate { ...@@ -361,8 +361,8 @@ extension TabsController: TabBarDelegate, _TabBarDelegate {
return return
} }
transition(to: viewControllers[i], isTriggeredByUserInteraction: true) { [weak self] (isFinished) in transition(to: viewControllers[i], isTriggeredByUserInteraction: true) { [weak self] (isFinishing) in
guard isFinished else { guard isFinishing else {
return return
} }
......
...@@ -159,14 +159,14 @@ open class TransitionController: UIViewController { ...@@ -159,14 +159,14 @@ open class TransitionController: UIViewController {
} }
view.isUserInteractionEnabled = false view.isUserInteractionEnabled = false
Motion.shared.transition(from: rootViewController, to: viewController, in: container) { [weak self, viewController = viewController, completion = completion] (isFinished) in Motion.shared.transition(from: rootViewController, to: viewController, in: container) { [weak self, viewController = viewController, completion = completion] (isFinishing) in
guard let s = self else { guard let s = self else {
return return
} }
s.rootViewController = viewController s.rootViewController = viewController
s.view.isUserInteractionEnabled = true s.view.isUserInteractionEnabled = true
completion?(isFinished) completion?(isFinishing)
} }
} }
......
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