Skip to content

Commit

Permalink
💫 Update: Exp - AdaptiveModal
Browse files Browse the repository at this point in the history 
Summary: Update experiment/test - `swift-programmatic-modal/AdaptiveModal`.
  • Loading branch information
@dominicstop
dominicstop committed Jun 16, 2023
1 parent e78a191 commit 8c3a2ea
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 64 deletions.
28 changes: 5 additions & 23 deletions experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalConfig.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,11 @@ struct AdaptiveModalConfig {
// let snapSwipeVelocityThreshold: CGFloat = 0;

var snapPoints: [AdaptiveModalSnapPointConfig] {
var items: [AdaptiveModalSnapPointConfig] = [];

if let snapPointFirst = self.baseSnapPoints.first {
let initialSnapPointConfig = AdaptiveModalSnapPointConfig(
fromSnapPointPreset: self.undershootSnapPoint,
fromBaseLayoutConfig: snapPointFirst.snapPoint
);

items.append(initialSnapPointConfig);
};

items += self.baseSnapPoints;

if let snapPointLast = self.baseSnapPoints.last {
let overshootSnapPointConfig = AdaptiveModalSnapPointConfig(
fromSnapPointPreset: self.overshootSnapPoint,
fromBaseLayoutConfig: snapPointLast.snapPoint
);

items.append(overshootSnapPointConfig);
};

return items;
.Element.deriveSnapPoints(
undershootSnapPoint: self.undershootSnapPoint,
inBetweenSnapPoints: self.baseSnapPoints,
overshootSnapPoint: self.overshootSnapPoint
);
};

var snapPointLastIndex: Int {
Expand Down
45 changes: 40 additions & 5 deletions experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ class AdaptiveModalManager: NSObject {
return displayLinkStartTimestamp + animator.duration;
};

private var rangeAnimators: [AdaptiveModalRangePropertyAnimator?] {[
self.backgroundVisualEffectAnimator,
self.modalBackgroundVisualEffectAnimator
]};

// MARK: - Properties - Gesture-Related
// -------------------------------------

Expand Down Expand Up @@ -910,7 +915,7 @@ class AdaptiveModalManager: NSObject {

self.didTriggerSetup = false;
};

private func cleanup() {
self.clearGestureValues();
self.clearAnimators();
Expand Down Expand Up @@ -1320,12 +1325,13 @@ class AdaptiveModalManager: NSObject {

func snapTo(
interpolationIndex nextIndex: Int,
interpolationPoint: AdaptiveModalInterpolationPoint? = nil,
completion: (() -> Void)? = nil
) {
self.nextInterpolationIndex = nextIndex;

let nextInterpolationPoint =
self.interpolationSteps[nextIndex];
let nextInterpolationPoint = interpolationPoint
?? self.interpolationSteps[nextIndex];

self.notifyOnModalWillSnap();

Expand Down Expand Up @@ -1395,8 +1401,37 @@ class AdaptiveModalManager: NSObject {
self.snapTo(interpolationIndex: nextIndex, completion: completion);
};

func dismissModal(completion: (() -> Void)? = nil){
func dismissModal(
useInBetweenSnapPoints: Bool = false,
completion: (() -> Void)? = nil
){

let nextIndex = 0;
self.snapTo(interpolationIndex: nextIndex, completion: completion);

if useInBetweenSnapPoints {
self.snapTo(interpolationIndex: nextIndex, completion: completion);

} else {
let currentSnapPointConfig = self.currentSnapPointConfig;

let undershootSnapPointConfig = AdaptiveModalSnapPointConfig(
fromSnapPointPreset: self.modalConfig.undershootSnapPoint,
fromBaseLayoutConfig: currentSnapPointConfig.snapPoint
);

let undershootInterpolationPoint = AdaptiveModalInterpolationPoint(
usingModalConfig: self.modalConfig,
snapPointIndex: nextIndex,
layoutValueContext: self.layoutValueContext,
snapPointConfig: undershootSnapPointConfig,
prevInterpolationPoint: self.currentInterpolationStep
);

self.snapTo(
interpolationIndex: nextIndex,
interpolationPoint: undershootInterpolationPoint,
completion: completion
);
};
};
};
48 changes: 34 additions & 14 deletions experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalSnapPoint.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct AdaptiveModalSnapPointConfig {
fromSnapPointPreset snapPointPreset: AdaptiveModalSnapPointPreset,
fromBaseLayoutConfig baseLayoutConfig: RNILayout
) {
let snapPointLayoutPreset = snapPointPreset.snapPointPreset;
let snapPointLayoutPreset = snapPointPreset.layoutPreset;

let snapPointLayout = snapPointLayoutPreset.getLayoutConfig(
fromBaseLayoutConfig: baseLayoutConfig
Expand All @@ -34,16 +34,36 @@ struct AdaptiveModalSnapPointConfig {
};
};

//extension AdaptiveModalSnapPointConfig {
//
// static func deriveSnapPoints(
// initialSnapPoint: AdaptiveModalSnapPointPreset,
// inBetweenSnapPoints: [AdaptiveModalSnapPointConfig],
// overshootSnapPoint: AdaptiveModalSnapPointPreset
// ) -> [AdaptiveModalSnapPointConfig] {
//
// var snapPoints: [AdaptiveModalSnapPointConfig] = [];
//
// return snapPoints;
// };
//};
extension AdaptiveModalSnapPointConfig {

static func deriveSnapPoints(
undershootSnapPoint: AdaptiveModalSnapPointPreset,
inBetweenSnapPoints: [AdaptiveModalSnapPointConfig],
overshootSnapPoint: AdaptiveModalSnapPointPreset
) -> [AdaptiveModalSnapPointConfig] {

var items: [AdaptiveModalSnapPointConfig] = [];

if let snapPointFirst = inBetweenSnapPoints.first {
let initialSnapPointConfig = AdaptiveModalSnapPointConfig(
fromSnapPointPreset: undershootSnapPoint,
fromBaseLayoutConfig: snapPointFirst.snapPoint
);

items.append(initialSnapPointConfig);
};

items += inBetweenSnapPoints;

if let snapPointLast = inBetweenSnapPoints.last {
let overshootSnapPointConfig = AdaptiveModalSnapPointConfig(
fromSnapPointPreset: overshootSnapPoint,
fromBaseLayoutConfig: snapPointLast.snapPoint
);

items.append(overshootSnapPointConfig);
};

return items;
};
};
14 changes: 7 additions & 7 deletions experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalSnapPointPreset.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import Foundation

struct AdaptiveModalSnapPointPreset {

let snapPointPreset: RNILayoutPreset;
let layoutPreset: RNILayoutPreset;
let animationKeyframe: AdaptiveModalAnimationConfig?;

init(
snapPoint: RNILayoutPreset,
layoutPreset: RNILayoutPreset,
animationKeyframe: AdaptiveModalAnimationConfig? = nil
) {
self.snapPointPreset = snapPoint;
self.layoutPreset = layoutPreset;
self.animationKeyframe = animationKeyframe;
};
};
Expand All @@ -26,7 +26,7 @@ extension AdaptiveModalSnapPointPreset {
forDirection direction: AdaptiveModalConfig.Direction
) -> Self {

let snapPoint: RNILayoutPreset = {
let layoutPreset: RNILayoutPreset = {
switch direction {
case .bottomToTop: return .edgeTop;
case .topToBottom: return .edgeBottom;
Expand All @@ -35,14 +35,14 @@ extension AdaptiveModalSnapPointPreset {
};
}();

return self.init(snapPoint: snapPoint);
return self.init(layoutPreset: layoutPreset);
};

static func getDefaultInitialSnapPoint(
forDirection direction: AdaptiveModalConfig.Direction
) -> Self {

let snapPoint: RNILayoutPreset = {
let layoutPreset: RNILayoutPreset = {
switch direction {
case .bottomToTop: return .offscreenBottom;
case .topToBottom: return .offscreenTop;
Expand All @@ -51,6 +51,6 @@ extension AdaptiveModalSnapPointPreset {
};
}();

return self.init(snapPoint: snapPoint);
return self.init(layoutPreset: layoutPreset);
};
};
10 changes: 5 additions & 5 deletions experiments/swift-programmatic-modal/RNILayout/RNILayout.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public struct RNILayout {
rect.setPoint(minY: context.targetRect.minY);

case .bottom:
rect.setPoint(maxY: context.targetRect.maxY);
rect.origin.y = context.targetRect.height - rect.height;
};
};

Expand Down Expand Up @@ -205,7 +205,7 @@ public struct RNILayout {
let computedMarginHorizontal =
(computedMarginLeft ?? 0) + (computedMarginRight ?? 0);

let computedMargiVertical =
let computedMarginVertical =
(computedMarginTop ?? 0) + (computedMarginBottom ?? 0);

// Margin - X-Axis
Expand Down Expand Up @@ -238,14 +238,14 @@ public struct RNILayout {

let shouldRecomputeXAxis: Bool = {
switch self.width.mode {
case .stretch: return true;
case .stretch: return abs(computedMarginHorizontal) < rect.width;
default: return false;
};
}();

let shouldRecomputeYAxis: Bool = {
switch self.height.mode {
case .stretch: return true;
case .stretch: return abs(computedMarginVertical) < rect.height;
default: return false;
};
}();
Expand All @@ -255,7 +255,7 @@ public struct RNILayout {
};

if shouldRecomputeYAxis {
rect.size.height = rect.size.height - computedMargiVertical;
rect.size.height = rect.size.height - computedMarginVertical;
};

if shouldRecomputeXAxis || shouldRecomputeYAxis {
Expand Down
22 changes: 15 additions & 7 deletions experiments/swift-programmatic-modal/RNILayout/RNILayoutPreset.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ enum RNILayoutPreset {
return .init(
derivedFrom: baseLayoutConfig,
verticalAlignment: .bottom,
marginTop: .constant(0),
marginBottom: .percent(
relativeTo: .currentHeight,
percentValue: -1
Expand All @@ -56,7 +57,8 @@ enum RNILayoutPreset {
marginTop: .percent(
relativeTo: .currentHeight,
percentValue: -1
)
),
marginBottom: .constant(0)
);

case .offscreenLeft:
Expand All @@ -66,13 +68,15 @@ enum RNILayoutPreset {
marginLeft: .percent(
relativeTo: .currentWidth,
percentValue: -1
)
),
marginRight: .constant(0)
);

case .offscreenRight:
return .init(
derivedFrom: baseLayoutConfig,
horizontalAlignment: .right,
marginLeft: .constant(0),
marginRight: .percent(
relativeTo: .currentWidth,
percentValue: 1
Expand All @@ -89,7 +93,8 @@ enum RNILayoutPreset {
return .init(
derivedFrom: baseLayoutConfig,
verticalAlignment: .top,
marginTop: .percent(
marginTop: .constant(0),
marginBottom: .percent(
relativeTo: .currentHeight,
percentValue: 0.5
)
Expand All @@ -100,9 +105,10 @@ enum RNILayoutPreset {
derivedFrom: baseLayoutConfig,
verticalAlignment: .top,
marginTop: .percent(
relativeTo: .currentHeight,
percentValue: -0.5
)
relativeTo: .currentHeight,
percentValue: -0.5
),
marginBottom: .constant(0)
);

case .halfOffscreenLeft:
Expand All @@ -112,13 +118,15 @@ enum RNILayoutPreset {
marginLeft: .percent(
relativeTo: .currentWidth,
percentValue: -0.5
)
),
marginRight: .constant(0)
);

case .halfOffscreenRight:
return .init(
derivedFrom: baseLayoutConfig,
horizontalAlignment: .right,
marginLeft: .constant(0),
marginRight: .percent(
relativeTo: .currentWidth,
percentValue: 0.5
Expand Down
4 changes: 2 additions & 2 deletions experiments/swift-programmatic-modal/Test/AdaptiveModalConfigTestPresets.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
],
snapDirection: .bottomToTop,
overshootSnapPoint: AdaptiveModalSnapPointPreset(
snapPoint: .fitScreenVertically
layoutPreset: .fitScreenVertically
)
);

Expand Down Expand Up @@ -314,7 +314,7 @@ enum AdaptiveModalConfigTestPresets: CaseIterable {
shouldClampModalLastX: true
),
overshootSnapPoint: AdaptiveModalSnapPointPreset(
snapPoint: .fitScreen
layoutPreset: .fitScreen
)
);
};
Expand Down
2 changes: 1 addition & 1 deletion experiments/swift-programmatic-modal/Test/AdaptiveModalPresentationTestViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class TestModalViewController: UIViewController, AdaptiveModalEventNotifiable {
stack.axis = .vertical;
stack.distribution = .equalSpacing;
stack.alignment = .center;
stack.spacing = 15;
stack.spacing = 10;

stack.addArrangedSubview(self.floatingViewLabel);
stack.addArrangedSubview(presentButton);
Expand Down

0 comments on commit 8c3a2ea

Please sign in to comment.