javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use fragment.getFragmentManager

Browse Source
This commit is contained in:
vakrilov
2019-12-06 16:13:52 +02:00
parent 9fd77fb648
commit b20ec86969
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
nativescript-core/ui/frame/frame.android.ts
View File

@ -87,16 +87,6 @@ function getAttachListener(): android.view.View.OnAttachStateChangeListener {
return attachStateChangeListener; return attachStateChangeListener;
} }
function nativeArrayIncludes<T>(arr: native.Array<T>, what: T): boolean {
for (let i = 0; i < arr.length; i++) {
if (arr[i] === what) {
return true;
}
}
return false;
}
export class Frame extends FrameBase { export class Frame extends FrameBase {
public _originalBackground: any; public _originalBackground: any;
private _android: AndroidFrame; private _android: AndroidFrame;
@ -274,24 +264,9 @@ export class Frame extends FrameBase {
!this._currentEntry.fragment.isAdded()) { !this._currentEntry.fragment.isAdded()) {
return; return;
} }
const fragmentManager: androidx.fragment.app.FragmentManager = this._getFragmentManager(); const fragment: androidx.fragment.app.Fragment = this._currentEntry.fragment;
const fragmentManager: androidx.fragment.app.FragmentManager = fragment.getFragmentManager();
// Check if manager contains the fragment to be removed
// This might happen when a dialog is already closed with android back btn
const fragment = this._currentEntry.fragment;
const fragmentFound = nativeArrayIncludes(fragmentManager.getFragments().toArray(), fragment);
if (traceEnabled()) {
const message = fragmentFound ?
`Frame.disposeCurrentFragment - fragment(${fragment}) found in fragmentManager(${fragmentManager}). Removing ...` :
`Frame.disposeCurrentFragment - fragment(${fragment}) NOT found in fragmentManager(${fragmentManager}). Skipping remove`;
traceWrite(message, traceCategories.NativeLifecycle);
}
if (!fragmentFound) {
return;
}
const transaction = fragmentManager.beginTransaction(); const transaction = fragmentManager.beginTransaction();
const fragmentExitTransition = fragment.getExitTransition(); const fragmentExitTransition = fragment.getExitTransition();
@ -662,7 +637,7 @@ function clearEntry(entry: BackstackEntry): void {
entry.recreated = false; entry.recreated = false;
entry.fragment = null; entry.fragment = null;
const page = entry.resolvedPage; const page = entry.resolvedPage;
if (page._context) { if (page && page._context) {
entry.resolvedPage._tearDownUI(true); entry.resolvedPage._tearDownUI(true);
} }
} }