💫 Update: Exp - AdaptiveModal

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

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -186,31 +186,42 @@ struct AdaptiveModalInterpolationPoint: Equatable {
 
     var transforms: [CGAffineTransform] = [];
 
-    if shouldApplyRotation {
+    if shouldApplyRotation,
+       self.modalRotation != 0 {
+
       transforms.append(
         .init(rotationAngle: self.modalRotation)
       );
     };
 
-    if shouldApplyScale {
+    if shouldApplyScale,
+      self.modalScaleX != 1 && self.modalScaleY != 1 {
+
       transforms.append(
         .init(scaleX: self.modalScaleX, y: self.modalScaleY)
       );
     };
 
-    if shouldApplyTranslate {
+    if shouldApplyTranslate,
+       self.modalTranslateX != 0 && self.modalTranslateY != 0 {
+
       transforms.append(
         .init(translationX: self.modalTranslateX, y: self.modalTranslateY)
       );
     };
 
+    if transforms.isEmpty {
+      return .identity;
+    };
+
     return transforms.reduce(.identity){
       $0.concatenating($1);
     };
   };
 
   func apply(toModalView modalView: UIView){
     modalView.frame = self.computedRect;
+    modalView.transform = self.getModalTransform(shouldApplyTranslate: false);
 
     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
@@ -677,7 +677,7 @@ class AdaptiveModalManager {
     if let nextModalTransform = self.interpolateModalTransform(
       forInputPercentValue: inputPercentValue
     ) {
-      modalView.transform = nextModalTransform;
+      //modalView.transform = nextModalTransform;
     };
 
     if let nextModalRadius = self.interpolateModalBorderRadius(
@@ -934,10 +934,8 @@ class AdaptiveModalManager {
   };
 
   @objc func onDisplayLinkTick(displayLink: CADisplayLink) {
-    guard let modalView = self.modalView,
-          let dummyModalViewPresentationLayer =
+    guard let dummyModalViewPresentationLayer =
             self.dummyModalView.layer.presentation(),
-
           let interpolationRangeMaxInput = self.interpolationRangeMaxInput
     else { return };
 
@@ -963,6 +961,7 @@ class AdaptiveModalManager {
       ? Self.invertPercent(percent)
       : percent;
 
+
     self.applyInterpolationToBackgroundVisualEffect(
       forInputPercentValue: percentAdj
     );
@@ -971,12 +970,6 @@ class AdaptiveModalManager {
       forInputPercentValue: percentAdj
     );
 
-    if let modalTranslate = self.interpolateModalTransform(
-      forInputPercentValue: percentAdj
-    ) {
-      modalView.transform = modalTranslate.concatenating(.identity);
-    };
-
     self.prevModalFrame = nextModalFrame;
   };