FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(android-animations): reuse animatorSet to prevent high memory usage by ADjenkov · Pull Request #6930 · NativeScript/NativeScript · GitHub

/ NativeScript Public

fix(android-animations): reuse animatorSet to prevent high memory usage #6930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ADjenkov merged 1 commit into from
Feb 21, 2019
Conversation 6 Commits 1 Checks 0 Files changed
Merged

fix(android-animations): reuse animatorSet to prevent high memory usage #6930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .ts  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
56 changes: 39 additions & 17 deletions tns-core-modules/ui/animation/animation.android.ts
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
} from "../styling/style-properties";

import { layout } from "../../utils/utils";
import { device } from "../../platform";
import lazy from "../../utils/lazy";

export * from "./animation-common";
Expand Down Expand Up @@ -92,6 +93,7 @@ export class Animation extends AnimationBase {
private _propertyResetCallbacks: Array<Function>;
private _valueSource: "animation" | "keyframe";
private _target: View;
private _resetOnFinish: boolean = true;

constructor(animationDefinitions: Array<AnimationDefinitionInternal>, playSequentially?: boolean) {
super(animationDefinitions, playSequentially);
Expand Down Expand Up @@ -134,12 +136,18 @@ export class Animation extends AnimationBase {
});
}

public play(): AnimationPromise {
public play(resetOnFinish?: boolean): AnimationPromise {
if (resetOnFinish !== undefined) {
this._resetOnFinish = resetOnFinish;
}

if (this.isPlaying) {
return this._rejectAlreadyPlaying();
}

let animationFinishedPromise = super.play();
if (this._animatorSet) {
return this._play();
}

this._animators = new Array<android.animation.Animator>();
this._propertyUpdateCallbacks = new Array<Function>();
Expand All @@ -156,21 +164,8 @@ export class Animation extends AnimationBase {

this._animatorSet = new android.animation.AnimatorSet();
this._animatorSet.addListener(this._animatorListener);
if (this._animators.length > 0) {
if (this._playSequentially) {
this._animatorSet.playSequentially(this._nativeAnimatorsArray);
}
else {
this._animatorSet.playTogether(this._nativeAnimatorsArray);
}
}

if (traceEnabled()) {
traceWrite("Starting " + this._nativeAnimatorsArray.length + " animations " + (this._playSequentially ? "sequentially." : "together."), traceCategories.Animation);
}
this._animatorSet.setupStartValues();
this._animatorSet.start();
return animationFinishedPromise;
return this._play();
}

public cancel(): void {
Expand All @@ -188,6 +183,33 @@ export class Animation extends AnimationBase {
return _resolveAnimationCurve(curve);
}

private _play(): AnimationPromise {
const animationFinishedPromise = super.play();

if (device.sdkVersion <= "23") {
this._animatorSet = new android.animation.AnimatorSet();
this._animatorSet.addListener(this._animatorListener);
}

if (this._animators.length > 0) {
if (this._playSequentially) {
this._animatorSet.playSequentially(this._nativeAnimatorsArray);
}
else {
this._animatorSet.playTogether(this._nativeAnimatorsArray);
}
}

if (traceEnabled()) {
traceWrite("Starting " + this._nativeAnimatorsArray.length + " animations " + (this._playSequentially ? "sequentially." : "together."), traceCategories.Animation);
}

this._animatorSet.setupStartValues();
this._animatorSet.start();

return animationFinishedPromise;
}

private _onAndroidAnimationEnd() { // tslint:disable-line
if (!this.isPlaying) {
// It has been cancelled
Expand All @@ -197,7 +219,7 @@ export class Animation extends AnimationBase {
this._propertyUpdateCallbacks.forEach(v => v());
this._resolveAnimationFinishedPromise();

if (this._target) {
if (this._resetOnFinish && this._target) {
this._target._removeAnimation(this);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tns-core-modules/ui/animation/animation.d.ts
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export type AnimationPromise = Promise<void> & Cancelable;
*/
export class Animation {
constructor(animationDefinitions: Array<AnimationDefinition>, playSequentially?: boolean);
public play: () => AnimationPromise;
public play: (resetOnFinish?: boolean) => AnimationPromise;
public cancel: () => void;
public isPlaying: boolean;
public _resolveAnimationCurve(curve: any): any;
Expand Down
4 changes: 3 additions & 1 deletion tns-core-modules/ui/animation/keyframe-animation.ts
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,10 @@ export class KeyframeAnimation implements KeyframeAnimationDefinition {
this._nativeAnimations.push(animation);
}

const isLastIteration = iterations - 1 <= 0;

// Catch the animation cancel to prevent unhandled promise rejection warnings
animation.play().then(() => {
animation.play(isLastIteration).then(() => {
this.animate(view, index + 1, iterations);
}, (error: any) => {
traceWrite(typeof error === "string" ? error : error.message, traceCategories.Animation, traceType.warn);
Expand Down
Back | FazBrowse Home | New Git URL