Commit 531c693c by Daniel Dahan

updated with Motion 1.3.0

parent 4108d345
Pod::Spec.new do |s|
s.name = 'Material'
s.version = '2.12.19'
s.version = '2.13.0'
s.license = 'BSD-3-Clause'
s.summary = 'A UI/UX framework for creating beautiful applications.'
s.homepage = 'http://materialswift.com'
......
Subproject commit f85a6744caf408f9a104e0363038dccf0d8ed3f6
Subproject commit e0089ce5345712d5a1eb542cb453f5e8c1323551
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.12.18</string>
<string>2.13.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
......@@ -47,14 +47,7 @@ extension UIViewController {
through child UIViewControllers.
*/
public var collectionViewController: CollectionViewController? {
var viewController: UIViewController? = self
while nil != viewController {
if viewController is CollectionViewController {
return viewController as? CollectionViewController
}
viewController = viewController?.parent
}
return nil
return traverseViewControllerHierarchyForClassType()
}
}
......
......@@ -206,7 +206,7 @@ fileprivate extension TabsController {
case .auto:
switch viewController.motionTransitionType {
case .auto:
Motion.shared.setAnimationForNextTransition(fvcIndex < tvcIndex ? .slide(direction: .left) : .slide(direction: .right))
MotionTransition.shared.setAnimationForNextTransition(fvcIndex < tvcIndex ? .slide(direction: .left) : .slide(direction: .right))
default:break
}
default:break
......
......@@ -159,7 +159,7 @@ open class TransitionController: UIViewController {
}
view.isUserInteractionEnabled = false
Motion.shared.transition(from: rootViewController, to: viewController, in: container) { [weak self, viewController = viewController, completion = completion] (isFinishing) in
MotionTransition.shared.transition(from: rootViewController, to: viewController, in: container) { [weak self, viewController = viewController, completion = completion] (isFinishing) in
guard let s = self else {
return
}
......
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