iOS: Clean up whitespace and improve code readability

Author: GitToTheHub

src/ios/GoogleMaps/CordovaGoogleMaps.m

@@ -163,21 +163,20 @@ - (void)_destroyMap:(NSString *)mapId {
   if (![self.viewPlugins objectForKey:mapId]) return;
 
   CDVPlugin<IPluginView> *pluginView = [self.viewPlugins objectForKey:mapId];
+
   if ([mapId hasPrefix:@"streetview_"]) {
     PluginStreetViewPanorama *pluginSV = (PluginStreetViewPanorama *)pluginView;
     pluginSV.isRemoved = YES;
-    //[pluginSV clear:nil];
     [pluginSV pluginUnload];
     [self.pluginLayer removePluginOverlay:pluginSV.panoramaCtrl];
     pluginSV.panoramaCtrl.view = nil;
     pluginSV = nil;
+
   } else {
     PluginMap *pluginMap = (PluginMap *)pluginView;
     pluginMap.isRemoved = YES;
-    //[pluginMap clear:nil];
     [pluginMap pluginUnload];
     [self.pluginLayer removePluginOverlay:pluginMap.mapCtrl];
-
     pluginMap.mapCtrl.view = nil;
     [pluginMap.mapCtrl.plugins removeAllObjects];
     pluginMap.mapCtrl.plugins = nil;
@@ -186,7 +185,6 @@ - (void)_destroyMap:(NSString *)mapId {
     pluginMap = nil;
   }
 
-
   [self.viewPlugins removeObjectForKey:mapId];
 }
 /**
@@ -552,3 +550,4 @@ - (void)putHtmlElements:(CDVInvokedUrlCommand *)command {
 }
 
 @end
+

src/ios/GoogleMaps/MyPluginLayer.m

@@ -34,6 +34,7 @@ - (id)initWithWebView:(UIView *)webView {
     self.isSuspended = false;
     self.opaque = NO;
     [self.webView removeFromSuperview];
+  
     // prevent webView from bouncing
     if ([self.webView respondsToSelector:@selector(scrollView)]) {
         ((UIScrollView*)[self.webView performSelector:@selector(scrollView)]).bounces = NO;
@@ -46,7 +47,6 @@ - (id)initWithWebView:(UIView *)webView {
     }
 
     self.pluginScrollView = [[MyPluginScrollView alloc] initWithFrame:[self.webView frame]];
-
     self.pluginScrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
     // Set webview delegate to MyPluginLayer and set contentSize of pluginScrollView to match the one of webView
@@ -57,16 +57,7 @@ - (id)initWithWebView:(UIView *)webView {
     }
 
     [self addSubview:self.pluginScrollView];
-
     [self addSubview:self.webView];
-
-
-//    dispatch_queue_t q_background = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0);
-//
-//    dispatch_async(q_background, ^{
-//      [self startRedrawTimer];
-//    });
-
     return self;
 }
 
@@ -90,6 +81,7 @@ - (void)stopRedrawTimer {
     }
   }
 }
+
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 {
   [self syncPluginScrollViewContentOffsetWithWebViewScrollView];
@@ -98,6 +90,7 @@ - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView
 -(void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
   [self syncPluginScrollViewContentOffsetWithWebViewScrollView];
 }
+
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
   [self syncPluginScrollViewContentOffsetWithWebViewScrollView];
 }
@@ -214,11 +207,7 @@ - (void)removePluginOverlay:(PluginViewController *)pluginViewCtrl {
       [pluginViewCtrl.view removeFromSuperview];
       [pluginViewCtrl removeFromParentViewController];
       [self.pluginScrollView detachView:pluginViewCtrl.view];
-
-      //[pluginViewCtrl.view setFrame:CGRectMake(0, -pluginViewCtrl.view.frame.size.height, pluginViewCtrl.view.frame.size.width, pluginViewCtrl.view.frame.size.height)];
-      //[pluginViewCtrl.view setNeedsDisplay];
   }];
-
 }
 
 - (void)resizeTask:(NSTimer *)timer {
@@ -248,9 +237,7 @@ - (void)updateViewPosition:(PluginViewController *)pluginViewCtrl {
   offset.y *= zoomScale;
   [self.pluginScrollView setContentOffset:offset];
 
-    if (!pluginViewCtrl.divId) {
-      return;
-    }
+  if (!pluginViewCtrl.divId) return;
 
     NSDictionary *domInfo = nil;
     @synchronized(self.pluginScrollView.HTMLNodes) {
@@ -339,13 +326,15 @@ - (void)updateViewPosition:(PluginViewController *)pluginViewCtrl {
     }
 
 }
+
 - (void)execJS: (NSString *)jsString {
     if ([self.webView respondsToSelector:@selector(stringByEvaluatingJavaScriptFromString:)]) {
         [self.webView performSelector:@selector(stringByEvaluatingJavaScriptFromString:) withObject:jsString];
     } else if ([self.webView respondsToSelector:@selector(evaluateJavaScript:completionHandler:)]) {
         [self.webView performSelector:@selector(evaluateJavaScript:completionHandler:) withObject:jsString withObject:nil];
     }
 }
+
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
   CGPoint browserClickPoint = CGPointMake(point.x - self.webView.frame.origin.x, point.y - self.webView.frame.origin.y);
   //NSLog(@"-->zoomScale = %f", self.webView.scrollView.zoomScale);
@@ -381,6 +370,7 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
       return hit;
     }
   }
+  
   if (self.pluginScrollView.mapCtrls == nil || self.pluginScrollView.mapCtrls.count == 0) {
     // Assumes all touches for the browser
     //NSLog(@"--->browser!");
@@ -464,8 +454,8 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
     }
   }
 
-    //NSLog(@"--->in browser!");
-    return [self.webView hitTest:browserClickPoint withEvent:event];
+  //NSLog(@"--->in browser!");
+  return [self.webView hitTest:browserClickPoint withEvent:event];
 }
 
 - (NSString *)findClickedDom:(NSString *)domId withPoint:(CGPoint)clickPoint isMapChild:(BOOL)isMapChild overflow:(OverflowCSS *)overflow {
@@ -711,3 +701,4 @@ - (NSString *)findClickedDom:(NSString *)domId withPoint:(CGPoint)clickPoint isM
 
 
 @end
+

src/ios/GoogleMaps/PluginCircle.m

@@ -21,12 +21,13 @@ - (void)pluginInitialize
 
 - (void)pluginUnload
 {
-
     // Plugin destroy
     NSArray *keys = [self.mapCtrl.objects allKeys];
     NSString *key;
+    
     for (int i = 0; i < [keys count]; i++) {
         key = [keys objectAtIndex:i];
+
         if ([key hasPrefix:@"circle_property"]) {
           key = [key stringByReplacingOccurrencesOfString:@"_property" withString:@""];
           GMSCircle *circle = (GMSCircle *)[self.mapCtrl.objects objectForKey:key];
@@ -129,6 +130,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
 
     });
 }
+
 /**
  * Set center
  * @params command First Argument is circle ID, Second is latitude, Third is longitude
@@ -173,7 +175,6 @@ -(void)setFillColor:(CDVInvokedUrlCommand *)command
     }];
 }
 
-
 /**
  * Set stroke color
  * @params command First Argument is circle ID, Second is RGB color array
@@ -232,6 +233,7 @@ -(void)setRadius:(CDVInvokedUrlCommand *)command
         }];
     }];
 }
+
 /**
  * Set z-index
  * @params command First Argument is circle ID, Second is z-index
@@ -284,8 +286,6 @@ -(void)setVisible:(CDVInvokedUrlCommand *)command
 
     }];
 }
-
-
 /**
  * Set clickable
  * @params command First Argument is circle ID, Second is clickable

src/ios/GoogleMaps/PluginGroundOverlay.m

@@ -35,6 +35,7 @@ - (void)pluginUnload
           groundoverlay.map = nil;
           groundoverlay = nil;
         }
+
         [self.mapCtrl.objects removeObjectForKey:key];
     }
 }
@@ -456,7 +457,6 @@ -(void)setBearing:(CDVInvokedUrlCommand *)command
 
 }
 
-
 /**
  * Set clickable
  * @params command First Argument is ground overlay ID, Second is clickable

src/ios/GoogleMaps/PluginMap.m

@@ -87,9 +87,11 @@ - (void)loadPlugin:(CDVInvokedUrlCommand*)command {
       // https://github.com/apache/cordova-ios/blob/582e35776f01ee03f32f0986de181bcf5eb4d232/CordovaLib/Classes/Public/CDVViewController.m#L577
       //
       CDVViewController *cdvViewController = (CDVViewController*)self.viewController;
+      
       if ([plugin respondsToSelector:@selector(setViewController:)]) {
         [plugin setViewController:cdvViewController];
       }
+      
       if ([plugin respondsToSelector:@selector(setCommandDelegate:)]) {
         [plugin setCommandDelegate:cdvViewController.commandDelegate];
       }
@@ -160,6 +162,7 @@ - (void)setDiv:(CDVInvokedUrlCommand *)command {
       [googlemaps.pluginLayer removePluginOverlay:self.mapCtrl];
       self.mapCtrl.attached = NO;
       self.mapCtrl.view = nil;
+      
     } else {
       self.mapCtrl.view = self.mapCtrl.map;
       [googlemaps.pluginLayer addPluginOverlay:self.mapCtrl];
@@ -169,6 +172,7 @@ - (void)setDiv:(CDVInvokedUrlCommand *)command {
       self.mapCtrl.isRenderedAtOnce = NO; //prevent unexpected animation
       [googlemaps.pluginLayer updateViewPosition:self.mapCtrl];
     }
+    
     CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
   }];
@@ -268,7 +272,6 @@ - (void)clear:(CDVInvokedUrlCommand *)command {
   if (command != (id)[NSNull null]) {
     CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-
   }
 }
 

src/ios/GoogleMaps/PluginMapViewController.m

@@ -65,8 +65,6 @@ - (void)mapView:(GMSMapView *)mapView didTapMyLocation:(CLLocationCoordinate2D)l
 }
 
 - (void)mapView:(GMSMapView *)mapView didTapAtCoordinate:(CLLocationCoordinate2D)coordinate {
-
-
   if (self.activeMarker) {
     /*
      NSString *clusterId_markerId =[NSString stringWithFormat:@"%@", self.activeMarker.userData];
@@ -185,9 +183,6 @@ - (void)mapView:(GMSMapView *)mapView didTapAtCoordinate:(CLLocationCoordinate2D
   CLLocationCoordinate2D hitArea = [self.map.projection coordinateForPoint:CGPointMake(1, 1)];
   CLLocationDistance threshold = GMSGeometryDistance(origin, hitArea);
 
-
-
-  //
   maxZIndex = -1;
   CLLocationCoordinate2D touchPoint = kCLLocationCoordinate2DInvalid;
 
@@ -268,6 +263,7 @@ - (void)mapView:(GMSMapView *)mapView didTapAtCoordinate:(CLLocationCoordinate2D
 
 
 }
+
 /**
  * map_long_click
  */
@@ -288,7 +284,6 @@ - (void) mapView:(GMSMapView *)mapView willMove:(BOOL)gesture
   [self triggerCameraEvent:@"camera_move_start" position:self.map.camera];
 }
 
-
 /**
  * plugin.google.maps.event.CAMERA_MOVE
  */
@@ -312,7 +307,6 @@ - (void) mapView:(GMSMapView *)mapView idleAtCameraPosition:(GMSCameraPosition *
   self.isDragging = NO;
 }
 
-
 /**
  * marker info_click
  */
@@ -339,6 +333,7 @@ - (void)mapView:(GMSMapView *)mapView didLongPressInfoWindowOfMarker:(GMSMarker
     [self triggerMarkerEvent:@"info_long_click" marker:marker];
   }
 }
+
 /**
  * plugin.google.maps.event.MARKER_DRAG_START
  */
@@ -352,6 +347,7 @@ - (void) mapView:(GMSMapView *) mapView didBeginDraggingMarker:(GMSMarker *)mark
     [self triggerMarkerEvent:@"marker_drag_start" marker:marker];
   }
 }
+
 /**
  * plugin.google.maps.event.MARKER_DRAG_END
  */
@@ -365,6 +361,7 @@ - (void) mapView:(GMSMapView *) mapView didEndDraggingMarker:(GMSMarker *)marker
     [self triggerMarkerEvent:@"marker_drag_end" marker:marker];
   }
 }
+
 /**
  * plugin.google.maps.event.MARKER_DRAG
  */

src/ios/GoogleMaps/PluginMarker.m

@@ -25,7 +25,6 @@ - (void)pluginInitialize
 
 - (void)pluginUnload
 {
-
   // Plugin destroy
   NSArray *keys = [self.mapCtrl.objects allKeys];
   NSString *key;
@@ -90,6 +89,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
   }];
 
 }
+
 - (void)_create:(NSString *)markerId markerOptions:(NSDictionary *)json callbackBlock:(void (^)(BOOL successed, id resultObj)) callbackBlock {
 
   if ([NSThread isMainThread] == NO) {
@@ -249,6 +249,7 @@ -(void)showInfoWindow:(CDVInvokedUrlCommand *)command
     }];
   }];
 }
+
 /**
  * Hide current infowindow
  */
@@ -263,6 +264,7 @@ -(void)hideInfoWindow:(CDVInvokedUrlCommand *)command
     }];
   }];
 }
+
 /**
  * Get the position of the specified marker.
  * Send as plugin result the current marker position with array(latitude, longitude)
@@ -314,7 +316,6 @@ -(void)setTitle:(CDVInvokedUrlCommand *)command
   }];
 }
 
-
 /**
  * Set snippet to the specified marker
  * @params command Will contain the markerId as first argument
@@ -446,7 +447,6 @@ -(void)setInfoWindowAnchor:(CDVInvokedUrlCommand *)command
   }];
 }
 
-
 /**
  * Set opacity
  * @params command The first argument contains the marker ID, the second is the opacity value