fix: some style property conversion fixes

Author: farfromrefug

src/layers/parser/property-parser.android.ts

@@ -1,22 +1,35 @@
+import { Color } from '@nativescript/core';
+
 function toCamelCase(s) {
     return s.replace(/([-_][a-z])/gi, ($1) => $1.toUpperCase().replace('-', '').replace('_', ''));
 }
+
+const Expression = com.mapbox.mapboxsdk.style.expressions.Expression;
+function transformValue(key, value) {
+    let nValue = value;
+    if (Array.isArray(value)) {
+        nValue = Expression.Converter.convert(JSON.stringify(value));
+    }
+    if (key.indexOf('-color') !== -1 && !Array.isArray(value)) {
+        const color = value instanceof Color ? value : new Color(value);
+        nValue = color.android;
+    } else if (typeof value === 'number') {
+        nValue = new java.lang.Float(value);
+    } else if (typeof value === 'boolean') {
+        nValue = new java.lang.Boolean(value);
+    }
+    return nValue;
+}
 export class PropertyParser {
     static parsePropertiesForLayer(propertiesObject) {
         const nProperties = [];
 
         const PropertyFactory = com.mapbox.mapboxsdk.style.layers.PropertyFactory;
-        const Expression = com.mapbox.mapboxsdk.style.expressions.Expression;
         if (propertiesObject) {
             Object.keys(propertiesObject).forEach((k) => {
                 const actualKey = toCamelCase(k);
                 const value = propertiesObject[k];
-                let nValue = value;
-                if (Array.isArray(value)) {
-                    nValue = Expression.Converter.convert(JSON.stringify(value));
-                } else if (typeof value === 'number') {
-                    nValue = new java.lang.Float(value);
-                }
+                const nValue = transformValue(k, value);
                 nProperties.push(PropertyFactory[actualKey](nValue));
             });
         }

src/layers/parser/property-parser.ios.ts

@@ -67,10 +67,11 @@ export class PropertyParser {
             Object.keys(propertiesObject).forEach((k) => {
                 const actualKey = keysMap[k] || toCamelCase(k);
                 const value = propertiesObject[k];
+                const rValue = transformValue(k, value);
                 if (Array.isArray(value)) {
-                    nProperties[actualKey] = (NSExpression as any).expressionWithMGLJSONObject(transformValue(k, value));
+                    nProperties[actualKey] = (NSExpression as any).expressionWithMGLJSONObject(rValue);
                 } else {
-                    nProperties[actualKey] = NSExpression.expressionForConstantValue(transformValue(k, value));
+                    nProperties[actualKey] = NSExpression.expressionForConstantValue(rValue);
                 }
             });
         }