markers;
+ private boolean loadImageStarted;
- public AirMapMarkerSharedIcon(){
- this.markers = new WeakHashMap<>();
- this.loadImageStarted = false;
- }
+ public AirMapMarkerSharedIcon() {
+ this.markers = new WeakHashMap<>();
+ this.loadImageStarted = false;
+ }
- /**
- * check whether the load image process started.
- * caller AirMapMarker will only need to load it when this returns true.
- *
- * @return true if it is not started, false otherwise.
- */
- public synchronized boolean shouldLoadImage(){
- if (!this.loadImageStarted) {
- this.loadImageStarted = true;
- return true;
- }
- return false;
+ /**
+ * check whether the load image process started.
+ * caller AirMapMarker will only need to load it when this returns true.
+ *
+ * @return true if it is not started, false otherwise.
+ */
+ public synchronized boolean shouldLoadImage() {
+ if (!this.loadImageStarted) {
+ this.loadImageStarted = true;
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * subscribe icon update for given marker.
+ *
+ * The marker is wrapped in weakReference, so no need to remove it explicitly.
+ *
+ * @param marker
+ */
+ public synchronized void addMarker(MapMarker marker) {
+ this.markers.put(marker, true);
+ if (this.iconBitmapDescriptor != null) {
+ marker.setIconBitmapDescriptor(this.iconBitmapDescriptor, this.bitmap);
+ }
+ }
+
+ /**
+ * Remove marker from this shared icon.
+ *
+ * Marker will only need to call it when the marker receives a different marker image uri.
+ *
+ * @param marker
+ */
+ public synchronized void removeMarker(MapMarker marker) {
+ this.markers.remove(marker);
+ }
+
+ /**
+ * check if there is markers still listening on this icon.
+ * when there are not markers listen on it, we can remove it.
+ *
+ * @return true if there is, false otherwise
+ */
+ public synchronized boolean hasMarker() {
+ return this.markers.isEmpty();
+ }
+
+ /**
+ * Update the bitmap descriptor and bitmap for the image uri.
+ * And notify all subscribers about the update.
+ *
+ * @param bitmapDescriptor
+ * @param bitmap
+ */
+ public synchronized void updateIcon(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
+
+ this.iconBitmapDescriptor = bitmapDescriptor;
+ this.bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+
+ if (this.markers.isEmpty()) {
+ return;
+ }
+
+ for (Map.Entry markerEntry : markers.entrySet()) {
+ if (markerEntry.getKey() != null) {
+ markerEntry.getKey().setIconBitmapDescriptor(bitmapDescriptor, bitmap);
+ }
+ }
+ }
}
+ private final Map sharedIcons = new ConcurrentHashMap<>();
+
/**
- * subscribe icon update for given marker.
- *
- * The marker is wrapped in weakReference, so no need to remove it explicitly.
+ * get the shared icon object, if not existed, create a new one and store it.
*
- * @param marker
+ * @param uri
+ * @return the icon object for the given uri.
*/
- public synchronized void addMarker(MapMarker marker) {
- this.markers.put(marker, true);
- if (this.iconBitmapDescriptor != null) {
- marker.setIconBitmapDescriptor(this.iconBitmapDescriptor, this.bitmap);
- }
+ public AirMapMarkerSharedIcon getSharedIcon(String uri) {
+ AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+ if (icon == null) {
+ synchronized (this) {
+ if ((icon = this.sharedIcons.get(uri)) == null) {
+ icon = new AirMapMarkerSharedIcon();
+ this.sharedIcons.put(uri, icon);
+ }
+ }
+ }
+ return icon;
}
/**
- * Remove marker from this shared icon.
- *
- * Marker will only need to call it when the marker receives a different marker image uri.
+ * Remove the share icon object from our sharedIcons map when no markers are listening for it.
*
- * @param marker
+ * @param uri
*/
- public synchronized void removeMarker(MapMarker marker) {
- this.markers.remove(marker);
+ public void removeSharedIconIfEmpty(String uri) {
+ AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
+ if (icon == null) {
+ return;
+ }
+ if (!icon.hasMarker()) {
+ synchronized (this) {
+ if ((icon = this.sharedIcons.get(uri)) != null && !icon.hasMarker()) {
+ this.sharedIcons.remove(uri);
+ }
+ }
+ }
}
- /**
- * check if there is markers still listening on this icon.
- * when there are not markers listen on it, we can remove it.
- *
- * @return true if there is, false otherwise
- */
- public synchronized boolean hasMarker(){
- return this.markers.isEmpty();
+ public MapMarkerManager() {
}
- /**
- * Update the bitmap descriptor and bitmap for the image uri.
- * And notify all subscribers about the update.
- *
- * @param bitmapDescriptor
- * @param bitmap
- */
- public synchronized void updateIcon(BitmapDescriptor bitmapDescriptor, Bitmap bitmap) {
+ @Override
+ public String getName() {
+ return "AIRMapMarker";
+ }
- this.iconBitmapDescriptor = bitmapDescriptor;
- this.bitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
+ @Override
+ public MapMarker createViewInstance(ThemedReactContext context) {
+ return new MapMarker(context, this);
+ }
- if (this.markers.isEmpty()) {
- return;
- }
+ @ReactProp(name = "coordinate")
+ public void setCoordinate(MapMarker view, ReadableMap map) {
+ view.setCoordinate(map);
+ }
- for (Map.Entry markerEntry: markers.entrySet()) {
- if (markerEntry.getKey() != null) {
- markerEntry.getKey().setIconBitmapDescriptor(bitmapDescriptor, bitmap);
- }
- }
+ @ReactProp(name = "title")
+ public void setTitle(MapMarker view, String title) {
+ view.setTitle(title);
}
- }
-
- private final Map sharedIcons = new ConcurrentHashMap<>();
-
- /**
- * get the shared icon object, if not existed, create a new one and store it.
- *
- * @param uri
- * @return the icon object for the given uri.
- */
- public AirMapMarkerSharedIcon getSharedIcon(String uri) {
- AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
- if (icon == null) {
- synchronized (this) {
- if((icon = this.sharedIcons.get(uri)) == null) {
- icon = new AirMapMarkerSharedIcon();
- this.sharedIcons.put(uri, icon);
- }
- }
+
+ @ReactProp(name = "identifier")
+ public void setIdentifier(MapMarker view, String identifier) {
+ view.setIdentifier(identifier);
}
- return icon;
- }
-
- /**
- * Remove the share icon object from our sharedIcons map when no markers are listening for it.
- *
- * @param uri
- */
- public void removeSharedIconIfEmpty(String uri) {
- AirMapMarkerSharedIcon icon = this.sharedIcons.get(uri);
- if (icon == null) {return;}
- if (!icon.hasMarker()) {
- synchronized (this) {
- if((icon = this.sharedIcons.get(uri)) != null && !icon.hasMarker()) {
- this.sharedIcons.remove(uri);
- }
- }
+
+ @ReactProp(name = "description")
+ public void setDescription(MapMarker view, String description) {
+ view.setSnippet(description);
}
- }
-
- public MapMarkerManager() {
- }
-
- @Override
- public String getName() {
- return "AIRMapMarker";
- }
-
- @Override
- public MapMarker createViewInstance(ThemedReactContext context) {
- return new MapMarker(context, this);
- }
-
- @ReactProp(name = "coordinate")
- public void setCoordinate(MapMarker view, ReadableMap map) {
- view.setCoordinate(map);
- }
-
- @ReactProp(name = "title")
- public void setTitle(MapMarker view, String title) {
- view.setTitle(title);
- }
-
- @ReactProp(name = "identifier")
- public void setIdentifier(MapMarker view, String identifier) {
- view.setIdentifier(identifier);
- }
-
- @ReactProp(name = "description")
- public void setDescription(MapMarker view, String description) {
- view.setSnippet(description);
- }
-
- // NOTE(lmr):
- // android uses normalized coordinate systems for this, and is provided through the
- // `anchor` property and `calloutAnchor` instead. Perhaps some work could be done
- // to normalize iOS and android to use just one of the systems.
+
+ // NOTE(lmr):
+ // android uses normalized coordinate systems for this, and is provided through the
+ // `anchor` property and `calloutAnchor` instead. Perhaps some work could be done
+ // to normalize iOS and android to use just one of the systems.
// @ReactProp(name = "centerOffset")
// public void setCenterOffset(AirMapMarker view, ReadableMap map) {
//
@@ -194,165 +197,172 @@ public void setDescription(MapMarker view, String description) {
//
// }
- @ReactProp(name = "anchor")
- public void setAnchor(MapMarker view, ReadableMap map) {
- // should default to (0.5, 1) (bottom middle)
- double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
- double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
- view.setAnchor(x, y);
- }
-
- @ReactProp(name = "calloutAnchor")
- public void setCalloutAnchor(MapMarker view, ReadableMap map) {
- // should default to (0.5, 0) (top middle)
- double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
- double y = map != null && map.hasKey("y") ? map.getDouble("y") : 0.0;
- view.setCalloutAnchor(x, y);
- }
-
- @ReactProp(name = "image")
- public void setImage(MapMarker view, @Nullable String source) {
- view.setImage(source);
- }
+ @ReactProp(name = "anchor")
+ public void setAnchor(MapMarker view, ReadableMap map) {
+ // should default to (0.5, 1) (bottom middle)
+ double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
+ double y = map != null && map.hasKey("y") ? map.getDouble("y") : 1.0;
+ view.setAnchor(x, y);
+ }
+
+ @ReactProp(name = "calloutAnchor")
+ public void setCalloutAnchor(MapMarker view, ReadableMap map) {
+ // should default to (0.5, 0) (top middle)
+ double x = map != null && map.hasKey("x") ? map.getDouble("x") : 0.5;
+ double y = map != null && map.hasKey("y") ? map.getDouble("y") : 0.0;
+ view.setCalloutAnchor(x, y);
+ }
+
+ @ReactProp(name = "image")
+ public void setImage(MapMarker view, @Nullable String source) {
+ view.setImage(source);
+ }
// public void setImage(AirMapMarker view, ReadableMap image) {
// view.setImage(image);
// }
- @ReactProp(name = "icon")
- public void setIcon(MapMarker view, @Nullable String source) {
- view.setImage(source);
- }
-
- @ReactProp(name = "pinColor", defaultInt = Color.RED, customType = "Color")
- public void setPinColor(MapMarker view, int pinColor) {
- float[] hsv = new float[3];
- Color.colorToHSV(pinColor, hsv);
- // NOTE: android only supports a hue
- view.setMarkerHue(hsv[0]);
- }
-
- @ReactProp(name = "rotation", defaultFloat = 0.0f)
- public void setMarkerRotation(MapMarker view, float rotation) {
- view.setRotation(rotation);
- }
-
- @ReactProp(name = "flat", defaultBoolean = false)
- public void setFlat(MapMarker view, boolean flat) {
- view.setFlat(flat);
- }
-
- @ReactProp(name = "draggable", defaultBoolean = false)
- public void setDraggable(MapMarker view, boolean draggable) {
- view.setDraggable(draggable);
- }
-
- @Override
- @ReactProp(name = "zIndex", defaultFloat = 0.0f)
- public void setZIndex(MapMarker view, float zIndex) {
- super.setZIndex(view, zIndex);
- int integerZIndex = Math.round(zIndex);
- view.setZIndex(integerZIndex);
- }
-
- @Override
- @ReactProp(name = "opacity", defaultFloat = 1.0f)
- public void setOpacity(MapMarker view, float opacity) {
- super.setOpacity(view, opacity);
- view.setOpacity(opacity);
- }
-
- @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
- public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
- view.setTracksViewChanges(tracksViewChanges);
- }
-
- @Override
- public void addView(MapMarker parent, View child, int index) {
- // if an component is a child, then it is a callout view, NOT part of the
- // marker.
- if (child instanceof MapCallout) {
- parent.setCalloutView((MapCallout) child);
- } else {
- super.addView(parent, child, index);
- parent.update(true);
+ @ReactProp(name = "icon")
+ public void setIcon(MapMarker view, @Nullable String source) {
+ view.setImage(source);
+ }
+
+ @ReactProp(name = "pinColor", defaultInt = Color.RED, customType = "Color")
+ public void setPinColor(MapMarker view, int pinColor) {
+ float[] hsv = new float[3];
+ Color.colorToHSV(pinColor, hsv);
+ // NOTE: android only supports a hue
+ view.setMarkerHue(hsv[0]);
+ }
+
+ @ReactProp(name = "rotation", defaultFloat = 0.0f)
+ public void setMarkerRotation(MapMarker view, float rotation) {
+ view.setRotation(rotation);
+ }
+
+ @ReactProp(name = "flat", defaultBoolean = false)
+ public void setFlat(MapMarker view, boolean flat) {
+ view.setFlat(flat);
+ }
+
+ @ReactProp(name = "draggable", defaultBoolean = false)
+ public void setDraggable(MapMarker view, boolean draggable) {
+ view.setDraggable(draggable);
+ }
+
+ @Override
+ @ReactProp(name = "zIndex", defaultFloat = 0.0f)
+ public void setZIndex(MapMarker view, float zIndex) {
+ super.setZIndex(view, zIndex);
+ int integerZIndex = Math.round(zIndex);
+ view.setZIndex(integerZIndex);
+ }
+
+ @Override
+ @ReactProp(name = "opacity", defaultFloat = 1.0f)
+ public void setOpacity(MapMarker view, float opacity) {
+ super.setOpacity(view, opacity);
+ view.setOpacity(opacity);
}
- }
-
- @Override
- public void removeViewAt(MapMarker parent, int index) {
- super.removeViewAt(parent, index);
- parent.update(true);
- }
-
- @Override
- public void receiveCommand(@NonNull MapMarker view, String commandId, @Nullable ReadableArray args) {
- int duration;
- double lat;
- double lng;
- ReadableMap region;
-
- switch (commandId) {
- case "showCallout":
- ((Marker) view.getFeature()).showInfoWindow();
- break;
-
- case "hideCallout":
- ((Marker) view.getFeature()).hideInfoWindow();
- break;
-
- case "animateMarkerToCoordinate":
- if(args == null) {
- break;
+
+ @ReactProp(name = "tracksViewChanges", defaultBoolean = true)
+ public void setTracksViewChanges(MapMarker view, boolean tracksViewChanges) {
+ view.setTracksViewChanges(tracksViewChanges);
+ }
+
+ @ReactProp(name = "accessibilityLabel")
+ public void setAccessibilityLabel(MapMarker view, @Nullable String accessibilityLabel) {
+ view.setTag(R.id.accessibility_label, accessibilityLabel);
+ }
+
+ @Override
+ public void addView(MapMarker parent, View child, int index) {
+ // if an component is a child, then it is a callout view, NOT part of the
+ // marker.
+ if (child instanceof MapCallout) {
+ parent.setCalloutView((MapCallout) child);
+ } else {
+ super.addView(parent, child, index);
+ parent.update(true);
}
- region = args.getMap(0);
- duration = args.getInt(1);
+ }
+
+ @Override
+ public void removeViewAt(MapMarker parent, int index) {
+ super.removeViewAt(parent, index);
+ parent.update(true);
+ }
- lng = region.getDouble("longitude");
- lat = region.getDouble("latitude");
- view.animateToCoodinate(new LatLng(lat, lng), duration);
- break;
+ @Override
+ public void receiveCommand(@NonNull MapMarker view, String commandId, @Nullable ReadableArray args) {
+ int duration;
+ double lat;
+ double lng;
+ ReadableMap region;
+
+ switch (commandId) {
+ case "showCallout":
+ ((Marker) view.getFeature()).showInfoWindow();
+ break;
+
+ case "hideCallout":
+ ((Marker) view.getFeature()).hideInfoWindow();
+ break;
+
+ case "animateMarkerToCoordinate":
+ if (args == null) {
+ break;
+ }
+ region = args.getMap(0);
+ duration = args.getInt(1);
+
+ lng = region.getDouble("longitude");
+ lat = region.getDouble("latitude");
+ view.animateToCoodinate(new LatLng(lat, lng), duration);
+ break;
+
+ case "redraw":
+ view.updateMarkerIcon();
+ break;
+ }
+ }
+
+ @Override
+ @Nullable
+ public Map getExportedCustomDirectEventTypeConstants() {
+ return MapBuilder.>builder()
+ .put("onPress", MapBuilder.of("registrationName", "onPress"))
+ .put("onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"))
+ .put("onDragStart", MapBuilder.of("registrationName", "onDragStart"))
+ .put("onDrag", MapBuilder.of("registrationName", "onDrag"))
+ .put("onDragEnd", MapBuilder.of("registrationName", "onDragEnd"))
+ .build();
+ }
+
+ @Override
+ @Nullable
+ public Map getExportedCustomBubblingEventTypeConstants() {
+ return MapBuilder.>builder()
+ .put("onSelect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onSelect")))
+ .put("onDeselect", MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", "onDeselect")))
+ .build();
+ }
+
+
+ @Override
+ public LayoutShadowNode createShadowNodeInstance() {
+ // we use a custom shadow node that emits the width/height of the view
+ // after layout with the updateExtraData method. Without this, we can't generate
+ // a bitmap of the appropriate width/height of the rendered view.
+ return new SizeReportingShadowNode();
+ }
- case "redraw":
- view.updateMarkerIcon();
- break;
+ @Override
+ public void updateExtraData(MapMarker view, Object extraData) {
+ // This method is called from the shadow node with the width/height of the rendered
+ // marker view.
+ HashMap data = (HashMap) extraData;
+ float width = data.get("width");
+ float height = data.get("height");
+ view.update((int) width, (int) height);
}
- }
-
- @Override
- @Nullable
- public Map getExportedCustomDirectEventTypeConstants() {
- Map> map = MapBuilder.of(
- "onPress", MapBuilder.of("registrationName", "onPress"),
- "onCalloutPress", MapBuilder.of("registrationName", "onCalloutPress"),
- "onDragStart", MapBuilder.of("registrationName", "onDragStart"),
- "onDrag", MapBuilder.of("registrationName", "onDrag"),
- "onDragEnd", MapBuilder.of("registrationName", "onDragEnd")
- );
-
- map.putAll(MapBuilder.of(
- "onDragStart", MapBuilder.of("registrationName", "onDragStart"),
- "onDrag", MapBuilder.of("registrationName", "onDrag"),
- "onDragEnd", MapBuilder.of("registrationName", "onDragEnd")
- ));
-
- return map;
- }
-
- @Override
- public LayoutShadowNode createShadowNodeInstance() {
- // we use a custom shadow node that emits the width/height of the view
- // after layout with the updateExtraData method. Without this, we can't generate
- // a bitmap of the appropriate width/height of the rendered view.
- return new SizeReportingShadowNode();
- }
-
- @Override
- public void updateExtraData(MapMarker view, Object extraData) {
- // This method is called from the shadow node with the width/height of the rendered
- // marker view.
- HashMap data = (HashMap) extraData;
- float width = data.get("width");
- float height = data.get("height");
- view.update((int) width, (int) height);
- }
}
diff --git a/android/src/main/java/com/rnmaps/maps/MapModule.java b/android/src/main/java/com/rnmaps/maps/MapModule.java
index 8e9e97a12..aef5bc5ff 100644
--- a/android/src/main/java/com/rnmaps/maps/MapModule.java
+++ b/android/src/main/java/com/rnmaps/maps/MapModule.java
@@ -8,10 +8,8 @@
import android.net.Uri;
import android.util.Base64;
import android.util.DisplayMetrics;
-import android.util.Log;
import androidx.annotation.Nullable;
-import androidx.annotation.NonNull;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
@@ -21,12 +19,7 @@
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.module.annotations.ReactModule;
-import com.facebook.react.uimanager.NativeViewHierarchyManager;
-import com.facebook.react.uimanager.UIBlock;
-import com.facebook.react.uimanager.UIManagerModule;
import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapsInitializer;
-import com.google.android.gms.maps.OnMapsSdkInitializedCallback;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
@@ -35,10 +28,9 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
@ReactModule(name = MapModule.NAME)
public class MapModule extends ReactContextBaseJavaModule {
@@ -94,19 +86,7 @@ public void takeSnapshot(final int tag, final ReadableMap options, final Promise
options.hasKey("height") ? (int) (displayMetrics.density * options.getDouble("height")) : 0;
final String result = options.hasKey("result") ? options.getString("result") : "file";
- // Add UI-block so we can get a valid reference to the map-view
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock() {
- public void execute(NativeViewHierarchyManager nvhm) {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null) {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null) {
- promise.reject("AirMapView.map is not valid");
- return;
- }
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
view.map.snapshot(new GoogleMap.SnapshotReadyCallback() {
public void onSnapshotReady(@Nullable Bitmap snapshot) {
@@ -146,30 +126,20 @@ public void onSnapshotReady(@Nullable Bitmap snapshot) {
}
}
});
- }
- });
+
+ return null;
+ });
+
+ // Add UI-block so we can get a valid reference to the map-view
+
+ uiBlock.addToUIManager();
}
@ReactMethod
public void getCamera(final int tag, final Promise promise) {
final ReactApplicationContext context = getReactApplicationContext();
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null) {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null) {
- promise.reject("AirMapView.map is not valid");
- return;
- }
-
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
CameraPosition position = view.map.getCameraPosition();
WritableMap centerJson = new WritableNativeMap();
@@ -183,34 +153,23 @@ public void execute(NativeViewHierarchyManager nvhm)
cameraJson.putDouble("pitch", (double)position.tilt);
promise.resolve(cameraJson);
- }
+
+ return null;
});
+
+ uiBlock.addToUIManager();
}
@ReactMethod
public void getAddressFromCoordinates(final int tag, final ReadableMap coordinate, final Promise promise) {
final ReactApplicationContext context = getReactApplicationContext();
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null) {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null) {
- promise.reject("AirMapView.map is not valid");
- return;
- }
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, mapView -> {
if (coordinate == null ||
!coordinate.hasKey("latitude") ||
!coordinate.hasKey("longitude")) {
promise.reject("Invalid coordinate format");
- return;
+ return null;
}
Geocoder geocoder = new Geocoder(context);
try {
@@ -218,7 +177,7 @@ public void execute(NativeViewHierarchyManager nvhm)
geocoder.getFromLocation(coordinate.getDouble("latitude"),coordinate.getDouble("longitude"),1);
if (list.isEmpty()) {
promise.reject("Can not get address location");
- return;
+ return null;
}
Address address = list.get(0);
@@ -238,8 +197,11 @@ public void execute(NativeViewHierarchyManager nvhm)
} catch (IOException e) {
promise.reject("Can not get address location");
}
- }
+
+ return null;
});
+
+ uiBlock.addToUIManager();
}
@ReactMethod
@@ -252,22 +214,7 @@ public void pointForCoordinate(final int tag, ReadableMap coordinate, final Prom
coordinate.hasKey("longitude") ? coordinate.getDouble("longitude") : 0.0
);
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null) {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null) {
- promise.reject("AirMapView.map is not valid");
- return;
- }
-
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
Point pt = view.map.getProjection().toScreenLocation(coord);
WritableMap ptJson = new WritableNativeMap();
@@ -275,8 +222,11 @@ public void execute(NativeViewHierarchyManager nvhm)
ptJson.putDouble("y", (double)pt.y / density);
promise.resolve(ptJson);
- }
+
+ return null;
});
+
+ uiBlock.addToUIManager();
}
@ReactMethod
@@ -289,24 +239,7 @@ public void coordinateForPoint(final int tag, ReadableMap point, final Promise p
point.hasKey("y") ? (int)(point.getDouble("y") * density) : 0
);
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null)
- {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null)
- {
- promise.reject("AirMapView.map is not valid");
- return;
- }
-
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
LatLng coord = view.map.getProjection().fromScreenLocation(pt);
WritableMap coordJson = new WritableNativeMap();
@@ -314,30 +247,18 @@ public void execute(NativeViewHierarchyManager nvhm)
coordJson.putDouble("longitude", coord.longitude);
promise.resolve(coordJson);
- }
+
+ return null;
});
+
+ uiBlock.addToUIManager();
}
@ReactMethod
public void getMapBoundaries(final int tag, final Promise promise) {
final ReactApplicationContext context = getReactApplicationContext();
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapView view = (MapView) nvhm.resolveView(tag);
- if (view == null) {
- promise.reject("AirMapView not found");
- return;
- }
- if (view.map == null) {
- promise.reject("AirMapView.map is not valid");
- return;
- }
-
+ MapUIBlock uiBlock = new MapUIBlock(tag, promise, context, view -> {
double[][] boundaries = view.getMapBoundaries();
WritableMap coordinates = new WritableNativeMap();
@@ -353,28 +274,10 @@ public void execute(NativeViewHierarchyManager nvhm)
coordinates.putMap("southWest", southWestHash);
promise.resolve(coordinates);
- }
- });
- }
-
- @ReactMethod
- public void enableLatestRenderer(final Promise promise) {
- final ReactApplicationContext context = getReactApplicationContext();
- UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
- uiManager.addUIBlock(new UIBlock()
- {
- @Override
- public void execute(NativeViewHierarchyManager nvhm)
- {
- MapsInitializer.initialize(context, MapsInitializer.Renderer.LATEST, new OnMapsSdkInitializedCallback() {
- @Override
- public void onMapsSdkInitialized(@NonNull MapsInitializer.Renderer renderer) {
- Log.d("AirMapRenderer", renderer.toString());
- promise.resolve(renderer.toString());
- }
- });
- }
+ return null;
});
+
+ uiBlock.addToUIManager();
}
}
diff --git a/android/src/main/java/com/rnmaps/maps/MapPolygon.java b/android/src/main/java/com/rnmaps/maps/MapPolygon.java
index 98ea14279..4dabeef0e 100644
--- a/android/src/main/java/com/rnmaps/maps/MapPolygon.java
+++ b/android/src/main/java/com/rnmaps/maps/MapPolygon.java
@@ -4,7 +4,10 @@
import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
+import com.google.android.gms.maps.model.Dash;
+import com.google.android.gms.maps.model.Gap;
import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.PatternItem;
import com.google.android.gms.maps.model.Polygon;
import com.google.android.gms.maps.model.PolygonOptions;
import com.google.maps.android.collections.PolygonManager;
@@ -25,6 +28,8 @@ public class MapPolygon extends MapFeature {
private boolean geodesic;
private boolean tappable;
private float zIndex;
+ private ReadableArray patternValues;
+ private List pattern;
public MapPolygon(Context context) {
super(context);
@@ -117,6 +122,32 @@ public void setZIndex(float zIndex) {
}
}
+ public void setLineDashPattern(ReadableArray patternValues) {
+ this.patternValues = patternValues;
+ this.applyPattern();
+ }
+
+ private void applyPattern() {
+ if(patternValues == null) {
+ return;
+ }
+ this.pattern = new ArrayList<>(patternValues.size());
+ for (int i = 0; i < patternValues.size(); i++) {
+ float patternValue = (float) patternValues.getDouble(i);
+ boolean isGap = i % 2 != 0;
+ if(isGap) {
+ this.pattern.add(new Gap(patternValue));
+ }else {
+ PatternItem patternItem;
+ patternItem = new Dash(patternValue);
+ this.pattern.add(patternItem);
+ }
+ }
+ if(polygon != null) {
+ polygon.setStrokePattern(this.pattern);
+ }
+ }
+
public PolygonOptions getPolygonOptions() {
if (polygonOptions == null) {
polygonOptions = createPolygonOptions();
@@ -132,6 +163,7 @@ private PolygonOptions createPolygonOptions() {
options.strokeWidth(strokeWidth);
options.geodesic(geodesic);
options.zIndex(zIndex);
+ options.strokePattern(this.pattern);
if (this.holes != null) {
for (int i = 0; i < holes.size(); i++) {
diff --git a/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java b/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java
index 4ca82fd7e..26c3f78c0 100644
--- a/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java
+++ b/android/src/main/java/com/rnmaps/maps/MapPolygonManager.java
@@ -78,6 +78,11 @@ public void setZIndex(MapPolygon view, float zIndex) {
view.setZIndex(zIndex);
}
+ @ReactProp(name = "lineDashPattern")
+ public void setLineDashPattern(MapPolygon view, ReadableArray patternValues) {
+ view.setLineDashPattern(patternValues);
+ }
+
@Override
@Nullable
public Map getExportedCustomDirectEventTypeConstants() {
diff --git a/android/src/main/java/com/rnmaps/maps/MapTileProvider.java b/android/src/main/java/com/rnmaps/maps/MapTileProvider.java
index 2b1a6461f..a974311c2 100644
--- a/android/src/main/java/com/rnmaps/maps/MapTileProvider.java
+++ b/android/src/main/java/com/rnmaps/maps/MapTileProvider.java
@@ -443,6 +443,10 @@ protected URL getTileUrl(int x, int y, int zoom) {
}
public void setUrlTemplate(String urlTemplate) {
+ if (this.urlTemplate != urlTemplate) {
+ this.tileProvider = new AIRMapUrlTileProvider(tileSize, tileSize, urlTemplate);
+ }
+
this.urlTemplate = urlTemplate;
}
diff --git a/android/src/main/java/com/rnmaps/maps/MapUIBlock.java b/android/src/main/java/com/rnmaps/maps/MapUIBlock.java
new file mode 100644
index 000000000..cceab1a31
--- /dev/null
+++ b/android/src/main/java/com/rnmaps/maps/MapUIBlock.java
@@ -0,0 +1,64 @@
+package com.rnmaps.maps;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.FabricUIManager;
+import com.facebook.react.fabric.interop.UIBlockViewResolver;
+import com.facebook.react.uimanager.common.UIManagerType;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.UIManagerModule;
+
+import java.util.function.Function;
+
+public class MapUIBlock implements UIBlockInterface {
+ private int tag;
+ private Promise promise;
+ private ReactApplicationContext context;
+ private Function mapOperation;
+
+ public MapUIBlock(int tag, Promise promise, ReactApplicationContext context, Function mapOperation) {
+ this.tag = tag;
+ this.promise = promise;
+ this.context = context;
+ this.mapOperation = mapOperation;
+ }
+
+ @Override
+ public void execute(NativeViewHierarchyManager nvhm) {
+ executeImpl(nvhm, null);
+ }
+
+ @Override
+ public void execute(UIBlockViewResolver uiBlockViewResolver) {
+ executeImpl(null, uiBlockViewResolver);
+ }
+
+ private void executeImpl(NativeViewHierarchyManager nvhm, UIBlockViewResolver uiBlockViewResolver) {
+ MapView view = uiBlockViewResolver != null ? (MapView) uiBlockViewResolver.resolveView(tag) : (MapView) nvhm.resolveView(tag);
+ if (view == null) {
+ promise.reject("AirMapView not found");
+ return;
+ }
+ if (view.map == null) {
+ promise.reject("AirMapView.map is not valid");
+ return;
+ }
+
+ mapOperation.apply(view);
+ }
+
+ public void addToUIManager() {
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ UIManager uiManager = UIManagerHelper.getUIManager(context, UIManagerType.FABRIC);
+ ((FabricUIManager) uiManager).addUIBlock(this);
+ } else {
+ UIManagerModule uiManager = context.getNativeModule(UIManagerModule.class);
+ uiManager.addUIBlock(this);
+ }
+ }
+}
+
+interface UIBlockInterface extends UIBlock, com.facebook.react.fabric.interop.UIBlock {}
diff --git a/android/src/main/java/com/rnmaps/maps/MapView.java b/android/src/main/java/com/rnmaps/maps/MapView.java
index 2ac1525e5..5f0399d8f 100644
--- a/android/src/main/java/com/rnmaps/maps/MapView.java
+++ b/android/src/main/java/com/rnmaps/maps/MapView.java
@@ -1,16 +1,14 @@
package com.rnmaps.maps;
+import static androidx.core.content.PermissionChecker.checkSelfPermission;
+
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;
-import androidx.annotation.Nullable;
-import androidx.core.content.PermissionChecker;
-import androidx.core.view.GestureDetectorCompat;
-import androidx.core.view.MotionEventCompat;
+import android.location.Location;
+import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
@@ -18,8 +16,14 @@
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
-import android.location.Location;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.PermissionChecker;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.MotionEventCompat;
+
+import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.LifecycleEventListener;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReadableArray;
@@ -28,19 +32,22 @@
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.Arguments;
import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.common.UIManagerType;
import com.facebook.react.uimanager.events.EventDispatcher;
import com.google.android.gms.maps.CameraUpdate;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.GoogleMapOptions;
+import com.google.android.gms.maps.MapsInitializer;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.Projection;
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.GroundOverlay;
+import com.google.android.gms.maps.model.IndoorBuilding;
+import com.google.android.gms.maps.model.IndoorLevel;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.LatLngBounds;
import com.google.android.gms.maps.model.MapStyleOptions;
@@ -50,8 +57,6 @@
import com.google.android.gms.maps.model.Polygon;
import com.google.android.gms.maps.model.Polyline;
import com.google.android.gms.maps.model.TileOverlay;
-import com.google.android.gms.maps.model.IndoorBuilding;
-import com.google.android.gms.maps.model.IndoorLevel;
import com.google.maps.android.collections.CircleManager;
import com.google.maps.android.collections.GroundOverlayManager;
import com.google.maps.android.collections.MarkerManager;
@@ -73,8 +78,6 @@
import java.util.Map;
import java.util.concurrent.ExecutionException;
-import static androidx.core.content.PermissionChecker.checkSelfPermission;
-
public class MapView extends com.google.android.gms.maps.MapView implements GoogleMap.InfoWindowAdapter,
GoogleMap.OnMarkerDragListener, OnMapReadyCallback, GoogleMap.OnPoiClickListener, GoogleMap.OnIndoorStateChangeListener {
public GoogleMap map;
@@ -93,23 +96,24 @@ public class MapView extends com.google.android.gms.maps.MapView implements Goog
private Boolean isMapLoaded = false;
private Integer loadingBackgroundColor = null;
private Integer loadingIndicatorColor = null;
- private final int baseMapPadding = 50;
private LatLngBounds boundsToMove;
private CameraUpdate cameraToSet;
+ private boolean setPaddingDeferred = false;
private boolean showUserLocation = false;
private boolean handlePanDrag = false;
private boolean moveOnMarkerPress = true;
private boolean cacheEnabled = false;
private ReadableMap initialRegion;
- private ReadableMap initialCamera;
private ReadableMap region;
+ private ReadableMap initialCamera;
private ReadableMap camera;
private String customMapStyleString;
private boolean initialRegionSet = false;
private boolean initialCameraSet = false;
private LatLngBounds cameraLastIdleBounds;
private int cameraMoveReason = 0;
+ private MapMarker selectedMarker;
private static final String[] PERMISSIONS = new String[]{
"android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"};
@@ -170,9 +174,8 @@ public MapView(ThemedReactContext reactContext, ReactApplicationContext appConte
this.manager = manager;
this.context = reactContext;
-
+ MapsInitializer.initialize(context, this.manager.renderer, renderer -> Log.d("AirMapRenderer", renderer.toString()));
super.onCreate(null);
- // TODO(lmr): what about onStart????
super.onResume();
super.getMapAsync(this);
@@ -208,7 +211,14 @@ public boolean onDoubleTap(MotionEvent ev) {
}
});
- eventDispatcher = reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();
+ int uiManagerType = UIManagerType.DEFAULT;
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ uiManagerType = UIManagerType.FABRIC;
+ }
+
+ eventDispatcher = UIManagerHelper
+ .getUIManager(reactContext, uiManagerType)
+ .getEventDispatcher();
// Set up a parent view for triggering visibility in subviews that depend on it.
// Mainly ReactImageView depends on Fresco which depends on onVisibilityChanged() event
@@ -287,6 +297,8 @@ public boolean onMarkerClick(@NonNull Marker marker) {
event.putString("id", airMapMarker.getIdentifier());
manager.pushEvent(context, airMapMarker, "onPress", event);
+ handleMarkerSelection(airMapMarker);
+
// Return false to open the callout info window and center on the marker
// https://developers.google.com/android/reference/com/google/android/gms/maps/GoogleMap
// .OnMarkerClickListener
@@ -342,6 +354,8 @@ public void onMapClick(@NonNull LatLng point) {
WritableMap event = makeClickEventData(point);
event.putString("action", "press");
manager.pushEvent(context, view, "onPress", event);
+
+ handleMarkerSelection(null);
}
});
@@ -367,6 +381,10 @@ public void onGroundOverlayClick(@NonNull GroundOverlay groundOverlay) {
@Override
public void onCameraMoveStarted(int reason) {
cameraMoveReason = reason;
+ boolean isGesture = GoogleMap.OnCameraMoveStartedListener.REASON_GESTURE == reason;
+ WritableMap event = new WritableNativeMap();
+ event.putBoolean("isGesture", isGesture);
+ manager.pushEvent(context, view, "onRegionChangeStart", event);
}
});
@@ -454,6 +472,40 @@ public void onHostDestroy() {
context.addLifecycleEventListener(lifecycleListener);
}
+ private synchronized void handleMarkerSelection(MapMarker target) {
+ if (selectedMarker == target) {
+ return;
+ }
+
+ WritableMap event;
+
+ if (selectedMarker != null) {
+ event = makeClickEventData(selectedMarker.getPosition());
+ event.putString("action", "marker-deselect");
+ event.putString("id", selectedMarker.getIdentifier());
+ manager.pushEvent(context, selectedMarker, "onDeselect", event);
+
+ event = makeClickEventData(selectedMarker.getPosition());
+ event.putString("action", "marker-deselect");
+ event.putString("id", selectedMarker.getIdentifier());
+ manager.pushEvent(context, this, "onMarkerDeselect", event);
+ }
+
+ if (target != null) {
+ event = makeClickEventData(target.getPosition());
+ event.putString("action", "marker-select");
+ event.putString("id", target.getIdentifier());
+ manager.pushEvent(context, target, "onSelect", event);
+
+ event = makeClickEventData(target.getPosition());
+ event.putString("action", "marker-select");
+ event.putString("id", target.getIdentifier());
+ manager.pushEvent(context, this, "onMarkerSelect", event);
+ }
+
+ selectedMarker = target;
+ }
+
private boolean hasPermissions() {
return checkSelfPermission(getContext(), PERMISSIONS[0]) == PermissionChecker.PERMISSION_GRANTED ||
checkSelfPermission(getContext(), PERMISSIONS[1]) == PermissionChecker.PERMISSION_GRANTED;
@@ -492,8 +544,6 @@ public void setInitialRegion(ReadableMap initialRegion) {
public void setInitialCamera(ReadableMap initialCamera) {
this.initialCamera = initialCamera;
- // Theoretically onMapReady might be called before setInitialCamera
- // In that case, trigger moveToCamera manually
if (!initialCameraSet && map != null) {
moveToCamera(initialCamera);
initialCameraSet = true;
@@ -504,12 +554,12 @@ private void applyBridgedProps() {
if(initialRegion != null) {
moveToRegion(initialRegion);
initialRegionSet = true;
- } else if(initialCamera != null) {
- moveToCamera(initialCamera);
- initialCameraSet = true;
} else if(region != null) {
moveToRegion(region);
- } else {
+ } else if (initialCamera != null) {
+ moveToCamera(initialCamera);
+ initialCameraSet = true;
+ } else if (camera != null) {
moveToCamera(camera);
}
if(customMapStyleString != null) {
@@ -554,24 +604,28 @@ public void setCamera(ReadableMap camera) {
moveToCamera(camera);
}
}
+public static CameraPosition cameraPositionFromMap(ReadableMap camera){
+ if (camera == null) return null;
- public void moveToCamera(ReadableMap camera) {
- if (camera == null) return;
-
- CameraPosition.Builder builder = new CameraPosition.Builder();
+ CameraPosition.Builder builder = new CameraPosition.Builder();
- ReadableMap center = camera.getMap("center");
- if (center != null) {
- double lng = center.getDouble("longitude");
- double lat = center.getDouble("latitude");
- builder.target(new LatLng(lat, lng));
- }
+ ReadableMap center = camera.getMap("center");
+ if (center != null) {
+ double lng = center.getDouble("longitude");
+ double lat = center.getDouble("latitude");
+ builder.target(new LatLng(lat, lng));
+ }
- builder.tilt((float)camera.getDouble("pitch"));
- builder.bearing((float)camera.getDouble("heading"));
- builder.zoom((float)camera.getDouble("zoom"));
+ builder.tilt((float)camera.getDouble("pitch"));
+ builder.bearing((float)camera.getDouble("heading"));
+ builder.zoom((float)camera.getDouble("zoom"));
- CameraUpdate update = CameraUpdateFactory.newCameraPosition(builder.build());
+ return builder.build();
+}
+ public void moveToCamera(ReadableMap cameraMap) {
+ CameraPosition camera = cameraPositionFromMap(cameraMap);
+ if (camera == null) return;
+ CameraUpdate update = CameraUpdateFactory.newCameraPosition(camera);
if (super.getHeight() <= 0 || super.getWidth() <= 0) {
// in this case, our map has not been laid out yet, so we save the camera update in a
@@ -771,6 +825,7 @@ public void removeFeatureAt(int index) {
if (feature instanceof MapMarker) {
markerMap.remove(feature.getFeature());
feature.removeFromMap(markerCollection);
+ attacherGroup.removeView(feature);
} else if (feature instanceof MapHeatmap) {
heatmapMap.remove(feature.getFeature());
feature.removeFromMap(map);
@@ -807,6 +862,21 @@ public WritableMap makeClickEventData(LatLng point) {
}
public void updateExtraData(Object extraData) {
+ if (setPaddingDeferred && super.getHeight() > 0 && super.getWidth() > 0) {
+ CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
+
+ map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+ edgeTopPadding + baseTopMapPadding,
+ edgeRightPadding + baseRightMapPadding,
+ edgeBottomPadding + baseBottomMapPadding);
+ map.moveCamera(cu);
+
+ // Move the google logo to the default base padding value.
+ map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
+
+ setPaddingDeferred = false;
+ }
+
// if boundsToMove is not null, we now have the MapView's width/height, so we can apply
// a proper camera move
if (boundsToMove != null) {
@@ -884,10 +954,10 @@ public void fitToElements(ReadableMap edgePadding, boolean animated) {
}
if (addedPosition) {
LatLngBounds bounds = builder.build();
- CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+ CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
if (edgePadding != null) {
- map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
+ appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
edgePadding.getInt("right"), edgePadding.getInt("bottom"));
}
@@ -896,6 +966,8 @@ public void fitToElements(ReadableMap edgePadding, boolean animated) {
} else {
map.moveCamera(cu);
}
+ // Move the google logo to the default base padding value.
+ map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
}
}
@@ -926,10 +998,10 @@ public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgeP
if (addedPosition) {
LatLngBounds bounds = builder.build();
- CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+ CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
if (edgePadding != null) {
- map.setPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
+ appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"),
edgePadding.getInt("right"), edgePadding.getInt("bottom"));
}
@@ -938,20 +1010,54 @@ public void fitToSuppliedMarkers(ReadableArray markerIDsArray, ReadableMap edgeP
} else {
map.moveCamera(cu);
}
+ // Move the google logo to the default base padding value.
+ map.setPadding(baseLeftMapPadding, baseTopMapPadding, baseRightMapPadding, baseBottomMapPadding);
}
}
+ // padding configured by 'mapPadding' property
int baseLeftMapPadding;
int baseRightMapPadding;
int baseTopMapPadding;
int baseBottomMapPadding;
+ // extra padding specified by 'edgePadding' option of fitToElements/fitToSuppliedMarkers/fitToCoordinates
+ int edgeLeftPadding;
+ int edgeRightPadding;
+ int edgeTopPadding;
+ int edgeBottomPadding;
public void applyBaseMapPadding(int left, int top, int right, int bottom){
- this.map.setPadding(left, top, right, bottom);
+ if (super.getHeight() <= 0 || super.getWidth() <= 0) {
+ // the map is not laid out yet and calling setPadding() now has no effect
+ baseLeftMapPadding = left;
+ baseRightMapPadding = right;
+ baseTopMapPadding = top;
+ baseBottomMapPadding = bottom;
+ setPaddingDeferred = true;
+ return;
+ }
+
+ // retrieve current camera with current edge paddings configured
+ map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+ edgeTopPadding + baseTopMapPadding,
+ edgeRightPadding + baseRightMapPadding,
+ edgeBottomPadding + baseBottomMapPadding);
+ CameraUpdate cu = CameraUpdateFactory.newCameraPosition(map.getCameraPosition());
+
baseLeftMapPadding = left;
baseRightMapPadding = right;
baseTopMapPadding = top;
baseBottomMapPadding = bottom;
+
+ // apply base paddings and restore center position of the map
+ map.setPadding(edgeLeftPadding + left,
+ edgeTopPadding + top,
+ edgeRightPadding + right,
+ edgeBottomPadding + bottom);
+ map.moveCamera(cu);
+
+ // Move the google logo to the default base padding value.
+ map.setPadding(left, top, right, bottom);
}
public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePadding,
@@ -968,7 +1074,7 @@ public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePad
}
LatLngBounds bounds = builder.build();
- CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, baseMapPadding);
+ CameraUpdate cu = CameraUpdateFactory.newLatLngBounds(bounds, 0);
if (edgePadding != null) {
appendMapPadding(edgePadding.getInt("left"), edgePadding.getInt("top"), edgePadding.getInt("right"), edgePadding.getInt("bottom"));
@@ -984,21 +1090,17 @@ public void fitToCoordinates(ReadableArray coordinatesArray, ReadableMap edgePad
}
private void appendMapPadding(int iLeft,int iTop, int iRight, int iBottom) {
- int left;
- int top;
- int right;
- int bottom;
double density = getResources().getDisplayMetrics().density;
- left = (int) (iLeft * density);
- top = (int) (iTop * density);
- right = (int) (iRight * density);
- bottom = (int) (iBottom * density);
+ edgeLeftPadding = (int) (iLeft * density);
+ edgeTopPadding = (int) (iTop * density);
+ edgeRightPadding = (int) (iRight * density);
+ edgeBottomPadding = (int) (iBottom * density);
- map.setPadding(left + baseLeftMapPadding,
- top + baseTopMapPadding,
- right + baseRightMapPadding,
- bottom + baseBottomMapPadding);
+ map.setPadding(edgeLeftPadding + baseLeftMapPadding,
+ edgeTopPadding + baseTopMapPadding,
+ edgeRightPadding + baseRightMapPadding,
+ edgeBottomPadding + baseBottomMapPadding);
}
public double[][] getMapBoundaries() {
diff --git a/android/src/main/java/com/rnmaps/maps/ViewChangesTracker.java b/android/src/main/java/com/rnmaps/maps/ViewChangesTracker.java
index 343e7c07f..238fcb537 100644
--- a/android/src/main/java/com/rnmaps/maps/ViewChangesTracker.java
+++ b/android/src/main/java/com/rnmaps/maps/ViewChangesTracker.java
@@ -18,12 +18,13 @@ private ViewChangesTracker() {
handler = new Handler(Looper.myLooper());
updateRunnable = new Runnable() {
@Override
- public void run() {
- hasScheduledFrame = false;
+ public void run() {
update();
if (markers.size() > 0) {
handler.postDelayed(updateRunnable, fps);
+ } else {
+ hasScheduledFrame = false;
}
}
};
diff --git a/docs/geojson.md b/docs/geojson.md
index db6b92f25..f4d9c9c29 100644
--- a/docs/geojson.md
+++ b/docs/geojson.md
@@ -2,23 +2,25 @@
## Props
-| Prop | Type | Default | Note |
-| ------------------- | ------------------------------- | ------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `geojson` | `GeoJSON` | | [Geojson](https://geojson.org/) description of object. |
-| `strokeColor` | `String` | `stroke` property in GeoJson if present else `#000` | The stroke color to use for polygons and polylines. |
-| `fillColor` | `String` | `fill` property in GeoJson | The fill color to use for polygons. |
-| `strokeWidth` | `Number` | `stroke-width` property in Geojson if present else `1` | The stroke width to use for polygons and polylines. |
-| `color` | `String` | `marker-color` property in GeoJson | The color to use for points. |
-| `lineDashPhase` | `Number` | | (iOS only) The offset (in points) at which to start drawing the dash pattern. Use this property to start drawing a dashed line partway through a segment or gap. For example, a phase value of 6 for the patter 5-2-3-2 would cause drawing to begin in the middle of the first gap. |
-| `lineDashPattern` | `Array` | | An array of numbers specifying the dash pattern to use for the path. The array contains one or more numbers that indicate the lengths (measured in points) of the line segments and gaps in the pattern. The values in the array alternate, starting with the first line segment length, followed by the first gap length, followed by the second line segment length, and so on. |
-| `lineCap` | `'butt' \| 'round' \| 'square'` | | The line cap style to apply to the open ends of the path. Possible values are `butt`, `round` or `square`. Note: lineCap is not yet supported for GoogleMaps provider on iOS. |
-| `lineJoin` | `'miter' \| 'round' \| 'bevel'` | | The line join style to apply to corners of the path. Possible values are `miter`, `round` or `bevel`. |
-| `miterLimit` | `Number` | | The limiting value that helps avoid spikes at junctions between connected line segments. The miter limit helps you avoid spikes in paths that use the `miter` `lineJoin` style. If the ratio of the miter length—that is, the diagonal length of the miter join—to the line thickness exceeds the miter limit, the joint is converted to a bevel join. The default miter limit is 10, which results in the conversion of miters whose angle at the joint is less than 11 degrees. |
-| `zIndex` | `Number` | | Layer level of the z-index value |
-| `onPress` | `Function` | | returns the selected overlay value with the onPress functionality |
-| `markerComponent` | `React Node` | | Component to render in place of the default marker when the overlay type is a `point` |
-| `title` | `string` | | The title of the marker. This is only used if the component has no children that are a `` |
-| `tracksViewChanges` | `Boolean` | true | Sets whether this marker should track view changes. It's recommended to turn it off whenever it's possible to improve custom marker performance. This is the default value for all point markers in your geojson data. It can be overriden on a per point basis by adding a `trackViewChanges` property to the `properties` object on the point. |
+| Prop | Type | Default | Note |
+| ------------------- | ------------------------------- | ------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `geojson` | `GeoJSON` | | [Geojson](https://geojson.org/) description of object. |
+| `strokeColor` | `String` | `stroke` property in GeoJson if present else `#000` | The stroke color to use for polygons and polylines. |
+| `fillColor` | `String` | `fill` property in GeoJson | The fill color to use for polygons. |
+| `strokeWidth` | `Number` | `stroke-width` property in Geojson if present else `1` | The stroke width to use for polygons and polylines. |
+| `color` | `String` | `marker-color` property in GeoJson | The color to use for points. |
+| `lineDashPhase` | `Number` | | (iOS only) The offset (in points) at which to start drawing the dash pattern. Use this property to start drawing a dashed line partway through a segment or gap. For example, a phase value of 6 for the patter 5-2-3-2 would cause drawing to begin in the middle of the first gap. |
+| `lineDashPattern` | `Array` | | An array of numbers specifying the dash pattern to use for the path. The array contains one or more numbers that indicate the lengths (measured in points) of the line segments and gaps in the pattern. The values in the array alternate, starting with the first line segment length, followed by the first gap length, followed by the second line segment length, and so on. |
+| `lineCap` | `'butt' \| 'round' \| 'square'` | | The line cap style to apply to the open ends of the path. Possible values are `butt`, `round` or `square`. Note: lineCap is not yet supported for GoogleMaps provider on iOS. |
+| `lineJoin` | `'miter' \| 'round' \| 'bevel'` | | The line join style to apply to corners of the path. Possible values are `miter`, `round` or `bevel`. |
+| `miterLimit` | `Number` | | The limiting value that helps avoid spikes at junctions between connected line segments. The miter limit helps you avoid spikes in paths that use the `miter` `lineJoin` style. If the ratio of the miter length—that is, the diagonal length of the miter join—to the line thickness exceeds the miter limit, the joint is converted to a bevel join. The default miter limit is 10, which results in the conversion of miters whose angle at the joint is less than 11 degrees. |
+| `zIndex` | `Number` | | Layer level of the z-index value |
+| `onPress` | `Function` | | returns the selected overlay value with the onPress functionality |
+| `markerComponent` | `React Node` | | Component to render in place of the default marker when the overlay type is a `point` |
+| `title` | `string` | | The title of the marker. This is only used if the component has no children that are a `` |
+| `tracksViewChanges` | `Boolean` | true | Sets whether this marker should track view changes. It's recommended to turn it off whenever it's possible to improve custom marker performance. This is the default value for all point markers in your geojson data. It can be overriden on a per point basis by adding a `trackViewChanges` property to the `properties` object on the point. |
+| `anchor` | `Point` | (0.5, 1) | Sets the anchor point for the marker.
The anchor specifies the point in the icon image that is anchored to the marker's position on the Earth's surface.
The anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0], where (0, 0) is the top-left corner of the image, and (1, 1) is the bottom-right corner. The anchoring point in a W x H image is the nearest discrete grid point in a (W + 1) x (H + 1) grid, obtained by scaling the then rounding. For example, in a 4 x 2 image, the anchor point (0.7, 0.6) resolves to the grid point at (3, 1).
For MapKit on iOS, see the `centerOffset` prop. |
+| `centerOffset` | `Point` | (0, 0) | The offset (in points) at which to display the view.
By default, the center point of an annotation view is placed at the coordinate point of the associated annotation. You can use this property to reposition the annotation view as needed. This x and y offset values are measured in points. Positive offset values move the annotation view down and to the right, while negative values move it up and to the left.
For Google Maps, see the `anchor` prop. |
## Example
diff --git a/docs/installation.md b/docs/installation.md
index 5d2c7ce83..c39f8a72f 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -46,12 +46,12 @@ If you want to enable Google Maps on iOS, obtain the Google API key and edit you
The `[GMSServices provideAPIKey]` should be the **first call** of the method.
-Google Maps SDK for iOS requires iOS 13, so make sure that your deployment target is >= 13.4 in your iOS project settings.
+Google Maps SDK for iOS requires iOS 14, so make sure that your deployment target is >= 4 in your iOS project settings.
-Also make sure that your Podfile deployment target is set to >= 13.4 at the top of your Podfile, eg:
+Also make sure that your Podfile deployment target is set to >= 14 at the top of your Podfile, eg:
```ruby
-platform :ios, '13.4'
+platform :ios, '14'
```
Add the following to your Podfile above the `use_native_modules!` function and run `pod install` in the ios folder:
@@ -100,26 +100,6 @@ None of these keys are required anymore and can be removed, if not used by other
from there you will see a button to update it (do not search within the
Play Store).
-### Using the new Google Maps Renderer
-
-A new renderer for Google Maps on Android will become the default through a progressive rollout starting in June 2022 at the earliest. (Read more about it [here](https://developers.google.com/maps/documentation/android-sdk/renderer))
-
-react-native-maps added support for the new renderer in v0.31.0.
-
-To opt in to the new renderer add the following code in your entry file (e.g. App.js):
-
-```javascript
-import {enableLatestRenderer} from 'react-native-maps';
-
-enableLatestRenderer();
-```
-
-`enableLatestRenderer` returns a promise (on android) specifying the map renderer being used, either `'LATEST' | 'LEGACY'`. It can be called at any point to get the renderer being used, but it won't change after the first map has been rendered.
-
-Make sure to test your app thoroughly after enabling the new renderer, as it seems to cause some behavioural changes, e.g. [this](https://github.com/react-native-maps/react-native-maps/pull/4055#issuecomment-1063358886).
-
----
-
## Troubleshooting
### The map background is blank (Google Maps)
diff --git a/docs/mapview.md b/docs/mapview.md
index 896cf50b7..2cdea8809 100644
--- a/docs/mapview.md
+++ b/docs/mapview.md
@@ -12,6 +12,7 @@
| `mapPadding` | `EdgePadding` | | Adds custom padding to each side of the map. Useful when map elements/markers are obscured. |
| `paddingAdjustmentBehavior` | 'always' \| 'automatic' \| 'never' | 'never' | Indicates how/when to affect padding with safe area insets (`GoogleMaps` in iOS only) |
| `liteMode` | `Boolean` | `false` | Enable [lite mode](https://developers.google.com/maps/documentation/android-sdk/lite#overview_of_lite_mode). **Note**: Android only. |
+| `googleMapId` | `String` | | Google Map ID (only for Provider "google") [google map id](https://developers.google.com/maps/documentation/get-map-id) |
| `mapType` | `String` | `"standard"` | The map type to be displayed.
- standard: standard road map (default)
- none: no map **Note** Not available on MapKit
- satellite: satellite view
- hybrid: satellite view with roads and points of interest overlayed
- terrain: topographic view
- mutedStandard: more subtle, makes markers/lines pop more (iOS 11.0+ only)
- satelliteFlyover: 3D globe with sattelite view (iOS 13.0+ Apple Maps only)
- hybridFlyover: 3D globe with hybrid view (iOS 13.0+ Apple Maps only) |
| `customMapStyle` | `Array` | | Adds custom styling to the map component. See [README](https://github.com/react-native-maps/react-native-maps#customizing-the-map-style) for more information. |
| `userInterfaceStyle` | 'light' \| 'dark' | | Sets the map to the style selected. Default is whatever the system settings is. **Note:** iOS Maps only (aka MapKit). |
@@ -60,6 +61,7 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
| ------------------------- | ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `onMapReady` | | Callback that is called once the map is fully loaded. |
| `onKmlReady` | `KmlContainer` | Callback that is called once the kml is fully loaded. |
+| `onRegionChangeStart` | `{ isGesture: boolean }` | Callback that is called once before the region changes, such as when the user starts moving the map. The second parameter is an object containing more details about the move. `isGesture` property indicates if the move was from the user (true) or an animation (false). **Note**: `isGesture` is supported by Google Maps only. |
| `onRegionChange` | (`Region`, `{isGesture: boolean}`) | Callback that is called continuously when the region changes, such as when a user is dragging the map. The second parameter is an object containing more details about the move. `isGesture` property indicates if the move was from the user (true) or an animation (false). **Note**: `isGesture` is supported by Google Maps only. |
| `onRegionChangeComplete` | (`Region`, `{isGesture: boolean}`) | Callback that is called once when the region changes, such as when the user is done moving the map. The second parameter is an object containing more details about the move. `isGesture` property indicates if the move was from the user (true) or an animation (false). **Note**: `isGesture` is supported by Google Maps only. |
| `onUserLocationChange` | `{ coordinate: Location }` | Callback that is called when the underlying map figures our users current location (coordinate also includes isFromMockProvider value for Android API 18 and above). Make sure **showsUserLocation** is set to _true_. |
@@ -69,8 +71,8 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
| `onPoiClick` | `{ coordinate: LatLng, position: Point, placeId: string, name: string }` | Callback that is called when user click on a POI. |
| `onLongPress` | `{ coordinate: LatLng, position: Point }` | Callback that is called when user makes a "long press" somewhere on the map. |
| `onMarkerPress` | | Callback that is called when a marker on the map is tapped by the user. |
-| `onMarkerSelect` | | Callback that is called when a marker on the map becomes selected. This will be called when the callout for that marker is about to be shown. **Note**: iOS only. |
-| `onMarkerDeselect` | | Callback that is called when a marker on the map becomes deselected. This will be called when the callout for that marker is about to be hidden. **Note**: iOS only. |
+| `onMarkerSelect` | | Callback that is called when a marker on the map becomes selected. This will be called when the callout for that marker is about to be shown. |
+| `onMarkerDeselect` | | Callback that is called when a marker on the map becomes deselected. This will be called when the callout for that marker is about to be hidden. |
| `onCalloutPress` | | Callback that is called when a callout is tapped by the user. |
| `onMarkerDragStart` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user initiates a drag on a marker (if it is draggable) |
| `onMarkerDrag` | `{ coordinate: LatLng, position: Point }` | Callback called continuously as a marker is dragged |
diff --git a/docs/marker.md b/docs/marker.md
index 29469b41a..e36dfa8f2 100644
--- a/docs/marker.md
+++ b/docs/marker.md
@@ -2,29 +2,32 @@
## Props
-| Prop | Type | Default | Note |
-| ------------------------- | --------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `title` | `String` | | The title of the marker. This is only used if the component has no children that are a ``, in which case the default callout behavior will be used, which will show both the `title` and the `description`, if provided. |
-| `description` | `String` | | The description of the marker. This is only used if the component has no children that are a ``, in which case the default callout behavior will be used, which will show both the `title` and the `description`, if provided. |
-| `image` | `ImageSource`\* | | A custom image to be used as the marker's icon. Only local image resources are allowed to be used. |
-| `icon` | `ImageSource`\* | | Marker icon to render (equivalent to `icon` property of GMSMarker Class). Only local image resources are allowed to be used. **Note:** Google maps only! |
-| `pinColor` | `Color` | | If no custom marker view or custom image is provided, the platform default pin will be used, which can be customized by this color. Ignored if a custom marker is being used.
For Android, the set of available colors is limited. Unsupported colors will fall back to red. See [#887](https://github.com/react-community/react-native-maps/issues/887) for more information. |
-| `coordinate` | `LatLng` | | The coordinate for the marker. |
-| `centerOffset` | `Point` | (0, 0) | The offset (in points) at which to display the view.
By default, the center point of an annotation view is placed at the coordinate point of the associated annotation. You can use this property to reposition the annotation view as needed. This x and y offset values are measured in points. Positive offset values move the annotation view down and to the right, while negative values move it up and to the left.
For Google Maps, see the `anchor` prop. |
-| `calloutOffset` | `Point` | (0, 0) | The offset (in points) at which to place the callout bubble.
This property determines the additional distance by which to move the callout bubble. When this property is set to (0, 0), the anchor point of the callout bubble is placed on the top-center point of the marker view’s frame. Specifying positive offset values moves the callout bubble down and to the right, while specifying negative values moves it up and to the left.
For Google Maps, see the `calloutAnchor` prop. |
-| `anchor` | `Point` | (0.5, 1) | Sets the anchor point for the marker.
The anchor specifies the point in the icon image that is anchored to the marker's position on the Earth's surface.
The anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0], where (0, 0) is the top-left corner of the image, and (1, 1) is the bottom-right corner. The anchoring point in a W x H image is the nearest discrete grid point in a (W + 1) x (H + 1) grid, obtained by scaling the then rounding. For example, in a 4 x 2 image, the anchor point (0.7, 0.6) resolves to the grid point at (3, 1).
For MapKit on iOS, see the `centerOffset` prop. |
-| `calloutAnchor` | `Point` | (0.5, 0) | Specifies the point in the marker image at which to anchor the callout when it is displayed. This is specified in the same coordinate system as the anchor. See the `anchor` prop for more details.
The default is the top middle of the image.
For MapKit on iOS, see the `calloutOffset` prop. |
-| `flat` | `Boolean` | false | Sets whether this marker should be flat against the map true or a billboard facing the camera. |
-| `identifier` | `String` | | An identifier used to reference this marker at a later date. |
-| `rotation` | `Float` | 0 | A float number indicating marker's rotation angle, in degrees. |
-| `draggable` | `` | | This is a non-value based prop. Adding this allows the marker to be draggable (re-positioned). |
-| `tappable` | `Boolean` | true | Sets whether marker should be tappable. If set to false, the marker will not have onPress events. **Note**: iOS Google Maps only. |
-| `tracksViewChanges` | `Boolean` | true | Sets whether this marker should track changes to child views. When using a child view to create a custom marker this option determines if changes to the content will be tracked after the first render pass. This option has a performance impact so when possible it's recommended to disable it and explictly call the `redraw` method if the marker content changes. |
-| `tracksInfoWindowChanges` | `Boolean` | false | Sets whether this marker should track view changes in info window. Enabling it will let marker change content of info window after first render pass, but will lead to decreased performance, so it's recommended to disable it whenever you don't need it. **Note**: iOS Google Maps only. |
-| `stopPropagation` | `Boolean` | false | Sets whether this marker should propagate `onPress` events. Enabling it will stop the parent `MapView`'s `onPress` from being called. **Note**: iOS only. Android does not propagate `onPress` events. See [#1132](https://github.com/react-community/react-native-maps/issues/1132) for more information. |
-| `opacity` | `Float` | 1.0 | The marker's opacity between 0.0 and 1.0. |
-| `isPreselected` | `Boolean` | false | When true, the marker will be pre-selected. Setting this to true allows the user to drag the marker without needing to tap on it once to focus on it. **Note**: iOS Apple Maps only. |
-| `key` | `String` | | If no key or non-unique `key` is specified, the `` will be reused, therefore there is an animation when the position is changed. If you want to disable the animation, add a `key` prop with a unique value like `key_${item.longitude}_${item.latitude}`. **Note**: iOS only. |
+| Prop | Type | Default | Note |
+| ------------------------- | ------------------------------- | -------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `title` | `String` | | The title of the marker. This is only used if the component has no children that are a ``, in which case the default callout behavior will be used, which will show both the `title` and the `description`, if provided. |
+| `description` | `String` | | The description of the marker. This is only used if the component has no children that are a ``, in which case the default callout behavior will be used, which will show both the `title` and the `description`, if provided. |
+| `image` | `ImageSource`\* | | A custom image to be used as the marker's icon. Only local image resources are allowed to be used. |
+| `icon` | `ImageSource`\* | | Marker icon to render (equivalent to `icon` property of GMSMarker Class). Only local image resources are allowed to be used. **Note:** Google maps only! |
+| `pinColor` | `Color` | | If no custom marker view or custom image is provided, the platform default pin will be used, which can be customized by this color. Ignored if a custom marker is being used.
For Android, the set of available colors is limited. Unsupported colors will fall back to red. See [#887](https://github.com/react-community/react-native-maps/issues/887) for more information. |
+| `coordinate` | `LatLng` | | The coordinate for the marker. |
+| `centerOffset` | `Point` | (0, 0) | The offset (in points) at which to display the view.
By default, the center point of an annotation view is placed at the coordinate point of the associated annotation. You can use this property to reposition the annotation view as needed. This x and y offset values are measured in points. Positive offset values move the annotation view down and to the right, while negative values move it up and to the left.
For Google Maps, see the `anchor` prop. |
+| `calloutOffset` | `Point` | (0, 0) | The offset (in points) at which to place the callout bubble.
This property determines the additional distance by which to move the callout bubble. When this property is set to (0, 0), the anchor point of the callout bubble is placed on the top-center point of the marker view’s frame. Specifying positive offset values moves the callout bubble down and to the right, while specifying negative values moves it up and to the left.
For Google Maps, see the `calloutAnchor` prop. |
+| `anchor` | `Point` | (0.5, 1) | Sets the anchor point for the marker.
The anchor specifies the point in the icon image that is anchored to the marker's position on the Earth's surface.
The anchor point is specified in the continuous space [0.0, 1.0] x [0.0, 1.0], where (0, 0) is the top-left corner of the image, and (1, 1) is the bottom-right corner. The anchoring point in a W x H image is the nearest discrete grid point in a (W + 1) x (H + 1) grid, obtained by scaling the then rounding. For example, in a 4 x 2 image, the anchor point (0.7, 0.6) resolves to the grid point at (3, 1).
For MapKit on iOS, see the `centerOffset` prop. |
+| `calloutAnchor` | `Point` | (0.5, 0) | Specifies the point in the marker image at which to anchor the callout when it is displayed. This is specified in the same coordinate system as the anchor. See the `anchor` prop for more details.
The default is the top middle of the image.
For MapKit on iOS, see the `calloutOffset` prop. |
+| `flat` | `Boolean` | false | Sets whether this marker should be flat against the map true or a billboard facing the camera. |
+| `identifier` | `String` | | An identifier used to reference this marker at a later date. |
+| `rotation` | `Float` | 0 | A float number indicating marker's rotation angle, in degrees. |
+| `draggable` | `` | | This is a non-value based prop. Adding this allows the marker to be draggable (re-positioned). |
+| `tappable` | `Boolean` | true | Sets whether marker should be tappable. If set to false, the marker will not have onPress events. **Note**: iOS Google Maps only. |
+| `tracksViewChanges` | `Boolean` | true | Sets whether this marker should track changes to child views. When using a child view to create a custom marker this option determines if changes to the content will be tracked after the first render pass. This option has a performance impact so when possible it's recommended to disable it and explictly call the `redraw` method if the marker content changes. |
+| `tracksInfoWindowChanges` | `Boolean` | false | Sets whether this marker should track view changes in info window. Enabling it will let marker change content of info window after first render pass, but will lead to decreased performance, so it's recommended to disable it whenever you don't need it. **Note**: iOS Google Maps only. |
+| `stopPropagation` | `Boolean` | false | Sets whether this marker should propagate `onPress` events. Enabling it will stop the parent `MapView`'s `onPress` from being called. **Note**: iOS only. Android does not propagate `onPress` events. See [#1132](https://github.com/react-community/react-native-maps/issues/1132) for more information. |
+| `opacity` | `Float` | 1.0 | The marker's opacity between 0.0 and 1.0. |
+| `isPreselected` | `Boolean` | false | When true, the marker will be pre-selected. Setting this to true allows the user to drag the marker without needing to tap on it once to focus on it. **Note**: iOS Apple Maps only. |
+| `key` | `String` | | If no key or non-unique `key` is specified, the `` will be reused, therefore there is an animation when the position is changed. If you want to disable the animation, add a `key` prop with a unique value like `key_${item.longitude}_${item.latitude}`. **Note**: iOS only. |
+| `titleVisibility` | `visible \| hidden \| adaptive` | 'hidden' | Visibility of the title text rendered beneath Marker balloon. **Note**: iOS Apple Maps only. |
+| `subtitleVisibility` | `visible \| hidden \| adaptive` | 'hidden' | Visibility of the subtitle text rendered beneath Marker balloon. **Note**: iOS Apple Maps only. |
+| `useLegacyPinView` | `Boolean` | false | Decide whether legacy MKPinAnnotationView or new MKMarkerAnnotationView should be used. **Note**: iOS Apple Maps only. |
\* `ImageSource` [docs](https://reactnative.dev/docs/image#imagesource)
@@ -35,8 +38,8 @@ To access event data, you will need to use `e.nativeEvent`. For example, `onPres
| Event Name | Returns | Notes |
| ---------------- | ----------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
| `onPress` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user presses on the marker |
-| `onSelect` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user selects the marker, before the callout is shown. **Note**: iOS Apple Maps only. |
-| `onDeselect` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the marker is deselected, before the callout is hidden. **Note**: iOS Apple Maps only. |
+| `onSelect` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user selects the marker, before the callout is shown. |
+| `onDeselect` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the marker is deselected, before the callout is hidden. |
| `onCalloutPress` | | Callback that is called when the user taps the callout view. |
| `onDragStart` | `{ coordinate: LatLng, position: Point }` | Callback that is called when the user initiates a drag on this marker (if it is draggable) |
| `onDrag` | `{ coordinate: LatLng, position: Point }` | Callback called continuously as the marker is dragged |
diff --git a/example/Gemfile b/example/Gemfile
index 6a7d5c7a4..6488e0028 100644
--- a/example/Gemfile
+++ b/example/Gemfile
@@ -3,5 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"
-gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+gem 'cocoapods', '>= 1.13'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
diff --git a/example/Gemfile.lock b/example/Gemfile.lock
index 8ae313de1..f41576c5c 100644
--- a/example/Gemfile.lock
+++ b/example/Gemfile.lock
@@ -87,11 +87,10 @@ GEM
PLATFORMS
ruby
- x86_64-linux
DEPENDENCIES
- activesupport (>= 6.1.7.3, < 7.1.0)
- cocoapods (~> 1.13)
+ activesupport (>= 6.1.7.5, < 7.1.0)
+ cocoapods (>= 1.13)
RUBY VERSION
ruby 3.2.2p53
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index b00ef6dd7..1e8c30e31 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -102,12 +102,12 @@ android {
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
+
}
dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
- implementation("com.facebook.react:flipper-integration")
if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
diff --git a/example/android/app/src/main/java/com/rnmshowcase/MainApplication.kt b/example/android/app/src/main/java/com/rnmshowcase/MainApplication.kt
index 742b998d9..3a3395c0c 100644
--- a/example/android/app/src/main/java/com/rnmshowcase/MainApplication.kt
+++ b/example/android/app/src/main/java/com/rnmshowcase/MainApplication.kt
@@ -9,15 +9,15 @@ import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.flipper.ReactNativeFlipper
import com.facebook.soloader.SoLoader
+
class MainApplication : Application(), ReactApplication {
override val reactNativeHost: ReactNativeHost =
object : DefaultReactNativeHost(this) {
- override fun getPackages(): List {
- // Packages that cannot be autolinked yet can be added manually here, for example:
- // packages.add(new MyReactNativePackage());
- return PackageList(this).packages
+ override fun getPackages(): List =
+ PackageList(this).packages.apply {
+ // Packages that cannot be autolinked yet can be added manually here, for example:
+ // add(MyReactNativePackage())
}
override fun getJSMainModuleName(): String = "index"
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
@@ -25,7 +25,7 @@ class MainApplication : Application(), ReactApplication {
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
}
override val reactHost: ReactHost
- get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
+ get() = getDefaultReactHost(applicationContext, reactNativeHost)
override fun onCreate() {
super.onCreate()
SoLoader.init(this, false)
@@ -33,6 +33,5 @@ class MainApplication : Application(), ReactApplication {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
- ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
}
-}
\ No newline at end of file
+}
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 0550c31f7..8c7454991 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -2,11 +2,11 @@
buildscript {
ext {
buildToolsVersion = "34.0.0"
- minSdkVersion = 21
+ minSdkVersion = 23
compileSdkVersion = 34
targetSdkVersion = 34
- ndkVersion = "25.1.8937393"
- kotlinVersion = "1.8.0"
+ ndkVersion = "26.1.10909125"
+ kotlinVersion = "1.9.22"
}
repositories {
google()
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index a46a5b90f..ed1e6169a 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
@@ -34,7 +34,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# your application. You should enable this flag either if you want
# to write custom TurboModules/Fabric components OR use libraries that
# are providing them.
-newArchEnabled=false
+newArchEnabled=true
# Use this property to enable or disable the Hermes JS engine.
# If set to false, you will be using JSC instead.
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index d11cdd907..2ea3535dc 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/example/android/gradlew b/example/android/gradlew
index 1b6c78733..64926bd00 100755
--- a/example/android/gradlew
+++ b/example/android/gradlew
@@ -143,12 +143,15 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -193,11 +196,11 @@ if "$cygwin" || "$msys" ; then
done
fi
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/example/android/gradlew.bat b/example/android/gradlew.bat
index ac1b06f93..90dc5d373 100644
--- a/example/android/gradlew.bat
+++ b/example/android/gradlew.bat
@@ -42,11 +42,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
@@ -56,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
goto fail
diff --git a/example/babel.config.js b/example/babel.config.js
index 378ae5d22..204c84c93 100644
--- a/example/babel.config.js
+++ b/example/babel.config.js
@@ -7,7 +7,6 @@ module.exports = {
['@babel/preset-typescript', {allowDeclareFields: true}], // to allow use of declare context
],
plugins: [
- 'react-native-reanimated/plugin',
[
'module-resolver',
{
diff --git a/example/ios/Podfile b/example/ios/Podfile
index d035ae448..cb8d185f1 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -5,20 +5,9 @@ require Pod::Executable.execute_command('node', ['-p',
{paths: [process.argv[1]]},
)', __dir__]).strip
-platform :ios, min_ios_version_supported
+platform :ios, 14
prepare_react_native_project!
-# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
-# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
-#
-# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
-# ```js
-# module.exports = {
-# dependencies: {
-# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
-# ```
-flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
-
linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -30,11 +19,6 @@ target 'rnmshowcase' do
use_react_native!(
:path => config[:reactNativePath],
- # Enables Flipper.
- #
- # Note that if you have use_frameworks! enabled, Flipper will not work and
- # you should disable the next line.
- :flipper_configuration => flipper_config,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
@@ -53,7 +37,8 @@ target 'rnmshowcase' do
react_native_post_install(
installer,
config[:reactNativePath],
- :mac_catalyst_enabled => false
+ :mac_catalyst_enabled => false,
+ # :ccache_enabled => true
)
end
end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index c856b9a4d..657be3cb6 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,406 +1,367 @@
PODS:
- boost (1.83.0)
- - CocoaAsyncSocket (7.6.5)
- DoubleConversion (1.1.6)
- - FBLazyVector (0.73.0)
- - FBReactNativeSpec (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
- - RCTRequired (= 0.73.0)
- - RCTTypeSafety (= 0.73.0)
- - React-Core (= 0.73.0)
- - React-jsi (= 0.73.0)
- - ReactCommon/turbomodule/core (= 0.73.0)
- - Flipper (0.201.0):
- - Flipper-Folly (~> 2.6)
- - Flipper-Boost-iOSX (1.76.0.1.11)
- - Flipper-DoubleConversion (3.2.0.1)
- - Flipper-Fmt (7.1.7)
- - Flipper-Folly (2.6.10):
- - Flipper-Boost-iOSX
- - Flipper-DoubleConversion
- - Flipper-Fmt (= 7.1.7)
- - Flipper-Glog
- - libevent (~> 2.1.12)
- - OpenSSL-Universal (= 1.1.1100)
- - Flipper-Glog (0.5.0.5)
- - Flipper-PeerTalk (0.0.4)
- - FlipperKit (0.201.0):
- - FlipperKit/Core (= 0.201.0)
- - FlipperKit/Core (0.201.0):
- - Flipper (~> 0.201.0)
- - FlipperKit/CppBridge
- - FlipperKit/FBCxxFollyDynamicConvert
- - FlipperKit/FBDefines
- - FlipperKit/FKPortForwarding
- - SocketRocket (~> 0.6.0)
- - FlipperKit/CppBridge (0.201.0):
- - Flipper (~> 0.201.0)
- - FlipperKit/FBCxxFollyDynamicConvert (0.201.0):
- - Flipper-Folly (~> 2.6)
- - FlipperKit/FBDefines (0.201.0)
- - FlipperKit/FKPortForwarding (0.201.0):
- - CocoaAsyncSocket (~> 7.6)
- - Flipper-PeerTalk (~> 0.0.4)
- - FlipperKit/FlipperKitHighlightOverlay (0.201.0)
- - FlipperKit/FlipperKitLayoutHelpers (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitHighlightOverlay
- - FlipperKit/FlipperKitLayoutTextSearchable
- - FlipperKit/FlipperKitLayoutIOSDescriptors (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitHighlightOverlay
- - FlipperKit/FlipperKitLayoutHelpers
- - FlipperKit/FlipperKitLayoutPlugin (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitHighlightOverlay
- - FlipperKit/FlipperKitLayoutHelpers
- - FlipperKit/FlipperKitLayoutIOSDescriptors
- - FlipperKit/FlipperKitLayoutTextSearchable
- - FlipperKit/FlipperKitLayoutTextSearchable (0.201.0)
- - FlipperKit/FlipperKitNetworkPlugin (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitReactPlugin (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitUserDefaultsPlugin (0.201.0):
- - FlipperKit/Core
- - FlipperKit/SKIOSNetworkPlugin (0.201.0):
- - FlipperKit/Core
- - FlipperKit/FlipperKitNetworkPlugin
- - fmt (6.2.1)
+ - FBLazyVector (0.74.1)
+ - fmt (9.1.0)
- glog (0.3.5)
- - Google-Maps-iOS-Utils (4.2.2):
- - Google-Maps-iOS-Utils/Clustering (= 4.2.2)
- - Google-Maps-iOS-Utils/Geometry (= 4.2.2)
- - Google-Maps-iOS-Utils/GeometryUtils (= 4.2.2)
- - Google-Maps-iOS-Utils/Heatmap (= 4.2.2)
- - Google-Maps-iOS-Utils/QuadTree (= 4.2.2)
- - GoogleMaps (~> 7.3)
- - Google-Maps-iOS-Utils/Clustering (4.2.2):
- - Google-Maps-iOS-Utils/QuadTree
- - GoogleMaps (~> 7.3)
- - Google-Maps-iOS-Utils/Geometry (4.2.2):
- - GoogleMaps (~> 7.3)
- - Google-Maps-iOS-Utils/GeometryUtils (4.2.2):
- - GoogleMaps (~> 7.3)
- - Google-Maps-iOS-Utils/Heatmap (4.2.2):
- - Google-Maps-iOS-Utils/QuadTree
- - GoogleMaps (~> 7.3)
- - Google-Maps-iOS-Utils/QuadTree (4.2.2):
- - GoogleMaps (~> 7.3)
- - GoogleMaps (7.4.0):
- - GoogleMaps/Maps (= 7.4.0)
- - GoogleMaps/Base (7.4.0)
- - GoogleMaps/Maps (7.4.0):
+ - Google-Maps-iOS-Utils (5.0.0):
+ - GoogleMaps (~> 8.0)
+ - GoogleMaps (8.4.0):
+ - GoogleMaps/Maps (= 8.4.0)
+ - GoogleMaps/Base (8.4.0)
+ - GoogleMaps/Maps (8.4.0):
- GoogleMaps/Base
- - hermes-engine (0.73.0):
- - hermes-engine/Pre-built (= 0.73.0)
- - hermes-engine/Pre-built (0.73.0)
- - libevent (2.1.12)
- - OpenSSL-Universal (1.1.1100)
- - RCT-Folly (2022.05.16.00):
+ - hermes-engine (0.74.1):
+ - hermes-engine/Pre-built (= 0.74.1)
+ - hermes-engine/Pre-built (0.74.1)
+ - RCT-Folly (2024.01.01.00):
- boost
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- - RCT-Folly/Default (= 2022.05.16.00)
- - RCT-Folly/Default (2022.05.16.00):
+ - RCT-Folly/Default (= 2024.01.01.00)
+ - RCT-Folly/Default (2024.01.01.00):
- boost
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- - RCT-Folly/Fabric (2022.05.16.00):
+ - RCT-Folly/Fabric (2024.01.01.00):
- boost
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- - RCT-Folly/Futures (2022.05.16.00):
- - boost
- - DoubleConversion
- - fmt (~> 6.2.1)
- - glog
- - libevent
- - RCTRequired (0.73.0)
- - RCTTypeSafety (0.73.0):
- - FBLazyVector (= 0.73.0)
- - RCTRequired (= 0.73.0)
- - React-Core (= 0.73.0)
- - React (0.73.0):
- - React-Core (= 0.73.0)
- - React-Core/DevSupport (= 0.73.0)
- - React-Core/RCTWebSocket (= 0.73.0)
- - React-RCTActionSheet (= 0.73.0)
- - React-RCTAnimation (= 0.73.0)
- - React-RCTBlob (= 0.73.0)
- - React-RCTImage (= 0.73.0)
- - React-RCTLinking (= 0.73.0)
- - React-RCTNetwork (= 0.73.0)
- - React-RCTSettings (= 0.73.0)
- - React-RCTText (= 0.73.0)
- - React-RCTVibration (= 0.73.0)
- - React-callinvoker (0.73.0)
- - React-Codegen (0.73.0):
+ - RCTDeprecation (0.74.1)
+ - RCTRequired (0.74.1)
+ - RCTTypeSafety (0.74.1):
+ - FBLazyVector (= 0.74.1)
+ - RCTRequired (= 0.74.1)
+ - React-Core (= 0.74.1)
+ - React (0.74.1):
+ - React-Core (= 0.74.1)
+ - React-Core/DevSupport (= 0.74.1)
+ - React-Core/RCTWebSocket (= 0.74.1)
+ - React-RCTActionSheet (= 0.74.1)
+ - React-RCTAnimation (= 0.74.1)
+ - React-RCTBlob (= 0.74.1)
+ - React-RCTImage (= 0.74.1)
+ - React-RCTLinking (= 0.74.1)
+ - React-RCTNetwork (= 0.74.1)
+ - React-RCTSettings (= 0.74.1)
+ - React-RCTText (= 0.74.1)
+ - React-RCTVibration (= 0.74.1)
+ - React-callinvoker (0.74.1)
+ - React-Codegen (0.74.1):
- DoubleConversion
- - FBReactNativeSpec
- glog
- hermes-engine
- RCT-Folly
- RCTRequired
- RCTTypeSafety
- React-Core
+ - React-debug
+ - React-Fabric
+ - React-FabricImage
+ - React-featureflags
+ - React-graphics
- React-jsi
- React-jsiexecutor
- React-NativeModulesApple
- - React-rncore
+ - React-rendererdebug
+ - React-utils
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- - React-Core (0.73.0):
+ - React-Core (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-Core/Default (= 0.73.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
+ - React-Core/Default (= 0.74.1)
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/CoreModulesHeaders (0.73.0):
+ - React-Core/CoreModulesHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/Default (0.73.0):
+ - React-Core/Default (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/DevSupport (0.73.0):
+ - React-Core/DevSupport (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-Core/Default (= 0.73.0)
- - React-Core/RCTWebSocket (= 0.73.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
+ - React-Core/Default (= 0.74.1)
+ - React-Core/RCTWebSocket (= 0.74.1)
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
- - React-jsinspector (= 0.73.0)
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTActionSheetHeaders (0.73.0):
+ - React-Core/RCTActionSheetHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTAnimationHeaders (0.73.0):
+ - React-Core/RCTAnimationHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTBlobHeaders (0.73.0):
+ - React-Core/RCTBlobHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTImageHeaders (0.73.0):
+ - React-Core/RCTImageHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTLinkingHeaders (0.73.0):
+ - React-Core/RCTLinkingHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTNetworkHeaders (0.73.0):
+ - React-Core/RCTNetworkHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTSettingsHeaders (0.73.0):
+ - React-Core/RCTSettingsHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTTextHeaders (0.73.0):
+ - React-Core/RCTTextHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTVibrationHeaders (0.73.0):
+ - React-Core/RCTVibrationHeaders (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
- React-Core/Default
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-Core/RCTWebSocket (0.73.0):
+ - React-Core/RCTWebSocket (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-Core/Default (= 0.73.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTDeprecation
+ - React-Core/Default (= 0.74.1)
- React-cxxreact
+ - React-featureflags
- React-hermes
- React-jsi
- React-jsiexecutor
+ - React-jsinspector
- React-perflogger
- React-runtimescheduler
- React-utils
- - SocketRocket (= 0.6.1)
+ - SocketRocket (= 0.7.0)
- Yoga
- - React-CoreModules (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
- - RCTTypeSafety (= 0.73.0)
+ - React-CoreModules (0.74.1):
+ - DoubleConversion
+ - fmt (= 9.1.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - RCTTypeSafety (= 0.74.1)
- React-Codegen
- - React-Core/CoreModulesHeaders (= 0.73.0)
- - React-jsi (= 0.73.0)
+ - React-Core/CoreModulesHeaders (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-jsinspector
- React-NativeModulesApple
- React-RCTBlob
- - React-RCTImage (= 0.73.0)
+ - React-RCTImage (= 0.74.1)
- ReactCommon
- - SocketRocket (= 0.6.1)
- - React-cxxreact (0.73.0):
+ - SocketRocket (= 0.7.0)
+ - React-cxxreact (0.74.1):
- boost (= 1.83.0)
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-callinvoker (= 0.73.0)
- - React-debug (= 0.73.0)
- - React-jsi (= 0.73.0)
- - React-jsinspector (= 0.73.0)
- - React-logger (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - React-runtimeexecutor (= 0.73.0)
- - React-debug (0.73.0)
- - React-Fabric (0.73.0):
+ - RCT-Folly (= 2024.01.01.00)
+ - React-callinvoker (= 0.74.1)
+ - React-debug (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-jsinspector
+ - React-logger (= 0.74.1)
+ - React-perflogger (= 0.74.1)
+ - React-runtimeexecutor (= 0.74.1)
+ - React-debug (0.74.1)
+ - React-Fabric (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-cxxreact
- React-debug
- - React-Fabric/animations (= 0.73.0)
- - React-Fabric/attributedstring (= 0.73.0)
- - React-Fabric/componentregistry (= 0.73.0)
- - React-Fabric/componentregistrynative (= 0.73.0)
- - React-Fabric/components (= 0.73.0)
- - React-Fabric/core (= 0.73.0)
- - React-Fabric/imagemanager (= 0.73.0)
- - React-Fabric/leakchecker (= 0.73.0)
- - React-Fabric/mounting (= 0.73.0)
- - React-Fabric/scheduler (= 0.73.0)
- - React-Fabric/telemetry (= 0.73.0)
- - React-Fabric/templateprocessor (= 0.73.0)
- - React-Fabric/textlayoutmanager (= 0.73.0)
- - React-Fabric/uimanager (= 0.73.0)
+ - React-Fabric/animations (= 0.74.1)
+ - React-Fabric/attributedstring (= 0.74.1)
+ - React-Fabric/componentregistry (= 0.74.1)
+ - React-Fabric/componentregistrynative (= 0.74.1)
+ - React-Fabric/components (= 0.74.1)
+ - React-Fabric/core (= 0.74.1)
+ - React-Fabric/imagemanager (= 0.74.1)
+ - React-Fabric/leakchecker (= 0.74.1)
+ - React-Fabric/mounting (= 0.74.1)
+ - React-Fabric/scheduler (= 0.74.1)
+ - React-Fabric/telemetry (= 0.74.1)
+ - React-Fabric/templateprocessor (= 0.74.1)
+ - React-Fabric/textlayoutmanager (= 0.74.1)
+ - React-Fabric/uimanager (= 0.74.1)
- React-graphics
- React-jsi
- React-jsiexecutor
@@ -409,12 +370,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/animations (0.73.0):
+ - React-Fabric/animations (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -428,12 +389,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/attributedstring (0.73.0):
+ - React-Fabric/attributedstring (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -447,12 +408,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/componentregistry (0.73.0):
+ - React-Fabric/componentregistry (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -466,12 +427,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/componentregistrynative (0.73.0):
+ - React-Fabric/componentregistrynative (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -485,28 +446,28 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components (0.73.0):
+ - React-Fabric/components (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-cxxreact
- React-debug
- - React-Fabric/components/inputaccessory (= 0.73.0)
- - React-Fabric/components/legacyviewmanagerinterop (= 0.73.0)
- - React-Fabric/components/modal (= 0.73.0)
- - React-Fabric/components/rncore (= 0.73.0)
- - React-Fabric/components/root (= 0.73.0)
- - React-Fabric/components/safeareaview (= 0.73.0)
- - React-Fabric/components/scrollview (= 0.73.0)
- - React-Fabric/components/text (= 0.73.0)
- - React-Fabric/components/textinput (= 0.73.0)
- - React-Fabric/components/unimplementedview (= 0.73.0)
- - React-Fabric/components/view (= 0.73.0)
+ - React-Fabric/components/inputaccessory (= 0.74.1)
+ - React-Fabric/components/legacyviewmanagerinterop (= 0.74.1)
+ - React-Fabric/components/modal (= 0.74.1)
+ - React-Fabric/components/rncore (= 0.74.1)
+ - React-Fabric/components/root (= 0.74.1)
+ - React-Fabric/components/safeareaview (= 0.74.1)
+ - React-Fabric/components/scrollview (= 0.74.1)
+ - React-Fabric/components/text (= 0.74.1)
+ - React-Fabric/components/textinput (= 0.74.1)
+ - React-Fabric/components/unimplementedview (= 0.74.1)
+ - React-Fabric/components/view (= 0.74.1)
- React-graphics
- React-jsi
- React-jsiexecutor
@@ -515,12 +476,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/inputaccessory (0.73.0):
+ - React-Fabric/components/inputaccessory (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -534,12 +495,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/legacyviewmanagerinterop (0.73.0):
+ - React-Fabric/components/legacyviewmanagerinterop (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -553,12 +514,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/modal (0.73.0):
+ - React-Fabric/components/modal (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -572,12 +533,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/rncore (0.73.0):
+ - React-Fabric/components/rncore (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -591,12 +552,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/root (0.73.0):
+ - React-Fabric/components/root (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -610,12 +571,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/safeareaview (0.73.0):
+ - React-Fabric/components/safeareaview (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -629,12 +590,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/scrollview (0.73.0):
+ - React-Fabric/components/scrollview (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -648,12 +609,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/text (0.73.0):
+ - React-Fabric/components/text (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -667,12 +628,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/textinput (0.73.0):
+ - React-Fabric/components/textinput (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -686,12 +647,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/unimplementedview (0.73.0):
+ - React-Fabric/components/unimplementedview (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -705,12 +666,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/components/view (0.73.0):
+ - React-Fabric/components/view (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -725,12 +686,12 @@ PODS:
- React-utils
- ReactCommon/turbomodule/core
- Yoga
- - React-Fabric/core (0.73.0):
+ - React-Fabric/core (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -744,12 +705,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/imagemanager (0.73.0):
+ - React-Fabric/imagemanager (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -763,12 +724,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/leakchecker (0.73.0):
+ - React-Fabric/leakchecker (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -782,12 +743,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/mounting (0.73.0):
+ - React-Fabric/mounting (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -801,12 +762,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/scheduler (0.73.0):
+ - React-Fabric/scheduler (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -820,12 +781,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/telemetry (0.73.0):
+ - React-Fabric/telemetry (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -839,12 +800,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/templateprocessor (0.73.0):
+ - React-Fabric/templateprocessor (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -858,12 +819,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/textlayoutmanager (0.73.0):
+ - React-Fabric/textlayoutmanager (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -878,12 +839,12 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-Fabric/uimanager (0.73.0):
+ - React-Fabric/uimanager (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
- React-Core
@@ -897,42 +858,45 @@ PODS:
- React-runtimescheduler
- React-utils
- ReactCommon/turbomodule/core
- - React-FabricImage (0.73.0):
+ - React-FabricImage (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
- - RCTRequired (= 0.73.0)
- - RCTTypeSafety (= 0.73.0)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
+ - RCTRequired (= 0.74.1)
+ - RCTTypeSafety (= 0.74.1)
- React-Fabric
- React-graphics
- React-ImageManager
- React-jsi
- - React-jsiexecutor (= 0.73.0)
+ - React-jsiexecutor (= 0.74.1)
- React-logger
- React-rendererdebug
- React-utils
- ReactCommon
- Yoga
- - React-graphics (0.73.0):
+ - React-featureflags (0.74.1)
+ - React-graphics (0.74.1):
+ - DoubleConversion
+ - fmt (= 9.1.0)
- glog
- - RCT-Folly/Fabric (= 2022.05.16.00)
- - React-Core/Default (= 0.73.0)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
+ - React-Core/Default (= 0.74.1)
- React-utils
- - React-hermes (0.73.0):
+ - React-hermes (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - RCT-Folly/Futures (= 2022.05.16.00)
- - React-cxxreact (= 0.73.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - React-cxxreact (= 0.74.1)
- React-jsi
- - React-jsiexecutor (= 0.73.0)
- - React-jsinspector (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - React-ImageManager (0.73.0):
+ - React-jsiexecutor (= 0.74.1)
+ - React-jsinspector
+ - React-perflogger (= 0.74.1)
+ - React-runtimeexecutor
+ - React-ImageManager (0.74.1):
- glog
- RCT-Folly/Fabric
- React-Core/Default
@@ -941,96 +905,122 @@ PODS:
- React-graphics
- React-rendererdebug
- React-utils
- - React-jserrorhandler (0.73.0):
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - React-jserrorhandler (0.74.1):
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- React-debug
- React-jsi
- React-Mapbuffer
- - React-jsi (0.73.0):
+ - React-jsi (0.74.1):
- boost (= 1.83.0)
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-jsiexecutor (0.73.0):
+ - RCT-Folly (= 2024.01.01.00)
+ - React-jsiexecutor (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-cxxreact (= 0.73.0)
- - React-jsi (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - React-jsinspector (0.73.0)
- - React-logger (0.73.0):
+ - RCT-Folly (= 2024.01.01.00)
+ - React-cxxreact (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-jsinspector
+ - React-perflogger (= 0.74.1)
+ - React-jsinspector (0.74.1):
+ - DoubleConversion
- glog
- - React-Mapbuffer (0.73.0):
+ - hermes-engine
+ - RCT-Folly (= 2024.01.01.00)
+ - React-featureflags
+ - React-jsi
+ - React-runtimeexecutor (= 0.74.1)
+ - React-jsitracing (0.74.1):
+ - React-jsi
+ - React-logger (0.74.1):
+ - glog
+ - React-Mapbuffer (0.74.1):
- glog
- React-debug
- react-native-google-maps (0.0.0):
- - Google-Maps-iOS-Utils (= 4.2.2)
- - GoogleMaps (= 7.4.0)
+ - Google-Maps-iOS-Utils (= 5.0.0)
+ - GoogleMaps (= 8.4.0)
- React-Core
- react-native-maps (0.0.0):
- React-Core
- - React-nativeconfig (0.73.0)
- - React-NativeModulesApple (0.73.0):
+ - React-nativeconfig (0.74.1)
+ - React-NativeModulesApple (0.74.1):
- glog
- hermes-engine
- React-callinvoker
- React-Core
- React-cxxreact
- React-jsi
+ - React-jsinspector
- React-runtimeexecutor
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- - React-perflogger (0.73.0)
- - React-RCTActionSheet (0.73.0):
- - React-Core/RCTActionSheetHeaders (= 0.73.0)
- - React-RCTAnimation (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
+ - React-perflogger (0.74.1)
+ - React-RCTActionSheet (0.74.1):
+ - React-Core/RCTActionSheetHeaders (= 0.74.1)
+ - React-RCTAnimation (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- RCTTypeSafety
- React-Codegen
- React-Core/RCTAnimationHeaders
- React-jsi
- React-NativeModulesApple
- ReactCommon
- - React-RCTAppDelegate (0.73.0):
- - RCT-Folly
+ - React-RCTAppDelegate (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- RCTRequired
- RCTTypeSafety
+ - React-Codegen
- React-Core
- React-CoreModules
+ - React-debug
+ - React-Fabric
+ - React-featureflags
+ - React-graphics
- React-hermes
- React-nativeconfig
- React-NativeModulesApple
- React-RCTFabric
- React-RCTImage
- React-RCTNetwork
+ - React-rendererdebug
+ - React-RuntimeApple
+ - React-RuntimeCore
+ - React-RuntimeHermes
- React-runtimescheduler
+ - React-utils
- ReactCommon
- - React-RCTBlob (0.73.0):
+ - React-RCTBlob (0.74.1):
+ - DoubleConversion
+ - fmt (= 9.1.0)
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly (= 2024.01.01.00)
- React-Codegen
- React-Core/RCTBlobHeaders
- React-Core/RCTWebSocket
- React-jsi
+ - React-jsinspector
- React-NativeModulesApple
- React-RCTNetwork
- ReactCommon
- - React-RCTFabric (0.73.0):
+ - React-RCTFabric (0.74.1):
- glog
- hermes-engine
- - RCT-Folly/Fabric (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
- React-Core
- React-debug
- React-Fabric
- React-FabricImage
+ - React-featureflags
- React-graphics
- React-ImageManager
- React-jsi
+ - React-jsinspector
- React-nativeconfig
- React-RCTImage
- React-RCTText
@@ -1038,8 +1028,8 @@ PODS:
- React-runtimescheduler
- React-utils
- Yoga
- - React-RCTImage (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
+ - React-RCTImage (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- RCTTypeSafety
- React-Codegen
- React-Core/RCTImageHeaders
@@ -1047,152 +1037,172 @@ PODS:
- React-NativeModulesApple
- React-RCTNetwork
- ReactCommon
- - React-RCTLinking (0.73.0):
+ - React-RCTLinking (0.74.1):
- React-Codegen
- - React-Core/RCTLinkingHeaders (= 0.73.0)
- - React-jsi (= 0.73.0)
+ - React-Core/RCTLinkingHeaders (= 0.74.1)
+ - React-jsi (= 0.74.1)
- React-NativeModulesApple
- ReactCommon
- - ReactCommon/turbomodule/core (= 0.73.0)
- - React-RCTNetwork (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
+ - ReactCommon/turbomodule/core (= 0.74.1)
+ - React-RCTNetwork (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- RCTTypeSafety
- React-Codegen
- React-Core/RCTNetworkHeaders
- React-jsi
- React-NativeModulesApple
- ReactCommon
- - React-RCTSettings (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
+ - React-RCTSettings (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- RCTTypeSafety
- React-Codegen
- React-Core/RCTSettingsHeaders
- React-jsi
- React-NativeModulesApple
- ReactCommon
- - React-RCTText (0.73.0):
- - React-Core/RCTTextHeaders (= 0.73.0)
+ - React-RCTText (0.74.1):
+ - React-Core/RCTTextHeaders (= 0.74.1)
- Yoga
- - React-RCTVibration (0.73.0):
- - RCT-Folly (= 2022.05.16.00)
+ - React-RCTVibration (0.74.1):
+ - RCT-Folly (= 2024.01.01.00)
- React-Codegen
- React-Core/RCTVibrationHeaders
- React-jsi
- React-NativeModulesApple
- ReactCommon
- - React-rendererdebug (0.73.0):
+ - React-rendererdebug (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
- - RCT-Folly (= 2022.05.16.00)
+ - fmt (= 9.1.0)
+ - RCT-Folly (= 2024.01.01.00)
- React-debug
- - React-rncore (0.73.0)
- - React-runtimeexecutor (0.73.0):
- - React-jsi (= 0.73.0)
- - React-runtimescheduler (0.73.0):
+ - React-rncore (0.74.1)
+ - React-RuntimeApple (0.74.1):
+ - hermes-engine
+ - RCT-Folly/Fabric (= 2024.01.01.00)
+ - React-callinvoker
+ - React-Core/Default
+ - React-CoreModules
+ - React-cxxreact
+ - React-jserrorhandler
+ - React-jsi
+ - React-jsiexecutor
+ - React-jsinspector
+ - React-Mapbuffer
+ - React-NativeModulesApple
+ - React-RCTFabric
+ - React-RuntimeCore
+ - React-runtimeexecutor
+ - React-RuntimeHermes
+ - React-utils
+ - React-RuntimeCore (0.74.1):
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
+ - RCT-Folly/Fabric (= 2024.01.01.00)
+ - React-cxxreact
+ - React-featureflags
+ - React-jserrorhandler
+ - React-jsi
+ - React-jsiexecutor
+ - React-jsinspector
+ - React-runtimeexecutor
+ - React-runtimescheduler
+ - React-utils
+ - React-runtimeexecutor (0.74.1):
+ - React-jsi (= 0.74.1)
+ - React-RuntimeHermes (0.74.1):
+ - hermes-engine
+ - RCT-Folly/Fabric (= 2024.01.01.00)
+ - React-featureflags
+ - React-hermes
+ - React-jsi
+ - React-jsinspector
+ - React-jsitracing
+ - React-nativeconfig
+ - React-RuntimeCore
+ - React-utils
+ - React-runtimescheduler (0.74.1):
+ - glog
+ - hermes-engine
+ - RCT-Folly (= 2024.01.01.00)
- React-callinvoker
- React-cxxreact
- React-debug
+ - React-featureflags
- React-jsi
- React-rendererdebug
- React-runtimeexecutor
- React-utils
- - React-utils (0.73.0):
+ - React-utils (0.74.1):
- glog
- - RCT-Folly (= 2022.05.16.00)
+ - hermes-engine
+ - RCT-Folly (= 2024.01.01.00)
- React-debug
- - ReactCommon (0.73.0):
- - React-logger (= 0.73.0)
- - ReactCommon/turbomodule (= 0.73.0)
- - ReactCommon/turbomodule (0.73.0):
+ - React-jsi (= 0.74.1)
+ - ReactCommon (0.74.1):
+ - ReactCommon/turbomodule (= 0.74.1)
+ - ReactCommon/turbomodule (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-callinvoker (= 0.73.0)
- - React-cxxreact (= 0.73.0)
- - React-jsi (= 0.73.0)
- - React-logger (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - ReactCommon/turbomodule/bridging (= 0.73.0)
- - ReactCommon/turbomodule/core (= 0.73.0)
- - ReactCommon/turbomodule/bridging (0.73.0):
+ - RCT-Folly (= 2024.01.01.00)
+ - React-callinvoker (= 0.74.1)
+ - React-cxxreact (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-logger (= 0.74.1)
+ - React-perflogger (= 0.74.1)
+ - ReactCommon/turbomodule/bridging (= 0.74.1)
+ - ReactCommon/turbomodule/core (= 0.74.1)
+ - ReactCommon/turbomodule/bridging (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-callinvoker (= 0.73.0)
- - React-cxxreact (= 0.73.0)
- - React-jsi (= 0.73.0)
- - React-logger (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - ReactCommon/turbomodule/core (0.73.0):
+ - RCT-Folly (= 2024.01.01.00)
+ - React-callinvoker (= 0.74.1)
+ - React-cxxreact (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-logger (= 0.74.1)
+ - React-perflogger (= 0.74.1)
+ - ReactCommon/turbomodule/core (0.74.1):
- DoubleConversion
- - fmt (~> 6.2.1)
+ - fmt (= 9.1.0)
- glog
- hermes-engine
- - RCT-Folly (= 2022.05.16.00)
- - React-callinvoker (= 0.73.0)
- - React-cxxreact (= 0.73.0)
- - React-jsi (= 0.73.0)
- - React-logger (= 0.73.0)
- - React-perflogger (= 0.73.0)
- - RNReanimated (3.7.0):
- - glog
- - RCT-Folly (= 2022.05.16.00)
- - React-Core
- - ReactCommon/turbomodule/core
- - SocketRocket (0.6.1)
- - Yoga (1.14.0)
+ - RCT-Folly (= 2024.01.01.00)
+ - React-callinvoker (= 0.74.1)
+ - React-cxxreact (= 0.74.1)
+ - React-debug (= 0.74.1)
+ - React-jsi (= 0.74.1)
+ - React-logger (= 0.74.1)
+ - React-perflogger (= 0.74.1)
+ - React-utils (= 0.74.1)
+ - SocketRocket (0.7.0)
+ - Yoga (0.0.0)
DEPENDENCIES:
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- - Flipper (= 0.201.0)
- - Flipper-Boost-iOSX (= 1.76.0.1.11)
- - Flipper-DoubleConversion (= 3.2.0.1)
- - Flipper-Fmt (= 7.1.7)
- - Flipper-Folly (= 2.6.10)
- - Flipper-Glog (= 0.5.0.5)
- - Flipper-PeerTalk (= 0.0.4)
- - FlipperKit (= 0.201.0)
- - FlipperKit/Core (= 0.201.0)
- - FlipperKit/CppBridge (= 0.201.0)
- - FlipperKit/FBCxxFollyDynamicConvert (= 0.201.0)
- - FlipperKit/FBDefines (= 0.201.0)
- - FlipperKit/FKPortForwarding (= 0.201.0)
- - FlipperKit/FlipperKitHighlightOverlay (= 0.201.0)
- - FlipperKit/FlipperKitLayoutPlugin (= 0.201.0)
- - FlipperKit/FlipperKitLayoutTextSearchable (= 0.201.0)
- - FlipperKit/FlipperKitNetworkPlugin (= 0.201.0)
- - FlipperKit/FlipperKitReactPlugin (= 0.201.0)
- - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.201.0)
- - FlipperKit/SKIOSNetworkPlugin (= 0.201.0)
+ - fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
- - libevent (~> 2.1.12)
- - OpenSSL-Universal (= 1.1.1100)
- RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
- - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
+ - RCTDeprecation (from `../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
+ - RCTRequired (from `../node_modules/react-native/Libraries/Required`)
- RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
- React (from `../node_modules/react-native/`)
- React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
- React-Codegen (from `build/generated/ios`)
- React-Core (from `../node_modules/react-native/`)
- - React-Core/DevSupport (from `../node_modules/react-native/`)
- React-Core/RCTWebSocket (from `../node_modules/react-native/`)
- React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
- React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
- React-debug (from `../node_modules/react-native/ReactCommon/react/debug`)
- React-Fabric (from `../node_modules/react-native/ReactCommon`)
- React-FabricImage (from `../node_modules/react-native/ReactCommon`)
+ - React-featureflags (from `../node_modules/react-native/ReactCommon/react/featureflags`)
- React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`)
- React-hermes (from `../node_modules/react-native/ReactCommon/hermes`)
- React-ImageManager (from `../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)
@@ -1200,6 +1210,7 @@ DEPENDENCIES:
- React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector-modern`)
+ - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`)
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
- React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
- react-native-google-maps (from `../..`)
@@ -1220,29 +1231,19 @@ DEPENDENCIES:
- React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
- React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`)
- React-rncore (from `../node_modules/react-native/ReactCommon`)
+ - React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`)
+ - React-RuntimeCore (from `../node_modules/react-native/ReactCommon/react/runtime`)
- React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
+ - React-RuntimeHermes (from `../node_modules/react-native/ReactCommon/react/runtime`)
- React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
- React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
- - RNReanimated (from `../node_modules/react-native-reanimated`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
SPEC REPOS:
trunk:
- - CocoaAsyncSocket
- - Flipper
- - Flipper-Boost-iOSX
- - Flipper-DoubleConversion
- - Flipper-Fmt
- - Flipper-Folly
- - Flipper-Glog
- - Flipper-PeerTalk
- - FlipperKit
- - fmt
- Google-Maps-iOS-Utils
- GoogleMaps
- - libevent
- - OpenSSL-Universal
- SocketRocket
EXTERNAL SOURCES:
@@ -1252,17 +1253,19 @@ EXTERNAL SOURCES:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
FBLazyVector:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
- FBReactNativeSpec:
- :path: "../node_modules/react-native/React/FBReactNativeSpec"
+ fmt:
+ :podspec: "../node_modules/react-native/third-party-podspecs/fmt.podspec"
glog:
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
hermes-engine:
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
- :tag: hermes-2023-11-17-RNv0.73.0-21043a3fc062be445e56a2c10ecd8be028dd9cc5
+ :tag: hermes-2024-04-25-RNv0.74.1-b54a3a01c531f4f5f1904cb0770033e8b7153dff
RCT-Folly:
:podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
+ RCTDeprecation:
+ :path: "../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
RCTRequired:
- :path: "../node_modules/react-native/Libraries/RCTRequired"
+ :path: "../node_modules/react-native/Libraries/Required"
RCTTypeSafety:
:path: "../node_modules/react-native/Libraries/TypeSafety"
React:
@@ -1283,6 +1286,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon"
React-FabricImage:
:path: "../node_modules/react-native/ReactCommon"
+ React-featureflags:
+ :path: "../node_modules/react-native/ReactCommon/react/featureflags"
React-graphics:
:path: "../node_modules/react-native/ReactCommon/react/renderer/graphics"
React-hermes:
@@ -1297,6 +1302,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/jsiexecutor"
React-jsinspector:
:path: "../node_modules/react-native/ReactCommon/jsinspector-modern"
+ React-jsitracing:
+ :path: "../node_modules/react-native/ReactCommon/hermes/executor/"
React-logger:
:path: "../node_modules/react-native/ReactCommon/logger"
React-Mapbuffer:
@@ -1337,87 +1344,84 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/react/renderer/debug"
React-rncore:
:path: "../node_modules/react-native/ReactCommon"
+ React-RuntimeApple:
+ :path: "../node_modules/react-native/ReactCommon/react/runtime/platform/ios"
+ React-RuntimeCore:
+ :path: "../node_modules/react-native/ReactCommon/react/runtime"
React-runtimeexecutor:
:path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
+ React-RuntimeHermes:
+ :path: "../node_modules/react-native/ReactCommon/react/runtime"
React-runtimescheduler:
:path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
React-utils:
:path: "../node_modules/react-native/ReactCommon/react/utils"
ReactCommon:
:path: "../node_modules/react-native/ReactCommon"
- RNReanimated:
- :path: "../node_modules/react-native-reanimated"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
- boost: 26fad476bfa736552bbfa698a06cc530475c1505
- CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
- DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
- FBLazyVector: 39ba45baf4e398618f8b3a4bb6ba8fcdb7fc2133
- FBReactNativeSpec: 20cfca68498e27879514790359289d1df2b52c56
- Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
- Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
- Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
- Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
- Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
- Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
- Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
- FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
- fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
+ boost: d3f49c53809116a5d38da093a8aa78bf551aed09
+ DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+ FBLazyVector: 898d14d17bf19e2435cafd9ea2a1033efe445709
+ fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
- Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
- GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
- hermes-engine: 34304f8c6e8fa68f63a5fe29af82f227d817d7a7
- libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
- OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
- RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
- RCTRequired: 5e3631b27c08716986980ef23eed8abdee1cdcaf
- RCTTypeSafety: 02a64828b0b428eb4f63de1397d44fb2d0747e85
- React: df5dbfbd10c5bd8d4bcb49bd9830551533e11c7e
- React-callinvoker: dc0dff59e8d3d1fe4cd9fb5f120f82a775d2a325
- React-Codegen: 88bf5d1e29db28c1c9b88fe909f073be6c9f769d
- React-Core: 276ccbbf282538138f4429313bb1200a15067c6e
- React-CoreModules: 64747180c0329bebed8307ffdc97c331220277a6
- React-cxxreact: 84d98283f701bae882dcd3ad7c573a02f4c9d5c0
- React-debug: 443cf46ade52f3555dd1ec709718793490ac5edc
- React-Fabric: 4c877c032b3acc07ed3f2e46ae25b5a39af89382
- React-FabricImage: c46c47ea3c672b9fadd6850795a51d3d9e5df712
- React-graphics: e1cff03acf09098513642535324432d495b6425c
- React-hermes: e3356f82c76c5c41688a7e08ced2254a944501c4
- React-ImageManager: c783771479ab0bf1e3dbe711cc8b9f5b0f65972b
- React-jserrorhandler: 7cd93ce5165e5d66c87b6f612f94e5642f5c5028
- React-jsi: 81b5fe94500e69051c2f3a775308afaa53e2608b
- React-jsiexecutor: 4f790f865ad23fa949396c1a103d06867c0047ed
- React-jsinspector: 9f6fb9ed9f03a0fb961ab8dc2e0e0ee0dc729e77
- React-logger: 008caec0d6a587abc1e71be21bfac5ba1662fe6a
- React-Mapbuffer: 58fe558faf52ecde6705376700f848d0293d1cef
- react-native-google-maps: 031abe9680dd5f1f4450beff976d98b1228c087f
- react-native-maps: 30d24060fb0abe9998d31a4cf37421ff14c59e25
- React-nativeconfig: a063483672b8add47a4875b0281e202908ff6747
- React-NativeModulesApple: 169506a5fd708ab22811f76ee06a976595c367a1
- React-perflogger: b61e5db8e5167f5e70366e820766c492847c082e
- React-RCTActionSheet: dcaecff7ffc1888972cd1c1935751ff3bce1e0c1
- React-RCTAnimation: 24b8ae7ebc897ba3f33a93a020bbc66ab7863f5d
- React-RCTAppDelegate: 661fc59d833e6727cc8c7e36bf8664215e5c277f
- React-RCTBlob: 112880abc731c5a0d8eefb5919a591ad30f630e8
- React-RCTFabric: a0289e3bf73da8c03b68b4e9733ba497b021de45
- React-RCTImage: b8065c1b51cc6c2ff58ad81001619352518dd793
- React-RCTLinking: fdf9f43f8bd763d178281a079700105674953849
- React-RCTNetwork: ad3d988e425288492510ee37c9dcdf8259566214
- React-RCTSettings: 67c3876f2775d1cf86298f657e6006afc2a2e4cf
- React-RCTText: 671518da40bd548943ec12ee6a60f733a751e2e9
- React-RCTVibration: 60bc4d01d7d8ab7cff14852a195a7fa93b38e1f3
- React-rendererdebug: 6aaab394c9fefe395ef61809580a9bf63b98fd3e
- React-rncore: 6680f0ebb941e256af7dc92c6a512356e77bfea7
- React-runtimeexecutor: 2ca6f02d3fd6eea5b9575eb30720cf12c5d89906
- React-runtimescheduler: 77543c74df984ce56c09d49d427149c53784aaf6
- React-utils: 42708ea436853045ef1eaff29996813d9fbbe209
- ReactCommon: 851280fb976399ca1aabc74cc2c3612069ea70a2
- RNReanimated: 7d6d32f238f914f13d9d6fb45c0aef557f7f901e
- SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
- Yoga: 44003f970aa541b79dfdd59cf236fda41bd5890f
+ Google-Maps-iOS-Utils: 66d6de12be1ce6d3742a54661e7a79cb317a9321
+ GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
+ hermes-engine: 16b8530de1b383cdada1476cf52d1b52f0692cbc
+ RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
+ RCTDeprecation: efb313d8126259e9294dc4ee0002f44a6f676aba
+ RCTRequired: f49ea29cece52aee20db633ae7edc4b271435562
+ RCTTypeSafety: a11979ff0570d230d74de9f604f7d19692157bc4
+ React: 88794fad7f460349dbc9df8a274d95f37a009f5d
+ React-callinvoker: 7a7023e34a55c89ea2aa62486bb3c1164ab0be0c
+ React-Codegen: af31a9323ce23988c255c9afd0ae9415ff894939
+ React-Core: 60075333bc22b5a793d3f62e207368b79bff2e64
+ React-CoreModules: 147c314d6b3b1e069c9ad64cbbbeba604854ff86
+ React-cxxreact: 5de27fd8bff4764acb2eac3ee66001e0e2b910e7
+ React-debug: 6397f0baf751b40511d01e984b01467d7e6d8127
+ React-Fabric: 6fa475e16e0a37b38d462cec32b70fd5cf886305
+ React-FabricImage: 7e09b3704e3fa084b4d44b5b5ef6e2e3d3334ec0
+ React-featureflags: 2eb79dd9df4095bff519379f2a4c915069e330bb
+ React-graphics: 82a482a3aa5d9659b74cdf2c8b57faf67eaa10fb
+ React-hermes: d93936b02de2fd7e67c11e92c16d4278a14d0134
+ React-ImageManager: ebb3c4812e2c5acba5a89728c2d77729471329ad
+ React-jserrorhandler: a08e0adcf1612900dde82b8bf8e93e7d2ad953b3
+ React-jsi: f46d09ee5079a4f3b637d30d0e59b8ea6470632c
+ React-jsiexecutor: e73579560957aa3ca9dc02ab90e163454279d48c
+ React-jsinspector: e8ba20dde269c7c1d45784b858fa1cf4383f0bbb
+ React-jsitracing: 233d1a798fe0ff33b8e630b8f00f62c4a8115fbc
+ React-logger: 7e7403a2b14c97f847d90763af76b84b152b6fce
+ React-Mapbuffer: 11029dcd47c5c9e057a4092ab9c2a8d10a496a33
+ react-native-google-maps: e37f53ff027fbb3223c2f317e8010bb9633d7823
+ react-native-maps: 3ae17cf31b3959bafed98adecd53d31fb2114fdc
+ React-nativeconfig: b0073a590774e8b35192fead188a36d1dca23dec
+ React-NativeModulesApple: df46ff3e3de5b842b30b4ca8a6caae6d7c8ab09f
+ React-perflogger: 3d31e0d1e8ad891e43a09ac70b7b17a79773003a
+ React-RCTActionSheet: c4a3a134f3434c9d7b0c1054f1a8cfed30c7a093
+ React-RCTAnimation: 0e5d15320eeece667fcceb6c785acf9a184e9da1
+ React-RCTAppDelegate: c4f6c0700b8950a8b18c2e004996eec1807d430a
+ React-RCTBlob: c46aaaee693d371a1c7cae2a8c8ee2aa7fbc1adb
+ React-RCTFabric: 0dbf28ce96c7f2843483e32a725a5b5793584ff3
+ React-RCTImage: a04dba5fcc823244f5822192c130ecf09623a57f
+ React-RCTLinking: 533bf13c745fcb2a0c14e0e49fd149586a7f0d14
+ React-RCTNetwork: a29e371e0d363d7b4c10ab907bc4d6ae610541e9
+ React-RCTSettings: 127813224780861d0d30ecda17a40d1dfebe7d73
+ React-RCTText: 8a823f245ecf82edb7569646e3c4d8041deb800a
+ React-RCTVibration: 46b5fae74e63f240f22f39de16ad6433da3b65d9
+ React-rendererdebug: 4653f8da6ab1d7b01af796bdf8ca47a927539e39
+ React-rncore: 4f1e645acb5107bd4b4cf29eff17b04a7cd422f3
+ React-RuntimeApple: 013b606e743efb5ee14ef03c32379b78bfe74354
+ React-RuntimeCore: 7205be45a25713b5418bbf2db91ddfcca0761d8b
+ React-runtimeexecutor: a278d4249921853d4a3f24e4d6e0ff30688f3c16
+ React-RuntimeHermes: 44c628568ce8feedc3acfbd48fc07b7f0f6d2731
+ React-runtimescheduler: e2152ed146b6a35c07386fc2ac4827b27e6aad12
+ React-utils: 3285151c9d1e3a28a9586571fc81d521678c196d
+ ReactCommon: f42444e384d82ab89184aed5d6f3142748b54768
+ SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
+ Yoga: 348f8b538c3ed4423eb58a8e5730feec50bce372
-PODFILE CHECKSUM: 417f449e48abef232f50f4a62d20ff4840d057ce
+PODFILE CHECKSUM: 755edc145d30a6e88b216e07c4c92cc1014e888f
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/example/ios/rnmshowcase.xcodeproj/project.pbxproj b/example/ios/rnmshowcase.xcodeproj/project.pbxproj
index f8a243039..b81ae982f 100644
--- a/example/ios/rnmshowcase.xcodeproj/project.pbxproj
+++ b/example/ios/rnmshowcase.xcodeproj/project.pbxproj
@@ -11,9 +11,10 @@
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
- 6FAAF388136C4C37DC65247E /* libPods-rnmshowcase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CAB63A75E1FFBF60FF9511 /* libPods-rnmshowcase.a */; };
+ 231400E32E29A085D951F35D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = BC9118EBBCFB2F7F115A78AF /* PrivacyInfo.xcprivacy */; };
+ 4C29620DC97E48BF112C778F /* libPods-rnmshowcase-rnmshowcaseTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B3DB5BD1D8514761EF76DF81 /* libPods-rnmshowcase-rnmshowcaseTests.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
- B1A4761618DB2466121455E5 /* libPods-rnmshowcase-rnmshowcaseTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 85F25E7FD15F0A5305414D7D /* libPods-rnmshowcase-rnmshowcaseTests.a */; };
+ E488AD8C7A4525666DB1123D /* libPods-rnmshowcase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 37D3C620F2B4F795C66DA8FC /* libPods-rnmshowcase.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -36,13 +37,15 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = rnmshowcase/Images.xcassets; sourceTree = ""; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = rnmshowcase/Info.plist; sourceTree = ""; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = rnmshowcase/main.m; sourceTree = ""; };
- 478B05C726D1CB50EFE020A4 /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig"; path = "Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig"; sourceTree = ""; };
- 49C9F7C0D9927234C677A8E3 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig"; path = "Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig"; sourceTree = ""; };
- 7EE474948AC6C5FB3075ED8C /* Pods-rnmshowcase.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase.debug.xcconfig"; path = "Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase.debug.xcconfig"; sourceTree = ""; };
+ 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = RnDiffApp/PrivacyInfo.xcprivacy; sourceTree = ""; };
+ 37D3C620F2B4F795C66DA8FC /* libPods-rnmshowcase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-rnmshowcase.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 3DCD38C83286E8B07C078CFA /* Pods-rnmshowcase.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase.release.xcconfig"; path = "Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase.release.xcconfig"; sourceTree = ""; };
+ 41E150966890F2E6247E9E4F /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig"; path = "Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig"; sourceTree = ""; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = rnmshowcase/LaunchScreen.storyboard; sourceTree = ""; };
- 85F25E7FD15F0A5305414D7D /* libPods-rnmshowcase-rnmshowcaseTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-rnmshowcase-rnmshowcaseTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- 94CAB63A75E1FFBF60FF9511 /* libPods-rnmshowcase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-rnmshowcase.a"; sourceTree = BUILT_PRODUCTS_DIR; };
- C302D3D3C83094474A40B658 /* Pods-rnmshowcase.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase.release.xcconfig"; path = "Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase.release.xcconfig"; sourceTree = ""; };
+ 8A910C563A7AD321B2AB6712 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig"; path = "Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig"; sourceTree = ""; };
+ B3DB5BD1D8514761EF76DF81 /* libPods-rnmshowcase-rnmshowcaseTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-rnmshowcase-rnmshowcaseTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC9118EBBCFB2F7F115A78AF /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = rnmshowcase/PrivacyInfo.xcprivacy; sourceTree = ""; };
+ C5B6C2B3A7189624E2CE5850 /* Pods-rnmshowcase.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnmshowcase.debug.xcconfig"; path = "Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase.debug.xcconfig"; sourceTree = ""; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
@@ -51,7 +54,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- B1A4761618DB2466121455E5 /* libPods-rnmshowcase-rnmshowcaseTests.a in Frameworks */,
+ 4C29620DC97E48BF112C778F /* libPods-rnmshowcase-rnmshowcaseTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -59,7 +62,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 6FAAF388136C4C37DC65247E /* libPods-rnmshowcase.a in Frameworks */,
+ E488AD8C7A4525666DB1123D /* libPods-rnmshowcase.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -92,6 +95,8 @@
13B07FB61A68108700A75B9A /* Info.plist */,
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
13B07FB71A68108700A75B9A /* main.m */,
+ 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */,
+ BC9118EBBCFB2F7F115A78AF /* PrivacyInfo.xcprivacy */,
);
name = rnmshowcase;
sourceTree = "";
@@ -100,8 +105,8 @@
isa = PBXGroup;
children = (
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
- 94CAB63A75E1FFBF60FF9511 /* libPods-rnmshowcase.a */,
- 85F25E7FD15F0A5305414D7D /* libPods-rnmshowcase-rnmshowcaseTests.a */,
+ 37D3C620F2B4F795C66DA8FC /* libPods-rnmshowcase.a */,
+ B3DB5BD1D8514761EF76DF81 /* libPods-rnmshowcase-rnmshowcaseTests.a */,
);
name = Frameworks;
sourceTree = "";
@@ -140,10 +145,10 @@
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
isa = PBXGroup;
children = (
- 7EE474948AC6C5FB3075ED8C /* Pods-rnmshowcase.debug.xcconfig */,
- C302D3D3C83094474A40B658 /* Pods-rnmshowcase.release.xcconfig */,
- 478B05C726D1CB50EFE020A4 /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */,
- 49C9F7C0D9927234C677A8E3 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */,
+ C5B6C2B3A7189624E2CE5850 /* Pods-rnmshowcase.debug.xcconfig */,
+ 3DCD38C83286E8B07C078CFA /* Pods-rnmshowcase.release.xcconfig */,
+ 41E150966890F2E6247E9E4F /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */,
+ 8A910C563A7AD321B2AB6712 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */,
);
path = Pods;
sourceTree = "";
@@ -155,12 +160,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "rnmshowcaseTests" */;
buildPhases = (
- 55AB2E50DFA0F57547AB6C5D /* [CP] Check Pods Manifest.lock */,
+ 6BB2B4F88862047370DBEC4E /* [CP] Check Pods Manifest.lock */,
00E356EA1AD99517003FC87E /* Sources */,
00E356EB1AD99517003FC87E /* Frameworks */,
00E356EC1AD99517003FC87E /* Resources */,
- 6F42A41D23496B5960BEC2EF /* [CP] Embed Pods Frameworks */,
- BEDDBB0A60A6D7A0F8CCFF16 /* [CP] Copy Pods Resources */,
+ 4BB5BDEB3BB3351A69AAFD04 /* [CP] Embed Pods Frameworks */,
+ 7149723BEA52900493758BCB /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -176,14 +181,14 @@
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "rnmshowcase" */;
buildPhases = (
- DAE6EFA50B414FBA02DFBE85 /* [CP] Check Pods Manifest.lock */,
+ EB2F1A58A44FE0FDC95046A9 /* [CP] Check Pods Manifest.lock */,
FD10A7F022414F080027D42C /* Start Packager */,
13B07F871A680F5B00A75B9A /* Sources */,
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
- 8E17FAAA5F99A61E0185E792 /* [CP] Embed Pods Frameworks */,
- 51E32F75E396288CF29EB001 /* [CP] Copy Pods Resources */,
+ 7178DD5CCC1BA4C10BC1338D /* [CP] Embed Pods Frameworks */,
+ 2FEBF6F3E6705F77B8AE9357 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -244,6 +249,7 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+ 231400E32E29A085D951F35D /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -264,9 +270,9 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
+ shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
- 51E32F75E396288CF29EB001 /* [CP] Copy Pods Resources */ = {
+ 2FEBF6F3E6705F77B8AE9357 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -283,7 +289,24 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase-resources.sh\"\n";
showEnvVarsInLog = 0;
};
- 55AB2E50DFA0F57547AB6C5D /* [CP] Check Pods Manifest.lock */ = {
+ 4BB5BDEB3BB3351A69AAFD04 /* [CP] Embed Pods Frameworks */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+ );
+ name = "[CP] Embed Pods Frameworks";
+ outputFileListPaths = (
+ "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks.sh\"\n";
+ showEnvVarsInLog = 0;
+ };
+ 6BB2B4F88862047370DBEC4E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -305,24 +328,24 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
- 6F42A41D23496B5960BEC2EF /* [CP] Embed Pods Frameworks */ = {
+ 7149723BEA52900493758BCB /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+ "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources-${CONFIGURATION}-input-files.xcfilelist",
);
- name = "[CP] Embed Pods Frameworks";
+ name = "[CP] Copy Pods Resources";
outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+ "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-frameworks.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
- 8E17FAAA5F99A61E0185E792 /* [CP] Embed Pods Frameworks */ = {
+ 7178DD5CCC1BA4C10BC1338D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -339,24 +362,7 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase/Pods-rnmshowcase-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
- BEDDBB0A60A6D7A0F8CCFF16 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources-${CONFIGURATION}-input-files.xcfilelist",
- );
- name = "[CP] Copy Pods Resources";
- outputFileListPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources-${CONFIGURATION}-output-files.xcfilelist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-rnmshowcase-rnmshowcaseTests/Pods-rnmshowcase-rnmshowcaseTests-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
- DAE6EFA50B414FBA02DFBE85 /* [CP] Check Pods Manifest.lock */ = {
+ EB2F1A58A44FE0FDC95046A9 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -430,7 +436,7 @@
/* Begin XCBuildConfiguration section */
00E356F61AD99517003FC87E /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 478B05C726D1CB50EFE020A4 /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */;
+ baseConfigurationReference = 41E150966890F2E6247E9E4F /* Pods-rnmshowcase-rnmshowcaseTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -457,7 +463,7 @@
};
00E356F71AD99517003FC87E /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 49C9F7C0D9927234C677A8E3 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */;
+ baseConfigurationReference = 8A910C563A7AD321B2AB6712 /* Pods-rnmshowcase-rnmshowcaseTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
COPY_PHASE_STRIP = NO;
@@ -481,7 +487,7 @@
};
13B07F941A680F5B00A75B9A /* Debug */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = 7EE474948AC6C5FB3075ED8C /* Pods-rnmshowcase.debug.xcconfig */;
+ baseConfigurationReference = C5B6C2B3A7189624E2CE5850 /* Pods-rnmshowcase.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
@@ -499,8 +505,8 @@
"-ObjC",
"-lc++",
);
- PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
- "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.reactjs.salah-maps";
+ PRODUCT_BUNDLE_IDENTIFIER = "salah-ghanim.reactjs.native.example.--PRODUCT-NAME-rfc1034identifier-";
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "salah-ghanim.native.example.rnmshowcases";
PRODUCT_NAME = rnmshowcase;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -510,7 +516,7 @@
};
13B07F951A680F5B00A75B9A /* Release */ = {
isa = XCBuildConfiguration;
- baseConfigurationReference = C302D3D3C83094474A40B658 /* Pods-rnmshowcase.release.xcconfig */;
+ baseConfigurationReference = 3DCD38C83286E8B07C078CFA /* Pods-rnmshowcase.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
@@ -528,7 +534,7 @@
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
- "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.reactjs.salah-maps";
+ "PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.reactjs.native.example.rnmshowcases;
PRODUCT_NAME = rnmshowcase;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
@@ -539,6 +545,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CC = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_CXX_LIBRARY = "libc++";
@@ -566,6 +573,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
+ CXX = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -596,6 +604,8 @@
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+ LD = "";
+ LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
@@ -609,19 +619,17 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
- " ",
+ "-DRN_FABRIC_ENABLED",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
+ "-DFOLLY_CFG_NO_COROUTINES=1",
+ "-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-Wl",
- "-ld_classic",
- );
+ OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
@@ -632,6 +640,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CC = "";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_CXX_LIBRARY = "libc++";
@@ -659,6 +668,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
+ CXX = "";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -682,6 +692,8 @@
"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
);
IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+ LD = "";
+ LDPLUSPLUS = "";
LD_RUNPATH_SEARCH_PATHS = (
/usr/lib/swift,
"$(inherited)",
@@ -694,19 +706,17 @@
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = (
"$(inherited)",
- " ",
+ "-DRN_FABRIC_ENABLED",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-DFOLLY_NO_CONFIG",
"-DFOLLY_MOBILE=1",
"-DFOLLY_USE_LIBCPP=1",
+ "-DFOLLY_CFG_NO_COROUTINES=1",
+ "-DFOLLY_HAVE_CLOCK_GETTIME=1",
);
- OTHER_LDFLAGS = (
- "$(inherited)",
- "-Wl",
- "-ld_classic",
- );
+ OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
diff --git a/example/ios/rnmshowcase/AppDelegate.mm b/example/ios/rnmshowcase/AppDelegate.mm
index da66e74ae..29f6af080 100644
--- a/example/ios/rnmshowcase/AppDelegate.mm
+++ b/example/ios/rnmshowcase/AppDelegate.mm
@@ -1,32 +1,28 @@
#import "AppDelegate.h"
-#import
#import
-#import
-
#import
-
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
[GMSServices provideAPIKey:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"MAPS_API_KEY"]];
self.moduleName = @"rnmshowcase";
-
+
// You can add your custom initial props in the dictionary below.
// They will be passed down to the ViewController used by React Native.
self.initialProps = @{};
-
+
return [super application:application didFinishLaunchingWithOptions:launchOptions];
}
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
{
- return [self getBundleURL];
+ return [self bundleURL];
}
-- (NSURL *)getBundleURL
+- (NSURL *)bundleURL
{
#if DEBUG
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
@@ -35,5 +31,4 @@ - (NSURL *)getBundleURL
#endif
}
-
@end
diff --git a/example/ios/rnmshowcase/Info.plist b/example/ios/rnmshowcase/Info.plist
index 68a7c8468..d77401465 100644
--- a/example/ios/rnmshowcase/Info.plist
+++ b/example/ios/rnmshowcase/Info.plist
@@ -39,7 +39,7 @@
LaunchScreen
UIRequiredDeviceCapabilities
- armv7
+ arm64
UISupportedInterfaceOrientations
diff --git a/example/ios/rnmshowcase/PrivacyInfo.xcprivacy b/example/ios/rnmshowcase/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000..41b8317f0
--- /dev/null
+++ b/example/ios/rnmshowcase/PrivacyInfo.xcprivacy
@@ -0,0 +1,37 @@
+
+
+
+
+ NSPrivacyAccessedAPITypes
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryFileTimestamp
+ NSPrivacyAccessedAPITypeReasons
+
+ C617.1
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryUserDefaults
+ NSPrivacyAccessedAPITypeReasons
+
+ CA92.1
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategorySystemBootTime
+ NSPrivacyAccessedAPITypeReasons
+
+ 35F9.1
+
+
+
+ NSPrivacyCollectedDataTypes
+
+ NSPrivacyTracking
+
+
+
diff --git a/example/package.json b/example/package.json
index e97c2bbd2..cfdd60fa9 100644
--- a/example/package.json
+++ b/example/package.json
@@ -11,19 +11,18 @@
},
"dependencies": {
"react": "18.2.0",
- "react-native": "0.73.0",
- "react-native-reanimated": "^3.7.0"
+ "react-native": "0.74.1"
},
"devDependencies": {
"@babel/core": "^7.20.0",
- "@babel/runtime": "^7.20.0",
"@babel/preset-env": "^7.20.0",
- "babel-plugin-module-resolver": "5.0.0",
- "@react-native/babel-preset": "^0.73.18",
- "@react-native/eslint-config": "^0.73.1",
- "@react-native/metro-config": "^0.73.2",
- "@react-native/typescript-config": "^0.73.1",
+ "@babel/runtime": "^7.20.0",
+ "@react-native/babel-preset": "0.74.83",
+ "@react-native/eslint-config": "0.74.83",
+ "@react-native/metro-config": "0.74.83",
+ "@react-native/typescript-config": "0.74.83",
"@types/react": "^18.2.6",
- "@types/react-test-renderer": "^18.0.0"
+ "@types/react-test-renderer": "^18.0.0",
+ "babel-plugin-module-resolver": "5.0.0"
}
}
diff --git a/example/react-native.config.js b/example/react-native.config.js
index a5166956f..4224096cb 100644
--- a/example/react-native.config.js
+++ b/example/react-native.config.js
@@ -7,4 +7,38 @@ module.exports = {
root: path.join(__dirname, '..'),
},
},
+ project: {
+ android: {
+ unstable_reactLegacyComponentNames: [
+ 'AIRMap',
+ 'AIRMapCallout',
+ 'AIRMapCalloutSubview',
+ 'AIRMapCircle',
+ 'AIRMapHeatmap',
+ 'AIRMapLocalTile',
+ 'AIRMapMarker',
+ 'AIRMapOverlay',
+ 'AIRMapPolygon',
+ 'AIRMapPolyline',
+ 'AIRMapUrlTile',
+ 'AIRMapWMSTile',
+ ],
+ },
+ ios: {
+ unstable_reactLegacyComponentNames: [
+ 'AIRMap',
+ 'AIRMapCallout',
+ 'AIRMapCalloutSubview',
+ 'AIRMapCircle',
+ 'AIRMapHeatmap',
+ 'AIRMapLocalTile',
+ 'AIRMapMarker',
+ 'AIRMapOverlay',
+ 'AIRMapPolygon',
+ 'AIRMapPolyline',
+ 'AIRMapUrlTile',
+ 'AIRMapWMSTile',
+ ],
+ },
+ },
};
diff --git a/example/src/App.tsx b/example/src/App.tsx
index 7e10cf572..da6ce7da2 100644
--- a/example/src/App.tsx
+++ b/example/src/App.tsx
@@ -17,6 +17,7 @@ import DraggableMarkers from './examples/DraggableMarkers';
import PolygonCreator from './examples/PolygonCreator';
import PolylineCreator from './examples/PolylineCreator';
import GradientPolylines from './examples/GradientPolylines';
+import GradientPolylinesFunctional from './examples/GradientPolylinesFunctional';
import AnimatedViews from './examples/AnimatedViews';
import AnimatedMarkers from './examples/AnimatedMarkers';
import Callouts from './examples/Callouts';
@@ -149,6 +150,7 @@ export default class App extends React.Component {
[PolygonCreator, 'Polygon Creator', true],
[PolylineCreator, 'Polyline Creator', true],
[GradientPolylines, 'Gradient Polylines', true],
+ [GradientPolylinesFunctional, 'Gradient Polylines Functional', true],
[AnimatedViews, 'Animating with MapViews'],
[AnimatedMarkers, 'Animated Marker Position'],
[Callouts, 'Custom Callouts', true],
@@ -157,7 +159,7 @@ export default class App extends React.Component {
[CustomMarkers, 'Custom Markers', true],
[TakeSnapshot, 'Take Snapshot', true, '(incomplete)'],
[CachedMap, 'Cached Map'],
- [LoadingMap, 'Map with loading'],
+ [LoadingMap, 'Map with loading', true],
[MapBoundaries, 'Get visible map boundaries', true],
[FitToSuppliedMarkers, 'Focus Map On Markers', true],
[FitToCoordinates, 'Fit Map To Coordinates', true],
diff --git a/example/src/examples/AnimatedMarkers.tsx b/example/src/examples/AnimatedMarkers.tsx
index 64f3acbe3..049c72110 100644
--- a/example/src/examples/AnimatedMarkers.tsx
+++ b/example/src/examples/AnimatedMarkers.tsx
@@ -1,88 +1,83 @@
-import React, {useRef} from 'react';
+import React from 'react';
import {
StyleSheet,
View,
Text,
Dimensions,
TouchableOpacity,
+ Platform,
} from 'react-native';
-import MapView, {MapMarker, Marker} from 'react-native-maps';
-import {
- runOnJS,
- useDerivedValue,
- useSharedValue,
- withTiming,
-} from 'react-native-reanimated';
+
+import MapView, {Marker, AnimatedRegion} from 'react-native-maps';
const screen = Dimensions.get('window');
+
const ASPECT_RATIO = screen.width / screen.height;
const LATITUDE = 37.78825;
const LONGITUDE = -122.4324;
const LATITUDE_DELTA = 0.0922;
const LONGITUDE_DELTA = LATITUDE_DELTA * ASPECT_RATIO;
-const AnimatedMarkers = () => {
- const markerRef = useRef(null);
- // Shared values for latitude and longitude
- const latitude = useSharedValue(LATITUDE);
- const longitude = useSharedValue(LONGITUDE);
+class AnimatedMarkers extends React.Component {
+ marker: any;
+ constructor(props: any) {
+ super(props);
- // Function to animate marker position
- const animateMarkerPosition = () => {
- const newLatitude = LATITUDE + (Math.random() - 0.5) * (LATITUDE_DELTA / 2);
- const newLongitude =
- LONGITUDE + (Math.random() - 0.5) * (LONGITUDE_DELTA / 2);
+ this.state = {
+ coordinate: new AnimatedRegion({
+ latitude: LATITUDE,
+ longitude: LONGITUDE,
+ }),
+ };
+ }
- latitude.value = withTiming(newLatitude, {duration: 1000});
- longitude.value = withTiming(newLongitude, {duration: 1000});
- };
+ animate() {
+ const {coordinate} = this.state;
+ const newCoordinate = {
+ latitude: LATITUDE + (Math.random() - 0.5) * (LATITUDE_DELTA / 2),
+ longitude: LONGITUDE + (Math.random() - 0.5) * (LONGITUDE_DELTA / 2),
+ };
- // Derived value to trigger marker updates
- const updateMarkerPosition = (lat: number, lng: number) => {
- if (markerRef && markerRef.current) {
- markerRef.current.setNativeProps({
- coordinate: {latitude: lat, longitude: lng},
- });
+ if (Platform.OS === 'android') {
+ if (this.marker) {
+ this.marker._component.animateMarkerToCoordinate(newCoordinate, 500);
+ }
+ } else {
+ // `useNativeDriver` defaults to false if not passed explicitly
+ coordinate.timing({...newCoordinate, useNativeDriver: true}).start();
}
- };
+ }
- // Use useDerivedValue to react to changes in latitude and longitude
- useDerivedValue(() => {
- const lat = latitude.value;
- const lng = longitude.value;
- // Use runOnJS to call updateMarkerPosition from the UI thread
- // runOnJS requires functions to be called with their arguments
- runOnJS(updateMarkerPosition)(lat, lng);
- }, [latitude, longitude]);
-
- return (
-
-
-
+
-
-
-
- Animate
-
+ latitudeDelta: LATITUDE_DELTA,
+ longitudeDelta: LONGITUDE_DELTA,
+ }}>
+ {
+ this.marker = marker;
+ }}
+ coordinate={this.state.coordinate}
+ />
+