Skip to content

fix(android): suppress reflection for default animations #6141

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
manoldonev merged 2 commits into from
Aug 2, 2018
Merged

fix(android): suppress reflection for default animations #6141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf2ba9c
fix(android): temporarily suppress reflection for default animations
manoldonev Aug 1, 2018
976adcd
Merge branch 'master' into mdonev/support-lib-suppress-reflection
Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 2 additions & 74 deletions tns-core-modules/ui/frame/fragment.transitions.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,19 @@ interface ExpandedEntry extends BackstackEntry {

const sdkVersion = lazy(() => parseInt(device.sdkVersion));
const defaultInterpolator = lazy(() => new android.view.animation.AccelerateDecelerateInterpolator());
const isAndroidP = lazy(() => sdkVersion() > 27);

export const waitingQueue = new Map<number, Set<ExpandedEntry>>();
export const completedEntries = new Map<number, ExpandedEntry>();

let TransitionListener: TransitionListener;
let AnimationListener: android.view.animation.Animation.AnimationListener;
let loadAnimationMethod: java.lang.reflect.Method;
let reflectionDone: boolean;
let defaultEnterAnimationStatic: android.view.animation.Animation;
let defaultExitAnimationStatic: android.view.animation.Animation;

export function _setAndroidFragmentTransitions(
animated: boolean,
navigationTransition: NavigationTransition,
currentEntry: ExpandedEntry,
newEntry: ExpandedEntry,
fragmentTransaction: android.support.v4.app.FragmentTransaction,
manager: android.support.v4.app.FragmentManager,
frameId: number): void {

const currentFragment: android.support.v4.app.Fragment = currentEntry ? currentEntry.fragment : null;
Expand All @@ -78,10 +72,6 @@ export function _setAndroidFragmentTransitions(
throw new Error("Calling navigation before previous navigation finish.");
}

if (!isAndroidP()) {
initDefaultAnimations(manager);
}

if (sdkVersion() >= 21) {
allowTransitionOverlap(currentFragment);
allowTransitionOverlap(newFragment);
Expand Down Expand Up @@ -120,11 +110,7 @@ export function _setAndroidFragmentTransitions(
if (name === "none") {
transition = new NoTransition(0, null);
} else if (name === "default") {
if (isAndroidP()) {
transition = new FadeTransition(150, null);
} else {
transition = new DefaultTransition(0, null);
}
transition = new FadeTransition(150, null);
} else if (useLollipopTransition) {
// setEnterTransition: Enter
// setExitTransition: Exit
Expand Down Expand Up @@ -178,11 +164,7 @@ export function _setAndroidFragmentTransitions(
}
}

if (isAndroidP()) {
setupDefaultAnimations(newEntry, new FadeTransition(150, null));
} else {
setupDefaultAnimations(newEntry, new DefaultTransition(0, null));
}
setupDefaultAnimations(newEntry, new FadeTransition(150, null));

printTransitions(currentEntry);
printTransitions(newEntry);
Expand Down Expand Up @@ -739,46 +721,6 @@ function toShortString(nativeTransition: android.transition.Transition): string
return `${nativeTransition.getClass().getSimpleName()}@${nativeTransition.hashCode().toString(16)}`;
}

function javaObjectArray(...params: java.lang.Object[]) {
const nativeArray = Array.create(java.lang.Object, params.length);
params.forEach((value, i) => nativeArray[i] = value);
return nativeArray;
}

function javaClassArray(...params: java.lang.Class<any>[]) {
const nativeArray = Array.create(java.lang.Class, params.length);
params.forEach((value, i) => nativeArray[i] = value);
return nativeArray;
}

function initDefaultAnimations(manager: android.support.v4.app.FragmentManager): void {
if (reflectionDone) {
return;
}

reflectionDone = true;

loadAnimationMethod = manager.getClass().getDeclaredMethod("loadAnimation", javaClassArray(android.support.v4.app.Fragment.class, java.lang.Integer.TYPE, java.lang.Boolean.TYPE, java.lang.Integer.TYPE));
if (loadAnimationMethod != null) {
loadAnimationMethod.setAccessible(true);

const fragment_open = java.lang.Integer.valueOf(android.support.v4.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
const zero = java.lang.Integer.valueOf(0);
const fragment = new android.support.v4.app.Fragment();

// Get default enter transition.
defaultEnterAnimationStatic = loadAnimationMethod.invoke(manager, javaObjectArray(fragment, fragment_open, java.lang.Boolean.TRUE, zero));

// Get default exit transition.
defaultExitAnimationStatic = loadAnimationMethod.invoke(manager, javaObjectArray(fragment, fragment_open, java.lang.Boolean.FALSE, zero));
}
}

function getDefaultAnimation(enter: boolean): android.view.animation.Animation {
const defaultAnimation = enter ? defaultEnterAnimationStatic : defaultExitAnimationStatic;
return defaultAnimation ? defaultAnimation.clone() : null;
}

function createDummyZeroDurationAnimation(): android.view.animation.Animation {
// NOTE: returning the dummy AlphaAnimation directly does not work for some reason;
// animationEnd is fired first, then some animationStart (but for a different animation?)
Expand Down Expand Up @@ -817,17 +759,3 @@ class NoTransition extends Transition {
return createDummyZeroDurationAnimation();
}
}

class DefaultTransition extends Transition {
public createAndroidAnimation(transitionType: string): android.view.animation.Animation {
switch (transitionType) {
case AndroidTransitionType.enter:
case AndroidTransitionType.popEnter:
return getDefaultAnimation(true);

case AndroidTransitionType.popExit:
case AndroidTransitionType.exit:
return getDefaultAnimation(false);
}
}
}
1 change: 0 additions & 1 deletion tns-core-modules/ui/frame/fragment.transitions.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export function _setAndroidFragmentTransitions(
currentEntry: BackstackEntry,
newEntry: BackstackEntry,
fragmentTransaction: any,
manager: any /* android.support.v4.app.FragmentManager */,
frameId: number): void;
/**
* @private
Expand Down
5 changes: 1 addition & 4 deletions tns-core-modules/ui/frame/frame.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,10 +337,7 @@ export class Frame extends FrameBase {
// https://github.com/NativeScript/NativeScript/issues/4895
const navigationTransition = this._currentEntry ? this._getNavigationTransition(newEntry.entry) : null;

_setAndroidFragmentTransitions(animated, navigationTransition, currentEntry, newEntry, transaction, manager, this._android.frameId);
// if (clearHistory) {
// deleteEntries(this.backStack);
// }
_setAndroidFragmentTransitions(animated, navigationTransition, currentEntry, newEntry, transaction, this._android.frameId);

if (currentEntry && animated && !navigationTransition) {
transaction.setTransition(android.support.v4.app.FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
Expand Down