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

fix(android): RootLayout shade cover blinking animation (#10750)

Browse Source
This commit is contained in:
Dimitris-Rafail Katsampas
2025-06-26 22:33:37 +03:00
committed by GitHub
parent a11ccd8753
commit 242c3ae03f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/ui/layouts/root-layout/index.android.ts
View File

@ -76,10 +76,10 @@ export class RootLayout extends RootLayoutBase {
return this._playAnimation(this._getAnimationSet(view, exitState), exitState?.duration); return this._playAnimation(this._getAnimationSet(view, exitState), exitState?.duration);
} }
private _getAnimationSet(view: View, shadeCoverAnimation: TransitionAnimation, backgroundColor: string = defaultShadeCoverOptions.color): Array<android.animation.Animator> { private _getAnimationSet(view: View, shadeCoverAnimation: TransitionAnimation, backgroundColor?: string): Array<android.animation.Animator> {
const isBackgroundGradient = backgroundColor && backgroundColor.startsWith('linear-gradient'); const isBackgroundGradient = backgroundColor && backgroundColor.startsWith('linear-gradient');
const animationSet = Array.create(android.animation.Animator, isBackgroundGradient ? 6 : 7); const animationSet = Array.create(android.animation.Animator, !backgroundColor || isBackgroundGradient ? 6 : 7);
animationSet[0] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationX', [shadeCoverAnimation.translateX]); animationSet[0] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationX', [shadeCoverAnimation.translateX]);
animationSet[1] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationY', [shadeCoverAnimation.translateY]); animationSet[1] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'translationY', [shadeCoverAnimation.translateY]);
animationSet[2] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'scaleX', [shadeCoverAnimation.scaleX]); animationSet[2] = android.animation.ObjectAnimator.ofFloat(view.nativeViewProtected, 'scaleX', [shadeCoverAnimation.scaleX]);
@ -97,7 +97,10 @@ export class RootLayout extends RootLayoutBase {
if (view.backgroundImage) { if (view.backgroundImage) {
view.backgroundImage = undefined; view.backgroundImage = undefined;
} }
animationSet[6] = this._getBackgroundColorAnimator(view, backgroundColor);
if (backgroundColor) {
animationSet[6] = this._getBackgroundColorAnimator(view, backgroundColor);
}
} }
return animationSet; return animationSet;
} }