Merge branch 'test'

Author: wf9a5m75

src/ios/GoogleMaps/GoogleMaps.m

@@ -507,9 +507,19 @@ - (void)showDialog:(CDVInvokedUrlCommand *)command {
   CGRect pluginRect = self.mapCtrl.view.frame;
   pluginRect.origin.x = 0;
   pluginRect.origin.y = 0;
-  int direction = self.mapCtrl.interfaceOrientation;
+  int direction;
+  
+  #if !defined(__IPHONE_8_0)
+    // iOS 7
+    direction = self.mapCtrl.interfaceOrientation;
+  #else
+    // iOS8 or above
+    direction = [UIDevice currentDevice].orientation;
+  #endif
+  
+  
   if (direction == UIInterfaceOrientationLandscapeLeft ||
-    direction == UIInterfaceOrientationLandscapeRight) {
+      direction == UIInterfaceOrientationLandscapeRight) {
     pluginRect.size.width = screenSize.size.height;
     pluginRect.size.height = screenSize.size.width - footerHeight - footerAdjustment;
   } else {

src/ios/GoogleMaps/GoogleMapsViewController.m

@@ -382,14 +382,16 @@ -(UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker*)marker
     isTextMode = false;
     NSArray *tmp = [title componentsSeparatedByString:@","];
     NSData *decodedData;
-    #ifdef __IPHONE_7_0
+    #if !defined(__IPHONE_8_0)
+      decodedData = [[NSData alloc] initWithBase64Encoding:(NSString *)tmp[1]];
+    #else
       if ([PluginUtil isIOS7_OR_OVER]) {
-        decodedData = [[NSData alloc] initWithBase64Encoding:(NSString *)tmp[1]];
-      } else {
         decodedData = [NSData dataFromBase64String:tmp[1]];
+      } else {
+        #if !defined(__IPHONE_7_0)
+          decodedData = [[NSData alloc] initWithBase64Encoding:(NSString *)tmp[1]];
+        #endif
       }
-    #else
-      decodedData = [NSData dataFromBase64String:tmp[1]];
     #endif
 
     base64Image = [[UIImage alloc] initWithData:decodedData];
@@ -410,15 +412,15 @@ -(UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker*)marker
       }
     }
     if (isBold == TRUE && isItalic == TRUE) {
-      if ([PluginUtil isIOS7_OR_OVER] == true) {
+      #ifdef __IPHONE_7_0
         // ref: http://stackoverflow.com/questions/4713236/how-do-i-set-bold-and-italic-on-uilabel-of-iphone-ipad#21777132
         titleFont = [UIFont systemFontOfSize:17.0f];
         UIFontDescriptor *fontDescriptor = [titleFont.fontDescriptor
                                                 fontDescriptorWithSymbolicTraits:UIFontDescriptorTraitBold | UIFontDescriptorTraitItalic];
         titleFont = [UIFont fontWithDescriptor:fontDescriptor size:0];
-      } else {
+      #else
         titleFont = [UIFont fontWithName:@"Helvetica-BoldOblique" size:17.0];
-      }
+      #endif
     } else if (isBold == TRUE && isItalic == FALSE) {
       titleFont = [UIFont boldSystemFontOfSize:17.0f];
     } else if (isBold == TRUE && isItalic == FALSE) {
@@ -428,14 +430,33 @@ -(UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker*)marker
     }
 
     // Calculate the size for the title strings
-    textSize = [title sizeWithFont:titleFont constrainedToSize: CGSizeMake(mapView.frame.size.width - 13, mapView.frame.size.height - 13)];
+    CGSize tmpSize = CGSizeMake(mapView.frame.size.width - 13, mapView.frame.size.height - 13);
+    #if !defined(__IPHONE_8_0)
+      textSize = [title sizeWithFont:titleFont constrainedToSize: tmpSize];
+    #else
+      NSDictionary *attr = @{ NSFontAttributeName: titleFont};
+      textSize = [title boundingRectWithSize:tmpSize
+                        options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine
+                        attributes:attr
+                        context:nil].size;
+    #endif
     rectSize = CGSizeMake(textSize.width + 10, textSize.height + 22);
 
     // Calculate the size for the snippet strings
     if (snippet) {
       snippetFont = [UIFont systemFontOfSize:12.0f];
       snippet = [snippet stringByReplacingOccurrencesOfString:@"\n" withString:@""];
-      snippetSize = [snippet sizeWithFont:snippetFont constrainedToSize: CGSizeMake(mapView.frame.size.width - 13, mapView.frame.size.height - 13)];
+      
+      
+      #if !defined(__IPHONE_8_0)
+        snippetSize = [snippet sizeWithFont:snippetFont constrainedToSize: tmpSize];
+      #else
+        NSDictionary *attr = @{ NSFontAttributeName: snippetFont};
+        snippetSize = [snippet boundingRectWithSize:tmpSize
+                          options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine
+                          attributes:attr
+                          context:nil].size;
+      #endif
       rectSize.height += snippetSize.height + 4;
       if (rectSize.width < snippetSize.width + leftImg.size.width) {
         rectSize.width = snippetSize.width + leftImg.size.width;
@@ -573,7 +594,7 @@ -(UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker*)marker
       }
 
       CGRect textRect = CGRectMake(5, 5 , rectSize.width - 10, textSize.height );
-      if ([PluginUtil isIOS7_OR_OVER] == true) {
+      #if defined(__IPHONE_7_0)
         // iOS7 and above
         NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
         style.lineBreakMode = NSLineBreakByWordWrapping;
@@ -586,43 +607,41 @@ -(UIView *)mapView:(GMSMapView *)mapView markerInfoWindow:(GMSMarker*)marker
         };
         [title drawInRect:textRect
                withAttributes:attributes];
-        
-        
-      } else {
+      #else
         // iOS6
         [titleColor set];
         [title drawInRect:textRect
                 withFont:titleFont
                 lineBreakMode:NSLineBreakByWordWrapping
                 alignment:textAlignment];
-      }
+      #endif
       //CGContextSetRGBStrokeColor(context, 1.0, 0.0, 0.0, 0.5);
       //CGContextStrokeRect(context, textRect);
     }
 
     //Draw the snippet
     if (snippet) {
       CGRect textRect = CGRectMake(5, textSize.height + 10 , rectSize.width - 10, snippetSize.height );
-      if ([PluginUtil isIOS7_OR_OVER] == true) {
-          // iOS7 and above
-          NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-          style.lineBreakMode = NSLineBreakByWordWrapping;
-          style.alignment = textAlignment;
-          
-          NSDictionary *attributes = @{
-              NSForegroundColorAttributeName : [UIColor grayColor],
-              NSFontAttributeName : snippetFont,
-              NSParagraphStyleAttributeName : style
-          };
-          [snippet drawInRect:textRect withAttributes:attributes];
-        } else {
-          // iOS6
-          [[UIColor grayColor] set];
-          [snippet drawInRect:textRect
-                  withFont:snippetFont
-                  lineBreakMode:NSLineBreakByWordWrapping
-                  alignment:textAlignment];
-        }
+      #if defined(__IPHONE_7_0)
+        // iOS7 and above
+        NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+        style.lineBreakMode = NSLineBreakByWordWrapping;
+        style.alignment = textAlignment;
+        
+        NSDictionary *attributes = @{
+            NSForegroundColorAttributeName : [UIColor grayColor],
+            NSFontAttributeName : snippetFont,
+            NSParagraphStyleAttributeName : style
+        };
+        [snippet drawInRect:textRect withAttributes:attributes];
+      #else
+        // iOS6
+        [[UIColor grayColor] set];
+        [snippet drawInRect:textRect
+                withFont:snippetFont
+                lineBreakMode:NSLineBreakByWordWrapping
+                alignment:textAlignment];
+      #endif
     }
   } else {
     //Draw the content image

src/ios/GoogleMaps/Marker.m

@@ -624,20 +624,17 @@ -(void)setIcon_:(GMSMarker *)marker iconProperty:(NSDictionary *)iconProperty
         NSArray *tmp = [iconPath componentsSeparatedByString:@","];
 
         NSData *decodedData;
-        #ifdef __IPHONE_7_0
+        #if !defined(__IPHONE_8_0)
           if ([PluginUtil isIOS7_OR_OVER]) {
-            decodedData = [[NSData alloc] initWithBase64Encoding:(NSString *)tmp[1]];
-          } else {
             decodedData = [NSData dataFromBase64String:tmp[1]];
+          } else {
+            #if !defined(__IPHONE_7_0)
+              decodedData = [[NSData alloc] initWithBase64Encoding:(NSString *)tmp[1]];
+            #endif
           }
         #else
           decodedData = [NSData dataFromBase64String:tmp[1]];
         #endif
-        if ([PluginUtil isIOS7_OR_OVER]) {
-          decodedData = [[NSData alloc] initWithBase64EncodedString:tmp[1] options:0];
-        } else {
-          decodedData = [NSData dataFromBase64String:tmp[1]];
-        }
         image = [[UIImage alloc] initWithData:decodedData];
         if (width && height) {
           image = [image resize:width height:height];