From 172efb5e5b6a8fbf328af622699d962181b8eac6 Mon Sep 17 00:00:00 2001 From: SvetoslavTsenov Date: Thu, 21 Feb 2019 16:58:23 +0200 Subject: [PATCH 1/2] chore: bump version to 5.2.2 --- tns-core-modules/package.json | 2 +- tns-platform-declarations/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json index d856903dd..c04928cce 100644 --- a/tns-core-modules/package.json +++ b/tns-core-modules/package.json @@ -1,7 +1,7 @@ { "name": "tns-core-modules", "description": "Telerik NativeScript Core Modules", - "version": "5.2.1", + "version": "5.2.2", "homepage": "https://www.nativescript.org", "repository": { "type": "git", diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json index 41c672ff6..9daf6ddfb 100644 --- a/tns-platform-declarations/package.json +++ b/tns-platform-declarations/package.json @@ -1,6 +1,6 @@ { "name": "tns-platform-declarations", - "version": "5.2.1", + "version": "5.2.2", "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects", "main": "", "scripts": { From 33d6d1f2286583bf42bc5a4c342aa261aa64611f Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Fri, 22 Feb 2019 15:00:24 +0200 Subject: [PATCH 2/2] fix(android): resource ID #0xffffffec not found on nav (#6955) --- .../ui/frame/fragment.transitions.android.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tns-core-modules/ui/frame/fragment.transitions.android.ts b/tns-core-modules/ui/frame/fragment.transitions.android.ts index 95d682b03..91aa45f48 100644 --- a/tns-core-modules/ui/frame/fragment.transitions.android.ts +++ b/tns-core-modules/ui/frame/fragment.transitions.android.ts @@ -87,19 +87,19 @@ export function _setAndroidFragmentTransitions( } let useLollipopTransition = !!(name && (name.indexOf("slide") === 0 || name === "fade" || name === "explode") && sdkVersion() >= 21); - // [nested frames / fragments] force disable lollipop transitions in case nested fragments - // are detected as applying dummy animator to the nested fragment with the same duration as - // the exit animator of the removing parent fragment as a workaround for + // [nested frames / fragments] force disable lollipop transitions in case nested fragments + // are detected as applying dummy animator to the nested fragment with the same duration as + // the exit animator of the removing parent fragment as a workaround for // https://code.google.com/p/android/issues/detail?id=55228 works only if custom animations are // used // NOTE: this effectively means you cannot use Explode transition in nested frames scenarios as // we have implementations only for slide, fade, and flip - if (currentFragment && + if (currentFragment && currentFragment.getChildFragmentManager() && currentFragment.getChildFragmentManager().getFragments().toArray().length > 0) { useLollipopTransition = false; } - + if (!animated) { name = "none"; } else if (transition) { @@ -114,8 +114,9 @@ export function _setAndroidFragmentTransitions( let currentFragmentNeedsDifferentAnimation = false; if (currentEntry) { _updateTransitions(currentEntry); - if (currentEntry.transitionName !== name - || currentEntry.transition !== transition) { + if (currentEntry.transitionName !== name || + currentEntry.transition !== transition || + !useLollipopTransition) { clearExitAndReenterTransitions(currentEntry, true); currentFragmentNeedsDifferentAnimation = true; }