chore: cleanup

NathanWalker · NathanWalker · commit 6a4a3bfa4fca · 2020-07-22T19:46:37.000-07:00
diff --git a/e2e/animation-examples/app/main.ts b/e2e/animation-examples/app/main.ts
@@ -10,25 +10,25 @@ class LaunchAnimation extends GridLayout implements AppLaunchView {
   circle: GridLayout;
   animatedContainer: GridLayout;
   finished = false;
-  resolve: () => void;
+  complete: () => void;
 
   constructor() {
     super();
 
     // setup container to house launch animation
     this.animatedContainer = new GridLayout();
     this.animatedContainer.style.zIndex = 100;
-    this.animatedContainer.backgroundColor = '#4caef7';
-    this.animatedContainer.className = 'w-full h-full';
+    this.animatedContainer.backgroundColor = "#4caef7";
+    this.animatedContainer.className = "w-full h-full";
 
     // any creative animation can be put inside
     this.circle = new GridLayout();
     this.circle.width = 30;
     this.circle.height = 30;
     this.circle.borderRadius = 15;
-    this.circle.horizontalAlignment = 'center';
-    this.circle.verticalAlignment = 'middle';
-    this.circle.backgroundColor = '#fff';
+    this.circle.horizontalAlignment = "center";
+    this.circle.verticalAlignment = "middle";
+    this.circle.backgroundColor = "#fff";
     this.animatedContainer.addRow(new ItemSpec(1, GridUnitType.STAR));
     this.animatedContainer.addRow(new ItemSpec(1, GridUnitType.AUTO));
     this.animatedContainer.addRow(new ItemSpec(1, GridUnitType.STAR));
@@ -40,62 +40,51 @@ class LaunchAnimation extends GridLayout implements AppLaunchView {
     this.addChild(this.animatedContainer);
   }
 
-  startAnimation() {
-    this.circle
-      .animate({
-        scale: { x: 2, y: 2 },
-        duration: 800,
-      })
-      .then(() => {
-        this.circle
-          .animate({
-            scale: { x: 1, y: 1 },
-            duration: 800,
-          })
-          .then(() => {
-            if (this.finished) {
-              this.circle
-                .animate({
-                  scale: { x: 30, y: 30 },
-                  duration: 400,
-                })
-                .then(() => {
-                  this.fadeOut();
-                });
-            } else {
-              // keep looping
-              this.startAnimation();
-            }
-          });
+  async startAnimation() {
+    await this.circle.animate({
+      scale: { x: 2, y: 2 },
+      duration: 800,
+    });
+
+    await this.circle.animate({
+      scale: { x: 1, y: 1 },
+      duration: 800,
+    });
+
+    if (this.finished) {
+      await this.circle.animate({
+        scale: { x: 30, y: 30 },
+        duration: 400,
       });
+      this.fadeOut();
+    } else {
+      // keep looping
+      this.startAnimation();
+    }
   }
 
   cleanup() {
-    return new Promise(resolve => {
-      this.resolve = resolve;
+    return new Promise((resolve) => {
+      this.complete = resolve;
       this.finished = true;
-    })
+    });
   }
 
-  fadeOut() {
-    this.animatedContainer
-      .animate({
-        opacity: 0,
-        duration: 400,
-      })
-      .then(() => {
-        // done with animation, can safely remove to reveal bootstrapped app
-        this.removeChild(this.animatedContainer);
-        this.animatedContainer = null;
-        this.circle = null;
-        if (this.resolve) {
-          this.resolve();
-        }
-      });
+  async fadeOut() {
+    await this.animatedContainer.animate({
+      opacity: 0,
+      duration: 400,
+    });
+    // done with animation, can safely remove to reveal bootstrapped app
+    this.removeChild(this.animatedContainer);
+    this.animatedContainer = null;
+    this.circle = null;
+    this.complete();
   }
 }
 
 platformNativeScriptDynamic({
   launchView: new LaunchAnimation(),
-  // backgroundColor: 'purple'
+  // backgroundColor: 'purple',
+  // async: true
 }).bootstrapModule(AppModule);
diff --git a/nativescript-angular/app-host-view.ts b/nativescript-angular/app-host-view.ts
@@ -43,7 +43,7 @@ export class AppHostView extends ContentView {
 	}
 }
 
-export class AppHostLaunchAnimationView extends GridLayout {
+export class AppHostAsyncView extends GridLayout {
 	constructor(backgroundColor: Color) {
 		super();
 		this.backgroundColor = backgroundColor;
diff --git a/nativescript-angular/directives/dialogs.ts b/nativescript-angular/directives/dialogs.ts
@@ -2,7 +2,7 @@ import { ComponentFactoryResolver, ComponentRef, Injectable, Injector, NgModuleR
 import { Frame, View, ViewBase, ProxyViewContainer, ShowModalOptions } from '@nativescript/core';
 
 import { NSLocationStrategy } from '../router/ns-location-strategy';
-import { AppHostView } from '../app-host-view';
+import { AppHostView, AppHostAsyncView } from '../app-host-view';
 import { DetachedLoader } from '../common/detached-loader';
 import { PageFactory, PAGE_FACTORY } from '../platform-providers';
 import { once } from '../common/utils';
@@ -44,7 +44,7 @@ export class ModalDialogService {
 			parentView = options.target;
 		}
 
-		if (parentView instanceof AppHostView && parentView.ngAppRoot) {
+		if ((parentView instanceof AppHostView || parentView instanceof AppHostAsyncView) && parentView.ngAppRoot) {
 			parentView = parentView.ngAppRoot;
 		}
 
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/angular",
-  "version": "10.0.0-rc.7",
+  "version": "10.0.0-rc.8",
   "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
   "homepage": "https://www.nativescript.org/",
   "bugs": "https://github.com/NativeScript/nativescript-angular/issues",
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
@@ -7,7 +7,7 @@ import { DOCUMENT } from '@angular/common';
 
 import { NativeScriptDebug } from './trace';
 import { defaultPageFactoryProvider, setRootPage, PageFactory, PAGE_FACTORY, getRootPage } from './platform-providers';
-import { AppHostView, AppHostLaunchAnimationView } from './app-host-view';
+import { AppHostView, AppHostAsyncView } from './app-host-view';
 
 export const onBeforeLivesync = new EventEmitter<NgModuleRef<any>>();
 export const onAfterLivesync = new EventEmitter<{
@@ -57,8 +57,19 @@ export interface AppOptions {
 	cssFile?: string;
 	startPageActionBarHidden?: boolean;
 	hmrOptions?: HmrOptions;
+	/**
+	 * Background color of the root view
+	 */
 	backgroundColor?: string;
+	/**
+	 * Use animated launch view (async by default)
+	 */
 	launchView?: AppLaunchView;
+	/**
+	 * When using Async APP_INITIALIZER, set this to `true`.
+	 * (Not needed when using launchView)
+	 */
+	async?: boolean;
 }
 
 export type PlatformFactory = (extraProviders?: StaticProvider[]) => PlatformRef;
@@ -170,16 +181,18 @@ export class NativeScriptPlatformRef extends PlatformRef {
 				NativeScriptDebug.bootstrapLog('Application launch event fired');
 			}
 
+			// Create a temp page for root of the renderer
 			let tempAppHostView: AppHostView;
-			let animatedHostView: AppHostLaunchAnimationView;
-			if (this.appOptions && this.appOptions.launchView) {
-				animatedHostView = new AppHostLaunchAnimationView(new Color(this.appOptions && this.appOptions.backgroundColor ? this.appOptions.backgroundColor : '#fff'));
-				this.appOptions.launchView.style.zIndex = 1000;
-				animatedHostView.addChild(this.appOptions.launchView);
-				rootContent = animatedHostView.ngAppRoot;
-				setRootPage(<any>animatedHostView);
+			let tempAppHostAsyncView: AppHostAsyncView;
+			if (this.appOptions && (this.appOptions.async || this.appOptions.launchView)) {
+				tempAppHostAsyncView = new AppHostAsyncView(new Color(this.appOptions && this.appOptions.backgroundColor ? this.appOptions.backgroundColor : '#fff'));
+				if (this.appOptions.launchView) {
+					this.appOptions.launchView.style.zIndex = 1000;
+					tempAppHostAsyncView.addChild(this.appOptions.launchView);
+				}
+				rootContent = tempAppHostAsyncView.ngAppRoot;
+				setRootPage(<any>tempAppHostAsyncView);
 			} else {
-				// Create a temp page for root of the renderer
 				tempAppHostView = new AppHostView(new Color(this.appOptions && this.appOptions.backgroundColor ? this.appOptions.backgroundColor : '#fff'));
 				setRootPage(<any>tempAppHostView);
 			}
@@ -196,10 +209,10 @@ export class NativeScriptPlatformRef extends PlatformRef {
 						if (this.appOptions.launchView && this.appOptions.launchView.cleanup) {
 							this.appOptions.launchView.cleanup().then(() => {
 								// cleanup any custom launch views
-								animatedHostView.removeChild(this.appOptions.launchView);
+								tempAppHostAsyncView.removeChild(this.appOptions.launchView);
 								this.appOptions.launchView = null;
 							});
-						} else {
+						} else if (tempAppHostView) {
 							rootContent = tempAppHostView.content;
 						}
 
@@ -235,13 +248,13 @@ export class NativeScriptPlatformRef extends PlatformRef {
 				});
 			}
 			bootstrap();
-			if (!bootstrapPromiseCompleted) {
-				const errorMessage = "Bootstrap promise didn't resolve";
-				if (NativeScriptDebug.isLogEnabled()) {
-					NativeScriptDebug.bootstrapLogError(errorMessage);
-				}
-				rootContent = this.createErrorUI(errorMessage);
-			}
+			// if (!bootstrapPromiseCompleted) {
+			// 	const errorMessage = "Bootstrap promise didn't resolve";
+			// 	if (NativeScriptDebug.isLogEnabled()) {
+			// 		NativeScriptDebug.bootstrapLogError(errorMessage);
+			// 	}
+			// 	rootContent = this.createErrorUI(errorMessage);
+			// }
 			args.root = rootContent;
 		});
 		const exitCallback = profile('@nativescript/angular/platform-common.exitCallback', (args: ApplicationEventData) => {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export class AppHostView extends ContentView {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-export class AppHostLaunchAnimationView extends GridLayout {`
	`46`	`+export class AppHostAsyncView extends GridLayout {`
`47`	`47`	`constructor(backgroundColor: Color) {`
`48`	`48`	`super();`
`49`	`49`	`this.backgroundColor = backgroundColor;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { ComponentFactoryResolver, ComponentRef, Injectable, Injector, NgModuleR`
`2`	`2`	`import { Frame, View, ViewBase, ProxyViewContainer, ShowModalOptions } from '@nativescript/core';`
`3`	`3`
`4`	`4`	`import { NSLocationStrategy } from '../router/ns-location-strategy';`
`5`		`-import { AppHostView } from '../app-host-view';`
	`5`	`+import { AppHostView, AppHostAsyncView } from '../app-host-view';`
`6`	`6`	`import { DetachedLoader } from '../common/detached-loader';`
`7`	`7`	`import { PageFactory, PAGE_FACTORY } from '../platform-providers';`
`8`	`8`	`import { once } from '../common/utils';`
`@@ -44,7 +44,7 @@ export class ModalDialogService {`
`44`	`44`	`parentView = options.target;`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (parentView instanceof AppHostView && parentView.ngAppRoot) {`
	`47`	`+ if ((parentView instanceof AppHostView \|\| parentView instanceof AppHostAsyncView) && parentView.ngAppRoot) {`
`48`	`48`	`parentView = parentView.ngAppRoot;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript/angular",`
`3`		`- "version": "10.0.0-rc.7",`
	`3`	`+ "version": "10.0.0-rc.8",`
`4`	`4`	`"description": "An Angular renderer that lets you build mobile apps with NativeScript.",`
`5`	`5`	`"homepage": "https://www.nativescript.org/",`
`6`	`6`	`"bugs": "https://github.com/NativeScript/nativescript-angular/issues",`