Fix TabViewItem loading

Hristo Hristov · Hristo Hristov · commit a416fa4fb61c · 2017-12-15T13:08:15.000+02:00
Fix showModal not on full screen
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
@@ -141,14 +141,20 @@ function initializeDialogFragment() {
             this.owner._dialogFragment = this;
             this.setStyle(android.app.DialogFragment.STYLE_NO_TITLE, 0);
             
-            return new DialogImpl(this, this.getActivity(), this.getTheme());
+            const dialog = new DialogImpl(this, this.getActivity(), this.getTheme());
+
+            // adjust alignment based on fullscreen value.
+            this.owner.horizontalAlignment = this._fullscreen ? "stretch" : "center";
+            this.owner.verticalAlignment = this._fullscreen ? "stretch" : "middle";
+          
+            return dialog;
         }
 
         public onCreateView(inflater: android.view.LayoutInflater, container: android.view.ViewGroup, savedInstanceState: android.os.Bundle): android.view.View {
             const owner = this.owner;
             owner._setupUI(this.getActivity());
             owner._isAddedToNativeVisualTree = true;
-
+            
             return this.owner.nativeViewProtected;
         }
 
diff --git a/tns-core-modules/ui/page/page.android.ts b/tns-core-modules/ui/page/page.android.ts
@@ -44,9 +44,6 @@ export class Page extends PageBase {
         this.actionBar.update();
     }
 
-    [actionBarHiddenProperty.getDefault](): boolean {
-        return undefined;
-    }
     [actionBarHiddenProperty.setNative](value: boolean) {
         this.updateActionBar();
     }
diff --git a/tns-core-modules/ui/tab-view/tab-view-common.ts b/tns-core-modules/ui/tab-view/tab-view-common.ts
@@ -30,7 +30,6 @@ export abstract class TabViewItemBase extends ViewBase implements TabViewItemDef
     get title(): string {
         return this._title;
     }
-
     set title(value: string) {
         if (this._title !== value) {
             this._title = value;
@@ -69,6 +68,17 @@ export abstract class TabViewItemBase extends ViewBase implements TabViewItemDef
         }
     }
 
+    public loadView(view: ViewBase): void {
+        const tabView = this.parent as TabViewBase;
+        if (tabView && tabView.items) {
+            const index = tabView.items.indexOf(this);
+            // Don't load items until their fragments are instantiated.
+            if (index === tabView.selectedIndex && (<TabViewItemDefinition>this).canBeLoaded) {
+                super.loadView(view);
+            }
+        }
+    }
+
     public abstract _update();
 }
 
@@ -135,11 +145,8 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom
     }
 
     get _childrenCount(): number {
-        if (this.items) {
-            return this.items.length;
-        }
-
-        return 0;
+        const items = this.items;
+        return items ? items.length : 0;
     }
 
     public eachChild(callback: (child: ViewBase) => boolean) {
@@ -151,15 +158,6 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom
         }
     }
 
-    public loadView(view: ViewBase): void {
-        const item = view as TabViewItem;
-        const index = this.items.indexOf(item);
-        if (index === this.selectedIndex && item.canBeLoaded) {
-            super.loadView(item);
-        }
-        // Don't load items until their fragments are instantiated.
-    }
-
     public eachChildView(callback: (child: View) => boolean) {
         const items = this.items;
         if (items) {
@@ -193,17 +191,18 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom
 
         const oldItem = items[oldIndex];
         if (oldItem) {
-            this.unloadView(oldItem);
+            oldItem.unloadView(oldItem.view);
         }
 
         const newItem = items[newIndex];
-        if (newItem && !newItem.isLoaded && this.isLoaded) {
-            this.loadView(newItem);
+        if (newItem && this.isLoaded) {
+            newItem.loadView(newItem.view);
         }
 
         this.notify(<SelectedIndexChangedEventData>{ eventName: TabViewBase.selectedIndexChangedEvent, object: this, oldIndex, newIndex });
     }
 }
+
 export interface TabViewBase {
     on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);
     on(event: "selectedIndexChanged", callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any);
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -173,8 +173,8 @@ function initializeNativeClasses() {
                 const tab = this.owner;
                 const items = tab.items;
                 const newItem = items ? items[position] : null;
-                if (newItem && !newItem.isLoaded && tab.isLoaded) {
-                    tab.loadView(newItem);
+                if (newItem && tab.isLoaded) {
+                    newItem.loadView(newItem.view);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,6 @@ export class Page extends PageBase {`
`44`	`44`	`this.actionBar.update();`
`45`	`45`	`}`
`46`	`46`
`47`		`- [actionBarHiddenProperty.getDefault](): boolean {`
`48`		`- return undefined;`
`49`		`- }`
`50`	`47`	`[actionBarHiddenProperty.setNative](value: boolean) {`
`51`	`48`	`this.updateActionBar();`
`52`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ function initializeNativeClasses() {`
`173`	`173`	`const tab = this.owner;`
`174`	`174`	`const items = tab.items;`
`175`	`175`	`const newItem = items ? items[position] : null;`
`176`		`- if (newItem && !newItem.isLoaded && tab.isLoaded) {`
`177`		`- tab.loadView(newItem);`
	`176`	`+ if (newItem && tab.isLoaded) {`
	`177`	`+ newItem.loadView(newItem.view);`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`