💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 16, 2023 · e78a191 · e78a191
1 parent 8f93db6
commit e78a191
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 46 deletions.
diff --git a/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerAnimatedTransitioning.swift b/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerAnimatedTransitioning.swift
@@ -19,38 +19,27 @@ extension AdaptiveModalManager: UIViewControllerAnimatedTransitioning {
   func animateTransition(
     using transitionContext: UIViewControllerContextTransitioning
   ) {
-    guard let fromVC = transitionContext.viewController(forKey: .from),
-          let toVC = transitionContext.viewController(forKey: .to)
-    else { return }
-
-    self.targetView = transitionContext.containerView;
-    self.targetViewController = fromVC;
-
-    self.prepareForPresentation();
-    self.showModal() {
-      transitionContext.completeTransition(true);
+    guard let fromVC = transitionContext.viewController(forKey: .from)
+    else { return };
+
+    switch self.presentationState {
+      case .presenting:
+        self.targetView = transitionContext.containerView;
+        self.targetViewController = fromVC;
+
+        self.prepareForPresentation();
+
+        self.showModal() {
+          transitionContext.completeTransition(true);
+        };
+
+      case .dismissing:
+        self.dismissModal(){
+          transitionContext.completeTransition(true);
+        };
+
+      case .none:
+        break;
     };
-
-    self.debug(prefix: "AdaptiveModalPresentationController.animateTransition");
-
-
-
-
-    // if self.currentInterpolationIndex == 0 {
-    //   self.prepareForPresentation(
-    //     presentingViewController: fromVC,
-    //     presentedViewController: toVC
-    //   );
-    // };
-    //
-    // self.showModal(){
-    //   transitionContext.completeTransition(true);
-    // };
-
-    print(
-      "AdaptiveModalPresentationController.animateTransition"
-      + "\n - fromVC: \(fromVC)"
-      + "\n - toVC: \(toVC)"
-    );
   };
 };
diff --git a/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerTransitioningDelegate.swift b/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerTransitioningDelegate.swift
@@ -32,18 +32,6 @@ extension AdaptiveModalManager: UIViewControllerTransitioningDelegate {
       modalManager: self
     );
 
-    print(
-        "AdaptiveModalManager+UIViewControllerTransitioningDelegate"
-      + "\n - presentationController"
-      + "\n - presented: \(presented)"
-      + "\n - presented.view.frame: \(presented.view.frame)"
-      + "\n - presenting: \(presenting)"
-      + "\n - presenting.view.frame: \(presenting?.view.frame)"
-      + "\n - source: \(source)"
-      + "\n - source.view.frame: \(source.view.frame)"
-      + "\n"
-    );
-
     presentationController.delegate = self;
     return presentationController;
   };
@@ -53,14 +41,16 @@ extension AdaptiveModalManager: UIViewControllerTransitioningDelegate {
     presenting: UIViewController,
     source: UIViewController
   ) -> UIViewControllerAnimatedTransitioning? {
-
+
+    self.presentationState = .presenting;
     return self;
   };
 
   func animationController(
     forDismissed dismissed: UIViewController
   ) -> UIViewControllerAnimatedTransitioning? {
-
+
+    self.presentationState = .dismissing;
     return self;
   };
 };
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -9,6 +9,10 @@ import UIKit
 
 class AdaptiveModalManager: NSObject {
 
+  enum PresentationState {
+    case presenting, dismissing, none;
+  };
+
   // MARK: -  Properties - Config-Related
   // ------------------------------------
 
@@ -193,6 +197,7 @@ class AdaptiveModalManager: NSObject {
   // -------------------
 
   private var didTriggerSetup = false;
+  var presentationState: PresentationState = .none;
 
   weak var eventDelegate: AdaptiveModalEventNotifiable?;
 
@@ -1389,4 +1394,9 @@ class AdaptiveModalManager: NSObject {
     let nextIndex = self.modalConfig.initialSnapPointIndex;
     self.snapTo(interpolationIndex: nextIndex, completion: completion);
   };
+
+  func dismissModal(completion: (() -> Void)? = nil){
+    let nextIndex = 0;
+    self.snapTo(interpolationIndex: nextIndex, completion: completion);
+  };
 };