This repository was archived by the owner on Aug 30, 2023. It is now read-only.
Only animate CGSize and CGPoint key paths additively if additive is enabled. #72
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| Copyright 2017-present The Material Motion Authors. All Rights Reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import XCTest | ||
| #if IS_BAZEL_BUILD | ||
| import _MotionAnimator | ||
| #else | ||
| import MotionAnimator | ||
| #endif | ||
|
|
||
| class AdditiveAnimationTests: XCTestCase { | ||
| var animator: MotionAnimator! | ||
| var timing: MotionTiming! | ||
| var view: UIView! | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
|
|
||
| animator = MotionAnimator() | ||
|
|
||
| animator.additive = true | ||
|
|
||
| timing = MotionTiming(delay: 0, | ||
| duration: 1, | ||
| curve: MotionCurveMakeBezier(p1x: 0, p1y: 0, p2x: 0, p2y: 0), | ||
| repetition: .init(type: .none, amount: 0, autoreverses: false)) | ||
|
|
||
| let window = UIWindow() | ||
| window.makeKeyAndVisible() | ||
| view = UIView() // Need to animate a view's layer to get implicit animations. | ||
| window.addSubview(view) | ||
|
|
||
| // Connect our layers to the render server. | ||
| CATransaction.flush() | ||
| } | ||
|
|
||
| override func tearDown() { | ||
| animator = nil | ||
| timing = nil | ||
| view = nil | ||
|
|
||
| super.tearDown() | ||
| } | ||
|
|
||
| func testNumericKeyPathsAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, withValues: [1, 0], keyPath: .cornerRadius) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertTrue(animation.isAdditive, "Animation is not additive when it should be.") | ||
| } | ||
|
|
||
| func testSizeKeyPathsAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, | ||
| withValues: [CGSize(width: 0, height: 0), | ||
| CGSize(width: 1, height: 2)], keyPath: .shadowOffset) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertTrue(animation.isAdditive, "Animation is not additive when it should be.") | ||
| } | ||
|
|
||
| func testPositionKeyPathsAnimateAdditively() { | ||
|
||
| animator.animate(with: timing, to: view.layer, | ||
| withValues: [CGPoint(x: 0, y: 0), | ||
| CGPoint(x: 1, y: 2)], keyPath: .position) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertTrue(animation.isAdditive, "Animation is not additive when it should be.") | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Are CGRect not additive no matter what?
Contributor
Author
There was a problem hiding this comment. Currently no. CGRect support isn't currently implemented. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| Copyright 2017-present The Material Motion Authors. All Rights Reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import XCTest | ||
| #if IS_BAZEL_BUILD | ||
| import _MotionAnimator | ||
| #else | ||
| import MotionAnimator | ||
| #endif | ||
|
|
||
| class NonAdditiveAnimationTests: XCTestCase { | ||
| var animator: MotionAnimator! | ||
| var timing: MotionTiming! | ||
| var view: UIView! | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
|
|
||
| animator = MotionAnimator() | ||
|
|
||
| animator.additive = false | ||
|
|
||
| timing = MotionTiming(delay: 0, | ||
| duration: 1, | ||
| curve: MotionCurveMakeBezier(p1x: 0, p1y: 0, p2x: 0, p2y: 0), | ||
| repetition: .init(type: .none, amount: 0, autoreverses: false)) | ||
|
|
||
| let window = UIWindow() | ||
| window.makeKeyAndVisible() | ||
| view = UIView() // Need to animate a view's layer to get implicit animations. | ||
| window.addSubview(view) | ||
|
|
||
| // Connect our layers to the render server. | ||
| CATransaction.flush() | ||
| } | ||
|
|
||
| override func tearDown() { | ||
| animator = nil | ||
| timing = nil | ||
| view = nil | ||
|
|
||
| super.tearDown() | ||
| } | ||
|
|
||
| func testNumericKeyPathsDontAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, withValues: [1, 0], keyPath: .cornerRadius) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertFalse(animation.isAdditive, "Animation is additive when it shouldn't be.") | ||
| } | ||
|
|
||
| func testSizeKeyPathsDontAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, | ||
| withValues: [CGSize(width: 0, height: 0), | ||
| CGSize(width: 1, height: 2)], keyPath: .shadowOffset) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertFalse(animation.isAdditive, "Animation is additive when it shouldn't be.") | ||
| } | ||
|
|
||
| func testPositionKeyPathsDontAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, | ||
| withValues: [CGPoint(x: 0, y: 0), | ||
| CGPoint(x: 1, y: 2)], keyPath: .position) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertFalse(animation.isAdditive, "Animation is additive when it shouldn't be.") | ||
| } | ||
|
|
||
| func testRectKeyPathsDontAnimateAdditively() { | ||
| animator.animate(with: timing, to: view.layer, | ||
| withValues: [CGRect(x: 0, y: 0, width: 0, height: 0), | ||
| CGRect(x: 0, y: 0, width: 100, height: 50)], keyPath: .bounds) | ||
|
|
||
| XCTAssertNotNil(view.layer.animationKeys(), | ||
| "Expected an animation to be added, but none were found.") | ||
| guard let animationKeys = view.layer.animationKeys() else { | ||
| return | ||
| } | ||
| XCTAssertEqual(animationKeys.count, 1, | ||
| "Expected only one animation to be added, but the following were found: " | ||
| + "\(animationKeys).") | ||
| guard let key = animationKeys.first, | ||
| let animation = view.layer.animation(forKey: key) as? CABasicAnimation else { | ||
| return | ||
| } | ||
|
|
||
| XCTAssertFalse(animation.isAdditive, "Animation is additive when it shouldn't be.") | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm probably misunderstanding timing curves, but doesn't this timing curve mean "never go to the 'to' value"? If all control points are zero?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are four control points in a cubic bezier, p0 and p3 represent the anchor points — respectively anchored at 0, 0, and 1,1 — and p1 and p2 are the control points. This API accepts p1 and p2.
While this particular cubic bezier is odd, it's not particularly important for the purposes of this test.