Merge pull request #50 from farfromrefug/color_fix

fix colors not working with instance of Color

Author: jdnichollsc

src/InAppBrowser.android.ts

@@ -3,13 +3,12 @@ import Bundle = android.os.Bundle;
 import TextUtils = android.text.TextUtils;
 import Intent = android.content.Intent;
 import Context = android.content.Context;
-import Color = android.graphics.Color;
 import BitmapFactory = android.graphics.BitmapFactory;
 import Browser = android.provider.Browser;
 import Pattern = java.util.regex.Pattern;
 import AssertionError = java.lang.AssertionError;
 
-import { Utils, Application, EventData } from '@nativescript/core';
+import { Utils, Application, EventData, Color } from '@nativescript/core';
 import {
   ChromeTabsEvent,
   BROWSER_ACTIVITY_EVENTS,
@@ -39,6 +38,8 @@ import {
   closeAuthSessionPolyfillAsync,
 } from './utils.android';
 
+import { parseColor } from './utils.common';
+
 declare let global: any;
 
 let InAppBrowserModuleInstance: InAppBrowserClassMethods;
@@ -101,20 +102,26 @@ 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];
+      let colorString = inAppBrowserOptions[InAppBrowserModule.KEY_TOOLBAR_COLOR];
+      if (colorString) {
         try {
-          builder.setToolbarColor(Color.parseColor(colorString));
-          this.isLightTheme = toolbarIsLight(colorString);
+          const color = parseColor(colorString);
+          if (color) {
+            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];
+      colorString = inAppBrowserOptions[InAppBrowserModule.KEY_SECONDARY_TOOLBAR_COLOR];
+      if (colorString) {
         try {
-          builder.setSecondaryToolbarColor(Color.parseColor(colorString));
+          const color = parseColor(colorString);
+          if (color) {
+            builder.setSecondaryToolbarColor(color.android);
+          }
         } catch (error) {
           throw new Error(
                   "Invalid secondary toolbar color '" + colorString + "': " + error.message);

src/InAppBrowser.common.ts

@@ -1,3 +1,5 @@
+import { Color } from "@nativescript/core";
+
 export interface RedirectEvent {
   url: 'string';
 }
@@ -14,8 +16,8 @@ export interface RedirectResult {
 
 type InAppBrowseriOSOptions = {
   dismissButtonStyle?: 'done' | 'close' | 'cancel',
-  preferredBarTintColor?: string,
-  preferredControlTintColor?: string,
+  preferredBarTintColor?: string | Color,
+  preferredControlTintColor?: string | Color,
   readerMode?: boolean,
   animated?: boolean,
   modalPresentationStyle?:
@@ -48,8 +50,8 @@ export type Animations = {
 
 type InAppBrowserAndroidOptions = {
   showTitle?: boolean,
-  toolbarColor?: string,
-  secondaryToolbarColor?: string,
+  toolbarColor?: string | Color,
+  secondaryToolbarColor?: string | Color,
   enableUrlBarHiding?: boolean,
   enableDefaultShare?: boolean,
   forceCloseOnRedirection?: boolean,

src/InAppBrowser.ios.ts

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

src/utils.android.ts

@@ -156,8 +156,8 @@ export function getPreferredPackages(context: Context): List<ResolveInfo> {
   return resolveInfos;
 }
 
-export function toolbarIsLight(themeColor: string): boolean {
-  return ColorUtils.calculateLuminance(Color.parseColor(themeColor)) > 0.5;
+export function toolbarIsLight(themeColor: number): boolean {
+  return ColorUtils.calculateLuminance(themeColor) > 0.5;
 }
 
 export function getDefaultBrowser(context: Context): string {

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;
+}