💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 6, 2023 · ef28916 · ef28916
1 parent 71e9bc5
commit ef28916
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -246,8 +246,23 @@ struct AdaptiveModalInterpolationPoint: Equatable {
     modalView.transform = self.modalTransform;
     modalView.alpha = self.modalOpacity;
 
-    modalView.layer.cornerRadius = self.modalCornerRadius;
-    modalView.layer.maskedCorners = self.modalMaskedCorners;
+    modalView.layer.mask = {
+      let path = UIBezierPath(
+        shouldRoundRect: modalView.bounds,
+        topLeftRadius: 20,
+        topRightRadius: 20,
+        bottomLeftRadius: 20,
+        bottomRightRadius: 20
+      );
+
+      let shape = CAShapeLayer();
+      shape.path = path.cgPath;
+
+      return shape;
+    }();
+
+    //modalView.layer.cornerRadius = self.modalCornerRadius;
+    //modalView.layer.maskedCorners = self.modalMaskedCorners;
   };
 
   func apply(toModalWrapperView modalWrapperView: UIView){

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -693,13 +693,28 @@ class AdaptiveModalManager {
       )
     );
 
-    AdaptiveModalUtilities.unwrapAndSetProperty(
-      forObject: modalView,
-      forPropertyKey: \.layer.cornerRadius,
-      withValue:  self.interpolateModalBorderRadius(
-        forInputPercentValue: inputPercentValue
-      )
-    );
+    // AdaptiveModalUtilities.unwrapAndSetProperty(
+    //   forObject: modalView,
+    //   forPropertyKey: \.layer.cornerRadius,
+    //   withValue:  self.interpolateModalBorderRadius(
+    //     forInputPercentValue: inputPercentValue
+    //   )
+    // );
+
+    modalView.layer.mask = {
+      let path = UIBezierPath(
+        shouldRoundRect: modalView.bounds,
+        topLeftRadius: 20,
+        topRightRadius: 20,
+        bottomLeftRadius: 20,
+        bottomRightRadius: 20
+      );
+
+      let shape = CAShapeLayer();
+      shape.path = path.cgPath;
+
+      return shape;
+    }();
 
     AdaptiveModalUtilities.unwrapAndSetProperty(
       forObject: self.modalBackgroundView,