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

Fix all possible cases of the current page not playing its exit transition

Browse Source
This commit is contained in:
Rossen Hristov
2016-06-03 17:32:40 +03:00
parent 9e40f8022b
commit 63471fcc3c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tns-core-modules/ui/transition/transition.android.ts
View File

@@ -44,6 +44,7 @@ interface ExpandedFragment {
exitPopEnterTransition: definitionTransition;
completePageAdditionWhenTransitionEnds: CompleteOptions;
completePageRemovalWhenTransitionEnds: CompleteOptions;
exitHack: boolean;
isDestroyed: boolean;
}
@@ -464,6 +465,16 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
case popExitFakeResourceId: transitionType = AndroidTransitionType.popExit; break;
}
// Clear history hack.
if ((nextAnim === popExitFakeResourceId || !nextAnim) && expandedFragment.exitHack) {
// fragment is the current fragment and was popped due to clear history.
// We have to simulate moving forward with the fragment's exit transition.
// nextAnim can be null if the transaction which brought us to the fragment
// was without a transition and setCustomAnimations was not called.
trace.write(`HACK EXIT FOR ${fragment}`, trace.categories.Transition);
transitionType = AndroidTransitionType.exit;
}
let transition;
switch (transitionType) {
case AndroidTransitionType.enter:
@@ -475,10 +486,11 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
transition = expandedFragment.exitPopEnterTransition;
break;
}
let animator: android.animation.Animator;
if (transition) {
animator = <android.animation.Animator>transition.createAndroidAnimator(transitionType);
trace.write(`${transition}.createAndroidAnimator(${transitionType}): ${animator}`, trace.categories.Transition);
let transitionListener = new android.animation.Animator.AnimatorListener({
onAnimationStart: function (animator: android.animation.Animator): void {
if (trace.enabled) {
@@ -527,7 +539,7 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
export function _prepareCurrentFragmentForClearHistory(fragment: any): void {
trace.write(`Preparing ${fragment} transitions fro clear history...`, trace.categories.Transition);
let expandedFragment = <ExpandedFragment>fragment;
expandedFragment.enterPopExitTransition = expandedFragment.exitPopEnterTransition;
expandedFragment.exitHack = true;
if (_sdkVersion() >= 21) {
let exitTransition = fragment.getExitTransition();
fragment.setReturnTransition(exitTransition);