javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 20:11:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1489 from NativeScript/feature/continiousAnimation

Browse Source 
Modified animations to allow smooth transition when the previous animation is replaced
This commit is contained in:
tzraikov
2016-02-04 15:59:49 +02:00
parent 343e15679b 91d1ba3f97
commit c70755b2e3
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ui/animation/animation.ios.ts
View File

@ -143,47 +143,54 @@ export class Animation extends common.Animation implements definition.Animation
finishedCallback(cancelled); finishedCallback(cancelled);
return; return;
} }
var animation = propertyAnimations[index]; var animation = propertyAnimations[index];
var nativeView = <UIView>animation.target._nativeView; var nativeView = <UIView>animation.target._nativeView;
var propertyNameToAnimate = animation.property; var propertyNameToAnimate = animation.property;
var value = animation.value; var value = animation.value;
var originalValue; var originalValue;
var presentationLayer = nativeView.layer.presentationLayer();
var tempRotate = animation.target.rotate * Math.PI / 180;
var abs
switch (animation.property) { switch (animation.property) {
case common.Properties.backgroundColor: case common.Properties.backgroundColor:
(<any>animation)._originalValue = animation.target.backgroundColor; (<any>animation)._originalValue = animation.target.backgroundColor;
(<any>animation)._propertyResetCallback = (value) => { animation.target.backgroundColor = value }; (<any>animation)._propertyResetCallback = (value) => { animation.target.backgroundColor = value };
originalValue = nativeView.layer.backgroundColor; originalValue = presentationLayer.backgroundColor;
value = value.CGColor; value = value.CGColor;
break; break;
case common.Properties.opacity: case common.Properties.opacity:
(<any>animation)._originalValue = animation.target.opacity; (<any>animation)._originalValue = animation.target.opacity;
(<any>animation)._propertyResetCallback = (value) => { animation.target.opacity = value }; (<any>animation)._propertyResetCallback = (value) => { animation.target.opacity = value };
originalValue = nativeView.layer.opacity; originalValue = presentationLayer.opacity;
break; break;
case common.Properties.rotate: case common.Properties.rotate:
(<any>animation)._originalValue = animation.target.rotate; (<any>animation)._originalValue = animation.target.rotate;
(<any>animation)._propertyResetCallback = (value) => { animation.target.rotate = value }; (<any>animation)._propertyResetCallback = (value) => { animation.target.rotate = value };
propertyNameToAnimate = "transform.rotation"; propertyNameToAnimate = "transform.rotation";
originalValue = animation.target.rotate * Math.PI / 180; originalValue = presentationLayer.valueForKeyPath("transform.rotation");
value = value * Math.PI / 180; value = value * Math.PI / 180;
abs = fabs(originalValue - value);
if (abs < 0.001 && originalValue !== tempRotate) {
originalValue = tempRotate;
}
break; break;
case common.Properties.translate: case common.Properties.translate:
(<any>animation)._originalValue = { x:animation.target.translateX, y:animation.target.translateY }; (<any>animation)._originalValue = { x:animation.target.translateX, y:animation.target.translateY };
(<any>animation)._propertyResetCallback = (value) => { animation.target.translateX = value.x; animation.target.translateY = value.y; }; (<any>animation)._propertyResetCallback = (value) => { animation.target.translateX = value.x; animation.target.translateY = value.y; };
propertyNameToAnimate = "transform" propertyNameToAnimate = "transform"
originalValue = NSValue.valueWithCATransform3D(nativeView.layer.transform); originalValue = NSValue.valueWithCATransform3D(presentationLayer.transform);
value = NSValue.valueWithCATransform3D(CATransform3DTranslate(nativeView.layer.transform, value.x, value.y, 0)); value = NSValue.valueWithCATransform3D(CATransform3DTranslate(nativeView.layer.transform, value.x, value.y, 0));
break; break;
case common.Properties.scale: case common.Properties.scale:
(<any>animation)._originalValue = { x:animation.target.scaleX, y:animation.target.scaleY }; (<any>animation)._originalValue = { x:animation.target.scaleX, y:animation.target.scaleY };
(<any>animation)._propertyResetCallback = (value) => { animation.target.scaleX = value.x; animation.target.scaleY = value.y; }; (<any>animation)._propertyResetCallback = (value) => { animation.target.scaleX = value.x; animation.target.scaleY = value.y; };
propertyNameToAnimate = "transform" propertyNameToAnimate = "transform"
originalValue = NSValue.valueWithCATransform3D(nativeView.layer.transform); originalValue = NSValue.valueWithCATransform3D(presentationLayer.transform);
value = NSValue.valueWithCATransform3D(CATransform3DScale(nativeView.layer.transform, value.x, value.y, 1)); value = NSValue.valueWithCATransform3D(CATransform3DScale(nativeView.layer.transform, value.x, value.y, 1));
break; break;
case _transform: case _transform:
originalValue = NSValue.valueWithCATransform3D(nativeView.layer.transform); originalValue = NSValue.valueWithCATransform3D(presentationLayer.transform);
(<any>animation)._originalValue = { xs:animation.target.scaleX, ys:animation.target.scaleY, (<any>animation)._originalValue = { xs:animation.target.scaleX, ys:animation.target.scaleY,
xt:animation.target.translateX, yt:animation.target.translateY }; xt:animation.target.translateX, yt:animation.target.translateY };
(<any>animation)._propertyResetCallback = (value) => { (<any>animation)._propertyResetCallback = (value) => {
@ -228,7 +235,7 @@ export class Animation extends common.Animation implements definition.Animation
var animationDelegate: AnimationDelegateImpl = AnimationDelegateImpl.initWithFinishedCallback(finishedCallback, animation); var animationDelegate: AnimationDelegateImpl = AnimationDelegateImpl.initWithFinishedCallback(finishedCallback, animation);
nativeAnimation.setValueForKey(animationDelegate, "delegate"); nativeAnimation.setValueForKey(animationDelegate, "delegate");
nativeView.layer.addAnimationForKey(nativeAnimation, null); nativeView.layer.addAnimationForKey(nativeAnimation, propertyNameToAnimate);
var callback = undefined; var callback = undefined;
if (index+1 < propertyAnimations.length) { if (index+1 < propertyAnimations.length) {