💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 2, 2023 · 6ad7e7a · 6ad7e7a
1 parent 767e925
commit 6ad7e7a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 57 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -19,6 +19,7 @@ struct AdaptiveModalInterpolationPoint: Equatable {
   let modalMaskedCorners: CACornerMask;
 
   let backgroundVisualEffect: UIVisualEffect?;
+  let backgroundVisualEffectIntensity: CGFloat;
 
   init(
     usingModalConfig modalConfig: AdaptiveModalConfig,
@@ -61,20 +62,23 @@ struct AdaptiveModalInterpolationPoint: Equatable {
       };
     }();
 
-
     let keyframeCurrent = snapPointConfig.animationKeyframe;
     let keyframePrev    = prevSnapPointConfig?.animationKeyframe;
 
     self.modalCornerRadius = keyframeCurrent?.modalCornerRadius
       ?? keyframePrev?.modalCornerRadius
       ?? Self.DefaultCornerRadius;
 
-    self.modalMaskedCorners = keyframePrev?.modalMaskedCorners
+    self.modalMaskedCorners = keyframeCurrent?.modalMaskedCorners
       ?? keyframePrev?.modalMaskedCorners
       ?? Self.DefaultMaskedCorners;
 
-    self.backgroundVisualEffect = keyframePrev?.backgroundVisualEffect
+    self.backgroundVisualEffect = keyframeCurrent?.backgroundVisualEffect
       ?? keyframePrev?.backgroundVisualEffect;
+
+    self.backgroundVisualEffectIntensity = keyframeCurrent?.backgroundVisualEffectIntensity
+      ?? keyframePrev?.backgroundVisualEffectIntensity
+      ?? 1;
   };
 
   func apply(toModalView modalView: UIView){

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager+Helpers.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager+Helpers.swift
@@ -21,11 +21,11 @@ extension AdaptiveModalManager {
           rangeInput.count >= 2
     else { return nil };
 
-    if shouldClampMin, inputValue <= rangeInput.first! {
+    if shouldClampMin, inputValue < rangeInput.first! {
       return rangeOutput.first!;
     };
 
-    if shouldClampMax, inputValue <= rangeInput.last! {
+    if shouldClampMax, inputValue > rangeInput.last! {
       return rangeOutput.last!;
     };
 

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -233,7 +233,7 @@ class AdaptiveModalManager {
       /// `inputPercentValue` is between the range of `percentCurrent`
       /// and `percentNext`
       ///
-      return percentCurrent    >= inputPercentValue &&
+      return inputPercentValue >= percentCurrent &&
              inputPercentValue <= percentNext;
     };
 
@@ -254,8 +254,6 @@ class AdaptiveModalManager {
     guard let interpolationSteps      = rangeOutput ?? self.interpolationStepsSorted,
           let interpolationRangeInput = rangeInput  ?? self.interpolationRangeInput
     else { return nil };
-
-    print("interpolationRangeInput:", interpolationRangeInput);
 
     let clampConfig = modalConfig.interpolationClampingConfig;
 
@@ -339,32 +337,30 @@ class AdaptiveModalManager {
   func applyInterpolationToBackgroundVisualEffect(
     forInputPercentValue inputPercentValue: CGFloat
   ) {
-    guard let backgroundVisualEffectView = self.backgroundVisualEffectView,
-          let inputRange = self.getInterpolationStepRange(
-            forInputPercentValue: inputPercentValue
-          )
-    else { return };
-
-    let animator: AdaptiveModalPropertyAnimator = {
+    let animator: AdaptiveModalPropertyAnimator? = {
       if let animator = self.backgroundVisualEffectAnimator {
         return animator;
       };
 
+      guard let backgroundVisualEffectView = self.backgroundVisualEffectView,
+            let inputRange = self.getInterpolationStepRange(
+              forInputPercentValue: inputPercentValue
+            )
+      else { return nil };
+
       return AdaptiveModalPropertyAnimator(
         interpolationRangeStart: inputRange.rangeStart,
         interpolationRangeEnd: inputRange.rangeEnd,
         forComponent: backgroundVisualEffectView,
-        withInputAxisKey: self.modalConfig.inputValueKeyForPoint
+        interpolationOutputKey: \.backgroundVisualEffectIntensity
       ) {
         $0.effect = $1.backgroundVisualEffect;
       };
     }();
 
-    print(
-      "applyInterpolationToBackgroundVisualEffect - inputPercentValue: \(inputPercentValue)"
-    );
-
+    guard let animator = animator else { return };
     self.backgroundVisualEffectAnimator = animator;
+
     animator.setFractionComplete(forInputPercentValue: inputPercentValue);
   };
 
@@ -413,14 +409,6 @@ class AdaptiveModalManager {
     let percentAdj = shouldInvertPercent
       ? Self.invertPercent(percent)
       : percent;
-
-    print(
-      "applyInterpolationToModal"
-      + " - inputValue: \(inputValue)"
-      + " - maxInputValue: \(interpolationRangeMaxInput)"
-      + " - percent: \(percent)"
-      + " - percentAdj: \(percentAdj)"
-    );
 
     self.applyInterpolationToModal(forInputPercentValue: percentAdj);
   };
@@ -447,14 +435,6 @@ class AdaptiveModalManager {
       x: gesturePoint.x - gestureOffset.x,
       y: gesturePoint.y - gestureOffset.y
     );
-
-    print(
-      "applyInterpolationToModal"
-      + " - gesturePoint: \(gesturePoint)"
-      + " - gestureOffset: \(gestureOffset)"
-      + " - gestureInputPoint: \(gestureInputPoint)"
-      + " - modalRect: \(modalRect.origin)"
-    );
 
     self.applyInterpolationToModal(forPoint: gestureInputPoint);
   };
@@ -657,11 +637,6 @@ class AdaptiveModalManager {
       forInputPercentValue: percentAdj
     );
 
-    print(
-        "onDisplayLinkTick"
-      + " - percentAdj: \(percentAdj)"
-    );
-
     self.prevModalFrame = nextModalFrame;
   };
 

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalPropertyAnimator.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalPropertyAnimator.swift
@@ -8,29 +8,27 @@
 import UIKit
 
 struct AdaptiveModalPropertyAnimator {
-
-  var inputAxisKey: KeyPath<CGPoint, CGFloat>;
 
   var interpolationRangeStart: AdaptiveModalInterpolationPoint;
   var interpolationRangeEnd: AdaptiveModalInterpolationPoint;
 
+  let interpolationOutputKey:
+    KeyPath<AdaptiveModalInterpolationPoint, CGFloat>;
+
   var animator: UIViewPropertyAnimator;
 
   private weak var component: AnyObject?;
 
-  private var inputRangeStart: CGFloat {
-    self.interpolationRangeStart.percent;
-  };
-
-  private var inputRangeEnd: CGFloat {
-    self.interpolationRangeEnd.percent;
-  };
+  private var range: [AdaptiveModalInterpolationPoint] {[
+    self.interpolationRangeStart,
+    self.interpolationRangeEnd
+  ]};
 
   init<T: AnyObject>(
     interpolationRangeStart: AdaptiveModalInterpolationPoint,
     interpolationRangeEnd: AdaptiveModalInterpolationPoint,
     forComponent component: T,
-    withInputAxisKey inputAxisKey: KeyPath<CGPoint, CGFloat>,
+    interpolationOutputKey: KeyPath<AdaptiveModalInterpolationPoint, CGFloat>,
     animation: @escaping (
       _ component: T,
       _ interpolationPoint: AdaptiveModalInterpolationPoint
@@ -39,7 +37,7 @@ struct AdaptiveModalPropertyAnimator {
     self.interpolationRangeStart = interpolationRangeStart;
     self.interpolationRangeEnd = interpolationRangeEnd;
 
-    self.inputAxisKey = inputAxisKey;
+    self.interpolationOutputKey = interpolationOutputKey;
     self.component = component;
 
     let animator = UIViewPropertyAnimator(
@@ -87,10 +85,17 @@ struct AdaptiveModalPropertyAnimator {
   func setFractionComplete(
     forInputPercentValue inputPercentValue: CGFloat
   ) {
-    let inputRangeEndAdj = self.inputRangeEnd - self.inputRangeStart;
-    let inputPercentAdj = inputPercentValue - self.inputRangeStart;
+    let percent = AdaptiveModalManager.interpolate(
+      inputValue: inputPercentValue,
+      rangeInput: range.map {
+        $0.percent
+      },
+      rangeOutput: range.map {
+        $0[keyPath: self.interpolationOutputKey]
+      }
+    );
 
-    let percent = inputPercentAdj / inputRangeEndAdj;
+    guard let percent = percent else { return };
     self.setFractionComplete(forPercent: percent);
   };
 

diff --git a/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift b/experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift
@@ -76,7 +76,9 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
               modalMaskedCorners: [
                 .layerMinXMinYCorner,
                 .layerMaxXMinYCorner
-              ]
+              ],
+              backgroundVisualEffect: UIBlurEffect(style: .regular),
+              backgroundVisualEffectIntensity: 0
             )
           ),
           AdaptiveModalSnapPointConfig(
@@ -100,7 +102,8 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
                 .layerMaxXMinYCorner,
                 .layerMaxXMaxYCorner
               ],
-              backgroundVisualEffect: UIBlurEffect(style: .regular)
+              backgroundVisualEffect: UIBlurEffect(style: .regular),
+              backgroundVisualEffectIntensity: 0.5
             )
           ),
         ],