diff --git a/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift b/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift index 59b3e680c4..708c6df81a 100644 --- a/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift +++ b/Sources/Private/CoreAnimation/Animations/CustomPathAnimation.swift @@ -16,8 +16,7 @@ extension CAShapeLayer { { let combinedKeyframes = try BezierPathKeyframe.combining( path: customPath, - cornerRadius: roundedCorners?.radius, - context: context) + cornerRadius: roundedCorners?.radius) try addAnimation( for: .path, @@ -51,6 +50,8 @@ extension CGPath { } } +// MARK: - BezierPathKeyframe + /// Data that represents how to render a bezier path at a specific point in time struct BezierPathKeyframe { let path: BezierPath @@ -59,8 +60,7 @@ struct BezierPathKeyframe { /// Creates a single array of animatable keyframes from the separate arrays of keyframes in this Rectangle static func combining( path: KeyframeGroup, - cornerRadius: KeyframeGroup?, - context: LayerAnimationContext) throws + cornerRadius: KeyframeGroup?) throws -> KeyframeGroup { guard diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-25.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-25.png index 8b4629ad58..2ce46a972a 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-25.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-25.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-50.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-50.png index 1047dcaa9e..c0c57ea48c 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-50.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-50.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-75.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-75.png index 5905565243..47e00c56aa 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-75.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.Issues-issue_1523-75.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-0.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-0.png index 8272f0855f..887330a8e5 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-0.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-0.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-100.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-100.png index 29c03b0389..b0a3638a86 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-100.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-100.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-25.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-25.png index e031f38e9c..fc2229fe32 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-25.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-25.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-50.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-50.png index 7fb88048f4..a3b787a6c6 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-50.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-50.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-75.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-75.png index 85a5484a1b..2a770384a5 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-75.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.LottieFiles-gradient_shapes-75.png differ diff --git a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.TypeFace-Apostrophe-25.png b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.TypeFace-Apostrophe-25.png index 3ef1bd1179..ac5bfc08b4 100644 Binary files a/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.TypeFace-Apostrophe-25.png and b/Tests/__Snapshots__/SnapshotTests/testCoreAnimationRenderingEngine.TypeFace-Apostrophe-25.png differ