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

Fixed: The exit transition of the current page is not played when navigating with clearHistory

Browse Source 
Resolves #2225
This commit is contained in:
Rossen Hristov
2016-06-03 15:48:02 +03:00
parent 3c265a7c00
commit 9e40f8022b
3 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/ui/frame/frame.android.ts
View File

@@ -192,7 +192,7 @@ export class Frame extends frameCommon.Frame {
// We need to reverse the transitions because Android will ask the current fragment
// to create its POP EXIT animator due to popping the back stack, but in reality
// we need to create the EXIT animator because we are actually going forward and not back.
transitionModule._reverseTransitionsDirection(currentFragment);
transitionModule._prepareCurrentFragmentForClearHistory(currentFragment);
}
let firstEntryName = manager.getBackStackEntryAt(0).getName();
if (trace.enabled) {

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

@@ -45,7 +45,6 @@ interface ExpandedFragment {
completePageAdditionWhenTransitionEnds: CompleteOptions;
completePageRemovalWhenTransitionEnds: CompleteOptions;
isDestroyed: boolean;
reverseNextAnimDirection: boolean;
}
let enterFakeResourceId = -10;
@@ -457,14 +456,12 @@ function _addNativeTransitionListener(fragment: any, nativeTransition: any/*andr
export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): android.animation.Animator {
let expandedFragment = <ExpandedFragment>fragment;
let noReverse = !expandedFragment.reverseNextAnimDirection;
delete expandedFragment.reverseNextAnimDirection;
let transitionType;
switch (nextAnim) {
case enterFakeResourceId: transitionType = noReverse ? AndroidTransitionType.enter : AndroidTransitionType.popEnter; break;
case exitFakeResourceId: transitionType = noReverse ? AndroidTransitionType.exit : AndroidTransitionType.popExit; break;
case popEnterFakeResourceId: transitionType = noReverse ? AndroidTransitionType.popEnter : AndroidTransitionType.enter; break;
case popExitFakeResourceId: transitionType = noReverse ? AndroidTransitionType.popExit : AndroidTransitionType.exit; break;
case enterFakeResourceId: transitionType = AndroidTransitionType.enter; break;
case exitFakeResourceId: transitionType = AndroidTransitionType.exit; break;
case popEnterFakeResourceId: transitionType = AndroidTransitionType.popEnter; break;
case popExitFakeResourceId: transitionType = AndroidTransitionType.popExit; break;
}
let transition;
@@ -527,19 +524,13 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
return animator;
}
export function _reverseTransitionsDirection(fragment: any): void {
trace.write(`Swapping ${fragment} transitions...`, trace.categories.Transition);
export function _prepareCurrentFragmentForClearHistory(fragment: any): void {
trace.write(`Preparing ${fragment} transitions fro clear history...`, trace.categories.Transition);
let expandedFragment = <ExpandedFragment>fragment;
expandedFragment.reverseNextAnimDirection = true;
expandedFragment.enterPopExitTransition = expandedFragment.exitPopEnterTransition;
if (_sdkVersion() >= 21) {
let enterTransition = fragment.getEnterTransition();
let exitTransition = fragment.getExitTransition();
let reenterTransition = fragment.getReenterTransition();
let returnTransition = fragment.getReturnTransition();
fragment.setEnterTransition(exitTransition);
fragment.setExitTransition(enterTransition);
fragment.setReenterTransition(returnTransition);
fragment.setReturnTransition(reenterTransition);
fragment.setReturnTransition(exitTransition);
}
_printTransitions(fragment);
}

2
tns-core-modules/ui/transition/transition.d.ts vendored
View File

@@ -26,7 +26,7 @@
export function _onFragmentShown(fragment: any, isBack: boolean): void;
export function _onFragmentHidden(fragment: any, isBack: boolean, destroyed: boolean): void;
export function _removePageNativeViewFromAndroidParent(page: Page): void;
export function _reverseTransitionsDirection(fragment: any): void;
export function _prepareCurrentFragmentForClearHistory(fragment: any): void;
export function _createIOSAnimatedTransitioning(navigationTransition: NavigationTransition, nativeCurve: any, operation: number, fromVC: any, toVC: any): any;
//@endprivate