react-native-maps 1.21.0-alpha.72 → 1.21.0-alpha.74

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -105,7 +105,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
                     options.maxZoomPreference(initialProps.getInt("maxZoom", 0));
                 }
             }
-            if (initialProps.hasKey("userInterfaceStyle")){
+            if (initialProps.hasKey("userInterfaceStyle") && !initialProps.hasKey("liteMode")){
                 String style = initialProps.getString("userInterfaceStyle");
                 if ("system".equals(style)) {
                     options.mapColorScheme(MapColorScheme.FOLLOW_SYSTEM);

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

@@ -2,13 +2,16 @@ package com.rnmaps.maps;
 
 import static androidx.core.content.PermissionChecker.checkSelfPermission;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.location.Location;
-import android.util.Log;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
@@ -26,7 +29,6 @@ import androidx.core.view.MotionEventCompat;
 import com.facebook.react.common.MapBuilder;
 
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -84,7 +86,7 @@ import java.util.concurrent.ExecutionException;
 import com.rnmaps.fabric.event.*;
 
 public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
-        GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
+        GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener, DefaultLifecycleObserver {
     public GoogleMap map;
     private MarkerManager markerManager;
     private MarkerManager.Collection markerCollection;
@@ -99,6 +101,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private RelativeLayout mapLoadingLayout;
     private ImageView cacheImageView;
     private Boolean isMapLoaded = false;
+
+    private Boolean isMapReady = false;
+
     private Integer loadingBackgroundColor = null;
     private Integer loadingIndicatorColor = null;
 
@@ -133,7 +138,6 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private final Map<TileOverlay, MapHeatmap> heatmapMap = new HashMap<>();
     private final Map<TileOverlay, MapGradientPolyline> gradientPolylineMap = new HashMap<>();
     private final GestureDetectorCompat gestureDetector;
-    private LifecycleEventListener lifecycleListener;
     private boolean paused = false;
     private boolean destroyed = false;
     private final ThemedReactContext context;
@@ -153,6 +157,7 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     private Boolean showIndoors;
     private Boolean scrollEnabled;
     private Boolean scrollDuringRotateOrZoomEnabled;
+    private String kmlSrc = null;
 
     private static boolean contextHasBug(Context context) {
         return context == null ||
@@ -184,13 +189,65 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         return superContext;
     }
 
+
+@Override
+public void onCreate(LifecycleOwner owner) {
+    super.onCreate(null);
+}
+
+    @Override
+    public void onStart(LifecycleOwner owner) {
+        super.onStart();
+    }
+    @Override
+    public void onResume(LifecycleOwner owner) {
+        if (hasPermissions() && map != null) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(showUserLocation);
+            map.setLocationSource(fusedLocationSource);
+        }
+        synchronized (MapView.this) {
+            if (!destroyed) {
+                MapView.this.onResume();
+            }
+            paused = false;
+        }
+    }
+
+
+    @Override
+    public void onPause(LifecycleOwner owner){
+        super.onPause();
+        if (hasPermissions() && map != null) {
+            //noinspection MissingPermission
+            map.setMyLocationEnabled(false);
+        }
+        synchronized (MapView.this) {
+            if (!destroyed) {
+                MapView.this.onPause();
+            }
+            paused = true;
+        }
+    }
+
+    @Override
+    public void onStop(LifecycleOwner owner) {
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy(LifecycleOwner owner){
+        MapView.this.doDestroy();
+    }
+
     public MapView(ThemedReactContext context,
                    GoogleMapOptions googleMapOptions) {
         super(context, googleMapOptions);
-        // todo add support for legacy renderer
         this.context = context;
-        super.onCreate(null);
-        super.onResume();
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner) {
+          ((LifecycleOwner) activity).getLifecycle().addObserver(this);
+        }
         super.getMapAsync(this);
 
         final MapView view = this;
@@ -518,50 +575,13 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
             MapView.this.cacheView();
         });
 
-        // We need to be sure to disable location-tracking when app enters background, in-case some
-        // other module
-        // has acquired a wake-lock and is controlling location-updates, otherwise, location-manager
-        // will be left
-        // updating location constantly, killing the battery, even though some other location-mgmt
-        // module may
-        // desire to shut-down location-services.
-        lifecycleListener = new LifecycleEventListener() {
-            @Override
-            public void onHostResume() {
-                if (hasPermissions() && map != null) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(showUserLocation);
-                    map.setLocationSource(fusedLocationSource);
-                }
-                synchronized (MapView.this) {
-                    if (!destroyed) {
-                        MapView.this.onResume();
-                    }
-                    paused = false;
-                }
-            }
 
-            @Override
-            public void onHostPause() {
-                if (hasPermissions() && map != null) {
-                    //noinspection MissingPermission
-                    map.setMyLocationEnabled(false);
-                }
-                synchronized (MapView.this) {
-                    if (!destroyed) {
-                        MapView.this.onPause();
-                    }
-                    paused = true;
-                }
-            }
-
-            @Override
-            public void onHostDestroy() {
-                MapView.this.doDestroy();
-            }
-        };
 
-        context.addLifecycleEventListener(lifecycleListener);
+        isMapReady = true;
+        if (kmlSrc != null){
+            setKmlSrc(kmlSrc);
+            kmlSrc = null;
+        }
     }
 
     private synchronized void handleMarkerSelection(MapMarker target) {
@@ -638,9 +658,9 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
         }
         destroyed = true;
 
-        if (lifecycleListener != null && context != null) {
-            context.removeLifecycleEventListener(lifecycleListener);
-            lifecycleListener = null;
+        Activity activity = context.getCurrentActivity();
+        if (activity instanceof LifecycleOwner) {
+            ((LifecycleOwner) activity).getLifecycle().removeObserver(this);
         }
         if (!paused) {
             onPause();
@@ -1587,64 +1607,66 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
     }
 
     public void setKmlSrc(String kmlSrc) {
-        try {
-            InputStream kmlStream = new FileUtil(context).execute(kmlSrc).get();
+        if (isMapReady) {
+            try {
+                InputStream kmlStream = new FileUtil(context).execute(kmlSrc).get();
 
-            if (kmlStream == null) {
-                return;
-            }
+                if (kmlStream == null) {
+                    return;
+                }
 
-            KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context, markerManager, polygonManager, polylineManager, groundOverlayManager, null);
-            kmlLayer.addLayerToMap();
+                KmlLayer kmlLayer = new KmlLayer(map, kmlStream, context, markerManager, polygonManager, polylineManager, groundOverlayManager, null);
 
-            WritableMap pointers = new WritableNativeMap();
-            WritableArray markers = new WritableNativeArray();
+                kmlLayer.addLayerToMap();
 
-            if (kmlLayer.getContainers() == null) {
-                // todo: use Fabric events
-                // manager.pushEvent(context, this, "onKmlReady", pointers);
-                return;
-            }
-
-            //Retrieve a nested container within the first container
-            KmlContainer container = kmlLayer.getContainers().iterator().next();
-            if (container == null || container.getContainers() == null) {
-                // todo: use Fabric events
-                // manager.pushEvent(context, this, "onKmlReady", pointers);
-                return;
-            }
+                WritableMap pointers = new WritableNativeMap();
+                WritableArray markers = new WritableNativeArray();
 
+                if (kmlLayer.getContainers() == null) {
+                    // todo: use Fabric events
+                    // manager.pushEvent(context, this, "onKmlReady", pointers);
+                    return;
+                }
 
-            if (container.getContainers().iterator().hasNext()) {
-                container = container.getContainers().iterator().next();
-            }
+                //Retrieve a nested container within the first container
+                KmlContainer container = kmlLayer.getContainers().iterator().next();
+                if (container == null || container.getContainers() == null) {
+                    // todo: use Fabric events
+                    // manager.pushEvent(context, this, "onKmlReady", pointers);
+                    return;
+                }
 
-            int index = 0;
-            for (KmlPlacemark placemark : container.getPlacemarks()) {
-                MarkerOptions options = new MarkerOptions();
 
-                if (placemark.getInlineStyle() != null) {
-                    options = placemark.getMarkerOptions();
-                } else {
-                    options.icon(BitmapDescriptorFactory.defaultMarker());
+                if (container.getContainers().iterator().hasNext()) {
+                    container = container.getContainers().iterator().next();
                 }
 
-                LatLng latLng = ((LatLng) placemark.getGeometry().getGeometryObject());
-                String title = "";
-                String snippet = "";
+                int index = 0;
+                for (KmlPlacemark placemark : container.getPlacemarks()) {
+                    MarkerOptions options = new MarkerOptions();
 
-                if (placemark.hasProperty("name")) {
-                    title = placemark.getProperty("name");
-                }
+                    if (placemark.getInlineStyle() != null) {
+                        options = placemark.getMarkerOptions();
+                    } else {
+                        options.icon(BitmapDescriptorFactory.defaultMarker());
+                    }
 
-                if (placemark.hasProperty("description")) {
-                    snippet = placemark.getProperty("description");
-                }
+                    LatLng latLng = ((LatLng) placemark.getGeometry().getGeometryObject());
+                    String title = "";
+                    String snippet = "";
+
+                    if (placemark.hasProperty("name")) {
+                        title = placemark.getProperty("name");
+                    }
+
+                    if (placemark.hasProperty("description")) {
+                        snippet = placemark.getProperty("description");
+                    }
 
-                options.position(latLng);
-                options.title(title);
-                options.snippet(snippet);
-                // FIXME: get markerManager from somewhere
+                    options.position(latLng);
+                    options.title(title);
+                    options.snippet(snippet);
+                    // FIXME: get markerManager from somewhere
         /*
         MapMarker marker = new MapMarker(context, options, this.manager.getMarkerManager());
 
@@ -1670,15 +1692,18 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
 
         markers.pushMap(loadedMarker);
          */
-            }
+                }
 
-            pointers.putArray("markers", markers);
-            // todo: use Fabric events
-            //  manager.pushEvent(context, this, "onKmlReady", pointers);
+                pointers.putArray("markers", markers);
+                // todo: use Fabric events
+                //  manager.pushEvent(context, this, "onKmlReady", pointers);
 
-        } catch (XmlPullParserException | IOException | InterruptedException |
-                 ExecutionException e) {
-            e.printStackTrace();
+            } catch (XmlPullParserException | IOException | InterruptedException |
+                     ExecutionException e) {
+                e.printStackTrace();
+            }
+        } else {
+           this.kmlSrc = kmlSrc;
         }
     }
 

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": "1.21.0-alpha.72",
+  "version": "1.21.0-alpha.74",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",