Fix broken merge conflict

Hristo Hristov · Hristo Hristov · commit 04c11325414e · 2017-12-15T13:06:34.000+02:00
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
@@ -11,6 +11,7 @@ import { ios as iosBackground, Background } from "../../styling/background";
 // HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to
 // kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism.
 import * as uiUtils from "tns-core-modules/ui/utils";
+import { ios as iosUtils } from "../../../utils/utils";
 import {
     Visibility,
     visibilityProperty, opacityProperty,
diff --git a/tns-core-modules/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts
@@ -434,7 +434,7 @@ export class Page extends PageBase {
     public onLayout(left: number, top: number, right: number, bottom: number) {
         const { width: actionBarWidth, height: actionBarHeight } = this.actionBar._getActualSize;
         View.layoutChild(this, this.actionBar, 0, 0, actionBarWidth, actionBarHeight);
-        View.layoutChild(this, this.layoutView, 0, top, right - left, bottom);
+        View.layoutChild(this, this.layoutView, 0, 0, right - left, bottom - top);
     }
 
     public _addViewToNativeVisualTree(child: View, atIndex: number): boolean {

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ export class Page extends PageBase {`
`434`	`434`	`public onLayout(left: number, top: number, right: number, bottom: number) {`
`435`	`435`	`const { width: actionBarWidth, height: actionBarHeight } = this.actionBar._getActualSize;`
`436`	`436`	`View.layoutChild(this, this.actionBar, 0, 0, actionBarWidth, actionBarHeight);`
`437`		`- View.layoutChild(this, this.layoutView, 0, top, right - left, bottom);`
	`437`	`+ View.layoutChild(this, this.layoutView, 0, 0, right - left, bottom - top);`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`public _addViewToNativeVisualTree(child: View, atIndex: number): boolean {`