react-native-maps 1.21.0-alpha.8 → 1.21.0-alpha.80

package/android/src/main/java/com/rnmaps/fabric/event/OnSelectEvent.java

@@ -0,0 +1,28 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnSelectEvent extends Event<OnSelectEvent> {
+    public static final String EVENT_NAME = "topSelect";
+
+    private final WritableMap payload;
+
+    public OnSelectEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

package/android/src/main/java/com/rnmaps/fabric/event/OnUserLocationChangeEvent.java

@@ -0,0 +1,28 @@
+package com.rnmaps.fabric.event;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.events.Event;
+
+public class OnUserLocationChangeEvent extends Event<OnUserLocationChangeEvent> {
+    public static final String EVENT_NAME = "topUserLocationChange";
+
+    private final WritableMap payload;
+
+    public OnUserLocationChangeEvent(int surfaceId, int viewId, WritableMap payload) {
+        super(surfaceId, viewId);
+        this.payload = payload;
+    }
+
+    @NonNull
+    @Override
+    public String getEventName() {
+        return EVENT_NAME;
+    }
+
+    @Override
+    public WritableMap getEventData() {
+        return payload;
+    }
+}

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

@@ -7,17 +7,45 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
 import com.facebook.react.module.model.ReactModuleInfoProvider;
+import com.facebook.react.uimanager.ViewManager;
+import com.rnmaps.fabric.CalloutManager;
+import com.rnmaps.fabric.MapViewManager;
+import com.rnmaps.fabric.MarkerManager;
 import com.rnmaps.fabric.NativeAirMapsModule;
-import com.rnmaps.fabric.NativeAirMapsModuleSpec;
+import com.facebook.fbreact.specs.NativeAirMapsModuleSpec;
+import com.rnmaps.fabric.PolygonManager;
+import com.rnmaps.fabric.PolylineManager;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class MapAirModulePackage extends TurboReactPackage {
 
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return List.of(new MapViewManager(reactContext), new MarkerManager(reactContext), new CalloutManager(reactContext), new PolygonManager(reactContext), new PolylineManager(reactContext));
+    }
+
+
     @Override
     public NativeModule getModule(String name, ReactApplicationContext reactContext) {
-        if (name.equals(NativeAirMapsModuleSpec.NAME)) {
+        if (PolylineManager.REACT_CLASS.equals(name)) {
+            return new PolylineManager(reactContext);
+        }
+        if (PolygonManager.REACT_CLASS.equals(name)) {
+            return new PolygonManager(reactContext);
+        }
+        if (CalloutManager.REACT_CLASS.equals(name)) {
+            return new CalloutManager(reactContext);
+        }
+        if (MarkerManager.REACT_CLASS.equals(name)) {
+            return new MarkerManager(reactContext);
+        }
+        if (MapViewManager.REACT_CLASS.equals(name)) {
+            return new MapViewManager(reactContext);
+        }
+        if (NativeAirMapsModuleSpec.NAME.equals(name)) {
             return new NativeAirMapsModule(reactContext);
         } else {
             return null;

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

@@ -2,7 +2,11 @@ package com.rnmaps.maps;
 
 import android.content.Context;
 
+import com.facebook.react.common.MapBuilder;
 import com.facebook.react.views.view.ReactViewGroup;
+import com.rnmaps.fabric.event.OnPressEvent;
+
+import java.util.Map;
 
 public class MapCallout extends ReactViewGroup {
   private boolean tooltip = false;
@@ -20,4 +24,18 @@ public class MapCallout extends ReactViewGroup {
   public boolean getTooltip() {
     return this.tooltip;
   }
+
+  @Override
+  protected void onLayout(boolean changed,
+                                   int left, int top, int right, int bottom){
+    width = right - left;
+    height = bottom - top;
+  }
+
+
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+   builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+   return builder.build();
+  }
 }

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

@@ -42,7 +42,7 @@ public class MapManager extends ViewGroupManager<MapView> {
             "none", GoogleMap.MAP_TYPE_NONE
     );
 
-    private final Map<String, Integer> MY_LOCATION_PRIORITY = MapBuilder.of(
+    public static final Map<String, Integer> MY_LOCATION_PRIORITY = MapBuilder.of(
             "balanced", Priority.PRIORITY_BALANCED_POWER_ACCURACY,
             "high", Priority.PRIORITY_HIGH_ACCURACY,
             "low", Priority.PRIORITY_LOW_POWER,
@@ -240,47 +240,47 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "showsBuildings", defaultBoolean = false)
     public void setShowBuildings(MapView view, boolean showBuildings) {
-        view.map.setBuildingsEnabled(showBuildings);
+        view.setShowBuildings(showBuildings);
     }
 
     @ReactProp(name = "showsIndoors", defaultBoolean = false)
     public void setShowIndoors(MapView view, boolean showIndoors) {
-        view.map.setIndoorEnabled(showIndoors);
+        view.setShowIndoors(showIndoors);
     }
 
     @ReactProp(name = "showsIndoorLevelPicker", defaultBoolean = false)
     public void setShowsIndoorLevelPicker(MapView view, boolean showsIndoorLevelPicker) {
-        view.map.getUiSettings().setIndoorLevelPickerEnabled(showsIndoorLevelPicker);
+        view.setShowsIndoorLevelPicker(showsIndoorLevelPicker);
     }
 
     @ReactProp(name = "showsCompass", defaultBoolean = false)
     public void setShowsCompass(MapView view, boolean showsCompass) {
-        view.map.getUiSettings().setCompassEnabled(showsCompass);
+        view.setShowsCompass(showsCompass);
     }
 
     @ReactProp(name = "scrollEnabled", defaultBoolean = false)
     public void setScrollEnabled(MapView view, boolean scrollEnabled) {
-        view.map.getUiSettings().setScrollGesturesEnabled(scrollEnabled);
+        view.setScrollEnabled(scrollEnabled);
     }
 
     @ReactProp(name = "zoomEnabled", defaultBoolean = false)
     public void setZoomEnabled(MapView view, boolean zoomEnabled) {
-        view.map.getUiSettings().setZoomGesturesEnabled(zoomEnabled);
+        view.setZoomEnabled(zoomEnabled);
     }
 
     @ReactProp(name = "zoomControlEnabled", defaultBoolean = true)
     public void setZoomControlEnabled(MapView view, boolean zoomControlEnabled) {
-        view.map.getUiSettings().setZoomControlsEnabled(zoomControlEnabled);
+        view.setZoomControlEnabled(zoomControlEnabled);
     }
 
     @ReactProp(name = "rotateEnabled", defaultBoolean = false)
     public void setRotateEnabled(MapView view, boolean rotateEnabled) {
-        view.map.getUiSettings().setRotateGesturesEnabled(rotateEnabled);
+        view.setRotateEnabled(rotateEnabled);
     }
 
     @ReactProp(name = "scrollDuringRotateOrZoomEnabled", defaultBoolean = true)
     public void setScrollDuringRotateOrZoomEnabled(MapView view, boolean scrollDuringRotateOrZoomEnabled) {
-        view.map.getUiSettings().setScrollGesturesEnabledDuringRotateOrZoom(scrollDuringRotateOrZoomEnabled);
+        view.setScrollDuringRotateOrZoomEnabled(scrollDuringRotateOrZoomEnabled);
     }
 
     @ReactProp(name = "cacheEnabled", defaultBoolean = false)
@@ -295,7 +295,7 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "loadingEnabled", defaultBoolean = false)
     public void setLoadingEnabled(MapView view, boolean loadingEnabled) {
-        view.enableMapLoading(loadingEnabled);
+        view.setLoadingEnabled(loadingEnabled);
     }
 
     @ReactProp(name = "moveOnMarkerPress", defaultBoolean = true)
@@ -315,17 +315,17 @@ public class MapManager extends ViewGroupManager<MapView> {
 
     @ReactProp(name = "pitchEnabled", defaultBoolean = false)
     public void setPitchEnabled(MapView view, boolean pitchEnabled) {
-        view.map.getUiSettings().setTiltGesturesEnabled(pitchEnabled);
+        view.setPitchEnabled(pitchEnabled);
     }
 
     @ReactProp(name = "minZoomLevel")
     public void setMinZoomLevel(MapView view, float minZoomLevel) {
-        view.map.setMinZoomPreference(minZoomLevel);
+        view.setMinZoomLevel(minZoomLevel);
     }
 
     @ReactProp(name = "maxZoomLevel")
     public void setMaxZoomLevel(MapView view, float maxZoomLevel) {
-        view.map.setMaxZoomPreference(maxZoomLevel);
+        view.setMaxZoomLevel(maxZoomLevel);
     }
 
     @ReactProp(name = "kmlSrc")

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

@@ -32,13 +32,28 @@ import com.facebook.imagepipeline.image.CloseableStaticBitmap;
 import com.facebook.imagepipeline.image.ImageInfo;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.Event;
+import com.facebook.react.uimanager.events.EventDispatcher;
+import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.maps.android.collections.MarkerManager;
+import com.rnmaps.fabric.event.OnDeselectEvent;
+import com.rnmaps.fabric.event.OnDragEndEvent;
+import com.rnmaps.fabric.event.OnDragEvent;
+import com.rnmaps.fabric.event.OnDragStartEvent;
+import com.rnmaps.fabric.event.OnPressEvent;
+import com.rnmaps.fabric.event.OnSelectEvent;
+
+import java.util.Map;
 
 public class MapMarker extends MapFeature {
 
@@ -80,11 +95,17 @@ public class MapMarker extends MapFeature {
   private boolean hasCustomMarkerView = false;
   private final MapMarkerManager markerManager;
   private String imageUri;
+  private boolean loadingImage;
 
   private final DraweeHolder<?> logoHolder;
+  private ImageManager.OnImageLoadedListener imageLoadedListener;
   private DataSource<CloseableReference<CloseableImage>> dataSource;
   private final ControllerListener<ImageInfo> mLogoControllerListener =
       new BaseControllerListener<ImageInfo>() {
+    @Override
+    public void onSubmit(String id, Object callerContext){
+        loadingImage = true;
+    }
         @Override
         public void onFinalImageSet(
             String id,
@@ -116,6 +137,12 @@ public class MapMarker extends MapFeature {
                 .updateIcon(iconBitmapDescriptor, iconBitmap);
           }
           update(true);
+          loadingImage = false;
+          if (imageLoadedListener != null){
+            imageLoadedListener.onImageLoaded(null, null, false);
+            // fire and forget
+            imageLoadedListener = null;
+          }
         }
       };
 
@@ -143,7 +170,7 @@ public class MapMarker extends MapFeature {
     setFlat(options.isFlat());
     setDraggable(options.isDraggable());
     setZIndex(Math.round(options.getZIndex()));
-    setAlpha(options.getAlpha());
+    setOpacity(options.getAlpha());
     iconBitmapDescriptor = options.getIcon();
   }
 
@@ -155,7 +182,10 @@ public class MapMarker extends MapFeature {
   }
 
   public void setCoordinate(ReadableMap coordinate) {
-    position = new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude"));
+    setCoordinate(new LatLng(coordinate.getDouble("latitude"), coordinate.getDouble("longitude")));
+  }
+  public void setCoordinate(LatLng position){
+    this.position = position;
     if (marker != null) {
       marker.setPosition(position);
     }
@@ -421,7 +451,6 @@ public class MapMarker extends MapFeature {
         updateTracksViewChanges();
         update(true);
       }
-
     }
   }
 
@@ -618,8 +647,55 @@ public class MapMarker extends MapFeature {
         getContext().getPackageName());
   }
 
+    public boolean isLoadingImage() {
+        return loadingImage;
+    }
+
+    public ImageManager.OnImageLoadedListener getImageLoadedListener() {
+        return imageLoadedListener;
+    }
+
+    public void setImageLoadedListener(ImageManager.OnImageLoadedListener imageLoadedListener) {
+        this.imageLoadedListener = imageLoadedListener;
+    }
+
+    @FunctionalInterface
+  public interface EventCreator<T extends Event> {
+    T create(int surfaceId, int viewId, WritableMap payload);
+  }
+  public  <T extends Event> void dispatchEvent(WritableMap payload, MapView.EventCreator<T> creator) {
+    // Cast context to ReactContext
+    ReactContext reactContext = (ReactContext) context;
+
+    // Get the event dispatcher
+    EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, getId());
+
+    // If there is a dispatcher, create and dispatch the event
+    if (eventDispatcher != null) {
+      int surfaceId = UIManagerHelper.getSurfaceId(reactContext);
+      T event = creator.create(surfaceId, getId(), payload);
+      eventDispatcher.dispatchEvent(event);
+    }
+  }
+
   private BitmapDescriptor getBitmapDescriptorByName(String name) {
     return BitmapDescriptorFactory.fromResource(getDrawableResourceByName(name));
   }
 
+  public static Map<String, Object> getExportedCustomBubblingEventTypeConstants() {
+    MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+    builder.put(OnSelectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnSelectEvent.EVENT_NAME));
+    builder.put(OnDeselectEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDeselectEvent.EVENT_NAME));
+    builder.put(OnPressEvent.EVENT_NAME, MapBuilder.of("registrationName", OnPressEvent.EVENT_NAME));
+    return builder.build();
+  }
+
+  public static Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+    return MapBuilder.of(
+            OnDragEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEvent.EVENT_NAME),
+            OnDragStartEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragStartEvent.EVENT_NAME),
+            OnDragEndEvent.EVENT_NAME, MapBuilder.of("registrationName", OnDragEndEvent.EVENT_NAME)
+    );
+  }
+
 }