chore: cleanup

e2e/ui-tests-app/app/app.ts

@@ -1,22 +1,21 @@
 console.log("####### ------ APP MODULES START ");
 
-import * as application from "tns-core-modules/application";
-import * as trace from "tns-core-modules/trace";
-trace.addCategories(trace.categories.NativeLifecycle);
-trace.addCategories(trace.categories.Navigation);
-trace.addCategories(trace.categories.Transition);
+import { Trace, Application, UnhandledErrorEventData, LaunchEventData, ApplicationEventData, DiscardedErrorEventData } from "@nativescript/core";
+Trace.addCategories(Trace.categories.NativeLifecycle);
+Trace.addCategories(Trace.categories.Navigation);
+Trace.addCategories(Trace.categories.Transition);
 
-trace.enable();
+Trace.enable();
 
 var countResume = 0;
 var countSuspend = 0;
 
-application.on("displayed", args => {
+Application.on("displayed", args => {
     const uptime = global.android ? (<any>org).nativescript.Process.getUpTime : (<any>global).__tns_uptime;
     console.log("Startup time: " + uptime() + "ms.");
 });
 
-application.on("uncaughtError", args => {
+Application.on("uncaughtError", args => {
     const error = args.error;
     console.warn(error.message);
     if (error.nativeError) {
@@ -24,7 +23,7 @@ application.on("uncaughtError", args => {
     }
 });
 
-application.on(application.launchEvent, function (args: application.LaunchEventData) {
+Application.on(Application.launchEvent, function (args: LaunchEventData) {
     if (args.android) {
         // For Android applications, args.android is an android.content.Intent class.
         console.log("### Launched application with: " + args.android + ".");
@@ -34,7 +33,7 @@ application.on(application.launchEvent, function (args: application.LaunchEventD
     }
 });
 
-application.on(application.suspendEvent, function (args: application.ApplicationEventData) {
+Application.on(Application.suspendEvent, function (args: ApplicationEventData) {
     if (args.android) {
         // For Android applications, args.android is an android activity class.
         console.log("#" + ++countSuspend + "# SuspendEvent Activity: " + args.android);
@@ -44,7 +43,7 @@ application.on(application.suspendEvent, function (args: application.Application
     }
 });
 
-application.on(application.resumeEvent, function (args: application.ApplicationEventData) {
+Application.on(Application.resumeEvent, function (args: ApplicationEventData) {
     if (args.android) {
         // For Android applications, args.android is an android activity class.
         console.log("#" + ++countResume + "# ResumeEvent Activity: " + args.android);
@@ -54,7 +53,7 @@ application.on(application.resumeEvent, function (args: application.ApplicationE
     }
 });
 
-application.on(application.exitEvent, function (args: application.ApplicationEventData) {
+Application.on(Application.exitEvent, function (args: ApplicationEventData) {
     if (args.android) {
         // For Android applications, args.android is an android activity class.
         console.log("### ExitEvent Activity: " + args.android);
@@ -64,7 +63,7 @@ application.on(application.exitEvent, function (args: application.ApplicationEve
     }
 });
 
-application.on(application.lowMemoryEvent, function (args: application.ApplicationEventData) {
+Application.on(Application.lowMemoryEvent, function (args: ApplicationEventData) {
     if (args.android) {
         // For Android applications, args.android is an android activity class.
         console.log("### LowMemoryEvent Activity: " + args.android);
@@ -74,21 +73,21 @@ application.on(application.lowMemoryEvent, function (args: application.Applicati
     }
 });
 
-application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) {
+Application.on(Application.uncaughtErrorEvent, function (args: UnhandledErrorEventData) {
     console.log("### NativeScriptError: " + args.error);
     console.log("### nativeException: " + (<any>args.error).nativeException);
     console.log("### stackTrace: " + (<any>args.error).stackTrace);
     console.log("### stack: " + args.error.stack);
 });
 
-application.on(application.discardedErrorEvent, function (args: application.DiscardedErrorEventData) {
+Application.on(Application.discardedErrorEvent, function (args: DiscardedErrorEventData) {
     console.log("### [Discarded] NativeScriptError: " + args.error);
     console.log("### [Discarded] nativeException: " + (<any>args.error).nativeException);
     console.log("### [Discarded] stackTrace: " + (<any>args.error).stackTrace);
     console.log("### [Discarded] stack: " + args.error.stack);
 });
 
-application.run({ moduleName: "app-root" });
+Application.run({ moduleName: "app-root" });
 
 // TODO: investigate tab-view -> tabviewcss test crash
 // TODO: investigate css -> layouts border overlap failure

e2e/ui-tests-app/app/bottom-navigation/fancy-fonts-page.ts

@@ -1,5 +1,4 @@
-import { EventData, Page } from "tns-core-modules/ui/page/page";
-import { BottomNavigation } from "tns-core-modules/ui/bottom-navigation/bottom-navigation";
+import { EventData, Page, BottomNavigation } from "@nativescript/core";
 
 export const selectTab = (args: EventData) => {
     const page = <Page>(<any>args.object).page;

e2e/ui-tests-app/app/bottom-navigation/first-page.ts

@@ -1,5 +1,5 @@
 import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button/button";
+import { Button } from "tns-core-modules/ui/button";
 
 export function goToSecond(args: EventData) {
   console.log("---> goToSecond Page");

e2e/ui-tests-app/app/bottom-navigation/reselect-page.ts

@@ -1,9 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Frame } from "tns-core-modules/ui/frame/frame";
-import { Page } from "tns-core-modules/ui/page";
-import {
-  TabStripItemEventData, SelectedIndexChangedEventData, BottomNavigation, TabStrip,
-} from "tns-core-modules/ui/bottom-navigation";
+import { EventData, Frame, Page, TabStripItemEventData, SelectedIndexChangedEventData, BottomNavigation, TabStrip } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   console.log("---> goToFirst");

e2e/ui-tests-app/app/bottom-navigation/second-page.ts

@@ -1,5 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button/button";
+import { Button, EventData } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   console.log("---> goToFirst Page");

e2e/ui-tests-app/app/css/elevation-page.ts

@@ -1,5 +1,5 @@
-import { Button } from "tns-core-modules/ui/button/button";
-import { EventData } from "tns-core-modules/ui/page/page";
+import { Button } from "tns-core-modules/ui/button";
+import { EventData } from "tns-core-modules/ui/page";
 
 const states = [
     { class: "", text: "default elevation" },

e2e/ui-tests-app/app/fonts-tests/button-page.ts

@@ -1,11 +1,8 @@
-import * as stack from "tns-core-modules/ui/layouts/stack-layout";
-import { Button } from "@nativescript/core/ui/button";
-import * as view from "tns-core-modules/ui/core/view";
-import { unsetValue } from "tns-core-modules/ui/core/view";
+import { unsetValue, Button, View, StackLayout } from "@nativescript/core";
 
 export function resetStyles(args) {
-    var stackLayout = <stack.StackLayout>args.object.parent.parent;
-    view.eachDescendant(stackLayout, function (v: view.View) {
+    var stackLayout = <StackLayout>args.object.parent.parent;
+    view.eachDescendant(stackLayout, function (v: View) {
         v.style.fontFamily = unsetValue;
         v.style.fontSize = unsetValue;
         v.style.fontStyle = unsetValue;

e2e/ui-tests-app/app/fonts-tests/label-page.ts

@@ -1,5 +1,4 @@
-import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
-import { View, unsetValue, eachDescendant } from "tns-core-modules/ui/core/view";
+import { View, unsetValue, eachDescendant, StackLayout } from "@nativescript/core";
 
 export function resetStyles(args) {
     var stackLayout = <StackLayout>args.object.parent;

e2e/ui-tests-app/app/layouts/passThroughParent-page.ts

@@ -1,5 +1,4 @@
-import { EventData, Page } from "tns-core-modules/ui/page/page";
-import { Label } from "tns-core-modules/ui/label/label";
+import { EventData, Page, Label } from "@nativescript/core";
 
 const setLabelTextAndLog = (args, text: string) => {
     const page = <Page>args.object.page;

e2e/ui-tests-app/app/tabs/custom-tabstrip-page.ts

@@ -1,6 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Page } from "tns-core-modules/ui/page";
-import { Tabs } from "tns-core-modules/ui/tabs";
+import { EventData, Page, Tabs } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   const page = <Page>(<any>args.object).page;

e2e/ui-tests-app/app/tabs/default-page.ts

@@ -1,6 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Page } from "tns-core-modules/ui/page";
-import { Tabs } from "tns-core-modules/ui/tabs";
+import { EventData, Page, Tabs } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   const page = <Page>(<any>args.object).page;

e2e/ui-tests-app/app/tabs/dynamic-color-change-page.ts

@@ -1,6 +1,4 @@
-import { View } from "tns-core-modules/ui/core/view";
-import { Page } from "tns-core-modules/ui/page";
-import { Tabs } from "tns-core-modules/ui/tabs";
+import { View, Page, Tabs } from "@nativescript/core";
 
 export function onButtonTap(args) {
     const page = <Page>(<View>args.object).page;

e2e/ui-tests-app/app/tabs/events-page.ts

@@ -1,6 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Page } from "tns-core-modules/ui/page";
-import { Tabs, SelectedIndexChangedEventData } from "tns-core-modules/ui/tabs";
+import { EventData, Page, Tabs, SelectedIndexChangedEventData } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   console.log("---> goToFirst");

e2e/ui-tests-app/app/tabs/first-page.ts

@@ -1,5 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button/button";
+import { EventData, Button } from "@nativescript/core";
 
 export function goToSecond(args: EventData) {
   console.log("---> goToSecond Page");

e2e/ui-tests-app/app/tabs/icon-change-page.ts

@@ -1,4 +1,4 @@
-import { Tabs, SelectedIndexChangedEventData } from "tns-core-modules/ui/tabs";
+import { Tabs, SelectedIndexChangedEventData } from "@nativescript/core";
 
 export function onSelectedIndexChanged(args: SelectedIndexChangedEventData) {
     const tabsNav = <Tabs>args.object;

e2e/ui-tests-app/app/tabs/main-page.ts

@@ -1,6 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
-import { Page } from "tns-core-modules/ui/page";
+import { EventData, WrapLayout, Page } from "@nativescript/core";
 
 import { SubMainPageViewModel } from "../sub-main-page-view-model";
 

e2e/ui-tests-app/app/tabs/reselect-page.ts

@@ -1,9 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Frame } from "tns-core-modules/ui/frame/frame";
-import { Page } from "tns-core-modules/ui/page";
-import {
-  TabStripItemEventData, SelectedIndexChangedEventData, Tabs, TabStrip //, TabStripItem
-} from "tns-core-modules/ui/tabs";
+import { EventData, Frame, Page, TabStripItemEventData, SelectedIndexChangedEventData, Tabs, TabStrip } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   console.log("---> goToFirst");

e2e/ui-tests-app/app/tabs/second-page.ts

@@ -1,5 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Button } from "tns-core-modules/ui/button/button";
+import { EventData, Button } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   console.log("---> goToFirst Page");

e2e/ui-tests-app/app/tabs/tabs-page.ts

@@ -1,6 +1,4 @@
-import { EventData } from "tns-core-modules/data/observable";
-import { Page } from "tns-core-modules/ui/page";
-import { Tabs } from "tns-core-modules/ui/tabs";
+import { EventData, Page, Tabs } from "@nativescript/core";
 
 export function goToFirst(args: EventData) {
   const page = <Page>(<any>args.object).page;

e2e/ui-tests-app/app/text-field/focus-blur-events-page.ts

@@ -1,5 +1,4 @@
-import { TextField } from "tns-core-modules/ui/text-field";
-import { TextView } from "tns-core-modules/ui/text-view";
+import { TextField, TextView } from "@nativescript/core";
 
 export function onLoaded(args) {
     const page = args.object;

e2e/ui-tests-app/app/text-field/main-page.ts

@@ -1,7 +1,5 @@
-import { EventData } from "tns-core-modules/data/observable";
+import { EventData, WrapLayout, Page } from "@nativescript/core";
 import { SubMainPageViewModel } from "../sub-main-page-view-model";
-import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
-import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     const page = <Page>args.object;

e2e/ui-tests-app/app/text-field/max-length-page.ts

@@ -1,5 +1,4 @@
-import { Page } from "tns-core-modules/ui/page";
-import { TextField } from "tns-core-modules/ui/text-field";
+import { Page, TextField } from "@nativescript/core";
 
 export function setText(args) {
     let page = args;

e2e/ui-tests-app/app/text-view/hint-text-color-page.ts

@@ -1,7 +1,4 @@
-import { Page } from "tns-core-modules/ui/page";
-import { unsetValue } from "tns-core-modules/ui/core/view";
-import { TextView } from "tns-core-modules/ui/text-view";
-import { TextField } from "tns-core-modules/ui/text-field";
+import { TextView, unsetValue, TextField, Page } from "@nativescript/core";
 
 function exectuteOnAll(page: Page, callback: (txt: TextView | TextField) => void) {
     page.getViewById("container").eachChild((child) => {

e2e/ui-tests-app/app/text-view/main-page.ts

@@ -1,7 +1,5 @@
-import { EventData } from "tns-core-modules/data/observable";
+import { EventData, WrapLayout, Page } from "@nativescript/core";
 import { SubMainPageViewModel } from "../sub-main-page-view-model";
-import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
-import { Page } from "tns-core-modules/ui/page";
 
 export function pageLoaded(args: EventData) {
     const page = <Page>args.object;

e2e/ui-tests-app/app/text-view/text-view-hint-color-page.ts

@@ -1,6 +1,4 @@
-import { Page } from "tns-core-modules/ui/page";
-import { TextView } from "tns-core-modules/ui/text-view";
-import { Color } from "tns-core-modules/color";
+import { Page, TextView, Color } from "@nativescript/core";
 
 export function changeTextAndColor(args) {
     const page = <Page>args.object.page;