javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

When android animation is interrupted by a second animation, the first animation will not try to set the animated properties on the view.

Browse Source
This commit is contained in:
Panayot Cankov
2015-10-26 15:02:00 +02:00
committed by vakrilov
parent 50966289a9
commit a3d762d6c6
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
es6.d.ts vendored Normal file
View File

@ -0,0 +1 @@
declare var Symbol: any;

52
ui/animation/animation.android.ts
View File

@ -10,6 +10,14 @@ global.moduleMerge(common, exports);
var floatType = java.lang.Float.class.getField("TYPE").get(null); var floatType = java.lang.Float.class.getField("TYPE").get(null);
var argbEvaluator = new android.animation.ArgbEvaluator(); var argbEvaluator = new android.animation.ArgbEvaluator();
var keyPrefix = "ui.animation.";
var propertyKeys = {};
propertyKeys[common.Properties.backgroundColor] = Symbol(keyPrefix + common.Properties.backgroundColor);
propertyKeys[common.Properties.opacity] = Symbol(keyPrefix + common.Properties.opacity);
propertyKeys[common.Properties.rotate] = Symbol(keyPrefix + common.Properties.rotate);
propertyKeys[common.Properties.scale] = Symbol(keyPrefix + common.Properties.scale);
propertyKeys[common.Properties.translate] = Symbol(keyPrefix + common.Properties.translate);
export class Animation extends common.Animation implements definition.Animation { export class Animation extends common.Animation implements definition.Animation {
private _animatorListener: android.animation.Animator.AnimatorListener; private _animatorListener: android.animation.Animator.AnimatorListener;
private _nativeAnimatorsArray: any; private _nativeAnimatorsArray: any;
@ -89,7 +97,7 @@ export class Animation extends common.Animation implements definition.Animation
// It has been cancelled // It has been cancelled
return; return;
} }
var i = 0; var i = 0;
var length = this._propertyUpdateCallbacks.length; var length = this._propertyUpdateCallbacks.length;
for (; i < length; i++) { for (; i < length; i++) {
@ -131,14 +139,28 @@ export class Animation extends common.Animation implements definition.Animation
var density = utils.layout.getDisplayDensity(); var density = utils.layout.getDisplayDensity();
var xyObjectAnimators: any; var xyObjectAnimators: any;
var animatorSet: android.animation.AnimatorSet; var animatorSet: android.animation.AnimatorSet;
var key = propertyKeys[propertyAnimation.property];
if (key) {
propertyAnimation.target[key] = propertyAnimation;
}
function checkAnimation(cb) {
return () => {
if (propertyAnimation.target[key] === propertyAnimation) {
delete propertyAnimation.target[key];
cb();
}
}
}
switch (propertyAnimation.property) { switch (propertyAnimation.property) {
case common.Properties.opacity: case common.Properties.opacity:
originalValue = nativeView.getAlpha(); originalValue = nativeView.getAlpha();
nativeArray = java.lang.reflect.Array.newInstance(floatType, 1); nativeArray = java.lang.reflect.Array.newInstance(floatType, 1);
nativeArray[0] = propertyAnimation.value; nativeArray[0] = propertyAnimation.value;
propertyUpdateCallbacks.push(() => { propertyAnimation.target.opacity = propertyAnimation.value }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.opacity = propertyAnimation.value }));
propertyResetCallbacks.push(() => { nativeView.setAlpha(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setAlpha(originalValue); }));
animators.push(android.animation.ObjectAnimator.ofFloat(nativeView, "alpha", nativeArray)); animators.push(android.animation.ObjectAnimator.ofFloat(nativeView, "alpha", nativeArray));
break; break;
@ -155,8 +177,8 @@ export class Animation extends common.Animation implements definition.Animation
} }
})); }));
propertyUpdateCallbacks.push(() => { propertyAnimation.target.backgroundColor = propertyAnimation.value; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.backgroundColor = propertyAnimation.value; }));
propertyResetCallbacks.push(() => { nativeView.setBackground(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setBackground(originalValue); }));
animators.push(animator); animators.push(animator);
break; break;
@ -168,16 +190,16 @@ export class Animation extends common.Animation implements definition.Animation
nativeArray[0] = propertyAnimation.value.x * density; nativeArray[0] = propertyAnimation.value.x * density;
xyObjectAnimators[0] = android.animation.ObjectAnimator.ofFloat(nativeView, "translationX", nativeArray); xyObjectAnimators[0] = android.animation.ObjectAnimator.ofFloat(nativeView, "translationX", nativeArray);
xyObjectAnimators[0].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations)); xyObjectAnimators[0].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations));
propertyUpdateCallbacks.push(() => { propertyAnimation.target.translateX = propertyAnimation.value.x; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.translateX = propertyAnimation.value.x; }));
propertyResetCallbacks.push(() => { nativeView.setTranslationX(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setTranslationX(originalValue); }));
originalValue = nativeView.getTranslationY(); originalValue = nativeView.getTranslationY();
nativeArray = java.lang.reflect.Array.newInstance(floatType, 1); nativeArray = java.lang.reflect.Array.newInstance(floatType, 1);
nativeArray[0] = propertyAnimation.value.y * density; nativeArray[0] = propertyAnimation.value.y * density;
xyObjectAnimators[1] = android.animation.ObjectAnimator.ofFloat(nativeView, "translationY", nativeArray); xyObjectAnimators[1] = android.animation.ObjectAnimator.ofFloat(nativeView, "translationY", nativeArray);
xyObjectAnimators[1].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations)); xyObjectAnimators[1].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations));
propertyUpdateCallbacks.push(() => { propertyAnimation.target.translateY = propertyAnimation.value.y; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.translateY = propertyAnimation.value.y; }));
propertyResetCallbacks.push(() => { nativeView.setTranslationY(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setTranslationY(originalValue); }));
animatorSet = new android.animation.AnimatorSet(); animatorSet = new android.animation.AnimatorSet();
animatorSet.playTogether(xyObjectAnimators); animatorSet.playTogether(xyObjectAnimators);
@ -193,16 +215,16 @@ export class Animation extends common.Animation implements definition.Animation
nativeArray[0] = propertyAnimation.value.x; nativeArray[0] = propertyAnimation.value.x;
xyObjectAnimators[0] = android.animation.ObjectAnimator.ofFloat(nativeView, "scaleX", nativeArray); xyObjectAnimators[0] = android.animation.ObjectAnimator.ofFloat(nativeView, "scaleX", nativeArray);
xyObjectAnimators[0].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations)); xyObjectAnimators[0].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations));
propertyUpdateCallbacks.push(() => { propertyAnimation.target.scaleX = propertyAnimation.value.x; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.scaleX = propertyAnimation.value.x; }));
propertyResetCallbacks.push(() => { nativeView.setScaleX(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setScaleX(originalValue); }));
originalValue = nativeView.getScaleY(); originalValue = nativeView.getScaleY();
nativeArray = java.lang.reflect.Array.newInstance(floatType, 1); nativeArray = java.lang.reflect.Array.newInstance(floatType, 1);
nativeArray[0] = propertyAnimation.value.y; nativeArray[0] = propertyAnimation.value.y;
xyObjectAnimators[1] = android.animation.ObjectAnimator.ofFloat(nativeView, "scaleY", nativeArray); xyObjectAnimators[1] = android.animation.ObjectAnimator.ofFloat(nativeView, "scaleY", nativeArray);
xyObjectAnimators[1].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations)); xyObjectAnimators[1].setRepeatCount(Animation._getAndroidRepeatCount(propertyAnimation.iterations));
propertyUpdateCallbacks.push(() => { propertyAnimation.target.scaleY = propertyAnimation.value.y; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.scaleY = propertyAnimation.value.y; }));
propertyResetCallbacks.push(() => { nativeView.setScaleY(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setScaleY(originalValue); }));
animatorSet = new android.animation.AnimatorSet(); animatorSet = new android.animation.AnimatorSet();
animatorSet.playTogether(xyObjectAnimators); animatorSet.playTogether(xyObjectAnimators);
@ -214,8 +236,8 @@ export class Animation extends common.Animation implements definition.Animation
originalValue = nativeView.getRotation(); originalValue = nativeView.getRotation();
nativeArray = java.lang.reflect.Array.newInstance(floatType, 1); nativeArray = java.lang.reflect.Array.newInstance(floatType, 1);
nativeArray[0] = propertyAnimation.value; nativeArray[0] = propertyAnimation.value;
propertyUpdateCallbacks.push(() => { propertyAnimation.target.rotate = propertyAnimation.value; }); propertyUpdateCallbacks.push(checkAnimation(() => { propertyAnimation.target.rotate = propertyAnimation.value; }));
propertyResetCallbacks.push(() => { nativeView.setRotation(originalValue); }); propertyResetCallbacks.push(checkAnimation(() => { nativeView.setRotation(originalValue); }));
animators.push(android.animation.ObjectAnimator.ofFloat(nativeView, "rotation", nativeArray)); animators.push(android.animation.ObjectAnimator.ofFloat(nativeView, "rotation", nativeArray));
break; break;