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 5, 2023
1 parent 38c69f5 commit 6008762
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 116 deletions.
183 changes: 68 additions & 115 deletions experiments/swift-programmatic-modal/AdaptiveModal/AdaptiveModalManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,32 @@ class AdaptiveModalManager {
};
};

// MARK: - Functions - Interpolation-Related
// -----------------------------------------
// MARK: - Functions - Interpolation-Related Helpers
// -------------------------------------------------

func interpolate(
inputValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil,
rangeOutputKey: KeyPath<AdaptiveModalInterpolationPoint, CGFloat>,
shouldClampMin: Bool = false,
shouldClampMax: Bool = false
) -> CGFloat? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

return Self.interpolate(
inputValue: inputValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0[keyPath: rangeOutputKey];
},
shouldClampMin: shouldClampMin,
shouldClampMax: shouldClampMax
);
};

func getInterpolationStepRange(
forInputPercentValue inputPercentValue: CGFloat
Expand Down Expand Up @@ -390,54 +414,39 @@ class AdaptiveModalManager {
return (rangeStart, rangeEnd);
};

// MARK: - Functions - Value Interpolators
// ---------------------------------------

func interpolateModalRect(
forInputPercentValue inputPercentValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGRect? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

let clampConfig = modalConfig.interpolationClampingConfig;

let nextHeight = Self.interpolate(
let nextHeight = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.computedRect.height
},
rangeOutputKey: \.computedRect.height,
shouldClampMin: clampConfig.shouldClampModalLastHeight,
shouldClampMax: clampConfig.shouldClampModalInitHeight
);

let nextWidth = Self.interpolate(
let nextWidth = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.computedRect.width
},
rangeOutputKey: \.computedRect.width,
shouldClampMin: clampConfig.shouldClampModalLastWidth,
shouldClampMax: clampConfig.shouldClampModalInitWidth
);

let nextX = Self.interpolate(
let nextX = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.computedRect.minX
},
rangeOutputKey: \.computedRect.origin.x,
shouldClampMin: clampConfig.shouldClampModalLastX,
shouldClampMax: clampConfig.shouldClampModalInitX
);

let nextY = Self.interpolate(
let nextY = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.computedRect.minY
},
rangeOutputKey: \.computedRect.origin.y,
shouldClampMin: clampConfig.shouldClampModalLastY,
shouldClampMax: clampConfig.shouldClampModalInitY
);
Expand All @@ -457,63 +466,42 @@ class AdaptiveModalManager {
};

func interpolateModalTransform(
forInputPercentValue inputPercentValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGAffineTransform? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

let clampConfig = modalConfig.interpolationClampingConfig;

let nextModalRotation = Self.interpolate(
let nextModalRotation = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalRotation
},
rangeOutputKey: \.modalRotation,
shouldClampMin: clampConfig.shouldClampModalInitRotation,
shouldClampMax: clampConfig.shouldClampModalLastRotation
);

let nextScaleX = Self.interpolate(
let nextScaleX = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalScaleX;
},
rangeOutputKey: \.modalScaleX,
shouldClampMin: clampConfig.shouldClampModalLastScaleX,
shouldClampMax: clampConfig.shouldClampModalLastScaleX
);

let nextScaleY = Self.interpolate(
let nextScaleY = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalScaleY
},
rangeOutputKey: \.modalScaleY,
shouldClampMin: clampConfig.shouldClampModalLastScaleY,
shouldClampMax: clampConfig.shouldClampModalLastScaleY
);

let nextTranslateX = Self.interpolate(
let nextTranslateX = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalTranslateX
},
rangeOutputKey: \.modalTranslateX,
shouldClampMin: clampConfig.shouldClampModalInitTranslateX,
shouldClampMax: clampConfig.shouldClampModalLastTranslateX
);

let nextTranslateY = Self.interpolate(
let nextTranslateY = self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalTranslateY
},
rangeOutputKey: \.modalTranslateY,
shouldClampMin: clampConfig.shouldClampModalInitTranslateY,
shouldClampMax: clampConfig.shouldClampModalLastTranslateY
);
Expand Down Expand Up @@ -552,85 +540,48 @@ class AdaptiveModalManager {
};

func interpolateOpacity(
forInputPercentValue inputPercentValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGFloat? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

return Self.interpolate(
return self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalOpacity
}
rangeOutputKey: \.modalOpacity
);
};

func interpolateModalBackgroundOpacity(
forInputPercentValue inputPercentValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGFloat? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

return Self.interpolate(
return self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalBackgroundOpacity
}
rangeOutputKey: \.modalBackgroundOpacity
);
};

func interpolateModalBorderRadius(
forInputPercentValue inputPercentValue: CGFloat,
modalBounds: CGRect,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGFloat? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

let modalCornerRadius = Self.interpolate(
return self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.modalCornerRadius
}
rangeOutputKey: \.modalCornerRadius
);

guard let modalCornerRadius = modalCornerRadius else { return nil };
return modalCornerRadius;
};

func interpolateBackgroundOpacity(
forInputPercentValue inputPercentValue: CGFloat,
rangeInput: [CGFloat]? = nil,
rangeOutput: [AdaptiveModalInterpolationPoint]? = nil
forInputPercentValue inputPercentValue: CGFloat
) -> CGFloat? {

guard let interpolationSteps = rangeOutput ?? self.interpolationStepsSorted,
let interpolationRangeInput = rangeInput ?? self.interpolationRangeInput
else { return nil };

return Self.interpolate(
return self.interpolate(
inputValue: inputPercentValue,
rangeInput: interpolationRangeInput,
rangeOutput: interpolationSteps.map {
$0.backgroundOpacity
}
rangeOutputKey: \.backgroundOpacity
);
};

// MARK: - Functions - Property Interpolators
// ------------------------------------------

func applyInterpolationToModalBackgroundVisualEffect(
forInputPercentValue inputPercentValue: CGFloat
) {
Expand Down Expand Up @@ -719,6 +670,9 @@ class AdaptiveModalManager {
animator.setFractionComplete(forInputPercentValue: inputPercentValue);
};

// MARK: - Functions - Apply Interpolators
// ----------------------------------------

func applyInterpolationToModal(
forInputPercentValue inputPercentValue: CGFloat
) {
Expand All @@ -743,8 +697,7 @@ class AdaptiveModalManager {
};

if let nextModalRadius = self.interpolateModalBorderRadius(
forInputPercentValue: inputPercentValue,
modalBounds: modalView.bounds
forInputPercentValue: inputPercentValue
) {
modalView.layer.cornerRadius = nextModalRadius;
};
Expand Down
2 changes: 1 addition & 1 deletion experiments/swift-programmatic-modal/Test/RNIDraggableTestViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UIKit

enum AdaptiveModalConfigTestPresets: CaseIterable {

static let `default`: Self = .test03;
static let `default`: Self = .testModalTransform01;

case testModalTransform01;

Expand Down

0 comments on commit 6008762

Please sign in to comment.