💫 Update: Exp - AdaptiveModal

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

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalAnimationConfig.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalAnimationConfig.swift
@@ -25,6 +25,7 @@ struct AdaptiveModalAnimationConfig {
   let modalMaskedCorners: CACornerMask?;
 
   let modalBackgroundVisualEffect: UIVisualEffect?;
+  let modalBackgroundVisualEffectOpacity: CGFloat?;
   let modalBackgroundVisualEffectIntensity: CGFloat?;
 
   let backgroundColor: UIColor?;
@@ -45,6 +46,7 @@ struct AdaptiveModalAnimationConfig {
      modalCornerRadius: CGFloat? = nil,
      modalMaskedCorners: CACornerMask? = nil,
      modalBackgroundVisualEffect: UIVisualEffect? = nil,
+     modalBackgroundVisualEffectOpacity: CGFloat? = nil,
      modalBackgroundVisualEffectIntensity: CGFloat? = nil,
      backgroundColor: UIColor? = nil,
      backgroundOpacity: CGFloat? = nil,
@@ -67,6 +69,7 @@ struct AdaptiveModalAnimationConfig {
     self.modalMaskedCorners = modalMaskedCorners;
 
     self.modalBackgroundVisualEffect = modalBackgroundVisualEffect;
+    self.modalBackgroundVisualEffectOpacity = modalBackgroundVisualEffectOpacity;
     self.modalBackgroundVisualEffectIntensity = modalBackgroundVisualEffectIntensity;
 
     self.backgroundColor = backgroundColor;

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -44,6 +44,7 @@ struct AdaptiveModalInterpolationPoint: Equatable {
   let modalMaskedCorners: CACornerMask;
 
   let modalBackgroundVisualEffect: UIVisualEffect?;
+  let modalBackgroundVisualEffectOpacity: CGFloat;
   let modalBackgroundVisualEffectIntensity: CGFloat;
 
   //let backgroundColor: UIColor;
@@ -164,6 +165,10 @@ struct AdaptiveModalInterpolationPoint: Equatable {
     self.modalBackgroundVisualEffect = keyframeCurrent?.modalBackgroundVisualEffect
       ?? keyframePrev?.modalBackgroundVisualEffect;
 
+    self.modalBackgroundVisualEffectOpacity = keyframeCurrent?.modalBackgroundVisualEffectOpacity
+      ?? keyframePrev?.modalBackgroundVisualEffectOpacity
+      ?? 1;
+
     self.modalBackgroundVisualEffectIntensity = keyframeCurrent?.modalBackgroundVisualEffectIntensity
       ?? keyframePrev?.modalBackgroundVisualEffectIntensity
       ?? 1;
@@ -244,8 +249,8 @@ struct AdaptiveModalInterpolationPoint: Equatable {
     modalBgView?.alpha = self.modalBackgroundOpacity;
   };
 
-  func apply(toBackgroundEffectView effectView: UIVisualEffectView?){
-    effectView?.effect = self.backgroundVisualEffect;
+  func apply(toModalBackgroundEffectView effectView: UIVisualEffectView?){
+    effectView?.alpha = self.modalBackgroundVisualEffectOpacity;
   };
 
   func apply(toBackgroundView bgView: UIView?){

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -539,7 +539,7 @@ class AdaptiveModalManager {
     return nextTransform;
   };
 
-  func interpolateOpacity(
+  func interpolateModalOpacity(
     forInputPercentValue inputPercentValue: CGFloat
   ) -> CGFloat? {
 
@@ -559,6 +559,16 @@ class AdaptiveModalManager {
     );
   };
 
+  func interpolateModalBackgroundVisualEffectOpacity(
+    forInputPercentValue inputPercentValue: CGFloat
+  ) -> CGFloat? {
+
+    return self.interpolate(
+      inputValue: inputPercentValue,
+      rangeOutputKey: \.modalBackgroundVisualEffectOpacity
+    );
+  };
+
   func interpolateModalBorderRadius(
     forInputPercentValue inputPercentValue: CGFloat
   ) -> CGFloat? {
@@ -693,7 +703,7 @@ class AdaptiveModalManager {
     Self.setProperty(
       forObject: modalView,
       forPropertyKey: \.alpha,
-      withValue:  self.interpolateOpacity(
+      withValue:  self.interpolateModalOpacity(
         forInputPercentValue: inputPercentValue
       )
     );
@@ -714,6 +724,14 @@ class AdaptiveModalManager {
       )
     );
 
+    Self.setProperty(
+      forObject: self.modalBackgroundVisualEffectView,
+      forPropertyKey: \.alpha,
+      withValue:  self.interpolateModalBackgroundVisualEffectOpacity(
+        forInputPercentValue: inputPercentValue
+      )
+    );
+
     Self.setProperty(
       forObject: self.backgroundDimmingView,
       forPropertyKey: \.alpha,
@@ -843,6 +861,8 @@ class AdaptiveModalManager {
       interpolationPoint.apply(toDummyModalView: self.dummyModalView);
       interpolationPoint.apply(toModalBackgroundView: self.modalBackgroundView);
       interpolationPoint.apply(toBackgroundView: self.backgroundDimmingView);
+
+      interpolationPoint.apply(toModalBackgroundEffectView: self.modalBackgroundVisualEffectView)
     };
 
     if let completion = completion {

diff --git a/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift b/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift
@@ -244,6 +244,7 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
                 .layerMinXMaxYCorner,
                 .layerMaxXMaxYCorner
               ],
+              modalBackgroundVisualEffectOpacity: 0.9,
               modalBackgroundVisualEffectIntensity: 0.6,
               backgroundOpacity: 0.1,
               backgroundVisualEffectIntensity: 0.075