refactor: address pr comments

manoldonev · manoldonev · commit dbce2855e375 · 2018-10-01T15:05:06.000+03:00
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
@@ -20,7 +20,7 @@ import {
 
 import { Background, ad as androidBackground } from "../../styling/background";
 import { profile } from "../../../profiling";
-import { topmost } from "../../frame";
+import { topmost } from "../../frame/frame-stack";
 import { AndroidActivityBackPressedEventData, android as androidApp } from "../../../application";
 
 export * from "./view-common";
@@ -265,6 +265,10 @@ export class View extends ViewCommon {
         }
     }
 
+    public _getChildFragmentManager(): android.support.v4.app.FragmentManager {
+        return null;
+    }
+
     public _getFragmentManager(): android.support.v4.app.FragmentManager {
         let manager = this._manager;
         if (!manager) {
@@ -287,9 +291,9 @@ export class View extends ViewCommon {
                 // - tabview -> frame1 (frame1 uses tabview item CHILD fm)
                 // - frame1 -> tabview (tabview uses frame1 CHILD fm)
                 // - frame1 -> tabview -> frame2 (tabview uses frame1 CHILD fm; frame2 uses tabview item CHILD fm)
-                if (view.typeName === "Frame" || view.typeName === "TabView") {
+                if (view._hasFragments) {
                     if (frameOrTabFound) {
-                        manager = (<any>view)._getChildFragmentManager();
+                        manager = view._getChildFragmentManager();
                         break;
                     }
 
@@ -425,6 +429,10 @@ export class View extends ViewCommon {
         return false;
     }
 
+    get _hasFragments(): boolean {
+        return false;
+    }
+
     public layoutNativeView(left: number, top: number, right: number, bottom: number): void {
         if (this.nativeViewProtected) {
             this.nativeViewProtected.layout(left, top, right, bottom);
@@ -994,4 +1002,4 @@ createNativePercentLengthProperty({
 createNativePercentLengthProperty({
     setter: "_setMinHeightNative",
     get setPixels() { return org.nativescript.widgets.ViewHelper.setMinHeight }
-});
+});
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
@@ -121,6 +121,10 @@ export class Frame extends FrameBase {
         return this._android;
     }
 
+    get _hasFragments(): boolean {
+        return true;
+    }
+
     _onAttachedToWindow(): void {
         super._onAttachedToWindow();
         this._attachedToWindow = true;
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -361,6 +361,10 @@ export class TabView extends TabViewBase {
         tabs.push(new WeakRef(this));
     }
 
+    get _hasFragments(): boolean {
+        return true;
+    }
+
     public _getChildFragmentManager(): android.support.v4.app.FragmentManager {
         if (this._pagerAdapter) {
             const fragment: android.support.v4.app.Fragment = (<any>this._pagerAdapter).mCurrentPrimaryItem;
