Commit 6bfd58cf by Daniel Dahan

development: removed messaged from UIPresentationController and updated…

development: removed messaged from UIPresentationController and updated Material.podspec for 2.6.3 release
parent 8f5bd914
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Material' s.name = 'Material'
s.version = '2.6.2' s.version = '2.6.3'
s.license = 'BSD-3-Clause' s.license = 'BSD-3-Clause'
s.summary = 'An animation and graphics framework for Material Design in Swift.' s.summary = 'An animation and graphics framework for Material Design in Swift.'
s.homepage = 'http://materialswift.com' s.homepage = 'http://materialswift.com'
......
...@@ -173,7 +173,7 @@ extension UIViewController { ...@@ -173,7 +173,7 @@ extension UIViewController {
- Returns: An optional UIViewControllerAnimatedTransitioning. - Returns: An optional UIViewControllerAnimatedTransitioning.
*/ */
open func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? { open func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
return isMotionEnabled ? PresentedMotion(isPresenting: true, isContainer: false) : nil return isMotionEnabled ? PresentingMotion(isPresenting: true, isContainer: false) : nil
} }
/** /**
...@@ -182,7 +182,7 @@ extension UIViewController { ...@@ -182,7 +182,7 @@ extension UIViewController {
- Returns: An optional UIViewControllerAnimatedTransitioning. - Returns: An optional UIViewControllerAnimatedTransitioning.
*/ */
open func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? { open func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
return isMotionEnabled ? DismissedMotion(isPresenting: true, isContainer: false) : nil return isMotionEnabled ? DismissingMotion(isPresenting: true, isContainer: false) : nil
} }
/** /**
...@@ -306,26 +306,20 @@ open class MotionPresentationController: UIPresentationController { ...@@ -306,26 +306,20 @@ open class MotionPresentationController: UIPresentationController {
return return
} }
print("presentationTransitionWillBegin")
presentedViewController.transitionCoordinator?.animate(alongsideTransition: { (context) in }) presentedViewController.transitionCoordinator?.animate(alongsideTransition: { (context) in })
} }
open override func presentationTransitionDidEnd(_ completed: Bool) { open override func presentationTransitionDidEnd(_ completed: Bool) {}
print("presentationTransitionDidEnd")
}
open override func dismissalTransitionWillBegin() { open override func dismissalTransitionWillBegin() {
guard nil != containerView else { guard nil != containerView else {
return return
} }
print("dismissalTransitionWillBegin")
presentedViewController.transitionCoordinator?.animate(alongsideTransition: { (context) in }) presentedViewController.transitionCoordinator?.animate(alongsideTransition: { (context) in })
} }
open override func dismissalTransitionDidEnd(_ completed: Bool) { open override func dismissalTransitionDidEnd(_ completed: Bool) {}
print("dismissalTransitionDidEnd")
}
open override var frameOfPresentedViewInContainerView: CGRect { open override var frameOfPresentedViewInContainerView: CGRect {
return containerView?.bounds ?? .zero return containerView?.bounds ?? .zero
...@@ -342,6 +336,12 @@ public protocol MotionDelegate { ...@@ -342,6 +336,12 @@ public protocol MotionDelegate {
@objc @objc
optional func motionDelayTransitionByTimeInterval(motion: Motion) -> TimeInterval optional func motionDelayTransitionByTimeInterval(motion: Motion) -> TimeInterval
@objc
optional func motionWillBeginPresentation(presentationController: UIPresentationController)
@objc
optional func motionAnimateAlongsideTransition(presentationController: UIPresentationController)
} }
open class MotionAnimator: NSObject { open class MotionAnimator: NSObject {
...@@ -822,9 +822,9 @@ extension Motion { ...@@ -822,9 +822,9 @@ extension Motion {
} }
} }
open class PresentedMotion: Motion {} open class PresentingMotion: Motion {}
open class DismissedMotion: Motion { open class DismissingMotion: Motion {
/// Prepares the toView. /// Prepares the toView.
fileprivate override func prepareToView() { fileprivate override func prepareToView() {
toView.isHidden = true toView.isHidden = 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