initial pass at MotionController rework

fcf3d822 · Daniel Dahan · 19664a2f · fcf3d822 · fcf3d822 · fcf3d822
Commit fcf3d822 authored Jun 08, 2017 by Daniel Dahan
Showing with 133 additions and 59 deletions

Motion.xcodeproj/project.pbxproj
+8 -4

Sources/Motion.swift
+87 -51

Sources/MotionController.swift
+0 -0

Sources/MotionTransitionObserver.swift
+38 -0

Sources/MotionViewController.swift
+0 -4

No files found.
--- a/Motion.xcodeproj/project.pbxproj
+++ b/Motion.xcodeproj/project.pbxproj
@@ -37,7 +37,7 @@
 		96AEB6A31EE4610F009A3BE0 /* MotionPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB67D1EE4610F009A3BE0 /* MotionPlugin.swift */; };
 		96AEB6A41EE4610F009A3BE0 /* MotionStringConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB67E1EE4610F009A3BE0 /* MotionStringConvertible.swift */; };
 		96AEB6A51EE4610F009A3BE0 /* MotionTargetState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB67F1EE4610F009A3BE0 /* MotionTargetState.swift */; };
-		96AEB6A61EE4610F009A3BE0 /* MotionTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB6801EE4610F009A3BE0 /* MotionTypes.swift */; };
+		96AEB6A61EE4610F009A3BE0 /* MotionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB6801EE4610F009A3BE0 /* MotionViewController.swift */; };
 		96AEB6A71EE4610F009A3BE0 /* Lexer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB6821EE4610F009A3BE0 /* Lexer.swift */; };
 		96AEB6A81EE4610F009A3BE0 /* Nodes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB6831EE4610F009A3BE0 /* Nodes.swift */; };
 		96AEB6A91EE4610F009A3BE0 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB6841EE4610F009A3BE0 /* Parser.swift */; };
@@ -48,6 +48,7 @@
 		96AEB6AE1EE4610F009A3BE0 /* IgnoreSubviewModifiersPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB68A1EE4610F009A3BE0 /* IgnoreSubviewModifiersPreprocessor.swift */; };
 		96AEB6AF1EE4610F009A3BE0 /* MatchPreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB68B1EE4610F009A3BE0 /* MatchPreprocessor.swift */; };
 		96AEB6B01EE4610F009A3BE0 /* SourcePreprocessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96AEB68C1EE4610F009A3BE0 /* SourcePreprocessor.swift */; };
+		96E49A401EEA08F8006D5A93 /* MotionTransitionObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96E49A3F1EEA08F8006D5A93 /* MotionTransitionObserver.swift */; };
 /* End PBXBuildFile section */
 /* Begin PBXFileReference section */
@@ -80,7 +81,7 @@
 		96AEB67D1EE4610F009A3BE0 /* MotionPlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionPlugin.swift; sourceTree = "<group>"; };
 		96AEB67E1EE4610F009A3BE0 /* MotionStringConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionStringConvertible.swift; sourceTree = "<group>"; };
 		96AEB67F1EE4610F009A3BE0 /* MotionTargetState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTargetState.swift; sourceTree = "<group>"; };
-		96AEB6801EE4610F009A3BE0 /* MotionTypes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTypes.swift; sourceTree = "<group>"; };
+		96AEB6801EE4610F009A3BE0 /* MotionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionViewController.swift; sourceTree = "<group>"; };
 		96AEB6821EE4610F009A3BE0 /* Lexer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lexer.swift; sourceTree = "<group>"; };
 		96AEB6831EE4610F009A3BE0 /* Nodes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Nodes.swift; sourceTree = "<group>"; };
 		96AEB6841EE4610F009A3BE0 /* Parser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
@@ -95,6 +96,7 @@
 		96C98DDD1E424B9000B22906 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		96C98DE21E43809D00B22906 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
 		96C98DED1E438A5700B22906 /* Motion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Motion.h; sourceTree = "<group>"; };
+		96E49A3F1EEA08F8006D5A93 /* MotionTransitionObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MotionTransitionObserver.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -207,7 +209,8 @@
 				96AEB67D1EE4610F009A3BE0 /* MotionPlugin.swift */,
 				96AEB67E1EE4610F009A3BE0 /* MotionStringConvertible.swift */,
 				96AEB67F1EE4610F009A3BE0 /* MotionTargetState.swift */,
-				96AEB6801EE4610F009A3BE0 /* MotionTypes.swift */,
+				96AEB6801EE4610F009A3BE0 /* MotionViewController.swift */,
+				96E49A3F1EEA08F8006D5A93 /* MotionTransitionObserver.swift */,
 				96AEB6811EE4610F009A3BE0 /* Parser */,
 				96AEB6861EE4610F009A3BE0 /* Preprocessors */,
 			);
@@ -308,9 +311,10 @@
 				96AEB6961EE4610F009A3BE0 /* Motion+CAMediaTimingFunction.swift in Sources */,
 				96AEB6941EE4610F009A3BE0 /* Motion+Array.swift in Sources */,
 				96AEB6951EE4610F009A3BE0 /* Motion+CALayer.swift in Sources */,
-				96AEB6A61EE4610F009A3BE0 /* MotionTypes.swift in Sources */,
+				96AEB6A61EE4610F009A3BE0 /* MotionViewController.swift in Sources */,
 				96AEB68E1EE4610F009A3BE0 /* MotionCoreAnimationViewContext.swift in Sources */,
 				96AEB6921EE4610F009A3BE0 /* MotionDebugView.swift in Sources */,
+				96E49A401EEA08F8006D5A93 /* MotionTransitionObserver.swift in Sources */,
 				96AEB6A01EE4610F009A3BE0 /* MotionIndependentController.swift in Sources */,
 				96AEB6AA1EE4610F009A3BE0 /* Regex.swift in Sources */,
 				96AEB6901EE4610F009A3BE0 /* MotionViewPropertyViewContext.swift in Sources */,

--- a/Sources/Motion.swift
+++ b/Sources/Motion.swift
@@ -58,11 +58,13 @@ public class Motion: MotionController {
    public internal(set) var isPresenting = true
    /// Progress of the current transition, 0 if a transition is not happening.
-    public override var progress: Double {
+    public override var elapsedTime: TimeInterval {
        didSet {
-            if isTransitioning {
+            guard isTransitioning else {
-                transitionContext?.updateInteractiveTransition(CGFloat(progress))
+                return
            }
+            transitionContext?.updateInteractiveTransition(CGFloat(elapsedTime))
        }
    }
@@ -155,7 +157,7 @@ public extension Motion {
    }
 }
-internal extension Motion {
+fileprivate extension Motion {
    /// Starts the transition animation.
    func start() {
        guard isTransitioning else {
@@ -165,51 +167,25 @@ internal extension Motion {
        prepareViewControllers()
        prepareSnapshotView()
        prepareForTransition()
-        prepareMotionContext()
+        prepareContext()
        prepareToView()
        prepareViewHierarchy()
        processContext()
        prepareForAnimation()
+        processForAnimation()
-        context.hide(view: toView)
-        #if os(tvOS)
-            animate()
-        #else
-            if isNavigationController {
-                // When animating within navigationController, we have to dispatch later into the main queue.
-                // otherwise snapshots will be pure white. Possibly a bug with UIKit
-                DispatchQueue.main.async { [weak self] in
-                    self?.animate()
-                }
-            } else {
-                animate()
-            }
-        #endif
    }
+}
+internal extension Motion {
    override func animate() {
        context.unhide(view: toView)
-        if let containerBackgroundColor = containerBackgroundColor {
+        updateContainerBackgroundColor()
-            container.backgroundColor = containerBackgroundColor
+        updateInsertOrder()
-        } else if !toOverFullScreen && !fromOverFullScreen {
-            container.backgroundColor = toView.backgroundColor
-        }
-        if fromOverFullScreen {
-            insertToViewFirst = true
-        }
-        for animator in animators {
-            if let animator = animator as? MotionHasInsertOrder {
-                animator.insertToViewFirst = insertToViewFirst
-            }
-        }
        super.animate()
-        fullScreenSnapshot!.removeFromSuperview()
+        fullScreenSnapshot?.removeFromSuperview()
    }
    override func complete(finished: Bool) {
@@ -344,7 +320,7 @@ fileprivate extension Motion {
    }
    /// Prepares the MotionContext instance.
-    func prepareMotionContext() {
+    func prepareContext() {
        context.loadViewAlpha(rootView: toView)
        context.loadViewAlpha(rootView: fromView)
        container.addSubview(toView)
@@ -370,6 +346,52 @@ internal extension Motion {
        super.prepareForTransition()
        insert(preprocessor: DefaultAnimationPreprocessor(motion: self), before: DurationPreprocessor.self)
    }
+    override func prepareForAnimation() {
+        super.prepareForAnimation()
+        context.hide(view: toView)
+    }
+}
+fileprivate extension Motion {
+    /// Processes the animations.
+    func processForAnimation() {
+        #if os(tvOS)
+            animate()
+        #else
+            if isNavigationController {
+                // When animating within navigationController, we have to dispatch later into the main queue.
+                // otherwise snapshots will be pure white. Possibly a bug with UIKit
+                DispatchQueue.main.async { [weak self] in
+                    self?.animate()
+                }
+            } else {
+                animate()
+            }
+        #endif
+    }
+}
+fileprivate extension Motion {
+    /// Updates the container background color.
+    func updateContainerBackgroundColor() {
+        if let v = containerBackgroundColor {
+            container.backgroundColor = v
+        } else if !toOverFullScreen && !fromOverFullScreen {
+            container.backgroundColor = toView.backgroundColor
+        }
+    }
+    /// Updates the insertToViewFirst boolean for animators.
+    func updateInsertOrder() {
+        if fromOverFullScreen {
+            insertToViewFirst = true
+        }
+        for v in animators {
+            (v as? MotionHasInsertOrder)?.insertToViewFirst = insertToViewFirst
+        }
+    }
 }
 internal extension Motion {
@@ -418,23 +440,31 @@ internal extension Motion {
    }
 }
-// MARK: UIKit Protocol Conformance
-/*****************************
- * UIKit protocol extensions *
- *****************************/
 extension Motion: UIViewControllerAnimatedTransitioning {
+    /**
+     The animation method that is used to coordinate the transition.
+     - Parameter using transitionContext: A UIViewControllerContextTransitioning.
+     */
    public func animateTransition(using context: UIViewControllerContextTransitioning) {
-    guard !isTransitioning else { return }
+        guard !isTransitioning else {
+            return
+        }
        transitionContext = context
        fromViewController = fromViewController ?? context.viewController(forKey: .from)
        toViewController = toViewController ?? context.viewController(forKey: .to)
        transitionContainer = context.containerView
        start()
    }
+    /**
+     Returns the transition duration time interval.
+     - Parameter using transitionContext: An optional UIViewControllerContextTransitioning.
+     - Returns: A TimeInterval that is the total animation time including delays.
+     */
    public func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
-    return 0.375 // doesn't matter, real duration will be calculated later
+        return 0 // Will be updated dynamically.
    }
    public func animationEnded(_ transitionCompleted: Bool) {
@@ -442,11 +472,14 @@ extension Motion: UIViewControllerAnimatedTransitioning {
    }
 }
-extension Motion:UIViewControllerTransitioningDelegate {
+extension Motion {
-  var interactiveTransitioning: UIViewControllerInteractiveTransitioning? {
+    /// A reference to the interactive transitioning.
-    return forceNonInteractive ? nil : self
+    fileprivate var interactiveTransitioning: UIViewControllerInteractiveTransitioning? {
+        return self
    }
+}
+extension Motion: UIViewControllerTransitioningDelegate {
    public func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
        self.isPresenting = true
        self.fromViewController = fromViewController ?? presenting
@@ -480,7 +513,7 @@ extension Motion: UIViewControllerInteractiveTransitioning {
 extension Motion: UINavigationControllerDelegate {
    public func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationControllerOperation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
-    self.isPresenting = operation == .push
+        self.isPresenting = .push == operation
        self.fromViewController = fromViewController ?? fromVC
        self.toViewController = toViewController ?? toVC
        self.isNavigationController = true
@@ -503,12 +536,15 @@ extension Motion: UITabBarControllerDelegate {
    public func tabBarController(_ tabBarController: UITabBarController, animationControllerForTransitionFrom fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
        isAnimating = true
        let fromVCIndex = tabBarController.childViewControllers.index(of: fromVC)!
        let toVCIndex = tabBarController.childViewControllers.index(of: toVC)!
        self.isPresenting = toVCIndex > fromVCIndex
        self.fromViewController = fromViewController ?? fromVC
        self.toViewController = toViewController ?? toVC
        self.isTabBarController = true
        return self
    }
 }

--- a/Sources/MotionController.swift
+++ b/Sources/MotionController.swift
--- a/Sources/MotionTransitionObserver.swift
+++ b/Sources/MotionTransitionObserver.swift
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2017, Daniel Dahan and CosmicMind, Inc. <http://cosmicmind.com>.
+ * All rights reserved.
+ *
+ * Original Inspiration & Author
+ * Copyright (c) 2016 Luke Zhao <me@lkzhao.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+import Foundation
+public protocol MotionTransitionObserver {
+    /**
+     Executed when the elapsed time changes during a transition.
+     - Parameter transitionObserver: A MotionTransitionObserver. 
+     - Parameter didUpdateWith elapsedTime: A TimeInterval.
+     */
+    func motion(transitionObserver: MotionTransitionObserver, didUpdateWith elapsedTime: TimeInterval)
+}
--- a/Sources/MotionTypes.swift
+++ b/Sources/MotionTypes.swift
@@ -28,10 +28,6 @@
 import UIKit
-public protocol MotionProgressUpdateObserver {
-    func motionDidUpdateProgress(progress: Double)
-}
 @objc(MotionViewControllerDelegate)
 public protocol MotionViewControllerDelegate {
    @objc