react-native-maps 2.0.0-beta.13 → 2.0.0-beta.15

package/android/src/main/java/com/rnmaps/maps/MapManager.java

@@ -2,12 +2,10 @@ package com.rnmaps.maps;
 
 import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.MapBuilder;
@@ -232,26 +230,11 @@ public class MapManager extends ViewGroupManager<MapView> {
     view.setCacheEnabled(cacheEnabled);
   }
 
-  @ReactProp(name = "loadingEnabled", defaultBoolean = false)
-  public void setLoadingEnabled(MapView view, boolean loadingEnabled) {
-    view.enableMapLoading(loadingEnabled);
-  }
-
   @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
   public void setMoveOnMarkerPress(MapView view, boolean moveOnPress) {
     view.setMoveOnMarkerPress(moveOnPress);
   }
 
-  @ReactProp(name = "loadingBackgroundColor", customType = "Color")
-  public void setLoadingBackgroundColor(MapView view, @Nullable Integer loadingBackgroundColor) {
-    view.setLoadingBackgroundColor(loadingBackgroundColor);
-  }
-
-  @ReactProp(name = "loadingIndicatorColor", customType = "Color")
-  public void setLoadingIndicatorColor(MapView view, @Nullable Integer loadingIndicatorColor) {
-    view.setLoadingIndicatorColor(loadingIndicatorColor);
-  }
-
   @ReactProp(name = "pitchEnabled", defaultBoolean = false)
   public void setPitchEnabled(MapView view, boolean pitchEnabled) {
     view.map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);

package/android/src/main/java/com/rnmaps/maps/MapView.java

@@ -1,9 +1,7 @@
 package com.rnmaps.maps;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.Point;
 
 import androidx.annotation.NonNull;
@@ -16,13 +14,10 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.location.Location;
 
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
@@ -67,7 +62,6 @@ import org.xmlpull.v1.XmlPullParserException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,13 +81,8 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
   private CircleManager.Collection circleCollection;
   private GroundOverlayManager groundOverlayManager;
   private GroundOverlayManager.Collection groundOverlayCollection;
-  private ProgressBar mapLoadingProgressBar;
-  private RelativeLayout mapLoadingLayout;
   private ImageView cacheImageView;
   private Boolean isMapLoaded = false;
-  private Integer loadingBackgroundColor = null;
-  private Integer loadingIndicatorColor = null;
-  public final int baseMapPadding = 50;
 
   private LatLngBounds boundsToMove;
   private CameraUpdate cameraToSet;
@@ -665,46 +654,10 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     this.cacheView();
   }
 
-  public void enableMapLoading(boolean loadingEnabled) {
-    if (loadingEnabled && !this.isMapLoaded) {
-      this.getMapLoadingLayoutView().setVisibility(View.VISIBLE);
-    }
-  }
-
   public void setMoveOnMarkerPress(boolean moveOnPress) {
     this.moveOnMarkerPress = moveOnPress;
   }
 
-  public void setLoadingBackgroundColor(Integer loadingBackgroundColor) {
-    this.loadingBackgroundColor = loadingBackgroundColor;
-
-    if (this.mapLoadingLayout != null) {
-      if (loadingBackgroundColor == null) {
-        this.mapLoadingLayout.setBackgroundColor(Color.WHITE);
-      } else {
-        this.mapLoadingLayout.setBackgroundColor(this.loadingBackgroundColor);
-      }
-    }
-  }
-
-  public void setLoadingIndicatorColor(Integer loadingIndicatorColor) {
-    this.loadingIndicatorColor = loadingIndicatorColor;
-    if (this.mapLoadingProgressBar != null) {
-      Integer color = loadingIndicatorColor;
-      if (color == null) {
-        color = Color.parseColor("#606060");
-      }
-
-      ColorStateList progressTintList = ColorStateList.valueOf(loadingIndicatorColor);
-      ColorStateList secondaryProgressTintList = ColorStateList.valueOf(loadingIndicatorColor);
-      ColorStateList indeterminateTintList = ColorStateList.valueOf(loadingIndicatorColor);
-
-      this.mapLoadingProgressBar.setProgressTintList(progressTintList);
-      this.mapLoadingProgressBar.setSecondaryProgressTintList(secondaryProgressTintList);
-      this.mapLoadingProgressBar.setIndeterminateTintList(indeterminateTintList);
-    }
-  }
-
   public void setHandlePanDrag(boolean handlePanDrag) {
     this.handlePanDrag = handlePanDrag;
   }
@@ -1008,36 +961,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     manager.pushEvent(context, this, "onPoiClick", event);
   }
 
-  private ProgressBar getMapLoadingProgressBar() {
-    if (this.mapLoadingProgressBar == null) {
-      this.mapLoadingProgressBar = new ProgressBar(getContext());
-      this.mapLoadingProgressBar.setIndeterminate(true);
-    }
-    if (this.loadingIndicatorColor != null) {
-      this.setLoadingIndicatorColor(this.loadingIndicatorColor);
-    }
-    return this.mapLoadingProgressBar;
-  }
-
-  private RelativeLayout getMapLoadingLayoutView() {
-    if (this.mapLoadingLayout == null) {
-      this.mapLoadingLayout = new RelativeLayout(getContext());
-      this.mapLoadingLayout.setBackgroundColor(Color.LTGRAY);
-      this.addView(this.mapLoadingLayout,
-          new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-              ViewGroup.LayoutParams.MATCH_PARENT));
-
-      RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
-          RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-      params.addRule(RelativeLayout.CENTER_IN_PARENT);
-      this.mapLoadingLayout.addView(this.getMapLoadingProgressBar(), params);
-
-      this.mapLoadingLayout.setVisibility(View.INVISIBLE);
-    }
-    this.setLoadingBackgroundColor(this.loadingBackgroundColor);
-    return this.mapLoadingLayout;
-  }
-
   private ImageView getCacheImageView() {
     if (this.cacheImageView == null) {
       this.cacheImageView = new ImageView(getContext());
@@ -1056,41 +979,20 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
   }
 
-  private void removeMapLoadingProgressBar() {
-    if (this.mapLoadingProgressBar != null) {
-      ((ViewGroup) this.mapLoadingProgressBar.getParent()).removeView(this.mapLoadingProgressBar);
-      this.mapLoadingProgressBar = null;
-    }
-  }
-
-  private void removeMapLoadingLayoutView() {
-    this.removeMapLoadingProgressBar();
-    if (this.mapLoadingLayout != null) {
-      ((ViewGroup) this.mapLoadingLayout.getParent()).removeView(this.mapLoadingLayout);
-      this.mapLoadingLayout = null;
-    }
-  }
-
   private void cacheView() {
     if (this.cacheEnabled) {
       final ImageView cacheImageView = this.getCacheImageView();
-      final RelativeLayout mapLoadingLayout = this.getMapLoadingLayoutView();
       cacheImageView.setVisibility(View.INVISIBLE);
-      mapLoadingLayout.setVisibility(View.VISIBLE);
       if (this.isMapLoaded) {
         this.map.snapshot(new GoogleMap.SnapshotReadyCallback() {
           @Override public void onSnapshotReady(Bitmap bitmap) {
             cacheImageView.setImageBitmap(bitmap);
             cacheImageView.setVisibility(View.VISIBLE);
-            mapLoadingLayout.setVisibility(View.INVISIBLE);
           }
         });
       }
     } else {
       this.removeCacheImageView();
-      if (this.isMapLoaded) {
-        this.removeMapLoadingLayoutView();
-      }
     }
   }
 

package/ios/Maps/RNMMap.h

@@ -23,54 +23,46 @@ extern const NSInteger RNMMapMaxZoomLevel;
 
 @interface RNMMap: MKMapView<SMCalloutViewDelegate>
 
-@property (nonatomic, strong) SMCalloutView *calloutView;
-@property (nonatomic, strong) UIImageView *cacheImageView;
-@property (nonatomic, strong) UIView *loadingView;
-
-@property (nonatomic, copy) NSString *userLocationAnnotationTitle;
+@property (nonatomic, assign) BOOL cacheEnabled;
 @property (nonatomic, assign) BOOL followUserLocation;
-@property (nonatomic, assign) BOOL userLocationCalloutEnabled;
 @property (nonatomic, assign) BOOL hasStartedRendering;
-@property (nonatomic, assign) BOOL cacheEnabled;
-@property (nonatomic, assign) BOOL loadingEnabled;
-@property (nonatomic, strong) UIColor *loadingBackgroundColor;
-@property (nonatomic, strong) UIColor *loadingIndicatorColor;
-@property (nonatomic, assign) BOOL hasShownInitialLoading;
-@property (nonatomic, assign) CGFloat minDelta;
+@property (nonatomic, assign) BOOL ignoreRegionChanges;
+@property (nonatomic, assign) BOOL mapLoaded;
+@property (nonatomic, assign) BOOL userLocationCalloutEnabled;
+@property (nonatomic, assign) BOOL mapChangedFromUserInteraction;
 @property (nonatomic, assign) CGFloat maxDelta;
-@property (nonatomic, assign) UIEdgeInsets legalLabelInsets;
-@property (nonatomic, assign) MKCoordinateRegion initialRegion;
-@property (nonatomic, assign) MKMapCamera *initialCamera;
-@property (nonatomic, assign) CGFloat minZoomLevel;
 @property (nonatomic, assign) CGFloat maxZoomLevel;
+@property (nonatomic, assign) CGFloat minDelta;
+@property (nonatomic, assign) CGFloat minZoomLevel;
 @property (nonatomic, assign) CGPoint compassOffset;
-@property (nonatomic, assign) UIEdgeInsets mapPadding;
-
 @property (nonatomic, assign) CLLocationCoordinate2D pendingCenter;
+@property (nonatomic, assign) MKCoordinateRegion initialRegion;
 @property (nonatomic, assign) MKCoordinateSpan pendingSpan;
+@property (nonatomic, assign) MKMapCamera *initialCamera;
+@property (nonatomic, assign) UIEdgeInsets legalLabelInsets;
+@property (nonatomic, assign) UIEdgeInsets mapPadding;
+@property (nonatomic, copy) NSString *userLocationAnnotationTitle;
+@property (nonatomic, strong) SMCalloutView *calloutView;
+@property (nonatomic, strong) UIImageView *cacheImageView;
 
-
-@property (nonatomic, assign) BOOL ignoreRegionChanges;
-
-@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
 @property (nonatomic, copy) RCTBubblingEventBlock onChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
 @property (nonatomic, copy) RCTBubblingEventBlock onDoublePress;
 @property (nonatomic, copy) RCTBubblingEventBlock onLongPress;
-@property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
-@property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
+@property (nonatomic, copy) RCTBubblingEventBlock onMapReady;
+@property (nonatomic, copy) RCTBubblingEventBlock onPanDrag;
+@property (nonatomic, copy) RCTBubblingEventBlock onPress;
+@property (nonatomic, copy) RCTBubblingEventBlock onTilesRendered;
+@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
+@property (nonatomic, copy) RCTDirectEventBlock onCalloutPress;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDeselect;
-@property (nonatomic, copy) RCTDirectEventBlock onMarkerDragStart;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDrag;
 @property (nonatomic, copy) RCTDirectEventBlock onMarkerDragEnd;
-@property (nonatomic, copy) RCTDirectEventBlock onCalloutPress;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerDragStart;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerPress;
+@property (nonatomic, copy) RCTDirectEventBlock onMarkerSelect;
 @property (nonatomic, copy) RCTDirectEventBlock onRegionChange;
-@property (nonatomic, copy) RCTBubblingEventBlock onTilesRendered;
-@property (nonatomic, copy) RCTBubblingEventBlock onUserLocationChange;
 
 - (void)cacheViewIfNeeded;
-- (void)beginLoading;
 - (void)finishLoading;
 - (NSArray *)getMapBoundaries;
 

package/ios/Maps/RNMMap.m

@@ -86,6 +86,7 @@ const NSInteger RNMMapMaxZoomLevel = 20;
         self.minZoomLevel = 0;
         self.maxZoomLevel = RNMMapMaxZoomLevel;
         self.compassOffset = CGPointMake(0, 0);
+        self.mapChangedFromUserInteraction = NO;
     }
     return self;
 }
@@ -405,6 +406,11 @@ const NSInteger RNMMapMaxZoomLevel = 20;
         region.span.longitudeDelta = self.region.span.longitudeDelta;
     }
 
+    // If the region was changed with an animation, there is no way it was a user interaction
+    if (animated) {
+        self.mapChangedFromUserInteraction = NO;
+    }
+    
     // Animate/move to new position
     [super setRegion:region animated:animated];
 }
@@ -418,6 +424,11 @@ const NSInteger RNMMapMaxZoomLevel = 20;
 
 - (void)setCamera:(MKMapCamera*)camera animated:(BOOL)animated
 {
+    // If the camera was changed with an animation, there is no way it was a user interaction
+    if (animated) {
+        self.mapChangedFromUserInteraction = NO;
+    }
+    
     [super setCamera:camera animated:animated];
 }
 
@@ -431,43 +442,6 @@ const NSInteger RNMMapMaxZoomLevel = 20;
 
 - (void)setCacheEnabled:(BOOL)cacheEnabled {
     _cacheEnabled = cacheEnabled;
-    if (self.cacheEnabled && self.cacheImageView.image == nil) {
-        self.loadingView.hidden = NO;
-        [self.activityIndicatorView startAnimating];
-    }
-    else {
-        if (_loadingView != nil) {
-            self.loadingView.hidden = YES;
-        }
-    }
-}
-
-- (void)setLoadingEnabled:(BOOL)loadingEnabled {
-    _loadingEnabled = loadingEnabled;
-    if (!self.hasShownInitialLoading) {
-        self.loadingView.hidden = !self.loadingEnabled;
-    }
-    else {
-        if (_loadingView != nil) {
-            self.loadingView.hidden = YES;
-        }
-    }
-}
-
-- (UIColor *)loadingBackgroundColor {
-    return self.loadingView.backgroundColor;
-}
-
-- (void)setLoadingBackgroundColor:(UIColor *)loadingBackgroundColor {
-    self.loadingView.backgroundColor = loadingBackgroundColor;
-}
-
-- (UIColor *)loadingIndicatorColor {
-    return self.activityIndicatorView.color;
-}
-
-- (void)setLoadingIndicatorColor:(UIColor *)loadingIndicatorColor {
-    self.activityIndicatorView.color = loadingIndicatorColor;
 }
 
 // Include properties of MKMapView which are only available on iOS 9+
@@ -549,7 +523,7 @@ const NSInteger RNMMapMaxZoomLevel = 20;
     if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateActive) {
         return;
     }
-    if (self.hasShownInitialLoading) {
+    if (self.mapLoaded) {
         if (!self.cacheEnabled) {
             if (_cacheImageView != nil) {
                 self.cacheImageView.hidden = YES;
@@ -612,48 +586,11 @@ const NSInteger RNMMapMaxZoomLevel = 20;
   return self.layoutMargins;
 }
 
-- (void)beginLoading {
-    if ((!self.hasShownInitialLoading && self.loadingEnabled) || (self.cacheEnabled && self.cacheImageView.image == nil)) {
-        self.loadingView.hidden = NO;
-        [self.activityIndicatorView startAnimating];
-    }
-    else {
-        if (_loadingView != nil) {
-            self.loadingView.hidden = YES;
-        }
-    }
-}
-
 - (void)finishLoading {
-    self.hasShownInitialLoading = YES;
-    if (_loadingView != nil) {
-        self.loadingView.hidden = YES;
-    }
+    self.mapLoaded = YES;
     [self cacheViewIfNeeded];
 }
 
-- (UIActivityIndicatorView *)activityIndicatorView {
-    if (_activityIndicatorView == nil) {
-        _activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
-        _activityIndicatorView.center = self.loadingView.center;
-        _activityIndicatorView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin;
-        _activityIndicatorView.color = [UIColor colorWithRed:96.f/255.f green:96.f/255.f blue:96.f/255.f alpha:1.f]; // defaults to #606060
-    }
-    [self.loadingView addSubview:_activityIndicatorView];
-    return _activityIndicatorView;
-}
-
-- (UIView *)loadingView {
-    if (_loadingView == nil) {
-        _loadingView = [[UIView alloc] initWithFrame:self.bounds];
-        _loadingView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
-        _loadingView.backgroundColor = [UIColor whiteColor]; // defaults to #FFFFFF
-        [self addSubview:_loadingView];
-        _loadingView.hidden = NO;
-    }
-    return _loadingView;
-}
-
 - (UIImageView *)cacheImageView {
     if (_cacheImageView == nil) {
         _cacheImageView = [[UIImageView alloc] initWithFrame:self.bounds];

package/ios/Maps/RNMMapManager.m

@@ -89,9 +89,6 @@ RCT_EXPORT_VIEW_PROPERTY(handlePanDrag, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(isAccessibilityElement, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(kmlSrc, NSString)
 RCT_EXPORT_VIEW_PROPERTY(legalLabelInsets, UIEdgeInsets)
-RCT_EXPORT_VIEW_PROPERTY(loadingBackgroundColor, UIColor)
-RCT_EXPORT_VIEW_PROPERTY(loadingEnabled, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(loadingIndicatorColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(mapPadding, UIEdgeInsets)
 RCT_EXPORT_VIEW_PROPERTY(mapType, MKMapType)
 RCT_EXPORT_VIEW_PROPERTY(maxDelta, CGFloat)
@@ -516,6 +513,24 @@ static int kDragCenterContext;
     [self _regionChanged:mapView];
 }
 
+- (BOOL)mapViewRegionDidChangeFromUserInteraction:(RNMMap *)mapView
+{
+    UIView *view = mapView.subviews.firstObject;
+    // Look through gesture recognizers to determine whether this region change is from user interaction
+    for(UIGestureRecognizer *recognizer in view.gestureRecognizers) {
+        if(recognizer.state == UIGestureRecognizerStateBegan || recognizer.state == UIGestureRecognizerStateChanged || recognizer.state == UIGestureRecognizerStateEnded) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
+- (void)mapView:(RNMMap *)mapView regionWillChangeAnimated:(BOOL)animated
+{
+    mapView.mapChangedFromUserInteraction = [self mapViewRegionDidChangeFromUserInteraction: mapView];
+}
+
 - (void)mapView:(RNMMap *)mapView regionDidChangeAnimated:(__unused BOOL)animated
 {
     CGFloat zoomLevel = [self zoomLevel:mapView];
@@ -549,7 +564,6 @@ static int kDragCenterContext;
       mapView.onMapReady(@{});
       mapView.hasStartedRendering = YES;
     }
-    [mapView beginLoading];
 }
 
 - (void)mapViewDidFinishRenderingMap:(RNMMap *)mapView fullyRendered:(__unused BOOL)fullyRendered
@@ -602,6 +616,7 @@ static int kDragCenterContext;
 #define FLUSH_NAN(value) (isnan(value) ? 0 : value)
         mapView.onChange(@{
                 @"continuous": @(continuous),
+                @"isGesture": @(mapView.mapChangedFromUserInteraction),
                 @"region": @{
                         @"latitude": @(FLUSH_NAN(region.center.latitude)),
                         @"longitude": @(FLUSH_NAN(region.center.longitude)),

package/lib/MapView.d.ts

@@ -108,30 +108,6 @@ export type MapViewProps = ViewProps & {
      * @platform Android: Supported
      */
     liteMode?: boolean;
-    /**
-     * Sets loading background color.
-     *
-     * @default `#FFFFFF`
-     * @platform iOS: Apple Maps only
-     * @platform Android: Supported
-     */
-    loadingBackgroundColor?: string;
-    /**
-     * If `true` a loading indicator will show while the map is loading.
-     *
-     * @default false
-     * @platform iOS: Apple Maps only
-     * @platform Android: Supported
-     */
-    loadingEnabled?: boolean;
-    /**
-     * Sets loading indicator color.
-     *
-     * @default `#606060`
-     * @platform iOS: Apple Maps only
-     * @platform Android: Supported
-     */
-    loadingIndicatorColor?: string;
     /**
      * Adds custom padding to each side of the map. Useful when map elements/markers are obscured.
      *

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",