FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[DO NOT MERGE] Mdonev/lollipop fragment transition fix by manoldonev · Pull Request #5712 · NativeScript/NativeScript · GitHub

  1. NativeScript
  2. NativeScript

Repository navigation

[DO NOT MERGE] Mdonev/lollipop fragment transition fix #5712

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

Closed
manoldonev wants to merge 3 commits into from
Conversation 2 Commits 3 Checks 0 Files changed
Closed

[DO NOT MERGE] Mdonev/lollipop fragment transition fix #5712

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8799c28
fix(android): lollipop crash on changing activity context after navig…
manoldonev Apr 18, 2018
3d1a199
Merge branch 'master' into mdonev/lollipop-fragment-transition-fix
manoldonev Apr 19, 2018
53182ea
Merge branch 'master' into mdonev/lollipop-fragment-transition-fix
manoldonev Apr 19, 2018
File filter

Filter by extension

Filter by extension .ts  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
30 changes: 25 additions & 5 deletions tns-core-modules/ui/frame/frame.android.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import { profile } from "../../profiling";
// TODO: Remove this and get it from global to decouple builder for angular
import { createViewFromEntry } from "../builder";

import { device } from "../../platform";
import lazy from "../../utils/lazy";

export * from "./frame-common";

const INTENT_EXTRA = "com.tns.activity";
Expand All @@ -32,6 +35,8 @@ const CALLBACKS = "_callbacks";
const ownerSymbol = Symbol("_owner");
const activityRootViewsMap = new Map<number, WeakRef<View>>();

const sdkVersion = lazy(() => parseInt(device.sdkVersion));

let navDepth = -1;
let fragmentId = -1;
export let moduleLoaded: boolean;
Expand Down Expand Up @@ -186,13 +191,28 @@ export class Frame extends FrameBase {
super.onUnloaded();
}

private disposeCurrentFragment(){
if (this._currentEntry && this._currentEntry.fragment) {
const manager: android.app.FragmentManager = this._getFragmentManager();
const transaction = manager.beginTransaction();
private disposeCurrentFragment(): void {
if (!this._currentEntry || !this._currentEntry.fragment) {
return;
}

const manager: android.app.FragmentManager = this._getFragmentManager();
const transaction = manager.beginTransaction();
const androidSdkVersion = sdkVersion();

if (androidSdkVersion !== 21 && androidSdkVersion !== 22) {
transaction.remove(this._currentEntry.fragment);
transaction.commitAllowingStateLoss();
} else {
// https://github.com/NativeScript/NativeScript/issues/5674
// HACK: Add and remove dummy fragment to workaround a Lollipop issue
// with inFragment passed as null when adding transition targets: https://android.googlesource.com/platform/frameworks/base.git/+/lollipop-release/core/java/android/app/BackStackRecord.java#1127
const dummyFragmentTag = "dummy";
const dummyFragment = this.createFragment(<BackstackEntry>{}, dummyFragmentTag);
transaction.replace(this.containerViewId, dummyFragment, dummyFragmentTag);
transaction.remove(dummyFragment);
}

transaction.commitAllowingStateLoss();
}

private createFragment(backstackEntry: BackstackEntry, fragmentTag: string): android.app.Fragment {
Expand Down
Back | FazBrowse Home | New Git URL