💫 Update: Exp - AdaptiveModal

Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
dominicstop · Jun 2, 2023 · 7799c6e · 7799c6e
1 parent d124753
commit 7799c6e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalConfig.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalConfig.swift
@@ -59,6 +59,13 @@ struct AdaptiveModalConfig {
     };
   };
 
+  var shouldInvertPercent: Bool {
+    switch self.snapDirection {
+      case .bottomToTop, .rightToLeft: return true;
+      default: return false;
+    };
+  };
+
   // MARK: - Init
   // ------------
 

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalInterpolationPoint.swift
@@ -41,13 +41,6 @@ struct AdaptiveModalInterpolationPoint: Equatable {
     self.percent = percent ?? {
       switch modalConfig.snapPercentStrategy {
         case .position:
-          let shouldInvertPercent: Bool = {
-            switch modalConfig.snapDirection {
-              case .bottomToTop, .rightToLeft: return true;
-              default: return false;
-            };
-          }();
-
           let maxRangeInput =
             targetRect[keyPath: modalConfig.maxInputRangeKeyForRect];
 
@@ -56,7 +49,7 @@ struct AdaptiveModalInterpolationPoint: Equatable {
 
           let percent = inputValue / maxRangeInput;
 
-          return shouldInvertPercent
+          return modalConfig.shouldInvertPercent
             ? AdaptiveModalManager.invertPercent(percent)
             : percent;
 

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
@@ -166,16 +166,9 @@ class AdaptiveModalManager {
     let inputCoord =
       modalView.frame.origin[keyPath: self.modalConfig.inputValueKeyForPoint];
 
-    let shouldInvertPercent: Bool = {
-      switch self.modalConfig.snapDirection {
-        case .bottomToTop, .rightToLeft: return true;
-        default: return false;
-      };
-    }();
-
     let percent = inputCoord / interpolationRangeMaxInput;
 
-    return shouldInvertPercent
+    return self.modalConfig.shouldInvertPercent
       ? Self.invertPercent(percent)
       : percent;
   };
@@ -647,7 +640,7 @@ class AdaptiveModalManager {
     let prevModalFrame = self.prevModalFrame;
     let nextModalFrame = modalViewPresentationLayer.frame;
 
-    // guard inputValueNext != inputValuePrev else { return };
+    guard prevModalFrame != nextModalFrame else { return };
 
     self.applyInterpolationToBackgroundVisualEffect(
       forInputPercentValue: currentPercent
@@ -679,8 +672,6 @@ class AdaptiveModalManager {
       withTargetRect: targetView.frame,
       currentSize: currentSize
     );
-
-    print(self.interpolationSteps);
   };
 
   func notifyOnDragPanGesture(_ gesture: UIPanGestureRecognizer){

diff --git a/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalPropertyAnimator.swift b/experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalPropertyAnimator.swift
@@ -91,11 +91,6 @@ struct AdaptiveModalPropertyAnimator {
     let inputPercentAdj = inputPercentValue - self.inputRangeStart;
 
     let percent = inputPercentAdj / inputRangeEndAdj;
-
-    print(
-        "component: \(self.component)"
-      + "\n - percent: \(percent)"
-    );
     self.setFractionComplete(forPercent: percent);
   };