🌲 Update

Author: muukii

FluidInterfaceKit-Demo/Book.swift

@@ -49,6 +49,15 @@ let book = Book(title: "MyBook") {
     return controller
   }
 
+  BookNavigationLink(title: "App") {
+    BookPresent(title: "Launch") {
+      let controller = DemoApplicationController()
+      controller.modalPresentationStyle = .fullScreen
+      return controller
+    }
+
+  }
+
   BookPush(title: "ControlCenter") {
     DemoControlCenterViewController()
   }
@@ -75,3 +84,18 @@ let book = Book(title: "MyBook") {
     }
   }
 }
+
+func makeButtonView(title: String, onTap: @escaping () -> Void) -> UIView {
+  let button = UIButton(type: .system)
+  button.setTitle(title, for: .normal)
+  button.onTap {
+    onTap()
+  }
+
+  return AnyView { _ in
+    VStackBlock {
+      button
+    }
+    .padding(10)
+  }
+}

FluidInterfaceKit-Demo/DemoApplicationViewController.swift

@@ -0,0 +1,84 @@
+import CompositionKit
+import FluidInterfaceKit
+import MondrianLayout
+import UIKit
+import ResultBuilderKit
+
+final class DemoApplicationController: FluidSwitchController {
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    setViewController(AppTabBarController())
+  }
+
+}
+
+final class AppTabBarController: UITabBarController {
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+    view.backgroundColor = .white
+
+    viewControllers = [
+      UINavigationController(rootViewController: AppSearchViewController()),
+      UINavigationController(rootViewController: AppOtherController()),
+    ]
+
+    tabBar.backgroundColor = .black
+  }
+
+}
+
+final class AppSearchViewController: CodeBasedViewController {
+
+  override init() {
+    super.init()
+    title = "Search"
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    view.backgroundColor = .neon(.cyan)
+
+    let list = VGridView(numberOfColumns: 1)
+
+    Mondrian.buildSubviews(on: view) {
+      ZStackBlock(alignment: .attach(.all)) {
+        list
+          .viewBlock
+      }
+      .container(respectingSafeAreaEdges: .all)
+    }
+
+    list.setContents(
+      buildArray {
+
+        makeButtonView(
+          title: "Open",
+          onTap: { [unowned self] in
+
+          }
+        )
+
+      }
+    )
+
+  }
+
+}
+
+final class AppOtherController: CodeBasedViewController {
+
+  override init() {
+    super.init()
+    title = "Other"
+  }
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    view.backgroundColor = .neon(.blue)
+  }
+}

FluidInterfaceKit-Demo/DemoListViewController.swift

@@ -138,7 +138,7 @@ private final class DetailViewController: UIViewController, ViewControllerFluidC
 
       }
       .padding(.horizontal, 24)
-      .respectSafeArea(edges: .all)
+      .container(respectingSafeAreaEdges: .all)
 
     }
 

FluidInterfaceKit-Demo/DemoTransitionViewController.swift

@@ -2,6 +2,7 @@ import CompositionKit
 import FluidInterfaceKit
 import Foundation
 import MondrianLayout
+import ResultBuilderKit
 import StorybookKit
 import UIKit
 
@@ -20,7 +21,7 @@ final class DemoTransitionViewController: FluidStackController {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    view.backgroundColor = .white
+    view.backgroundColor = .systemBackground
 
     let list = VGridView(numberOfColumns: 1)
 
@@ -29,17 +30,29 @@ final class DemoTransitionViewController: FluidStackController {
         list
           .viewBlock
       }
+      .container(respectingSafeAreaEdges: .all)
     }
 
-    list.setContents([
-      Self.makeCell(
-        title: "fade",
-        onTap: { [unowned self] in
+    list.setContents(
+      buildArray {
 
-          _display(transition: .popup())
-        }
-      )
-    ])
+        Self.makeCell(
+          title: "popup",
+          onTap: { [unowned self] in
+
+            _display(transition: .popup())
+          }
+        )
+
+        Self.makeCell(
+          title: "push",
+          onTap: { [unowned self] in
+
+            _display(transition: .pushIdiom())
+          }
+        )
+      }
+    )
 
   }
 

FluidInterfaceKit.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		4B1561C52773732000C4DE07 /* DemoPresentationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B1561C42773732000C4DE07 /* DemoPresentationViewController.swift */; };
 		4B34DEED2789FC00002D820E /* DemoTransitionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B34DEEC2789FC00002D820E /* DemoTransitionViewController.swift */; };
 		4B425A0F278F3A780062B4C5 /* DemoPictureInPictureController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B425A0E278F3A780062B4C5 /* DemoPictureInPictureController.swift */; };
+		4B4F93BA27908DC100490A21 /* DemoApplicationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4F93B927908DC100490A21 /* DemoApplicationViewController.swift */; };
 		4B5ED7D4278C3D6B00D30EE7 /* DemoContextMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B5ED7D3278C3D6B00D30EE7 /* DemoContextMenuViewController.swift */; };
 		4B658D0F276A59F700A17878 /* Wrap in Frameworks */ = {isa = PBXBuildFile; productRef = 4B658D0E276A59F700A17878 /* Wrap */; };
 		4B959B092764F77E0003FFB6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B959B082764F77E0003FFB6 /* AppDelegate.swift */; };
@@ -46,6 +47,7 @@
 		4B2CCB88278DD21400EAB928 /* Descriptors */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Descriptors; path = submodules/Descriptors; sourceTree = "<group>"; };
 		4B34DEEC2789FC00002D820E /* DemoTransitionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoTransitionViewController.swift; sourceTree = "<group>"; };
 		4B425A0E278F3A780062B4C5 /* DemoPictureInPictureController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoPictureInPictureController.swift; sourceTree = "<group>"; };
+		4B4F93B927908DC100490A21 /* DemoApplicationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoApplicationViewController.swift; sourceTree = "<group>"; };
 		4B5ED7D3278C3D6B00D30EE7 /* DemoContextMenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoContextMenuViewController.swift; sourceTree = "<group>"; };
 		4B959B062764F77E0003FFB6 /* FluidInterfaceKit-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FluidInterfaceKit-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		4B959B082764F77E0003FFB6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -129,6 +131,7 @@
 				4BB7B9CE277AF6170014B62A /* TranslationVelocityPlaygroundViewController.swift */,
 				4B037C56277B4CAD00D06150 /* ScalingVelocityPlaygroundViewController.swift */,
 				4BDDF27E277F7BFA00636B00 /* ViewModel.swift */,
+				4B4F93B927908DC100490A21 /* DemoApplicationViewController.swift */,
 			);
 			path = "FluidInterfaceKit-Demo";
 			sourceTree = "<group>";
@@ -245,6 +248,7 @@
 				4BB7B9CF277AF6170014B62A /* TranslationVelocityPlaygroundViewController.swift in Sources */,
 				4B959B0D2764F77E0003FFB6 /* ViewController.swift in Sources */,
 				4BBDECD32766241200982229 /* UIControl+Closure.swift in Sources */,
+				4B4F93BA27908DC100490A21 /* DemoApplicationViewController.swift in Sources */,
 				4BE193592765B1290008626E /* DemoThreadsMessagesViewController.swift in Sources */,
 				4BCD46532775BF8600B060C6 /* AnimatorPlaygroundViewController.swift in Sources */,
 				4B959B092764F77E0003FFB6 /* AppDelegate.swift in Sources */,

FluidInterfaceKit/Transition/AddingPresets/AnyAddingTransition+pushIdiom.swift

@@ -0,0 +1,35 @@
+import UIKit
+
+extension AnyAddingTransition {
+
+  public static func pushIdiom(
+    duration: TimeInterval = 0.6
+  ) -> Self {
+
+    return .init { context in
+     
+      context.toViewController.view.transform = .init(translationX: context.toViewController.view.bounds.width, y: 0)
+      context.toViewController.view.alpha = 0.02
+
+      let animator = UIViewPropertyAnimator(duration: duration, dampingRatio: 1) {
+
+        context.toViewController.view.transform = .identity
+        if let fromViewController = context.fromViewController {
+          fromViewController.view.transform = .init(translationX: -fromViewController.view.bounds.width, y: 0)
+        }
+        context.toViewController.view.alpha = 1
+
+      }
+
+      animator.addCompletion { _ in
+        context.notifyCompleted()
+      }
+
+      animator.startAnimation()
+
+    }
+
+  }
+
+
+}

FluidInterfaceKit/ViewController/FluidStackController.swift

@@ -376,6 +376,7 @@ open class FluidStackController: UIViewController {
   private func viewControllerState(viewController: UIViewController) -> TransitionContext? {
     viewControllerStateMap.object(forKey: viewController)
   }
+ 
 }
 
 public struct FluidStackControllerContext {

FluidInterfaceKit/ViewController/FluidSwitchController.swift

@@ -0,0 +1,22 @@
+import UIKit
+
+open class FluidSwitchController: UIViewController {
+
+  public private(set) var currentDisplayViewController: UIViewController?
+
+  public func setViewController(_ viewController: UIViewController) {
+
+    if let currentDisplayViewController = currentDisplayViewController {
+      currentDisplayViewController.willMove(toParent: nil)
+      currentDisplayViewController.view.removeFromSuperview()
+      currentDisplayViewController.removeFromParent()
+    }
+
+    addChild(viewController)
+    view.addSubview(viewController.view)
+    viewController.view.autoresizingMask = [.flexibleHeight, .flexibleWidth]
+    viewController.didMove(toParent: self)
+    currentDisplayViewController = viewController
+  }
+
+}