refactoring

Author: farfromrefug

src/InAppBrowser.android.ts

@@ -38,6 +38,8 @@ import {
   closeAuthSessionPolyfillAsync,
 } from './utils.android';
 
+import { parseColor } from './utils.common';
+
 declare let global: any;
 
 let InAppBrowserModuleInstance: InAppBrowserClassMethods;
@@ -100,25 +102,30 @@ function setup() {
       const inAppBrowserOptions = getDefaultOptions(url, options);
 
       const builder = new CustomTabsIntent.Builder();
-      if (inAppBrowserOptions[InAppBrowserModule.KEY_TOOLBAR_COLOR]) {
-        const colorString = inAppBrowserOptions[InAppBrowserModule.KEY_TOOLBAR_COLOR];
-        const color = colorString instanceof Color ? colorString : new Color(colorString);
-        try {
-          builder.setToolbarColor(color.android);
-          this.isLightTheme = toolbarIsLight(color.android);
-        } catch (error) {
-          throw new Error(
-                  "Invalid toolbar color '" + colorString + "': " + error.message);
+      let colorString = inAppBrowserOptions[InAppBrowserModule.KEY_TOOLBAR_COLOR];
+      if (colorString) {
+        const color = parseColor(colorString);
+        if (color) {
+          try {
+            builder.setToolbarColor(color.android);
+            this.isLightTheme = toolbarIsLight(color.android);
+          } catch (error) {
+            throw new Error(
+                    "Invalid toolbar color '" + colorString + "': " + error.message);
+          }
         }
+        
       }
-      if (inAppBrowserOptions[InAppBrowserModule.KEY_SECONDARY_TOOLBAR_COLOR]) {
-        const colorString = inAppBrowserOptions[InAppBrowserModule.KEY_SECONDARY_TOOLBAR_COLOR];
-        const color = colorString instanceof Color ? colorString : new Color(colorString);
-        try {
-          builder.setSecondaryToolbarColor(color.android);
-        } catch (error) {
-          throw new Error(
-                  "Invalid secondary toolbar color '" + colorString + "': " + error.message);
+      colorString = inAppBrowserOptions[InAppBrowserModule.KEY_SECONDARY_TOOLBAR_COLOR];
+      if (colorString) {
+        const color = parseColor(colorString);
+        if (color) {
+          try {
+            builder.setSecondaryToolbarColor(color.android);
+          } catch (error) {
+            throw new Error(
+                    "Invalid secondary toolbar color '" + colorString + "': " + error.message);
+          }
         }
       }
 

src/InAppBrowser.ios.ts

@@ -1,4 +1,5 @@
 import { Color, Utils } from '@nativescript/core';
+import { parseColor } from 'utils.common';
 
 import {
   BrowserResult,
@@ -98,13 +99,16 @@ function setup() {
 
         if (Utils.ios.MajorVersion >= 10) {
           if (inAppBrowserOptions.preferredBarTintColor) {
-            const color = inAppBrowserOptions.preferredBarTintColor instanceof Color ? inAppBrowserOptions.preferredBarTintColor : new Color(inAppBrowserOptions.preferredBarTintColor);
-
-            this.safariVC.preferredBarTintColor = color.ios;
+            const color = parseColor(inAppBrowserOptions.preferredBarTintColor);
+            if (color) {
+              this.safariVC.preferredBarTintColor = color.ios;
+            }
           }
           if (inAppBrowserOptions.preferredControlTintColor) {
-            const color = inAppBrowserOptions.preferredControlTintColor instanceof Color ? inAppBrowserOptions.preferredControlTintColor : new Color(inAppBrowserOptions.preferredControlTintColor);
-            this.safariVC.preferredControlTintColor = color.ios;
+            const color = parseColor(inAppBrowserOptions.preferredBarTintColor);
+            if (color) {
+              this.safariVC.preferredControlTintColor = color.ios;
+            }
           }
         }
 

src/utils.common.ts

@@ -0,0 +1,8 @@
+import { Color } from "@nativescript/core";
+
+export function parseColor(color: string | Color) {
+    if (color && !(color instanceof Color)) {
+        return new Color(color);
+    }
+    return color as Color;
+}