💫 Update: Exp - AdaptiveModal

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

Hide file tree

Showing 4 changed files with 53 additions and 31 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -19,40 +19,40 @@ struct AdaptiveModalInterpolationPoint: Equatable {
   // MARK: - Properties
   // ------------------
 
-  let percent: CGFloat;
-  let snapPointIndex: Int;
+  var percent: CGFloat;
+  var snapPointIndex: Int;
 
   /// The computed frames of the modal based on the snap points
-  let computedRect: CGRect;
+  var computedRect: CGRect;
 
   // MARK: - Properties - Keyframes
   // ------------------------------
 
-  let modalRotation: CGFloat;
+  var modalRotation: CGFloat;
 
-  let modalScaleX: CGFloat;
-  let modalScaleY: CGFloat;
+  var modalScaleX: CGFloat;
+  var modalScaleY: CGFloat;
 
-  let modalTranslateX: CGFloat;
-  let modalTranslateY: CGFloat;
+  var modalTranslateX: CGFloat;
+  var modalTranslateY: CGFloat;
 
-  let modalOpacity: CGFloat;
-  let modalBackgroundColor: UIColor;
-  let modalBackgroundOpacity: CGFloat;
+  var modalOpacity: CGFloat;
+  var modalBackgroundColor: UIColor;
+  var modalBackgroundOpacity: CGFloat;
 
-  let modalCornerRadius: CGFloat;
-  let modalMaskedCorners: CACornerMask;
+  var modalCornerRadius: CGFloat;
+  var modalMaskedCorners: CACornerMask;
 
-  let modalBackgroundVisualEffect: UIVisualEffect?;
-  let modalBackgroundVisualEffectOpacity: CGFloat;
-  let modalBackgroundVisualEffectIntensity: CGFloat;
+  var modalBackgroundVisualEffect: UIVisualEffect?;
+  var modalBackgroundVisualEffectOpacity: CGFloat;
+  var modalBackgroundVisualEffectIntensity: CGFloat;
 
-  let backgroundColor: UIColor;
-  let backgroundOpacity: CGFloat;
+  var backgroundColor: UIColor;
+  var backgroundOpacity: CGFloat;
 
-  let backgroundVisualEffect: UIVisualEffect?;
-  let backgroundVisualEffectOpacity: CGFloat;
-  let backgroundVisualEffectIntensity: CGFloat;
+  var backgroundVisualEffect: UIVisualEffect?;
+  var backgroundVisualEffectOpacity: CGFloat;
+  var backgroundVisualEffectIntensity: CGFloat;
 
   // MARK: - Computed Properties
   // ---------------------------

diff --git a/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerAnimatedTransitioning.swift b/...atic-modal/AdaptiveModal/AdaptiveModalManager+UIViewControllerAnimatedTransitioning.swift
@@ -34,7 +34,7 @@ extension AdaptiveModalManager: UIViewControllerAnimatedTransitioning {
         };
 
       case .dismissing:
-        self.dismissModal(){
+        self.hideModal(){
           transitionContext.completeTransition(true);
         };
 

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -1310,7 +1310,8 @@ class AdaptiveModalManager: NSObject {
   };
 
   func prepareForPresentation(
-    presentingViewController presentingVC: UIViewController
+    viewControllerToPresent presentingVC: UIViewController,
+    presentingViewController presentedVC: UIViewController
   ) {
     self.modalViewController = presentingVC;
     self.modalView = presentingVC.view;
@@ -1401,7 +1402,7 @@ class AdaptiveModalManager: NSObject {
     self.snapTo(interpolationIndex: nextIndex, completion: completion);
   };
 
-  func dismissModal(
+  func hideModal(
     useInBetweenSnapPoints: Bool = false,
     completion: (() -> Void)? = nil
   ){
@@ -1413,25 +1414,46 @@ class AdaptiveModalManager: NSObject {
 
     } else {
       let currentSnapPointConfig = self.currentSnapPointConfig;
+      let currentInterpolationStep = self.currentInterpolationStep;
 
       let undershootSnapPointConfig = AdaptiveModalSnapPointConfig(
         fromSnapPointPreset: self.modalConfig.undershootSnapPoint,
         fromBaseLayoutConfig: currentSnapPointConfig.snapPoint
       );
 
-      let undershootInterpolationPoint = AdaptiveModalInterpolationPoint(
+      var undershootInterpolationPoint = AdaptiveModalInterpolationPoint(
         usingModalConfig: self.modalConfig,
         snapPointIndex: nextIndex,
         layoutValueContext: self.layoutValueContext,
-        snapPointConfig: undershootSnapPointConfig,
-        prevInterpolationPoint: self.currentInterpolationStep
+        snapPointConfig: undershootSnapPointConfig
       );
 
+      undershootInterpolationPoint.modalCornerRadius =
+        currentInterpolationStep.modalCornerRadius;
+
       self.snapTo(
         interpolationIndex: nextIndex,
         interpolationPoint: undershootInterpolationPoint,
         completion: completion
       );
     };
   };
+
+  public func presentModal(
+    viewControllerToPresent modalVC: UIViewController,
+    presentingViewController targetVC: UIViewController,
+    animated: Bool = true,
+    completion: (() -> Void)? = nil
+  ) {
+    self.prepareForPresentation(
+      viewControllerToPresent: modalVC,
+      presentingViewController: targetVC
+    );
+
+    targetVC.present(
+      modalVC,
+      animated: animated,
+      completion: completion
+    );
+  };
 };
diff --git a/experiments/swift-programmatic-modal/Test/AdaptiveModalPresentationTestViewController.swift b/experiments/swift-programmatic-modal/Test/AdaptiveModalPresentationTestViewController.swift
@@ -145,10 +145,10 @@ class AdaptiveModalPresentationTestViewController : UIViewController {
     self.adaptiveModalManager.eventDelegate = testVC;
     testVC.modalManager = self.adaptiveModalManager;
 
-    self.adaptiveModalManager.prepareForPresentation(
-      presentingViewController: testVC
-    );
 
-    self.present(testVC, animated: true);
+    self.adaptiveModalManager.presentModal(
+      viewControllerToPresent: testVC,
+      presentingViewController: self
+    );
   };
 };