[DON'T MERGE] Integrate with "nativescript-angular" next

app/app.module.ts

@@ -1,17 +1,19 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
 // >> ngmodule-config
 // >> (hide)
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import {
+    NativeScriptModule,
+    NativeScriptRouterModule,
+    NativeScriptFormsModule,
+    NSModuleFactoryLoader,
+    ModalDialogService,
+    registerElement
+} from "nativescript-angular";
 import { NgModule, NO_ERRORS_SCHEMA, NgModuleFactoryLoader } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 import { routes } from "./app.routes";
 import { AppComponent } from "./app.component";
 // << (hide)
-import { NsModuleFactoryLoader } from "./ns-module-factory-loader";
-import { ModalDialogService } from "nativescript-angular/modal-dialog";
-import { registerElement } from "nativescript-angular/element-registry";
 import { TnsGoogleMaps } from "nativescript-googlemaps";
 import { isIOS } from "platform";
 
@@ -31,7 +33,7 @@ declare var GMSServices: any;
     ],
     providers: [
         ModalDialogService,
-        { provide: NgModuleFactoryLoader, useClass: NsModuleFactoryLoader }
+        { provide: NgModuleFactoryLoader, useClass: NSModuleFactoryLoader }
     ]
 })
 // << ngmodule-config

app/application-settings/application-settings-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ApplicationSettingsExamplesComponent } from "./application-settings-examples.component";
 import { ValuesExampleComponent } from "./values/values.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";

app/application/application-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ApplicationExamplesComponent } from "./application-examples.component";
 import { AppCheckingTargetExampleComponent } from "./app-checking-target/app-checking-target.component";
 import { AppUsingAndroidExampleComponent } from "./app-using-android-specifics/app-using-android-specifics.component";

app/camera/camera-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { CameraExamplesComponent } from "./camera-examples.component";
 import { UsingCameraExampleComponent } from "./using-camera/using-camera.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";

app/color/color-examples.module.ts

@@ -1,7 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 import { ColorExamplesComponent } from "./color-examples.component";
 import { CreatingColorsExampleComponent } from "./creating-colors/creating-colors.component";
 import { HexPipe } from "./creating-colors/creating-colors.component";

app/common-screens-category/content-screens/content-screens-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ContentScreensExamplesComponent } from "./content-screens-examples.component";
 import { ContentScrollablePageExampleComponent } from "./content-scrollable/content-scrollable-example.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";

app/common-screens-category/dataentry/extended-dataentry-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ExtendedDataEntryExamplesComponent } from "./extended-dataentry-examples.component";
 import { SignupDataEntryExampleComponent } from "./dataentry-signup/dataentry-signup.component";
 import { SocialLoginDataEntryExampleComponent } from "./dataentry-sociallogin/dataentry-sociallogin.component";

app/common-screens-category/lists-category/extended-listview-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ExtendedListViewExamplesComponent } from "./extended-listview-examples.component";
 import { CardsListViewExampleComponent } from "./cards/cards-listview.component";
 import { HeaderWithMapExampleComponent } from "./header-with-map/header-with-map.component";

app/common-screens-category/lists-category/multi-line-big/multi-line-big.component.ts

@@ -1,7 +1,7 @@
 // >> multi-line-big-code
 import { Component, ChangeDetectionStrategy, OnInit, Input } from "@angular/core";
 import { ItemEventData } from "ui/list-view";
-import { SetupItemViewArgs } from "nativescript-angular/directives";
+import { SetupItemViewArgs } from "nativescript-angular";
 import { mockedDataArray, mockedGroupDataArray, Country } from "../mock-dataItems";
 
 @Component({

app/common-screens-category/lists-category/multi-line/multi-line.component.ts

@@ -1,6 +1,6 @@
 import { Component, ChangeDetectionStrategy, OnInit, Input } from "@angular/core";
 import { ItemEventData } from "ui/list-view";
-import { SetupItemViewArgs } from "nativescript-angular/directives";
+import { SetupItemViewArgs } from "nativescript-angular";
 import { mockedDataArray, Country } from "../mock-dataItems";
 
 // >> multiline-listview-code

app/common-screens-category/userprofile/extended-userprofile-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ExtendedUserProfileExamplesComponent } from "./extended-userprofile-examples.component";
 import { UserFeedExampleComponent } from "./user-feed/user-feed.component";
 import { UserFeedImagesExampleComponent } from "./user-feed-images/user-feed-images.component";

app/connectivity/connectivity-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ConnectivityExamplesComponent } from "./connectivity-examples.component";
 import { UsingConnectivityExampleComponent } from "./using-connectivity/using-connectivity.component";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";

app/directives/toggle-nav-button.directive.ts

@@ -3,7 +3,7 @@ import { Directive, OnInit } from "@angular/core";
 import { EventData } from "data/observable";
 import { NavigationButton } from "ui/action-bar";
 import { Page } from "ui/page";
-import { RouterExtensions } from "nativescript-angular/router";
+import { RouterExtensions } from "nativescript-angular";
 import * as app from "application";
 
 @Directive({

app/examples-list.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ExamplesListComponent } from "./examples-list.component";
 import { TitleAndNavButtonModule } from "./directives/title-and-nav-button.module";
 

app/fetch/fetch-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { FetchExamplesComponent } from "./fetch-examples.component";
 import { FetchGetExampleComponent } from "./fetch-get/fetch-get.component";
 import { FetchPostExampleComponent } from "./fetch-post/fetch-post.component";

app/file-system/file-system-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { FileSystemExamplesComponent } from "./file-system-examples.component";
 import { CreateExampleComponent } from "./create/create.component";
 import { DeleteExampleComponent } from "./delete/delete.component";

app/fps-meter/fps-meter-examples.module.ts

@@ -1,7 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 
 import { FpsExamplesComponent } from "./fps-meter-examples.component";
 

app/http/http-examples.module.ts

@@ -1,7 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 
 import { HttpExamplesComponent } from "./http-examples.component";
 

app/location/location-examples.module.ts

@@ -1,11 +1,9 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 import { LocationExamplesComponent } from "./location-examples.component";
 import { BasicLocationExampleComponent } from "./basic-location-example/basic-location-example";
 import { LocationMonitoringExampleComponent } from "./location-monitoring-example/location-monitoring-example";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
 
 export const routerConfig = [
     {

app/main.aot.ts

@@ -1,4 +1,4 @@
-import { platformNativeScript } from "nativescript-angular/platform-static";
+import { platformNativeScript } from "nativescript-angular";
 import { AppModuleNgFactory } from "./app.module.ngfactory";
 
 platformNativeScript().bootstrapModuleFactory(AppModuleNgFactory);

app/main.ts

@@ -1,4 +1,4 @@
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { platformNativeScriptDynamic } from "nativescript-angular";
 import { AppModule } from "./app.module";
 
 platformNativeScriptDynamic().bootstrapModule(AppModule);

app/modal-page/modal-page-examples.module.ts

@@ -1,7 +1,6 @@
 // tslint:disable:max-line-length
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ModalPageExamplesComponent } from "./modal-page-examples.component";
 import { SampleModalPageModuleExampleComponent } from "./sample-modal-page-module-example/sample-modal-page-module-example";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";

app/modal-page/sample-modal-page-module-example/modal-view.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, NgModule } from "@angular/core";
-import { ModalDialogParams } from "nativescript-angular/modal-dialog";
+import { ModalDialogParams } from "nativescript-angular";
 import { DatePicker } from "ui/date-picker";
 import { Page } from "ui/page";
 

app/modal-page/sample-modal-page-module-example/sample-modal-page-module-example.ts

@@ -1,5 +1,5 @@
 // >> time-picker-configure-code
-import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/modal-dialog";
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular";
 import { Component, ViewContainerRef  } from "@angular/core";
 import { DatePicker } from "ui/date-picker";
 import { ModalViewComponent } from "./modal-view";

app/platform/platform-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { PlatformExamplesComponent } from "./platform-examples.component";
 import { PlatformModuleExampleComponent } from "./platform-module-example/platform-module-example";
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";

app/timer/timer-examples.module.ts

@@ -1,7 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 
 import { TimerExamplesComponent } from "./timer-examples.component";
 import { SetIntervalComponent } from "./set-interval/setinterval-example";

app/trace/trace-examples.module.ts

@@ -1,12 +1,9 @@
-// tslint:disable:max-line-length
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
-import { NativeScriptFormsModule } from "nativescript-angular/forms";
+import { NativeScriptModule, NativeScriptRouterModule, NativeScriptFormsModule } from "nativescript-angular";
 
 import { TraceExamplesComponent } from "./trace-examples.component";
 import { CustomTraceWriterExampleComponent } from "./custom-trace-writer/custom-tracewriter-example.component";
-import { TraceSpecificCategoriesExampleComponent } from "./trace-specific-categories/trace-specific-categories-example.component";
+import { TraceSpecificCategoriesExampleComponent } from "./trace-specific-categories/trace-specific-categories-example.component"; // tslint:disable-line:max-line-length
 import { TitleAndNavButtonModule } from "../directives/title-and-nav-button.module";
 
 export const routerConfig = [

app/ui-category/action-bar/action-bar-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ActionBarExamplesComponent } from "./action-bar-examples.component";
 import { ActionItemsComponent } from "./action-items/action-items.component";
 import { NavigationButtonComponent } from "./navigation-button/navigation-button.component";

app/ui-category/action-bar/action-items/action-items.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { RouterExtensions } from "nativescript-angular/router";
+import { RouterExtensions } from "nativescript-angular";
 
 @Component({
     moduleId: module.id,

app/ui-category/action-bar/navigation-button/navigation-button.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { RouterExtensions } from "nativescript-angular/router";
+import { RouterExtensions } from "nativescript-angular";
 
 @Component({
     moduleId: module.id,

app/ui-category/action-bar/title/title.component.ts

@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { RouterExtensions } from "nativescript-angular/router";
+import { RouterExtensions } from "nativescript-angular";
 
 @Component({
     moduleId: module.id,

app/ui-category/activity-indicator/activity-indicator-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { ActivityIndicatorExamplesComponent } from "./activity-indicator-examples.component";
 import { SettingBusyComponent } from "./setting-busy/setting-busy.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";

app/ui-category/animations/animations-examples.module.ts

@@ -1,6 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
-import { NativeScriptModule } from "nativescript-angular/platform";
+import { NativeScriptModule, NativeScriptRouterModule } from "nativescript-angular";
 import { AnimationsExamplesComponent } from "./animations-examples.component";
 import { AnimatingPropertiesComponent } from "./animating-properties/animating-properties.component";
 import { ChainingAnimationsComponent } from "./chaining-animations/chaining-animations.component";