refactor: check for root view

vchimev · vchimev · commit 833afe245a53 · 2019-10-14T13:37:37.000+03:00
diff --git a/tns-core-modules/application/application-common.ts b/tns-core-modules/application/application-common.ts
@@ -143,6 +143,10 @@ function removeCssClass(rootView: View, cssClass: string) {
 }
 
 export function orientationChanged(rootView: View, newOrientation: "portrait" | "landscape" | "unknown"): void {
+    if (!rootView) {
+        return;
+    }
+
     const newOrientationCssClass = `${CLASS_PREFIX}${newOrientation}`;
     if (!rootView.cssClasses.has(newOrientationCssClass)) {
         ORIENTATION_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));
@@ -152,6 +156,10 @@ export function orientationChanged(rootView: View, newOrientation: "portrait" |
 }
 
 export function systemAppearanceChanged(rootView: View, newSystemAppearance: "dark" | "light"): void {
+    if (!rootView) {
+        return;
+    }
+
     const newSystemAppearanceCssClass = `${CLASS_PREFIX}${newSystemAppearance}`;
     if (!rootView.cssClasses.has(newSystemAppearanceCssClass)) {
         SYSTEM_APPEARANCE_CSS_CLASSES.forEach(cssClass => removeCssClass(rootView, cssClass));
diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
@@ -418,9 +418,7 @@ function initComponentCallbacks() {
 
             if (androidApp.orientation !== newOrientation) {
                 androidApp.orientation = newOrientation;
-                if (rootView) {
-                    orientationChanged(rootView, newOrientation);
-                }
+                orientationChanged(rootView, newOrientation);
 
                 notify(<OrientationChangedEventData>{
                     eventName: orientationChangedEvent,
@@ -436,9 +434,7 @@ function initComponentCallbacks() {
 
             if (androidApp.systemAppearance !== newSystemAppearance) {
                 androidApp.systemAppearance = newSystemAppearance;
-                if (rootView) {
-                    systemAppearanceChanged(rootView, newSystemAppearance);
-                }
+                systemAppearanceChanged(rootView, newSystemAppearance);
 
                 notify(<SystemAppearanceChangedEventData>{
                     eventName: systemAppearanceChangedEvent,
