Allow set color marker in hex android/ios

Author: lempere

src/android/plugin/google/maps/PluginMarker.java

@@ -1204,7 +1204,10 @@ protected Bitmap drawLabel(Bitmap image, Bundle labelOptions) {
 
     int color = Color.BLACK;
     if (labelOptions.containsKey("color")) {
-      color = labelOptions.getInt("color");
+      color = labelOptions.getInt("color", -1);
+      if(color == -1 && labelOptions.getString("color", "") != "") {
+        color = Color.parseColor(labelOptions.getString("color"));
+      }
     }
     boolean bold = false;
     if (labelOptions.containsKey("bold")) {

src/ios/GoogleMaps/PluginMarker.m

@@ -1442,7 +1442,14 @@ - (UIImage *)drawLabel:(UIImage *) image labelOptions:(NSDictionary *)labelOptio
 
 
   if ([labelOptions objectForKey:@"color"]) {
-    textColor = [[labelOptions objectForKey:@"color"] parsePluginColor];
+    if ( [[labelOptions objectForKey:@"color"] isKindOfClass:[NSString class]]) {
+      NSString* hex = [[labelOptions objectForKey:@"color"] stringByReplacingOccurrencesOfString:@"#" withString:@""];
+      unsigned colorInt = 0;
+      [[NSScanner scannerWithString:hex] scanHexInt:&colorInt];
+      textColor = UIColorFromRGB(colorInt);
+    } else {
+      textColor = [[labelOptions objectForKey:@"color"] parsePluginColor];
+    }
   }
 
   // Calculate the size for the title strings

src/ios/GoogleMaps/PluginUtil.h

@@ -30,6 +30,11 @@ typedef void (^MYCompletionHandler)(NSError *error);
 #define SWITCH(s) for (NSString *__s__ = (s); __s__; __s__ = nil)
 #define DEFAULT
 
+#define UIColorFromRGB(rgbValue) [UIColor \
+    colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \
+    green:((float)((rgbValue & 0xFF00) >> 8))/255.0 \
+    blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
+
 @interface UIView (GoogleMapsPlugin)
 - (void)setFrameWithDictionary:(NSDictionary *) params;
 - (void)setFrameWithInt:(int)left top:(int)top width:(int)width height:(int)height;