refactoring circular imports

This commit is contained in:
Hristo Hristov
2017-03-06 14:01:22 +02:00
parent 347755367e
commit ea22eb9c20
82 changed files with 2229 additions and 2188 deletions

View File

@@ -1,6 +1,9 @@
import { Transition as TransitionDefinition } from "ui/transition";
import { NavigationTransition, BackstackEntry, topmost } from "ui/frame";
// Definitions.
import { Transition as TransitionDefinition } from "ui/transition";
import { Page } from "ui/page";
import { NavigationTransition, BackstackEntry } from "ui/frame";
// Types.
import { getClass } from "utils/types";
import { device } from "platform";
import { _resolveAnimationCurve } from "ui/animation";
@@ -129,7 +132,7 @@ export function _clearForwardTransitions(fragment: any): void {
}
}
export function _setAndroidFragmentTransitions(navigationTransition: NavigationTransition, currentFragment: any, newFragment: any, fragmentTransaction: any): void {
export function _setAndroidFragmentTransitions(cachePagesOnNavigate: boolean, navigationTransition: NavigationTransition, currentFragment: any, newFragment: any, fragmentTransaction: android.app.FragmentTransaction): void {
traceWrite(`Setting Android Fragment Transitions...`, traceCategories.Transition);
let name;
if (navigationTransition.name) {
@@ -142,7 +145,7 @@ export function _setAndroidFragmentTransitions(navigationTransition: NavigationT
// The exit transition of the current fragment ends immediately, the page UI is removed from the visual tree
// and a white spot is left in its place making the transition ugly.
// So we will use the "old" pre-Lollipop transitions in this particular case.
if (topmost().android.cachePagesOnNavigate && _sdkVersion() === 23) {
if (cachePagesOnNavigate && _sdkVersion() === 23) {
useLollipopTransition = false;
}