javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 11:01:21 +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-02 10:47:23 +03:00
parent 659d91bfb2
commit 5c47f54fe5
5 changed files with 171 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/frame/frame-common.ts
View File

@ -321,13 +321,13 @@ export class Frame extends CustomLayoutView implements definition.Frame {
public _goBackCore(backstackEntry: definition.BackstackEntry) { public _goBackCore(backstackEntry: definition.BackstackEntry) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${this}._goBackCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation); trace.write(`GO BACK CORE(${this._backstackEntryTrace(backstackEntry)}); currentPage: ${this.currentPage}`, trace.categories.Navigation);
} }
} }
public _navigateCore(backstackEntry: definition.BackstackEntry) { public _navigateCore(backstackEntry: definition.BackstackEntry) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${this}._navigateCore(${this._backstackEntryTrace(backstackEntry)}); ${this}.currentPage: ${this.currentPage}`, trace.categories.Navigation); trace.write(`NAVIGATE CORE(${this._backstackEntryTrace(backstackEntry)}); currentPage: ${this.currentPage}`, trace.categories.Navigation);
} }
} }

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

@ -163,24 +163,6 @@ export class Frame extends frameCommon.Frame {
backstackEntry.fragmentTag = newFragmentTag; backstackEntry.fragmentTag = newFragmentTag;
backstackEntry.navDepth = navDepth; backstackEntry.navDepth = navDepth;
// Clear History
let length = manager.getBackStackEntryCount();
let emptyNativeBackStack = clearHistory && length > 0;
if (emptyNativeBackStack) {
for (let i = 0; i < length; i++) {
let fragmentToRemove = <FragmentClass>manager.findFragmentByTag(manager.getBackStackEntryAt(i).getName());
Frame._clearHistory(fragmentToRemove);
}
if (currentFragment) {
Frame._clearHistory(currentFragment);
}
let firstEntryName = manager.getBackStackEntryAt(0).getName();
if (trace.enabled) {
trace.write(`POP BACK STACK ${firstEntryName}`, trace.categories.Navigation);
}
manager.popBackStackImmediate(firstEntryName, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
let fragmentTransaction = manager.beginTransaction(); let fragmentTransaction = manager.beginTransaction();
if (trace.enabled) { if (trace.enabled) {
trace.write(`BEGIN TRANSACTION ${fragmentTransaction}`, trace.categories.Navigation); trace.write(`BEGIN TRANSACTION ${fragmentTransaction}`, trace.categories.Navigation);
@ -198,6 +180,27 @@ export class Frame extends frameCommon.Frame {
} }
} }
// Clear History
let length = manager.getBackStackEntryCount();
let emptyNativeBackStack = clearHistory && length > 0;
if (emptyNativeBackStack) {
for (let i = 0; i < length; i++) {
let fragmentToRemove = <FragmentClass>manager.findFragmentByTag(manager.getBackStackEntryAt(i).getName());
Frame._clearHistory(fragmentToRemove);
}
if (currentFragment) {
// 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);
}
let firstEntryName = manager.getBackStackEntryAt(0).getName();
if (trace.enabled) {
trace.write(`POP BACK STACK ${firstEntryName}`, trace.categories.Navigation);
}
manager.popBackStackImmediate(firstEntryName, android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
}
// Hide/remove current fragment if it exists and was not popped // Hide/remove current fragment if it exists and was not popped
if (currentFragment && !emptyNativeBackStack) { if (currentFragment && !emptyNativeBackStack) {
if (this.android.cachePagesOnNavigate && !clearHistory) { if (this.android.cachePagesOnNavigate && !clearHistory) {

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

@ -113,4 +113,8 @@ export class SlideTransition extends transition.Transition {
animator.setInterpolator(this.getCurve()); animator.setInterpolator(this.getCurve());
return animator; return animator;
} }
public toString(): string {
return `${super.toString()} ${this._direction}`;
}
} }

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

@ -6,9 +6,9 @@ import { device } from "platform";
import * as animationModule from "ui/animation"; import * as animationModule from "ui/animation";
import lazy from "utils/lazy"; import lazy from "utils/lazy";
import trace = require("trace"); import trace = require("trace");
var _sdkVersion = lazy(() => parseInt(device.sdkVersion)); let _sdkVersion = lazy(() => parseInt(device.sdkVersion));
var _defaultInterpolator = lazy(() => new android.view.animation.AccelerateDecelerateInterpolator()); let _defaultInterpolator = lazy(() => new android.view.animation.AccelerateDecelerateInterpolator());
interface CompleteOptions { interface CompleteOptions {
isBack: boolean; isBack: boolean;
@ -20,22 +20,23 @@ interface ExpandedFragment {
completePageAdditionWhenTransitionEnds: CompleteOptions; completePageAdditionWhenTransitionEnds: CompleteOptions;
completePageRemovalWhenTransitionEnds: CompleteOptions; completePageRemovalWhenTransitionEnds: CompleteOptions;
isDestroyed: boolean; isDestroyed: boolean;
reverseNextAnimDirection: boolean;
} }
var enterFakeResourceId = -10; let enterFakeResourceId = -10;
var exitFakeResourceId = -20; let exitFakeResourceId = -20;
var popEnterFakeResourceId = -30; let popEnterFakeResourceId = -30;
var popExitFakeResourceId = -40; let popExitFakeResourceId = -40;
export module AndroidTransitionType { export module AndroidTransitionType {
export var enter: string = "enter"; export let enter: string = "enter";
export var exit: string = "exit"; export let exit: string = "exit";
export var popEnter: string = "popEnter"; export let popEnter: string = "popEnter";
export var popExit: string = "popExit"; export let popExit: string = "popExit";
} }
export function _clearBackwardTransitions(fragment: any): void { export function _clearBackwardTransitions(fragment: any): void {
var expandedFragment = <ExpandedFragment>fragment; let expandedFragment = <ExpandedFragment>fragment;
if (expandedFragment.enterPopExitTransition) { if (expandedFragment.enterPopExitTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared enterPopExitTransition ${expandedFragment.enterPopExitTransition} for ${fragment}`, trace.categories.Transition); trace.write(`Cleared enterPopExitTransition ${expandedFragment.enterPopExitTransition} for ${fragment}`, trace.categories.Transition);
@ -44,14 +45,14 @@ export function _clearBackwardTransitions(fragment: any): void {
} }
if (_sdkVersion() >= 21) { if (_sdkVersion() >= 21) {
var enterTransition = (<any>fragment).getEnterTransition(); let enterTransition = (<any>fragment).getEnterTransition();
if (enterTransition) { if (enterTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared Enter ${enterTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition); trace.write(`Cleared Enter ${enterTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition);
} }
(<any>fragment).setEnterTransition(null); (<any>fragment).setEnterTransition(null);
} }
var returnTransition = (<any>fragment).getReturnTransition(); let returnTransition = (<any>fragment).getReturnTransition();
if (returnTransition) { if (returnTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared Pop Exit ${returnTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition); trace.write(`Cleared Pop Exit ${returnTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition);
@ -62,7 +63,7 @@ export function _clearBackwardTransitions(fragment: any): void {
} }
export function _clearForwardTransitions(fragment: any): void { export function _clearForwardTransitions(fragment: any): void {
var expandedFragment = <ExpandedFragment>fragment; let expandedFragment = <ExpandedFragment>fragment;
if (expandedFragment.exitPopEnterTransition) { if (expandedFragment.exitPopEnterTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared exitPopEnterTransition ${expandedFragment.exitPopEnterTransition} for ${fragment}`, trace.categories.Transition); trace.write(`Cleared exitPopEnterTransition ${expandedFragment.exitPopEnterTransition} for ${fragment}`, trace.categories.Transition);
@ -71,14 +72,14 @@ export function _clearForwardTransitions(fragment: any): void {
} }
if (_sdkVersion() >= 21) { if (_sdkVersion() >= 21) {
var exitTransition = (<any>fragment).getExitTransition(); let exitTransition = (<any>fragment).getExitTransition();
if (exitTransition) { if (exitTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared Exit ${exitTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition); trace.write(`Cleared Exit ${exitTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition);
} }
(<any>fragment).setExitTransition(null);//exit (<any>fragment).setExitTransition(null);//exit
} }
var reenterTransition = (<any>fragment).getReenterTransition(); let reenterTransition = (<any>fragment).getReenterTransition();
if (reenterTransition) { if (reenterTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`Cleared Pop Enter ${reenterTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition); trace.write(`Cleared Pop Enter ${reenterTransition.getClass().getSimpleName() } transition for ${fragment}`, trace.categories.Transition);
@ -89,12 +90,13 @@ export function _clearForwardTransitions(fragment: any): void {
} }
export function _setAndroidFragmentTransitions(navigationTransition: NavigationTransition, currentFragment: any, newFragment: any, fragmentTransaction: any): void { export function _setAndroidFragmentTransitions(navigationTransition: NavigationTransition, currentFragment: any, newFragment: any, fragmentTransaction: any): void {
var name; trace.write(`Setting Android Fragment Transitions...`, trace.categories.Transition);
let name;
if (navigationTransition.name) { if (navigationTransition.name) {
name = navigationTransition.name.toLowerCase(); name = navigationTransition.name.toLowerCase();
} }
var useLollipopTransition = name && (name.indexOf("slide") === 0 || name === "fade" || name === "explode") && _sdkVersion() >= 21; let useLollipopTransition = name && (name.indexOf("slide") === 0 || name === "fade" || name === "explode") && _sdkVersion() >= 21;
if (useLollipopTransition) { if (useLollipopTransition) {
// setEnterTransition: Enter // setEnterTransition: Enter
// setExitTransition: Exit // setExitTransition: Exit
@ -109,7 +111,7 @@ export function _setAndroidFragmentTransitions(navigationTransition: NavigationT
} }
if (name.indexOf("slide") === 0) { if (name.indexOf("slide") === 0) {
var direction = name.substr("slide".length) || "left"; //Extract the direction from the string let direction = name.substr("slide".length) || "left"; //Extract the direction from the string
switch (direction) { switch (direction) {
case "left": case "left":
let rightEdge = new (<any>android).transition.Slide((<any>android).view.Gravity.RIGHT); let rightEdge = new (<any>android).transition.Slide((<any>android).view.Gravity.RIGHT);
@ -193,42 +195,45 @@ export function _setAndroidFragmentTransitions(navigationTransition: NavigationT
currentFragment.setExitTransition(explodeExit); currentFragment.setExitTransition(explodeExit);
} }
} }
return;
}
var transition: definitionTransition;
if (name) {
if (name.indexOf("slide") === 0) {
//HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
var slideTransitionModule = require("ui/transition/slide-transition");
var direction = name.substr("slide".length) || "left"; //Extract the direction from the string
transition = new slideTransitionModule.SlideTransition(direction, navigationTransition.duration, navigationTransition.curve);
}
else if (name === "fade") {
//HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
var fadeTransitionModule = require("ui/transition/fade-transition");
transition = new fadeTransitionModule.FadeTransition(navigationTransition.duration, navigationTransition.curve);
}
else if (name.indexOf("flip") === 0) {
//HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
var flipTransitionModule = require("ui/transition/flip-transition");
var direction = name.substr("flip".length) || "right"; //Extract the direction from the string
transition = new flipTransitionModule.FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);
}
} }
else { else {
transition = navigationTransition.instance; // User-defined instance of Transition let transition: definitionTransition;
} if (name) {
if (name.indexOf("slide") === 0) {
if (transition) { //HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
var newExpandedFragment = <ExpandedFragment>newFragment; let slideTransitionModule = require("ui/transition/slide-transition");
newExpandedFragment.enterPopExitTransition = transition; let direction = name.substr("slide".length) || "left"; //Extract the direction from the string
if (currentFragment) { transition = new slideTransitionModule.SlideTransition(direction, navigationTransition.duration, navigationTransition.curve);
var currentExpandedFragment = <ExpandedFragment>currentFragment; }
currentExpandedFragment.exitPopEnterTransition = transition; else if (name === "fade") {
//HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
let fadeTransitionModule = require("ui/transition/fade-transition");
transition = new fadeTransitionModule.FadeTransition(navigationTransition.duration, navigationTransition.curve);
}
else if (name.indexOf("flip") === 0) {
//HACK: Use an absolute import to work around a webpack issue that doesn't resolve relatively-imported "xxx.android/ios" modules
let flipTransitionModule = require("ui/transition/flip-transition");
let direction = name.substr("flip".length) || "right"; //Extract the direction from the string
transition = new flipTransitionModule.FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);
}
}
else {
transition = navigationTransition.instance; // User-defined instance of Transition
}
if (transition) {
let newExpandedFragment = <ExpandedFragment>newFragment;
newExpandedFragment.enterPopExitTransition = transition;
if (currentFragment) {
let currentExpandedFragment = <ExpandedFragment>currentFragment;
currentExpandedFragment.exitPopEnterTransition = transition;
}
fragmentTransaction.setCustomAnimations(enterFakeResourceId, exitFakeResourceId, popEnterFakeResourceId, popExitFakeResourceId);
} }
fragmentTransaction.setCustomAnimations(enterFakeResourceId, exitFakeResourceId, popEnterFakeResourceId, popExitFakeResourceId);
} }
_printTransitions(currentFragment);
_printTransitions(newFragment);
} }
function _setUpNativeTransition(navigationTransition: NavigationTransition, nativeTransition: any/*android.transition.Transition*/) { function _setUpNativeTransition(navigationTransition: NavigationTransition, nativeTransition: any/*android.transition.Transition*/) {
@ -237,8 +242,8 @@ function _setUpNativeTransition(navigationTransition: NavigationTransition, nati
} }
if (navigationTransition.curve) { if (navigationTransition.curve) {
var animation: typeof animationModule = require("ui/animation"); let animation: typeof animationModule = require("ui/animation");
var interpolator = animation._resolveAnimationCurve(navigationTransition.curve); let interpolator = animation._resolveAnimationCurve(navigationTransition.curve);
nativeTransition.setInterpolator(interpolator); nativeTransition.setInterpolator(interpolator);
} }
else { else {
@ -247,20 +252,23 @@ function _setUpNativeTransition(navigationTransition: NavigationTransition, nati
} }
export function _onFragmentShown(fragment: any, isBack: boolean): void { export function _onFragmentShown(fragment: any, isBack: boolean): void {
var expandedFragment = <ExpandedFragment>fragment; if (trace.enabled){
var transitionType = isBack ? "Pop Enter" : "Enter"; trace.write(`_onFragmentShown(${fragment}, isBack: ${isBack})`, trace.categories.Transition);
var relevantTransition = isBack ? expandedFragment.exitPopEnterTransition : expandedFragment.enterPopExitTransition; }
let expandedFragment = <ExpandedFragment>fragment;
let transitionType = isBack ? "Pop Enter" : "Enter";
let relevantTransition = isBack ? expandedFragment.exitPopEnterTransition : expandedFragment.enterPopExitTransition;
if (relevantTransition) { if (relevantTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${fragment } has been shown when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${relevantTransition}. Will complete page addition when transition ends.`, trace.categories.Transition); trace.write(`${fragment} has been shown when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${relevantTransition}. Will complete page addition when transition ends.`, trace.categories.Transition);
} }
expandedFragment.completePageAdditionWhenTransitionEnds = { isBack: isBack }; expandedFragment.completePageAdditionWhenTransitionEnds = { isBack: isBack };
} }
else if (_sdkVersion() >= 21) { else if (_sdkVersion() >= 21) {
var nativeTransition = isBack ? (<any>fragment).getReenterTransition() : (<any>fragment).getEnterTransition(); let nativeTransition = isBack ? (<any>fragment).getReenterTransition() : (<any>fragment).getEnterTransition();
if (nativeTransition) { if (nativeTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${fragment } has been shown when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${nativeTransition.getClass().getSimpleName() } transition. Will complete page addition when transition ends.`, trace.categories.Transition); trace.write(`${fragment} has been shown when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${nativeTransition.getClass().getSimpleName() } transition. Will complete page addition when transition ends.`, trace.categories.Transition);
} }
expandedFragment.completePageAdditionWhenTransitionEnds = { isBack: isBack }; expandedFragment.completePageAdditionWhenTransitionEnds = { isBack: isBack };
} }
@ -272,9 +280,12 @@ export function _onFragmentShown(fragment: any, isBack: boolean): void {
} }
export function _onFragmentHidden(fragment: any, isBack: boolean, destroyed: boolean) { export function _onFragmentHidden(fragment: any, isBack: boolean, destroyed: boolean) {
var expandedFragment = <ExpandedFragment>fragment; if (trace.enabled){
var transitionType = isBack ? "Pop Exit" : "Exit"; trace.write(`_onFragmentHidden(${fragment}, isBack: ${isBack}, destroyed: ${destroyed})`, trace.categories.Transition);
var relevantTransition = isBack ? expandedFragment.enterPopExitTransition : expandedFragment.exitPopEnterTransition; }
let expandedFragment = <ExpandedFragment>fragment;
let transitionType = isBack ? "Pop Exit" : "Exit";
let relevantTransition = isBack ? expandedFragment.enterPopExitTransition : expandedFragment.exitPopEnterTransition;
if (relevantTransition) { if (relevantTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${fragment} has been hidden when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${relevantTransition}. Will complete page removal when transition ends.`, trace.categories.Transition); trace.write(`${fragment} has been hidden when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${relevantTransition}. Will complete page removal when transition ends.`, trace.categories.Transition);
@ -282,7 +293,7 @@ export function _onFragmentHidden(fragment: any, isBack: boolean, destroyed: boo
expandedFragment.completePageRemovalWhenTransitionEnds = { isBack: isBack }; expandedFragment.completePageRemovalWhenTransitionEnds = { isBack: isBack };
} }
else if (_sdkVersion() >= 21) { else if (_sdkVersion() >= 21) {
var nativeTransition = isBack ? (<any>fragment).getReturnTransition() : (<any>fragment).getExitTransition(); let nativeTransition = isBack ? (<any>fragment).getReturnTransition() : (<any>fragment).getExitTransition();
if (nativeTransition) { if (nativeTransition) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`${fragment} has been hidden when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${nativeTransition.getClass().getSimpleName() } transition. Will complete page removal when transition ends.`, trace.categories.Transition); trace.write(`${fragment} has been hidden when going ${isBack ? "back" : "forward"}, but there is ${transitionType} ${nativeTransition.getClass().getSimpleName() } transition. Will complete page removal when transition ends.`, trace.categories.Transition);
@ -300,14 +311,14 @@ export function _onFragmentHidden(fragment: any, isBack: boolean, destroyed: boo
} }
function _completePageAddition(fragment: any, isBack: boolean) { function _completePageAddition(fragment: any, isBack: boolean) {
let expandedFragment = <ExpandedFragment>fragment;
expandedFragment.completePageAdditionWhenTransitionEnds = undefined;
let frame = fragment.frame;
let entry: BackstackEntry = fragment.entry;
let page: Page = entry.resolvedPage;
if (trace.enabled) { if (trace.enabled) {
trace.write(`STARTING ADDITION of ${page}...`, trace.categories.Transition); trace.write(`STARTING ADDITION of ${page}...`, trace.categories.Transition);
} }
var expandedFragment = <ExpandedFragment>fragment;
expandedFragment.completePageAdditionWhenTransitionEnds = undefined;
var frame = fragment.frame;
var entry: BackstackEntry = fragment.entry;
var page: Page = entry.resolvedPage;
// The original code that was once in Frame onFragmentShown // The original code that was once in Frame onFragmentShown
frame._currentEntry = entry; frame._currentEntry = entry;
page.onNavigatedTo(isBack); page.onNavigatedTo(isBack);
@ -319,14 +330,14 @@ function _completePageAddition(fragment: any, isBack: boolean) {
} }
function _completePageRemoval(fragment: any, isBack: boolean) { function _completePageRemoval(fragment: any, isBack: boolean) {
let expandedFragment = <ExpandedFragment>fragment;
expandedFragment.completePageRemovalWhenTransitionEnds = undefined;
let frame = fragment.frame;
let entry: BackstackEntry = fragment.entry;
let page: Page = entry.resolvedPage;
if (trace.enabled) { if (trace.enabled) {
trace.write(`STARTING REMOVAL of ${page}...`, trace.categories.Transition); trace.write(`STARTING REMOVAL of ${page}...`, trace.categories.Transition);
} }
var expandedFragment = <ExpandedFragment>fragment;
expandedFragment.completePageRemovalWhenTransitionEnds = undefined;
var frame = fragment.frame;
var entry: BackstackEntry = fragment.entry;
var page: Page = entry.resolvedPage;
if (page.frame) { if (page.frame) {
frame._removeView(page); frame._removeView(page);
// This could be undefined if activity is destroyed (e.g. without actual navigation). // This could be undefined if activity is destroyed (e.g. without actual navigation).
@ -364,7 +375,7 @@ function _completePageRemoval(fragment: any, isBack: boolean) {
export function _removePageNativeViewFromAndroidParent(page: Page): void { export function _removePageNativeViewFromAndroidParent(page: Page): void {
if (page._nativeView && page._nativeView.getParent) { if (page._nativeView && page._nativeView.getParent) {
var androidParent = page._nativeView.getParent(); let androidParent = page._nativeView.getParent();
if (androidParent && androidParent.removeView) { if (androidParent && androidParent.removeView) {
if (trace.enabled) { if (trace.enabled) {
trace.write(`REMOVED ${page}._nativeView from its Android parent`, trace.categories.Transition); trace.write(`REMOVED ${page}._nativeView from its Android parent`, trace.categories.Transition);
@ -374,12 +385,16 @@ export function _removePageNativeViewFromAndroidParent(page: Page): void {
} }
} }
function _toShortString(nativeTransition: any): string {
return `${nativeTransition.getClass().getSimpleName()}@${nativeTransition.hashCode().toString(16)}`;
}
function _addNativeTransitionListener(fragment: any, nativeTransition: any/*android.transition.Transition*/) { function _addNativeTransitionListener(fragment: any, nativeTransition: any/*android.transition.Transition*/) {
var expandedFragment = <ExpandedFragment>fragment; let expandedFragment = <ExpandedFragment>fragment;
var transitionListener = new (<any>android).transition.Transition.TransitionListener({ let transitionListener = new (<any>android).transition.Transition.TransitionListener({
onTransitionCancel: function (transition: any): void { onTransitionCancel: function (transition: any): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`CANCEL ${nativeTransition} transition for ${fragment}`, trace.categories.Transition); trace.write(`CANCEL ${_toShortString(nativeTransition)} transition for ${fragment}`, trace.categories.Transition);
} }
if (expandedFragment.completePageRemovalWhenTransitionEnds) { if (expandedFragment.completePageRemovalWhenTransitionEnds) {
_completePageRemoval(fragment, expandedFragment.completePageRemovalWhenTransitionEnds.isBack); _completePageRemoval(fragment, expandedFragment.completePageRemovalWhenTransitionEnds.isBack);
@ -390,7 +405,7 @@ function _addNativeTransitionListener(fragment: any, nativeTransition: any/*andr
}, },
onTransitionEnd: function (transition: any): void { onTransitionEnd: function (transition: any): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`END ${nativeTransition} transition for ${fragment}`, trace.categories.Transition); trace.write(`END ${_toShortString(nativeTransition)} transition for ${fragment}`, trace.categories.Transition);
} }
if (expandedFragment.completePageRemovalWhenTransitionEnds) { if (expandedFragment.completePageRemovalWhenTransitionEnds) {
_completePageRemoval(fragment, expandedFragment.completePageRemovalWhenTransitionEnds.isBack); _completePageRemoval(fragment, expandedFragment.completePageRemovalWhenTransitionEnds.isBack);
@ -401,17 +416,17 @@ function _addNativeTransitionListener(fragment: any, nativeTransition: any/*andr
}, },
onTransitionPause: function (transition: any): void { onTransitionPause: function (transition: any): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`PAUSE ${nativeTransition} transition for ${fragment}`, trace.categories.Transition); trace.write(`PAUSE ${_toShortString(nativeTransition)} transition for ${fragment}`, trace.categories.Transition);
} }
}, },
onTransitionResume: function (transition: any): void { onTransitionResume: function (transition: any): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`RESUME ${nativeTransition} transition for ${fragment}`, trace.categories.Transition); trace.write(`RESUME ${_toShortString(nativeTransition)} transition for ${fragment}`, trace.categories.Transition);
} }
}, },
onTransitionStart: function (transition: any): void { onTransitionStart: function (transition: any): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`START ${nativeTransition} transition for ${fragment}`, trace.categories.Transition); trace.write(`START ${_toShortString(nativeTransition)} transition for ${fragment}`, trace.categories.Transition);
} }
} }
}); });
@ -419,16 +434,18 @@ function _addNativeTransitionListener(fragment: any, nativeTransition: any/*andr
} }
export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): android.animation.Animator { export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): android.animation.Animator {
var expandedFragment = <ExpandedFragment>fragment; let expandedFragment = <ExpandedFragment>fragment;
var transitionType; let noReverse = !expandedFragment.reverseNextAnimDirection;
delete expandedFragment.reverseNextAnimDirection;
let transitionType;
switch (nextAnim) { switch (nextAnim) {
case enterFakeResourceId: transitionType = AndroidTransitionType.enter; break; case enterFakeResourceId: transitionType = noReverse ? AndroidTransitionType.enter : AndroidTransitionType.popEnter; break;
case exitFakeResourceId: transitionType = AndroidTransitionType.exit; break; case exitFakeResourceId: transitionType = noReverse ? AndroidTransitionType.exit : AndroidTransitionType.popExit; break;
case popEnterFakeResourceId: transitionType = AndroidTransitionType.popEnter; break; case popEnterFakeResourceId: transitionType = noReverse ? AndroidTransitionType.popEnter : AndroidTransitionType.enter; break;
case popExitFakeResourceId: transitionType = AndroidTransitionType.popExit; break; case popExitFakeResourceId: transitionType = noReverse ? AndroidTransitionType.popExit : AndroidTransitionType.exit; break;
} }
var transition; let transition;
switch (transitionType) { switch (transitionType) {
case AndroidTransitionType.enter: case AndroidTransitionType.enter:
case AndroidTransitionType.popExit: case AndroidTransitionType.popExit:
@ -440,10 +457,10 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
break; break;
} }
var animator: android.animation.Animator; let animator: android.animation.Animator;
if (transition) { if (transition) {
animator = <android.animation.Animator>transition.createAndroidAnimator(transitionType); animator = <android.animation.Animator>transition.createAndroidAnimator(transitionType);
var transitionListener = new android.animation.Animator.AnimatorListener({ let transitionListener = new android.animation.Animator.AnimatorListener({
onAnimationStart: function (animator: android.animation.Animator): void { onAnimationStart: function (animator: android.animation.Animator): void {
if (trace.enabled) { if (trace.enabled) {
trace.write(`START ${transitionType} ${transition} for ${fragment}`, trace.categories.Transition); trace.write(`START ${transitionType} ${transition} for ${fragment}`, trace.categories.Transition);
@ -488,6 +505,23 @@ export function _onFragmentCreateAnimator(fragment: any, nextAnim: number): andr
return animator; return animator;
} }
export function _reverseTransitionsDirection(fragment: any): void {
trace.write(`Swapping ${fragment} transitions...`, trace.categories.Transition);
let expandedFragment = <ExpandedFragment>fragment;
expandedFragment.reverseNextAnimDirection = true;
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);
}
_printTransitions(fragment);
}
let intEvaluator: android.animation.IntEvaluator; let intEvaluator: android.animation.IntEvaluator;
function ensureIntEvaluator() { function ensureIntEvaluator() {
if (!intEvaluator) { if (!intEvaluator) {
@ -503,11 +537,27 @@ function _createDummyZeroDurationAnimator(): android.animation.Animator {
let nativeArray = (<any>Array).create(java.lang.Object, 2); let nativeArray = (<any>Array).create(java.lang.Object, 2);
nativeArray[0] = java.lang.Integer.valueOf(0); nativeArray[0] = java.lang.Integer.valueOf(0);
nativeArray[1] = java.lang.Integer.valueOf(1); nativeArray[1] = java.lang.Integer.valueOf(1);
var animator = android.animation.ValueAnimator.ofObject(intEvaluator, nativeArray); let animator = android.animation.ValueAnimator.ofObject(intEvaluator, nativeArray);
animator.setDuration(0); animator.setDuration(0);
return animator; return animator;
} }
function _printTransitions(f: any) {
if (f && trace.enabled){
let ef = <ExpandedFragment>f;
let result = `${ef} Transitions:`;
result += `${ef.enterPopExitTransition ? " enterPopExit=" + ef.enterPopExitTransition : ""}`;
result += `${ef.exitPopEnterTransition ? " exitPopEnter=" + ef.exitPopEnterTransition : ""}`;
if (_sdkVersion() >= 21) {
result += `${f.getEnterTransition() ? " enter=" + _toShortString(f.getEnterTransition()) : ""}`;
result += `${f.getExitTransition() ? " exit=" + _toShortString(f.getExitTransition()) : ""}`;
result += `${f.getReenterTransition() ? " popEnter=" + _toShortString(f.getReenterTransition()) : ""}`;
result += `${f.getReturnTransition() ? " popExit=" + _toShortString(f.getReturnTransition()) : ""}`;
}
trace.write(result, trace.categories.Transition);
}
}
export class Transition implements definitionTransition { export class Transition implements definitionTransition {
private _duration: number; private _duration: number;
private _interpolator: android.view.animation.Interpolator; private _interpolator: android.view.animation.Interpolator;
@ -517,7 +567,7 @@ export class Transition implements definitionTransition {
constructor(duration: number, curve: any) { constructor(duration: number, curve: any) {
this._duration = duration; this._duration = duration;
if (curve) { if (curve) {
var animation: typeof animationModule = require("ui/animation"); let animation: typeof animationModule = require("ui/animation");
this._interpolator = animation._resolveAnimationCurve(curve); this._interpolator = animation._resolveAnimationCurve(curve);
} }
else { else {
@ -545,4 +595,4 @@ export class Transition implements definitionTransition {
public toString(): string { public toString(): string {
return `${getClass(this)}@${this._id}`; return `${getClass(this)}@${this._id}`;
} }
} }

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

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