iOS: Refactor code for improved readability and performance

Author: GitToTheHub

src/ios/GoogleMaps/MyPluginLayer.m

@@ -343,30 +343,16 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
 
   // Check other views of other plugins before this plugin
   // e.g. PhoneGap-Plugin-ListPicker, etc
-  UIView *subview;
-  NSArray *subviews = [self.webView.superview subviews];
-  //CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
-  //CGPoint subviewPoint = CGPointMake(browserClickPoint.x, browserClickPoint.y - statusBarFrame.size.height);
-
-  for (int i = ((int)[subviews count] - 1); i >= 0; i--) {
-    subview = [subviews objectAtIndex: i];
-    //NSLog(@"--->subview[%d] = %@", i, subview);
+  for (UIView *subview in [self.webView.superview.subviews reverseObjectEnumerator]) {
     // we only want to check against other views
-    if (subview == self.pluginScrollView) {
-      continue;
-    }
-
-    if (subview.isHidden || !subview.isUserInteractionEnabled) {
-      continue;
-    }
+    if (subview == self.pluginScrollView) continue;
+    if (subview.isHidden || !subview.isUserInteractionEnabled) continue;
 
     CGPoint subviewPoint = CGPointMake(point.x, point.y - subview.frame.origin.y);
     UIView *hit = [subview hitTest:subviewPoint withEvent:event];
 
     if (hit) {
-      if (subview == self.webView) {
-        break;
-      }
+      if (subview == self.webView) break;
       return hit;
     }
   }
@@ -390,34 +376,23 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
   float webviewWidth = self.webView.frame.size.width;
   float webviewHeight = self.webView.frame.size.height;
 
-
-  CGRect rect;
-  NSEnumerator *mapIDs = [self.pluginScrollView.mapCtrls keyEnumerator];
-  PluginMapViewController *mapCtrl;
-  id mapId;
-  NSString *clickedDomId;
-
   CGFloat zoomScale = [[UIScreen mainScreen] scale];
   offsetY *= zoomScale;
   offsetX *= zoomScale;
   webviewWidth *= zoomScale;
   webviewHeight *= zoomScale;
 
-  NSDictionary *domInfo;
-
   @synchronized(self.pluginScrollView.HTMLNodes) {
     //NSLog(@"--->browserClickPoint = %f, %f", browserClickPoint.x, browserClickPoint.y);
-    clickedDomId = [self findClickedDom:@"root" withPoint:browserClickPoint isMapChild:NO overflow:nil];
+    NSString *clickedDomId = [self findClickedDom:@"root" withPoint:browserClickPoint isMapChild:NO overflow:nil];
     //NSLog(@"--->clickedDomId = %@", clickedDomId);
 
-    while(mapId = [mapIDs nextObject]) {
-      mapCtrl = [self.pluginScrollView.mapCtrls objectForKey:mapId];
-      if (!mapCtrl.divId) {
-        continue;
-      }
-      domInfo =[self.pluginScrollView.HTMLNodes objectForKey:mapCtrl.divId];
-
-      rect = CGRectFromString([domInfo objectForKey:@"size"]);
+    for (id mapId in [[self.pluginScrollView.mapCtrls keyEnumerator] allObjects]) {
+      PluginMapViewController *mapCtrl = [self.pluginScrollView.mapCtrls objectForKey:mapId];
+      if (!mapCtrl.divId) continue;
+      
+      NSDictionary *domInfo = [self.pluginScrollView.HTMLNodes objectForKey:mapCtrl.divId];
+      CGRect rect = CGRectFromString([domInfo objectForKey:@"size"]);
 
       // Is the map clickable?
       if (mapCtrl.clickable == NO) {

src/ios/GoogleMaps/PluginGroundOverlay.m

@@ -20,18 +20,11 @@ - (void)pluginInitialize
   //self.imgCache.totalCostLimit = 3 * 1024 * 1024 * 1024; // 3MB = Cache for image
 }
 
-- (void)pluginUnload
-{
-
-
+- (void)pluginUnload {
     // Plugin destroy
-    NSArray *keys = [self.mapCtrl.objects allKeys];
-    NSString *key;
-    for (int i = 0; i < [keys count]; i++) {
-        key = [keys objectAtIndex:i];
+    for (id key in [self.mapCtrl.objects allKeys]) {
         if ([key hasPrefix:@"groundoverlay_property"]) {
-          key = [key stringByReplacingOccurrencesOfString:@"_property" withString:@""];
-          GMSGroundOverlay *groundoverlay = (GMSGroundOverlay *)[self.mapCtrl.objects objectForKey:key];
+          GMSGroundOverlay *groundoverlay = (GMSGroundOverlay *)[self.mapCtrl.objects objectForKey:[key stringByReplacingOccurrencesOfString:@"_property" withString:@""]];
           groundoverlay.map = nil;
           groundoverlay = nil;
         }

src/ios/GoogleMaps/PluginMapViewController.m

@@ -10,15 +10,16 @@
 
 @implementation PluginMapViewController
 
-- (void)mapView:(GMSMapView *)mapView didTapPOIWithPlaceID:(NSString *)placeID name:(NSString *)name location:(CLLocationCoordinate2D)location {
+- (void)mapView:(GMSMapView *)mapView
+didTapPOIWithPlaceID:(NSString *)placeID
+           name:(NSString *)name
+       location:(CLLocationCoordinate2D)location {
   NSString* jsName = [name stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"];
   jsName = [jsName stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"];
   jsName = [jsName stringByReplacingOccurrencesOfString:@"\r" withString:@"\\r"];
-
-  NSString* jsString = [NSString
-                        stringWithFormat:@"javascript:if('%@' in plugin.google.maps){plugin.google.maps['%@']({evtName: '%@', callback: '_onMapEvent', args: ['%@', \"%@\", new plugin.google.maps.LatLng(%f,%f)]});}",
-                        self.overlayId, self.overlayId, @"poi_click", placeID, jsName, location.latitude, location.longitude];
-  [self execJS:jsString];
+  
+  [self execJS:[NSString stringWithFormat:@"javascript:if('%@' in plugin.google.maps){plugin.google.maps['%@']({evtName: '%@', callback: '_onMapEvent', args: ['%@', \"%@\", new plugin.google.maps.LatLng(%f,%f)]});}",
+                self.overlayId, self.overlayId, @"poi_click", placeID, jsName, location.latitude, location.longitude]];
 }
 
 /**

src/ios/GoogleMaps/PluginPolygon.m

@@ -696,11 +696,11 @@ -(void)setGeodesic:(CDVInvokedUrlCommand *)command
   [self.mapCtrl.executeQueue addOperationWithBlock:^{
       NSString *polygonKey = [command.arguments objectAtIndex:0];
       GMSPolygon *polygon = [self.mapCtrl.objects objectForKey:polygonKey];
-      Boolean isGeodisic = [[command.arguments objectAtIndex:1] boolValue];
+      Boolean isGeodesic = [[command.arguments objectAtIndex:1] boolValue];
 
       // Apply to the polygon on UI thread.
       [[NSOperationQueue mainQueue] addOperationWithBlock:^{
-          [polygon setGeodesic:isGeodisic];
+          [polygon setGeodesic:isGeodesic];
 
           CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
           [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];