fluidPop supports to remove all view controllers from target (#84)

* Patch

* Fix test

* Update log message

Author: muukii

Sources/FluidInterfaceKit-Demo/DemoStackingViewController.swift

@@ -268,7 +268,7 @@ private final class ContentViewController: UIViewController {
 
             UIButton.make(title: "Remove all", color: .white) { [unowned self] in
 
-              fluidStackContext?.removeAllViewController(transition: .springFlourish())
+              fluidStackContext?.removeAllViewController(transition: .springFlourish)
 
             }
 
@@ -279,6 +279,10 @@ private final class ContentViewController: UIViewController {
             UIButton.make(title: "Remove self", color: .white) { [unowned self] in
               fluidPop()
             }
+            
+            UIButton.make(title: "Remove self from parent", color: .white) { [unowned self] in
+              fluidStackContext?.fluidStackController?.viewController(before: self.parent!)?.fluidPop()
+            }
 
             UIButton.make(title: "Set title", color: .white) { [unowned self] in
               self.title = "Fluid!"

Sources/FluidInterfaceKit/Helper/FluidExtentionViewController.swift

@@ -105,15 +105,11 @@ extension FluidExtentionViewController {
    */
   public func fluidPop(
     transition: AnyRemovingTransition? = nil,
+    transitionForBatch: AnyBatchRemovingTransition? = .crossDissolve,
     forwardingToParent: Bool = true,
     completion: ((RemovingTransitionContext.CompletionEvent) -> Void)? = nil
   ) {
-    
-    guard next != nil else {
-      // got the end of tree.
-      return
-    }
-    
+     
     guard
       let fluidStackContext = fluidStackContext,
       let _ = fluidStackContext.fluidStackController
@@ -123,22 +119,23 @@ extension FluidExtentionViewController {
       return
     }
 
-    _fluidPop(transition: transition, forwardingToParent: forwardingToParent, completion: completion)
+    _fluidPop(
+      transition: transition,
+      transitionForBatch: transitionForBatch,
+      forwardingToParent: forwardingToParent,
+      completion: completion
+    )
 
   }
 
   private func _fluidPop(
     transition: AnyRemovingTransition?,
+    transitionForBatch: AnyBatchRemovingTransition?,
     forwardingToParent: Bool,
     completion: ((RemovingTransitionContext.CompletionEvent) -> Void)? = nil
   ) {
-    
-    guard next != nil else {
-      // got the end of tree.
-      return
-    }
-    
-    guard
+        
+    guard      
       let fluidStackContext = fluidStackContext,
       let stack = fluidStackContext.fluidStackController
     else {
@@ -157,16 +154,19 @@ extension FluidExtentionViewController {
 
       stack._fluidPop(
         transition: transition,
+        transitionForBatch: transitionForBatch,
         forwardingToParent: forwardingToParent,
         completion: completion
       )
 
     } else {
 
-      fluidStackContext.removeSelf(
-        transition: transition,
-        completion: completion
-      )
+      fluidStackContext
+        .removeSelf(
+          transition: transition,
+          transitionForBatch: transitionForBatch,
+          completion: completion
+        )
 
     }
 

Sources/FluidInterfaceKit/Transition/AnyBatchRemovingTransition.swift

@@ -31,7 +31,7 @@ extension AnyBatchRemovingTransition {
     return disabled
   }
 
-  public static func vanishing(duration: TimeInterval = 0.6) -> Self {
+  public static var crossDissolve: Self {
 
     return .init { context in
 
@@ -42,7 +42,7 @@ extension AnyBatchRemovingTransition {
         $0.view.isHidden = true
       }
 
-      let animator = UIViewPropertyAnimator(duration: duration, dampingRatio: 1) {
+      let animator = UIViewPropertyAnimator(duration: 0.6, dampingRatio: 1) {
 
         topViewController.view.alpha = 0
 
@@ -71,7 +71,7 @@ extension AnyBatchRemovingTransition {
 
   }
 
-  public static func springFlourish() -> Self {
+  public static var springFlourish: Self {
 
     return .init { context in
 

Sources/FluidInterfaceKit/Transition/BatchRemovingTransitionContext.swift

@@ -49,6 +49,13 @@ public final class BatchRemovingTransitionContext: TransitionContext {
     super.init(contentView: contentView)
   }
 
+  deinit {
+    assert(
+      isInvalidated == true || isCompleted == true,
+      "\(self) is deallocated without appropriate operation. Call `notifyAnimationCompleted()` or `notifyCancelled()`"
+    )
+  }
+  
   public func notifyCompleted() {
     assert(Thread.isMainThread)
     isCompleted = true

Sources/FluidInterfaceKit/ViewController/FluidStackContext.swift

@@ -0,0 +1,91 @@
+import UIKit
+
+/// A context object that communicates with ``FluidStackController``.
+/// Associated with the view controller displayed on the stack.
+public final class FluidStackContext: Equatable {
+  
+  public static func == (lhs: FluidStackContext, rhs: FluidStackContext) -> Bool {
+    lhs === rhs
+  }
+  
+  public private(set) weak var fluidStackController: FluidStackController?
+  public private(set) weak var targetViewController: UIViewController?
+  
+  init(
+    fluidStackController: FluidStackController,
+    targetViewController: UIViewController
+  ) {
+    self.fluidStackController = fluidStackController
+    self.targetViewController = targetViewController
+  }
+  
+  /**
+   Adds view controller to parent container if it presents.
+   */
+  public func addContentViewController(
+    _ viewController: UIViewController,
+    transition: AnyAddingTransition?,
+    completion: @escaping (AddingTransitionContext.CompletionEvent) -> Void = { _ in }
+  ) {
+    fluidStackController?.addContentViewController(
+      viewController,
+      transition: transition,
+      completion: completion
+    )
+  }
+  
+  public func addContentView(
+    _ view: UIView,
+    transition: AnyAddingTransition?,
+    completion: @escaping (AddingTransitionContext.CompletionEvent) -> Void = { _ in }
+  ) {
+    fluidStackController?.addContentView(
+      view,
+      transition: transition,
+      completion: completion
+    )
+  }
+  
+  /// Removes the target view controller in ``FluidStackController``.
+  /// - Parameter transition: if not nil, it would be used override parameter.
+  ///
+  /// See detail in ``FluidStackController/removeViewController(_:transition:)``
+  public func removeSelf(
+    transition: AnyRemovingTransition?,
+    transitionForBatch: AnyBatchRemovingTransition? = .crossDissolve,
+    completion: ((RemovingTransitionContext.CompletionEvent) -> Void)? = nil
+  ) {
+    guard let targetViewController = targetViewController else {
+      return
+    }
+    fluidStackController?.removeViewController(
+      targetViewController,
+      transition: transition,
+      transitionForBatch: transitionForBatch,
+      completion: completion
+    )
+  }
+  
+  /**
+   Starts transition for removing if parent container presents.
+   
+   See detail in ``FluidStackController/startRemovingForInteraction(_:)``
+   */
+  public func startRemovingForInteraction() -> RemovingTransitionContext? {
+    guard let targetViewController = targetViewController else {
+      return nil
+    }
+    return fluidStackController?.startRemovingForInteraction(targetViewController)
+  }
+  
+  /**
+   See detail in ``FluidStackController/removeAllViewController(transition:)``
+   */
+  public func removeAllViewController(
+    transition: AnyBatchRemovingTransition?
+  ) {
+    fluidStackController?.removeAllViewController(transition: transition)
+  }
+  
+}
+