💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 5, 2023 · c579ae1 · c579ae1
1 parent 85ae662
commit c579ae1
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 65 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -54,22 +54,28 @@ struct AdaptiveModalInterpolationPoint: Equatable {
   // MARK: - Computed Properties
   // ---------------------------
 
-  var transform: CGAffineTransform {
-    var transform: CGAffineTransform = .identity;
+  var modalTransforms: [CGAffineTransform] {
+    var transforms: [CGAffineTransform] = [];
 
-    transform = transform.rotated(by: self.modalRotation);
+    transforms.append(
+      .init(rotationAngle: self.modalRotation)
+    );
 
-    transform = transform.scaledBy(
-      x: self.modalScaleX,
-      y: self.modalScaleY
+    transforms.append(
+      .init(scaleX: self.modalScaleX, y: self.modalScaleY)
     );
 
-    transform = transform.translatedBy(
-      x: self.modalTranslateX,
-      y: self.modalTranslateY
+    transforms.append(
+      .init(translationX: self.modalTranslateX, y: self.modalTranslateY)
     );
 
-    return transform;
+    return transforms;
+  };
+
+  var modalTransform: CGAffineTransform {
+    self.modalTransforms.reduce(.identity){
+      $0.concatenating($1);
+    };
   };
 
   // MARK: - Init
@@ -172,38 +178,39 @@ struct AdaptiveModalInterpolationPoint: Equatable {
   // MARK: - Functions
   // -----------------
 
-  func getTransform(
+  func getModalTransform(
     shouldApplyRotation: Bool = true,
     shouldApplyScale: Bool = true,
     shouldApplyTranslate: Bool = true
   ) -> CGAffineTransform {
 
-    var transform: CGAffineTransform = .identity;
+    var transforms: [CGAffineTransform] = [];
 
     if shouldApplyRotation {
-      transform = transform.rotated(by: self.modalRotation);
+      transforms.append(
+        .init(rotationAngle: self.modalRotation)
+      );
     };
 
     if shouldApplyScale {
-      transform = transform.scaledBy(
-        x: self.modalScaleX,
-        y: self.modalScaleY
+      transforms.append(
+        .init(scaleX: self.modalScaleX, y: self.modalScaleY)
       );
     };
 
     if shouldApplyTranslate {
-      transform = transform.translatedBy(
-        x: self.modalTranslateX,
-        y: self.modalTranslateY
+      transforms.append(
+        .init(translationX: self.modalTranslateX, y: self.modalTranslateY)
       );
     };
 
-    return transform;
+    return transforms.reduce(.identity){
+      $0.concatenating($1);
+    };
   };
 
   func apply(toModalView modalView: UIView){
     modalView.frame = self.computedRect;
-    modalView.transform = self.transform;
 
     modalView.layer.cornerRadius = self.modalCornerRadius;
     modalView.layer.maskedCorners = self.modalMaskedCorners;

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -14,7 +14,7 @@ class AdaptiveModalManager {
 
   var modalConfig: AdaptiveModalConfig;
 
-  var enableSnapping = false;
+  var enableSnapping = true;
 
   // MARK: -  Properties - Refs
   // --------------------------
@@ -489,52 +489,26 @@ class AdaptiveModalManager {
       shouldClampMax: clampConfig.shouldClampModalLastScaleY
     );
 
-    let nextTranslateX = Self.interpolate(
-      inputValue: inputPercentValue,
-      rangeInput: interpolationRangeInput,
-      rangeOutput: interpolationSteps.map {
-        $0.modalTranslateX
-      },
-      shouldClampMin: clampConfig.shouldClampModalLastTranslateX,
-      shouldClampMax: clampConfig.shouldClampModalLastTranslateX
-    );
-
-    let nextTranslateY = Self.interpolate(
-      inputValue: inputPercentValue,
-      rangeInput: interpolationRangeInput,
-      rangeOutput: interpolationSteps.map {
-        $0.modalTranslateY
-      },
-      shouldClampMin: clampConfig.shouldClampModalLastTranslateY,
-      shouldClampMax: clampConfig.shouldClampModalLastTranslateY
-    );
-
     let nextTransform: CGAffineTransform = {
-      var transform: CGAffineTransform = .identity;
+      var transforms: [CGAffineTransform] = [];
 
       if let rotation = nextModalRotation {
-        transform = transform.rotated(by: rotation);
+        transforms.append(
+          .init(rotationAngle: rotation)
+        );
       };
 
       if let nextScaleX = nextScaleX,
          let nextScaleY = nextScaleY {
 
-        transform = transform.scaledBy(
-          x: nextScaleX,
-          y: nextScaleY
+        transforms.append(
+          .init(scaleX: nextScaleX, y: nextScaleY)
         );
       };
 
-      if let nextTranslateX = nextTranslateX,
-         let nextTranslateY = nextTranslateY {
-
-        transform = transform.translatedBy(
-          x: nextTranslateX,
-          y: nextTranslateY
-        );
+      return transforms.reduce(.identity) {
+        $0.concatenating($1);
       };
-
-      return transform;
     }();
 
     return nextTransform;
@@ -849,8 +823,6 @@ class AdaptiveModalManager {
       interpolationPoint.apply(toDummyModalView: self.dummyModalView);
       interpolationPoint.apply(toModalBackgroundView: self.modalBackgroundView);
       interpolationPoint.apply(toBackgroundView: self.backgroundDimmingView);
-
-      modalView.layoutIfNeeded();
     };
 
     if let completion = completion {
@@ -962,8 +934,10 @@ class AdaptiveModalManager {
   };
 
   @objc func onDisplayLinkTick(displayLink: CADisplayLink) {
-    guard let dummyModalViewPresentationLayer =
+    guard let modalView = self.modalView,
+          let dummyModalViewPresentationLayer =
             self.dummyModalView.layer.presentation(),
+
           let interpolationRangeMaxInput = self.interpolationRangeMaxInput
     else { return };
 
@@ -989,7 +963,6 @@ class AdaptiveModalManager {
       ? Self.invertPercent(percent)
       : percent;
 
-
     self.applyInterpolationToBackgroundVisualEffect(
       forInputPercentValue: percentAdj
     );
@@ -998,6 +971,12 @@ class AdaptiveModalManager {
       forInputPercentValue: percentAdj
     );
 
+    if let modalTranslate = self.interpolateModalTransform(
+      forInputPercentValue: percentAdj
+    ) {
+      modalView.transform = modalTranslate.concatenating(.identity);
+    };
+
     self.prevModalFrame = nextModalFrame;
   };
 

diff --git a/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift b/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift
@@ -59,8 +59,8 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
               modalRotation: 0.1,
               modalScaleX: 0.5,
               modalScaleY: 1,
-              modalTranslateX: 1000,
-              modalTranslateY: 1000
+              modalTranslateX: 500,
+              modalTranslateY: 500
             )
           ),
           // snap point - 2
@@ -79,7 +79,7 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
               modalRotation: -0.1,
               modalScaleX: 1,
               modalScaleY: 1,
-              modalTranslateX: -400,
+              modalTranslateX: -600,
               modalTranslateY: 0
             )
           ),
@@ -444,10 +444,9 @@ class RNIDraggableTestViewController : UIViewController {
   };
 
   @objc func onDragPanGestureView(_ sender: UIPanGestureRecognizer) {
-    print("onDragPanGestureView - velocity: \(sender.velocity(in: self.view))");
+    // print("onDragPanGestureView - velocity: \(sender.velocity(in: self.view))");
 
     self.modalManager.notifyOnDragPanGesture(sender);
-
   };
 };