Fixing type errors in tests

CodingConvention.md

@@ -696,7 +696,7 @@ Sometimes we need to explicitly check for a type. In such cases use the built-in
 
 *Right:*
 ~~~ {.javascript}
-import types = require("utils/types");
+import * as types from "utils/types";
 var myVar;
 
 if(types.isString(myVar)) {

CreateNewModule.md

@@ -24,7 +24,7 @@ declare module "foo"{
 **Implementation file (foo.ts):**
 
 ```javascript
-import definition = require("foo");
+import * as definition from "foo";
 
 export function a(){
     // do somethign here
@@ -53,7 +53,7 @@ declare module "foo"{
 **Android implementation file (foo.android.ts):**
 
 ```javascript
-import definition = require("foo");
+import * as definition from "foo";
 
 // require the definition and put implements clause to ensure API consistency between the declaration and implementation
 export class Foo implements definition.Foo {
@@ -72,7 +72,7 @@ export class Foo implements definition.Foo {
 **iOS implementation file (foo.ios.ts):**
 
 ```javascript
-import definition = require("foo");
+import * as definition from "foo";
 
 // require the definition and put implements clause to ensure API consistency between the declaration and implementation
 export class Foo implements definition.Foo {
@@ -109,7 +109,7 @@ declare module "foo"{
 **Common implementation file (foo-common.ts):**
 
 ```javascript
-import definition = require("foo");
+import * as definition from "foo";
 
 // require the definition and put implements clause to ensure API consistency between the declaration and implementation
 export class Foo implements definition.Foo {
@@ -128,7 +128,7 @@ export class Foo implements definition.Foo {
 **Android implementation file (foo.android.ts):**
 
 ```javascript
-import common = require("foo-common");
+import * as common from "foo-common";
 
 // require the common file and extend the base common implementation
 export class Foo extends common.Foo {
@@ -148,7 +148,7 @@ export class Foo extends common.Foo {
 **iOS implementation file (foo.ios.ts):**
 
 ```javascript
-import common = require("foo-common");
+import * as common from "foo-common";
 
 // require the common file and extend the base common implementation
 export class Foo extends common.Foo {
@@ -215,8 +215,8 @@ export function stopNative(){
 **Common implementation file (foo.ts):**
 
 ```javascript
-import definition = require("foo");
+import * as definition from "foo";
-import fooNative = require("foo-native");
+import * as fooNative from "foo-native";
 
 // require the definition and put implements clause to ensure API consistency between the declaration and implementation
 export class Foo implements definition.Foo {

apps/app/css-perf-test/app.ts

@@ -1,4 +1,4 @@
-import application = require("application");
+import * as application from "application";
 declare var CACurrentMediaTime;
 
 global.time = function(): number {

apps/app/cuteness.io/app.ts

@@ -1,5 +1,5 @@
-import application = require("application");
+import * as application from "application";
-import fps = require("fps-meter");
+import * as fps from "fps-meter";
 fps.addCallback(function (fps, minFps) {
     console.info("fps=" + fps + " minFps=" + minFps);
 });

apps/app/gallery-app/app.ts

@@ -1,6 +1,6 @@
-import application = require("application");
+import * as application from "application";
 
 // Needed only for build infrastructure
-application.cssFile = "gallery-app/app.css";
+application.setCssFileName("gallery-app/app.css");
 
 application.start({ moduleName: "gallery-app/main-page" });

apps/app/gallery-app/main-page.ts

@@ -1,5 +1,5 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function itemTap(args: observable.EventData) {
     frame.topmost().navigate({

apps/app/gallery-app/views/dialogs.ts

@@ -1,4 +1,4 @@
-import dialogs = require("ui/dialogs");
+import * as dialogs from "ui/dialogs";
 
 export function alertTapped(args) {
     dialogs.alert("Hi there!");

apps/app/gallery-app/views/list-picker.ts

@@ -1,5 +1,5 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import observableModule = require("data/observable");
+import * as observableModule from "data/observable";
 
 export function onPageLoaded(args: observableModule.EventData) {
     var page = <pages.Page>args.object;

apps/app/ui-tests-app/action-bar/action-item-position.ts

@@ -1,6 +1,6 @@
 import { EventData } from "data/observable";
 import { Page } from "ui/page";
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 export function navigatingTo(args: EventData) {
     let page = <Page>args.object;

apps/app/ui-tests-app/action-bar/action-view.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/action-bar/all.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/action-bar/background-css.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/action-bar/background.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/action-bar/clean.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().goBack();

apps/app/ui-tests-app/action-bar/color.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/action-bar/system-icons.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/action-bar/clean");

apps/app/ui-tests-app/animations/background.ts

@@ -1,7 +1,7 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import viewModule = require("ui/core/view");
+import * as viewModule from "ui/core/view";
-import color = require("color");
+import * as color from "color";
 
 var view: viewModule.View;
 

apps/app/ui-tests-app/app.ts

@@ -1,5 +1,5 @@
-import application = require("application");
+import * as application from "application";
-import trace = require("trace");
+import * as trace from "trace";
 trace.enable();
 trace.setCategories(trace.categories.concat(
     trace.categories.NativeLifecycle,
@@ -11,12 +11,13 @@ trace.setCategories(trace.categories.concat(
 var countResume = 0;
 var countSuspend = 0;
 
-application.onUncaughtError = function (error: application.NativeScriptError) {
+application.on("uncaughtError", args => {
+    const error = args.error;
     console.warn(error.message);
     if (error.nativeError) {
         console.warn("native error: " + error.nativeError);
     }
-}
+});
 
 application.on(application.launchEvent, function (args: application.ApplicationEventData) {
     if (args.android) {

apps/app/ui-tests-app/bindings/basics.ts

@@ -1,8 +1,8 @@
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import textFieldModule = require("ui/text-field");
+import * as textFieldModule from "ui/text-field";
-import stackLayoutModule = require("ui/layouts/stack-layout");
+import * as stackLayoutModule from "ui/layouts/stack-layout";
-import observableModule = require("data/observable");
+import * as observableModule from "data/observable";
 
 export function createPage() {
 

apps/app/ui-tests-app/bindings/xmlbasics.ts

@@ -1,7 +1,7 @@
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import stackLayoutModule = require("ui/layouts/stack-layout");
+import * as stackLayoutModule from "ui/layouts/stack-layout";
-import textFieldModule = require("ui/text-field");
+import * as textFieldModule from "ui/text-field";
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 export function stack0Loaded(args: observable.EventData) {
     var source = new observable.Observable();

apps/app/ui-tests-app/css/background.ts

@@ -1,5 +1,5 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import pages = require("ui/page");
+import * as pages from "ui/page";
 
 export function applyTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;

apps/app/ui-tests-app/css/margins-paddings-with-percentage.ts

@@ -1,7 +1,7 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import pages = require("ui/page");
+import * as pages from "ui/page";
 import { EventData } from "data/observable";
-import button = require("ui/button");
+import * as button from "ui/button";
 
 var cssPercentage = " Page { margin:5% 10% 15% 8%; background-color: orange; font-size:8; } GridLayout { margin:3%; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10%; } .test2 { padding:10%; background-color:lightblue; } .test3 { margin:1% 2% 3% 4%; } WrapLayout { orientation:vertical; width:75%; height:45% } Button { color:black }"
 var cssWithouPercentage = " Page { margin:15 10 15 30; background-color: orange; font-size:8; } GridLayout { margin:3; background-color: lightgreen; font-size:8; } StackLayout { border-color:red; border-width:1px; } StackLayout * { border-color:blue; border-width:1px; } GridLayout { border-color:green;border-width:1px; } .test1 { padding:10; } .test2 { padding:10; background-color:lightblue; } .test3 { margin:10 20 30 40; } WrapLayout { orientation:vertical; width:100; height:120 } Button { color:black }"

apps/app/ui-tests-app/css/text-transform.ts

@@ -1,8 +1,8 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import label = require("ui/label");
+import * as label from "ui/label";
-import button = require("ui/button");
+import * as button from "ui/button";
-import textField = require("ui/text-field");
+import * as textField from "ui/text-field";
-import textView = require("ui/text-view");
+import * as textView from "ui/text-view";
 
 export function changeTextButonTap(args) {
     var btnChange = <button.Button>args.object;

apps/app/ui-tests-app/css/white-space.ts

@@ -1,9 +1,9 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import label = require("ui/label");
+import * as label from "ui/label";
-import button = require("ui/button");
+import * as button from "ui/button";
-import textField = require("ui/text-field");
+import * as textField from "ui/text-field";
-import textView = require("ui/text-view");
+import * as textView from "ui/text-view";
 
 export function butonTap(args: observable.EventData) {
     var btnChange = <view.View>args.object;

apps/app/ui-tests-app/dialogs/dialogs.ts

@@ -1,6 +1,6 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import vmModule = require("./view-model");
+import * as vmModule from "./view-model";
 
 var viewModel = vmModule.settingsViewModel;
 

apps/app/ui-tests-app/dialogs/view-model.ts

@@ -1,5 +1,5 @@
-import dialogs = require("ui/dialogs");
+import * as dialogs from "ui/dialogs";
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 var name = "Harold Finch";
 

apps/app/ui-tests-app/font/all-fonts.ts

@@ -4,7 +4,7 @@ import { StackLayout } from "ui/layouts/stack-layout";
 import { ScrollView } from "ui/scroll-view";
 import { Label } from "ui/label";
 import { FontStyle, FontWeight } from "ui/enums";
-import typeUtils = require("utils/types");
+import * as typeUtils from "utils/types";
 import { Color } from "color";
 import * as font from "ui/styling/font";
 

apps/app/ui-tests-app/font/button.ts

@@ -1,31 +1,33 @@
-import stack = require("ui/layouts/stack-layout");
+import * as stack from "ui/layouts/stack-layout";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
+import { unsetValue } from "ui/core/view";
+
 export function resetStyles(args) {
     var stackLayout = <stack.StackLayout>args.object.parent.parent;
     view.eachDescendant(stackLayout, function (v: view.View) {
-        v.style._resetValue(style.fontFamilyProperty);
+        v.style.fontFamily = unsetValue;
-        v.style._resetValue(style.fontSizeProperty);
+        v.style.fontSize = unsetValue;
-        v.style._resetValue(style.fontStyleProperty);
+        v.style.fontStyle = unsetValue;
-        v.style._resetValue(style.fontWeightProperty);
+        v.style.fontWeight = unsetValue;
-        v.style._resetValue(style.colorProperty);
+        v.style.color = unsetValue;
-        v.style._resetValue(style.textAlignmentProperty);
+        v.style.textAlignment = unsetValue;
-        v.style._resetValue(style.paddingLeftProperty);
+        v.style.paddingLeft = unsetValue;
-        v.style._resetValue(style.paddingRightProperty);
+        v.style.paddingRight = unsetValue;
-        v.style._resetValue(style.paddingTopProperty);
+        v.style.paddingTop = unsetValue;
-        v.style._resetValue(style.paddingBottomProperty);
+        v.style.paddingBottom = unsetValue;
-        v.style._resetValue(style.borderTopColorProperty);
+        v.style.borderTopColor = unsetValue;
-        v.style._resetValue(style.borderRightColorProperty);
+        v.style.borderRightColor = unsetValue;
-        v.style._resetValue(style.borderBottomColorProperty);
+        v.style.borderBottomColor = unsetValue;
-        v.style._resetValue(style.borderLeftColorProperty);
+        v.style.borderLeftColor = unsetValue;
-        v.style._resetValue(style.borderTopWidthProperty);
+        v.style.borderTopWidth = unsetValue;
-        v.style._resetValue(style.borderRightWidthProperty);
+        v.style.borderRightWidth = unsetValue;
-        v.style._resetValue(style.borderBottomWidthProperty);
+        v.style.borderBottomWidth = unsetValue;
-        v.style._resetValue(style.borderLeftWidthProperty);
+        v.style.borderLeftWidth = unsetValue;
-        v.style._resetValue(style.borderTopLeftRadiusProperty);
+        v.style.borderTopLeftRadius = unsetValue;
-        v.style._resetValue(style.borderTopRightRadiusProperty);
+        v.style.borderTopRightRadius = unsetValue;
-        v.style._resetValue(style.borderBottomRightRadiusProperty);
+        v.style.borderBottomRightRadius = unsetValue;
-        v.style._resetValue(style.borderBottomLeftRadiusProperty);
+        v.style.borderBottomLeftRadius = unsetValue;
         return true;
     });
 }

apps/app/ui-tests-app/font/label.ts

@@ -1,15 +1,15 @@
-import stack = require("ui/layouts/stack-layout");
+import * as stack from "ui/layouts/stack-layout";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
 export function resetStyles(args) {
     var stackLayout = <stack.StackLayout>args.object.parent;
     view.eachDescendant(stackLayout, function (v: view.View) {
-        v.style._resetValue(style.fontFamilyProperty);
+        v.style.fontFamily = unsetValue;
-        v.style._resetValue(style.fontSizeProperty);
+        v.style.fontSize = unsetValue;
-        v.style._resetValue(style.fontStyleProperty);
+        v.style.fontStyle = unsetValue;
-        v.style._resetValue(style.fontWeightProperty);
+        v.style.fontWeight = unsetValue;
-        v.style._resetValue(style.colorProperty);
+        v.style.color = unsetValue;
-        v.style._resetValue(style.textAlignmentProperty);
+        v.style.textAlignment = unsetValue;
         return true;
     });
 }

apps/app/ui-tests-app/font/text-field.ts

@@ -1,15 +1,15 @@
-import stack = require("ui/layouts/stack-layout");
+import * as stack from "ui/layouts/stack-layout";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
 export function resetStyles(args) {
     var stackLayout = <stack.StackLayout>args.object.parent;
     view.eachDescendant(stackLayout, function (v: view.View) {
-        v.style._resetValue(style.fontFamilyProperty);
+        v.style.fontFamily = unsetValue;
-        v.style._resetValue(style.fontSizeProperty);
+        v.style.fontSize = unsetValue;
-        v.style._resetValue(style.fontStyleProperty);
+        v.style.fontStyle = unsetValue;
-        v.style._resetValue(style.fontWeightProperty);
+        v.style.fontWeight = unsetValue;
-        v.style._resetValue(style.colorProperty);
+        v.style.color = unsetValue;
-        v.style._resetValue(style.textAlignmentProperty);
+        v.style.textAlignment = unsetValue;
         return true;
     });
 }

apps/app/ui-tests-app/font/text-view.ts

@@ -1,15 +1,15 @@
-import stack = require("ui/layouts/stack-layout");
+import * as stack from "ui/layouts/stack-layout";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
 export function resetStyles(args) {
     var stackLayout = <stack.StackLayout>args.object.parent;
     view.eachDescendant(stackLayout, function (v: view.View) {
-        v.style._resetValue(style.fontFamilyProperty);
+        v.style.fontFamily = unsetValue;
-        v.style._resetValue(style.fontSizeProperty);
+        v.style.fontSize = unsetValue;
-        v.style._resetValue(style.fontStyleProperty);
+        v.style.fontStyle = unsetValue;
-        v.style._resetValue(style.fontWeightProperty);
+        v.style.fontWeight = unsetValue;
-        v.style._resetValue(style.colorProperty);
+        v.style.color = unsetValue;
-        v.style._resetValue(style.textAlignmentProperty);
+        v.style.textAlignment = unsetValue;
         return true;
     });
 }

apps/app/ui-tests-app/layouts-percent/absolute.ts

@@ -1,6 +1,6 @@
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import absoluteLayout = require("ui/layouts/absolute-layout");
+import * as absoluteLayout from "ui/layouts/absolute-layout";
-import model = require("./myview");
+import * as model from "./myview";
 
 var count = 0;
 

apps/app/ui-tests-app/layouts-percent/dock.ts

@@ -1,5 +1,5 @@
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts-percent/grid.ts

@@ -1,7 +1,7 @@
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import gridLayoutModule = require("ui/layouts/grid-layout");
+import * as gridLayoutModule from "ui/layouts/grid-layout";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts-percent/myview.ts

@@ -1,7 +1,7 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import layouts = require("ui/layouts/layout-base");
+import * as layouts from "ui/layouts/layout-base";
 
 export class ViewModel extends observable.Observable {
 

apps/app/ui-tests-app/layouts-percent/stack.ts

@@ -1,6 +1,6 @@
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts-percent/wrap.ts

@@ -1,6 +1,6 @@
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts/absolute.ts

@@ -1,6 +1,6 @@
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import absoluteLayout = require("ui/layouts/absolute-layout");
+import * as absoluteLayout from "ui/layouts/absolute-layout";
-import model = require("./myview");
+import * as model from "./myview";
 
 var count = 0;
 

apps/app/ui-tests-app/layouts/dock.ts

@@ -1,5 +1,5 @@
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts/grid.ts

@@ -1,7 +1,7 @@
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import gridLayoutModule = require("ui/layouts/grid-layout");
+import * as gridLayoutModule from "ui/layouts/grid-layout";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts/myview.ts

@@ -1,7 +1,7 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import layouts = require("ui/layouts/layout-base");
+import * as layouts from "ui/layouts/layout-base";
 
 export class ViewModel extends observable.Observable {
 

apps/app/ui-tests-app/layouts/stack.ts

@@ -1,6 +1,6 @@
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/layouts/wrap.ts

@@ -1,6 +1,6 @@
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import model = require("./myview");
+import * as model from "./myview";
 
 export function onLoaded(args: { eventName: string, object: any }) {
     var page = <pageModule.Page>args.object;

apps/app/ui-tests-app/mainPage.ts

@@ -1,12 +1,12 @@
 import { EventData } from "data/observable";
 import { Page } from "ui/page";
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import colorModule = require("color");
+import * as colorModule from "color";
 import * as platform from "platform";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import trace = require("trace");
+import * as trace from "trace";
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import dialogs = require("ui/dialogs");
+import * as dialogs from "ui/dialogs";
 import { WrapLayout } from "ui/layouts/wrap-layout";
 
 var examples: Map<string, string> = new Map<string, string>();

apps/app/ui-tests-app/modal-view/login-page.ts

@@ -1,6 +1,6 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import textField = require("ui/text-field");
+import * as textField from "ui/text-field";
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 var context: any;
 var closeCallback: Function;

apps/app/ui-tests-app/modal-view/modal-view.ts

@@ -1,6 +1,6 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import labelModule = require("ui/label");
+import * as labelModule from "ui/label";
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 var page: pages.Page;
 var label: labelModule.Label;

apps/app/ui-tests-app/page/page-status-bar-css.ts

@@ -1,7 +1,7 @@
-import color = require("color");
+import * as color from "color";
-import page = require("ui/page");
+import * as page from "ui/page";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
 
 export function applyTap(args) {
     let page = <page.Page>(<view.View>args.object).page;
@@ -68,5 +68,5 @@ function reset(page: page.Page) {
     page.css = "";
     page.actionBarHidden = false;
     page.backgroundSpanUnderStatusBar = false;
-    page.actionBar.style._resetValue(style.backgroundColorProperty);
+    page.actionBar.style.backgroundColor = unsetValue;
 } 

apps/app/ui-tests-app/pages/console.ts

@@ -1,9 +1,9 @@
-import app = require("application");
+import * as app from "application";
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import labelModule = require("ui/label");
+import * as labelModule from "ui/label";
-import stackLayoutModule = require("ui/layouts/stack-layout");
+import * as stackLayoutModule from "ui/layouts/stack-layout";
-import textViewModule = require("ui/text-view");
+import * as textViewModule from "ui/text-view";
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
 
 export function createPage() {
 

apps/app/ui-tests-app/pages/gestures.ts

@@ -1,9 +1,9 @@
-import labelModule = require("ui/label");
+import * as labelModule from "ui/label";
-import gestures = require("ui/gestures");
+import * as gestures from "ui/gestures";
-import button = require("ui/button");
+import * as button from "ui/button";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import deviceProperties = require("platform");
+import * as deviceProperties from "platform";
-import stackLayoutModule = require("ui/layouts/stack-layout");
+import * as stackLayoutModule from "ui/layouts/stack-layout";
 
 export function createPage() {
 

apps/app/ui-tests-app/pages/handlers.ts

@@ -1,6 +1,6 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import gestures = require("ui/gestures");
+import * as gestures from "ui/gestures";
-import pages = require("ui/page");
+import * as pages from "ui/page";
 
 export function pageLoaded(args: observable.EventData) {
     var page = <pages.Page>args.object;

apps/app/ui-tests-app/pages/i61.ts

@@ -1,6 +1,6 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import button = require("ui/button");
+import * as button from "ui/button";
-import panelModule = require("ui/layouts/stack-layout");
+import * as panelModule from "ui/layouts/stack-layout";
 
 export function createPage() {
 

apps/app/ui-tests-app/pages/i73.ts

@@ -1,6 +1,6 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import button = require("ui/button");
+import * as button from "ui/button";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
 
 export function createPage() {
 

apps/app/ui-tests-app/pages/listview_binding.ts

@@ -1,8 +1,8 @@
-import pageModule = require("ui/page");
+import * as pageModule from "ui/page";
-import gridLayoutModule = require("ui/layouts/grid-layout");
+import * as gridLayoutModule from "ui/layouts/grid-layout";
-import listViewModule = require("ui/list-view");
+import * as listViewModule from "ui/list-view";
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import observableArr = require("data/observable-array");
+import * as observableArr from "data/observable-array";
 
 var arr = new observableArr.ObservableArray();
 for (var i = 0; i < 100; i++) {

apps/app/ui-tests-app/pages/touch-event.ts

@@ -1,5 +1,5 @@
 import {TextView} from "ui/text-view";
-import gestures = require("ui/gestures");
+import * as gestures from "ui/gestures";
 
 export function onTouch(args: gestures.TouchGestureEventData) {
     var msg = " touch action: " + args.action +

apps/app/ui-tests-app/segmented-bar/all.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().navigate("ui-tests-app/segmented-bar/clean");

apps/app/ui-tests-app/segmented-bar/clean.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function navigate(args) {
     frame.topmost().goBack();

apps/app/ui-tests-app/tab-view/tab-view-css.ts

@@ -1,5 +1,5 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import pages = require("ui/page");
+import * as pages from "ui/page";
 
 export function applyTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;

apps/app/ui-tests-app/text-field/text-field.ts

@@ -1,4 +1,4 @@
-import observable = require("data/observable");
+import * as observable from "data/observable";
 
 export function pageLoaded(args) {
     var page = args.object;

apps/app/ui-tests-app/transitions/page0.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function onTap(args) {
     var navigationEntry = {

apps/app/ui-tests-app/transitions/page1.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function onTap(args) {
     var navigationEntry = {

tests/app/TKUnit.ts

@@ -10,11 +10,11 @@
  
 */
 
-import Application = require("application");
+import * as Application from "application";
-import timer = require("timer");
+import * as timer from "timer";
-import trace = require("trace");
+import * as trace from "trace";
-import types = require("utils/types");
+import * as types from "utils/types";
-import platform = require("platform");
+import * as platform from "platform";
 
 import * as utils from "utils/utils";
 

tests/app/app/app.ts

@@ -6,7 +6,7 @@ else {
     start = java.lang.System.currentTimeMillis();
 }
 
-import application = require("application");
+import * as application from "application";
 
 // Specify custom UIApplicationDelegate.
 /*

tests/app/app/location-example.ts

@@ -1,10 +1,10 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import locationModule = require("location");
+import * as locationModule from "location";
-import dialogsModule = require("ui/dialogs");
+import * as dialogsModule from "ui/dialogs";
-import platformModule = require("platform");
+import * as platformModule from "platform";
-import textViewModule = require("ui/text-view");
+import * as textViewModule from "ui/text-view";
-import observable = require("data/observable");
+import * as observable from "data/observable";
-import appModule = require("application");
+import * as appModule from "application";
 
 var locationManager = new locationModule.LocationManager();
 

tests/app/app/mainPage.ts

@@ -1,6 +1,6 @@
 import {Page} from "ui/page";
 import * as trace from "trace";
-import tests = require("../testRunner");
+import * as tests from "../testRunner";
 import {Label} from "ui/label";
 import * as application from "application";
 import * as platform from "platform";

tests/app/app/pageNavigation.ts

@@ -1,7 +1,7 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import tabViewModule = require("ui/tab-view");
+import * as tabViewModule from "ui/tab-view";
 
 export function createPage() {
     var tab = new tabViewModule.TabView();

tests/app/app/style_props.ts

@@ -1,10 +1,10 @@
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
 import {PropertyMetadata, PropertyMetadataSettings} from "ui/core/dependency-observable";
-import styleProperty = require("ui/styling/style-property");
+import * as styleProperty from "ui/styling/style-property";
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import buttonModule = require("ui/button");
+import * as buttonModule from "ui/button";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import stackLayoutDef = require("ui/layouts/stack-layout");
+import * as stackLayoutDef from "ui/layouts/stack-layout";
 import {isAndroid} from "platform";
 
 // on Android we explicitly set propertySettings to None because android will invalidate its layout (skip unnecessary native call).

tests/app/app/testPage.ts

@@ -1,4 +1,4 @@
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
 
 export function buttonTap(args) { 
     frame.topmost().goBack();

tests/app/app/testRunnerPage.ts

@@ -1,8 +1,8 @@
-import tests = require("../testRunner");
+import * as tests from "../testRunner";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import bm = require("ui/button");
+import * as bm from "ui/button";
-import listViewDef = require("ui/list-view");
+import * as listViewDef from "ui/list-view";
-import trace = require("trace");
+import * as trace from "trace";
 trace.enable();
 trace.addCategories(trace.categories.Test + "," + trace.categories.Error);
 

tests/app/application-tests-common.ts

@@ -1,6 +1,6 @@
 // >> application-require
-import app = require("application");
+import * as app from "application";
-import platform = require("platform");
+import * as platform from "platform";
 // << application-require
 
 // >> application-app-check
@@ -11,7 +11,7 @@ if (app.android) {
 }
 // << application-app-check
 
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
 
 export var testInitialized = function () {
     if (platform.device.os === platform.platformNames.android) {

tests/app/application-tests.android.ts

@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-variable */
-import app = require("application");
+import * as app from "application";
-import TKUnit = require("./TKUnit"); 
+import * as TKUnit from "./TKUnit"; 
-import commonTests = require("./application-tests-common");
+import * as commonTests from "./application-tests-common";
 
 global.moduleMerge(commonTests, exports);
 

tests/app/application-tests.ios.ts

@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-variable */
-import app = require("application");
+import * as app from "application";
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
-import commonTests = require("./application-tests-common");
+import * as commonTests from "./application-tests-common";
 
 import * as utils from "utils/utils";
 import getter = utils.ios.getter;

tests/app/camera-tests.ts

@@ -1,8 +1,8 @@
 // >> camera-require
-import camera = require("camera");
+import * as camera from "camera";
 // << camera-require
 
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
 
 export var test_takePicture = function () {
     // >> camera-take-picture

tests/app/color-tests.ts

@@ -1,8 +1,8 @@
 // >> color-require
-import colorModule = require("color");
+import * as colorModule from "color";
 var Color = colorModule.Color;
 // << color-require
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
 
 export var test_Hex_Color = function () {
     // >> color-hex

tests/app/connectivity-tests.ts

@@ -1,5 +1,5 @@
 // >> connectivity-require
-import connectivity = require("connectivity");
+import * as connectivity from "connectivity";
 // << connectivity-require
 
 export var test_DummyTestForSnippetOnly0 = function () {

tests/app/data/observable-array-tests.ts

@@ -1,9 +1,9 @@
-import TKUnit = require("../TKUnit");
+import * as TKUnit from "../TKUnit";
-import bindableModule = require("ui/core/bindable");
+import * as bindableModule from "ui/core/bindable";
 require("globals");
 
 // >> observable-array-require
-import observableArrayModule = require("data/observable-array");
+import * as observableArrayModule from "data/observable-array";
 // << observable-array-require
 
 require("globals");

tests/app/data/observable-tests.ts

@@ -1,11 +1,11 @@
 // >> observable-require
-import observable = require("data/observable");
+import * as observable from "data/observable";
 // << observable-require
 
-import dependencyObservable = require("ui/core/dependency-observable");
+import * as dependencyObservable from "ui/core/dependency-observable";
-import TKUnit = require("../TKUnit");
+import * as TKUnit from "../TKUnit";
-import types = require("utils/types");
+import * as types from "utils/types";
-import proxy = require("ui/core/proxy");
+import * as proxy from "ui/core/proxy";
 import {ObservableArray} from "data/observable-array";
 
 var TESTED_NAME = "tested";

tests/app/data/virtual-array-tests.ts

@@ -1,8 +1,8 @@
-import TKUnit = require("../TKUnit");
+import * as TKUnit from "../TKUnit";
-import types = require("utils/types");
+import * as types from "utils/types";
 
 // >> virtual-array-require
-import virtualArrayModule = require("data/virtual-array");
+import * as virtualArrayModule from "data/virtual-array";
 // << virtual-array-require
 
 require("globals");

tests/app/fetch-tests.ts

@@ -1,6 +1,6 @@
 /* tslint:disable:no-unused-variable */
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
-import types = require("utils/types");
+import * as types from "utils/types";
 
 export var test_fetch_defined = function () {
     TKUnit.assert(types.isDefined((fetch)), "Method fetch() should be defined!");

tests/app/file-name-resolver-tests/file-name-resolver-tests.ts

@@ -1,7 +1,7 @@
-import TKUnit = require("../TKUnit");
+import * as TKUnit from "../TKUnit";
-import fs = require("file-system");
+import * as fs from "file-system";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import resolver = require("file-system/file-name-resolver");
+import * as resolver from "file-system/file-name-resolver";
 
 var androidPhonePortraitContext: resolver.PlatformContext = {
     width: 360,

tests/app/file-system-access-tests/file-system-access-tests.ts

@@ -1,5 +1,5 @@
-import TKUnit = require("../TKUnit");
+import * as TKUnit from "../TKUnit";
-import fs = require("file-system");
+import * as fs from "file-system";
 
 export var test_UTF8_BOM_is_not_returned = function () {
     var actualResult: string;

tests/app/file-system-tests.ts

@@ -1,11 +1,11 @@
 /* tslint:disable:no-unused-variable */
 // >> file-system-require
-import fs = require("file-system");
+import * as fs from "file-system";
 // << file-system-require
 
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
-import appModule = require("application");
+import * as appModule from "application";
-import platform = require("platform");
+import * as platform from "platform";
 
 export var testPathNormalize = function () {
     // >> file-system-normalize

tests/app/fps-meter-tests.ts

@@ -1,5 +1,5 @@
 // >> fps-meter-require
-import fpsMeter = require("fps-meter");
+import * as fpsMeter from "fps-meter";
 // << fps-meter-require
 
 export var test_DummyTestForSnippetOnly0 = function () {

tests/app/http-tests.ts

@@ -1,8 +1,8 @@
 /* tslint:disable:no-unused-variable */
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
-import http = require("http");
+import * as http from "http";
-import types = require("utils/types");
+import * as types from "utils/types";
-import fs = require("file-system");
+import * as fs from "file-system";
 require("globals");
 
 // >> http-require

tests/app/image-source-tests.ts

@@ -6,12 +6,12 @@
 // var fs = require("file-system");
 // << imagesource-require-alt
 
-import imageSource = require("image-source");
+import * as imageSource from "image-source";
-import fs = require("file-system");
+import * as fs from "file-system";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
-import app = require("application");
+import * as app from "application";
-import TKUnit = require("./TKUnit");
+import * as TKUnit from "./TKUnit";
-import platform = require("platform");
+import * as platform from "platform";
 
 var imagePath = fs.path.join(__dirname, "/logo.png");
 var smallImagePath = fs.path.join(__dirname, "/small-image.png");

tests/app/navigation/custom-transition.android.ts

@@ -1,4 +1,4 @@
-import transition = require("ui/transition");
+import * as transition from "ui/transition";
 
 export class CustomTransition extends transition.Transition {
     constructor(duration: number, curve: any) {

tests/app/navigation/custom-transition.ios.ts

@@ -1,4 +1,4 @@
-import transition = require("ui/transition");
+import * as transition from "ui/transition";
 
 export class CustomTransition extends transition.Transition {
     constructor(duration: number, curve: any) {

tests/app/navigation/navigation-tests.ts

@@ -2,7 +2,7 @@
 import {Page, NavigatedData} from "ui/page";
 import {topmost as topmostFrame, NavigationTransition} from "ui/frame";
 import {Color} from "color";
-import helper = require("../ui/helper");
+import * as helper from "../ui/helper";
 
 // Creates a random colorful page full of meaningless stuff.
 let id = 0;

tests/app/pages/app.ts

@@ -1,2 +1,2 @@
-import application = require("application");
+import * as application from "application";
 application.start({ moduleName: "pages/page14" });

tests/app/pages/background-test.ts

@@ -1,5 +1,5 @@
-import view = require("ui/core/view");
+import * as view from "ui/core/view";
-import pages = require("ui/page");
+import * as pages from "ui/page";
 
 export function applyTap(args) {
     var page = <pages.Page>(<view.View>args.object).page;

tests/app/pages/file-load-test.ts

@@ -1,7 +1,7 @@
-import label = require("ui/label");
+import * as label from "ui/label";
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import fs = require("file-system");
+import * as fs from "file-system";
-import fileResolverModule = require("file-system/file-name-resolver");
+import * as fileResolverModule from "file-system/file-name-resolver";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/fonts-test.ts

@@ -1,17 +1,17 @@
-import stack = require("ui/layouts/stack-layout");
+import * as stack from "ui/layouts/stack-layout";
-import style = require("ui/styling/style");
+import * as style from "ui/styling/style";
 
 export function buttonTap(args) {
     var stackLayout = <stack.StackLayout>args.object.parent;
 
     for (var i = 0; i < stackLayout.getChildrenCount(); i++){
         var v = stackLayout.getChildAt(i);
-        v.style._resetValue(style.fontFamilyProperty);
+        v.style.fontFamily = unsetValue;
-        v.style._resetValue(style.fontSizeProperty);
+        v.style.fontSize = unsetValue;
-        v.style._resetValue(style.fontStyleProperty);
+        v.style.fontStyle = unsetValue;
-        v.style._resetValue(style.fontWeightProperty);
+        v.style.fontWeight = unsetValue;
 
-        v.style._resetValue(style.colorProperty);
+        v.style.color = unsetValue;
-        v.style._resetValue(style.textAlignmentProperty);
+        v.style.textAlignment = unsetValue;
     }
 }

tests/app/pages/navigation/pageA-new-activity.ts

@@ -1,8 +1,8 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/navigation/pageA.ts

@@ -1,10 +1,10 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
-import color = require("color");
+import * as color from "color";
-import list = require("ui/list-view");
+import * as list from "ui/list-view";
 
 //// Enable page caching
 //frame.topmost().android.cachePagesOnNavigate = true;

tests/app/pages/navigation/pageB-new-activity.ts

@@ -1,8 +1,8 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/navigation/pageB.ts

@@ -1,10 +1,10 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
-import color = require("color");
+import * as color from "color";
-import scroll = require("ui/scroll-view");
+import * as scroll from "ui/scroll-view";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/navigation/pageC-new-activity.ts

@@ -1,8 +1,8 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/navigation/pageC.ts

@@ -1,8 +1,8 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import frame = require("ui/frame");
+import * as frame from "ui/frame";
-import stackModule = require("ui/layouts/stack-layout");
+import * as stackModule from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import text = require("ui/text-field");
+import * as text from "ui/text-field";
 
 export function createPage() {
     var page = new pages.Page();

tests/app/pages/page10.ts

@@ -1,7 +1,7 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import imageSource = require("image-source");
+import * as imageSource from "image-source";
-import gridModule = require("ui/layouts/grid-layout");
+import * as gridModule from "ui/layouts/grid-layout";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
 
 export function createPage() {
     var StackLayout = require("ui/layouts/stack-layout").StackLayout;
@@ -12,10 +12,10 @@ export function createPage() {
     var grid = new gridModule.GridLayout();
     stack.addChild(grid);
 
-    grid.addColumn(new gridModule.ItemSpec(80, gridModule.GridUnitType.pixel));
+    grid.addColumn(new gridModule.ItemSpec(80, "pixel"));
-    grid.addColumn(new gridModule.ItemSpec(1, gridModule.GridUnitType.star));
+    grid.addColumn(new gridModule.ItemSpec(1, "star"));
-    grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto));
+    grid.addRow(new gridModule.ItemSpec(1, "auto"));
-    grid.addRow(new gridModule.ItemSpec(1, gridModule.GridUnitType.auto));
+    grid.addRow(new gridModule.ItemSpec(1, "auto"));
 
     var defaultImageSource = imageSource.fromFile(__dirname + "/test.png");
 

tests/app/pages/page11.ts

@@ -1,13 +1,13 @@
-import p = require("ui/page");
+import * as p from "ui/page";
-import gridModule = require("ui/layouts/grid-layout");
+import * as gridModule from "ui/layouts/grid-layout";
-import sp = require("ui/layouts/stack-layout");
+import * as sp from "ui/layouts/stack-layout";
-import button = require("ui/button");
+import * as button from "ui/button";
-import enums = require("ui/enums");
+import * as enums from "ui/enums";
 
 export function createPage() {
     var StackLayout = new sp.StackLayout();
     var grid = new gridModule.GridLayout();
-    grid.horizontalAlignment = enums.HorizontalAlignment.left;
+    grid.horizontalAlignment = "left";
 
     StackLayout.addChild(grid);
 
@@ -25,8 +25,8 @@ export function createPage() {
     grid.addChild(btn4);
 
     var sp1 = new sp.StackLayout();
-    sp1.orientation = enums.Orientation.horizontal;
+    sp1.orientation = "horizontal";
-    sp1.height = 200;
+    sp1.height = { value: 200, unit: "dip" };
 
     var b1 = new button.Button();
     b1.text = "nested Btn1";

tests/app/pages/page12.ts

@@ -1,16 +1,16 @@
-import pages = require("ui/page");
+import * as pages from "ui/page";
-import btns = require("ui/button");
+import * as btns from "ui/button";
-import tb = require("ui/text-field");
+import * as tb from "ui/text-field";
-import gridLayoutModule = require("ui/layouts/grid-layout");
+import * as gridLayoutModule from "ui/layouts/grid-layout";
 
 export function createPage() {
     var page = new pages.Page();
     var gridLayout = new gridLayoutModule.GridLayout();
 
     var lengths = [
-        new gridLayoutModule.ItemSpec(140, gridLayoutModule.GridUnitType.pixel),
+        new gridLayoutModule.ItemSpec(140, "pixel"),
-        new gridLayoutModule.ItemSpec(1, gridLayoutModule.GridUnitType.star),
+        new gridLayoutModule.ItemSpec(1, "star"),
-        new gridLayoutModule.ItemSpec(140, gridLayoutModule.GridUnitType.pixel)
+        new gridLayoutModule.ItemSpec(140, "pixel")
     ];
 
     var rows = 2;
@@ -19,7 +19,7 @@ export function createPage() {
     var col;
 
     for (row = 0; row < rows; row++) {
-        var rowDef = new gridLayoutModule.ItemSpec(1, gridLayoutModule.GridUnitType.auto);
+        var rowDef = new gridLayoutModule.ItemSpec(1, "auto");
         gridLayout.addRow(rowDef);
     }
 
@@ -41,7 +41,7 @@ export function createPage() {
 
     var txt = new tb.TextField();
     txt.text = "Col: 1";
-    txt.width = 140;
+    txt.width = { value: 140, unit: "dip" };
     gridLayoutModule.GridLayout.setColumn(txt, 1);
     gridLayoutModule.GridLayout.setRow(txt, 0);
     gridLayout.addChild(txt);