@maplibre/maplibre-react-native 10.0.0-alpha.6 → 10.0.0-alpha.8

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateItem.java

@@ -2,9 +2,9 @@ package com.maplibre.rctmln.components.camera;
 
 import androidx.annotation.NonNull;
 
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.constants.MapboxConstants;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
+import org.maplibre.android.camera.CameraUpdate;
+import org.maplibre.android.constants.MapLibreConstants;
+import org.maplibre.android.maps.MapLibreMap;
 import com.maplibre.rctmln.components.camera.constants.CameraMode;
 
 import java.lang.ref.WeakReference;
@@ -23,16 +23,16 @@ import java.util.concurrent.TimeoutException;
 
 public class CameraUpdateItem implements RunnableFuture<Void> {
     private int mDuration;
-    private MapboxMap.CancelableCallback mCallback;
+    private MapLibreMap.CancelableCallback mCallback;
     private CameraUpdate mCameraUpdate;
     private int mCameraMode;
 
     private boolean isCameraActionFinished;
     private boolean isCameraActionCancelled;
 
-    private WeakReference<MapboxMap> mMap;
+    private WeakReference<MapLibreMap> mMap;
 
-    public CameraUpdateItem(MapboxMap map, CameraUpdate update, int duration, MapboxMap.CancelableCallback callback, @CameraMode.Mode int cameraMode) {
+    public CameraUpdateItem(MapLibreMap map, CameraUpdate update, int duration, MapLibreMap.CancelableCallback callback, @CameraMode.Mode int cameraMode) {
         mCameraUpdate = update;
         mDuration = duration;
         mCallback = callback;
@@ -46,7 +46,7 @@ public class CameraUpdateItem implements RunnableFuture<Void> {
 
     @Override
     public void run() {
-        final MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
+        final MapLibreMap.CancelableCallback callback = new MapLibreMap.CancelableCallback() {
             @Override
             public void onCancel() {
                 handleCallbackResponse(true);
@@ -58,7 +58,7 @@ public class CameraUpdateItem implements RunnableFuture<Void> {
             }
         };
 
-        MapboxMap map = mMap.get();
+        MapLibreMap map = mMap.get();
         if (map == null) {
             isCameraActionCancelled = true;
             return;
@@ -71,8 +71,8 @@ public class CameraUpdateItem implements RunnableFuture<Void> {
         }
 
         // On iOS a duration of -1 means default or dynamic duration (based on flight-path length)
-        // On Android we can fallback to Mapbox's default duration as there is no such API
-        int duration = mDuration < 0 ? MapboxConstants.ANIMATION_DURATION : mDuration;
+        // On Android we can fallback to MapLibre's default duration as there is no such API
+        int duration = mDuration < 0 ? MapLibreConstants.ANIMATION_DURATION : mDuration;
 
         if (mCameraMode == CameraMode.FLIGHT) {
             map.animateCamera(mCameraUpdate, duration, callback);

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateQueue.java

@@ -1,6 +1,6 @@
 package com.maplibre.rctmln.components.camera;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
+import org.maplibre.android.maps.MapLibreMap;
 import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
 
 import java.util.ArrayList;

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCamera.java

@@ -3,21 +3,21 @@ package com.maplibre.rctmln.components.camera;
 import android.content.Context;
 import android.location.Location;
 
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.camera.CameraUpdateFactory;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.LatLngBounds;
-import com.mapbox.mapboxsdk.geometry.VisibleRegion;
-import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener;
-import com.mapbox.mapboxsdk.location.modes.CameraMode;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.location.LocationComponent;
-import com.mapbox.mapboxsdk.location.LocationComponentOptions;
-import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions;
-// import com.mapbox.mapboxsdk.plugins.locationlayer.LocationLayerPlugin;
+import org.maplibre.android.camera.CameraPosition;
+import org.maplibre.android.camera.CameraUpdate;
+import org.maplibre.android.camera.CameraUpdateFactory;
+import org.maplibre.android.geometry.LatLng;
+import org.maplibre.android.geometry.LatLngBounds;
+import org.maplibre.android.geometry.VisibleRegion;
+import org.maplibre.android.location.OnCameraTrackingChangedListener;
+import org.maplibre.android.location.modes.CameraMode;
+import org.maplibre.android.location.modes.RenderMode;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.Style;
+import org.maplibre.android.location.LocationComponent;
+import org.maplibre.android.location.LocationComponentOptions;
+import org.maplibre.android.location.LocationComponentActivationOptions;
+// import org.maplibre.android.plugins.locationlayer.LocationLayerPlugin;
 import com.maplibre.rctmln.components.AbstractMapFeature;
 import com.maplibre.rctmln.components.location.LocationComponentManager;
 import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
@@ -38,9 +38,9 @@ import com.maplibre.rctmln.events.constants.EventTypes;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 
-import com.mapbox.geojson.Point;
+import org.maplibre.geojson.Point;
 
-import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
+import org.maplibre.android.location.permissions.PermissionsManager;
 
 import androidx.annotation.NonNull;
 
@@ -96,7 +96,7 @@ public class RCTMLNCamera extends AbstractMapFeature {
         }
     };
 
-    private MapboxMap.CancelableCallback mCameraCallback = new MapboxMap.CancelableCallback() {
+    private MapLibreMap.CancelableCallback mCameraCallback = new MapLibreMap.CancelableCallback() {
         @Override
         public void onCancel() {
             if (!hasSentFirstRegion) {
@@ -170,14 +170,14 @@ public class RCTMLNCamera extends AbstractMapFeature {
     }
 
     private void updateMaxBounds() {
-        MapboxMap map = getMapboxMap();
+        MapLibreMap map = getMapboxMap();
         if (map != null && mMaxBounds != null) {
             map.setLatLngBoundsForCameraTarget(mMaxBounds);
         }
     }
 
     private void updateMaxMinZoomLevel() {
-        MapboxMap map = getMapboxMap();
+        MapLibreMap map = getMapboxMap();
         if (map != null) {
             if (mMinZoomLevel >= 0.0) {
                 map.setMinZoomPreference(mMinZoomLevel);
@@ -281,15 +281,15 @@ public class RCTMLNCamera extends AbstractMapFeature {
 
         double zoom = mZoomLevel;
         if (zoom < 0) {
-            double camerZoom = mMapView.getMapboxMap().getCameraPosition().zoom;
-            if (camerZoom < minimumZoomLevelForUserTracking) {
+            double cameraZoom = mMapView.getMapboxMap().getCameraPosition().zoom;
+            if (cameraZoom < minimumZoomLevelForUserTracking) {
                 zoom = defaultZoomLevelForUserTracking;
             } else {
-                zoom = camerZoom;
+                zoom = cameraZoom;
             }
         }
         CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(getUserLocationUpdateCameraPosition(zoom));
-        MapboxMap.CancelableCallback cameraCallback = new MapboxMap.CancelableCallback() {
+        MapLibreMap.CancelableCallback cameraCallback = new MapLibreMap.CancelableCallback() {
             @Override
             public void onCancel() {
                 mUserTrackingState = UserTrackingState.CHANGED;
@@ -314,7 +314,7 @@ public class RCTMLNCamera extends AbstractMapFeature {
         CameraPosition cameraPosition = mMapView.getCameraPosition();
         CameraUpdate cameraUpdate = CameraUpdateFactory.newCameraPosition(getUserLocationUpdateCameraPosition(cameraPosition.zoom));
 
-        MapboxMap.CancelableCallback callback = new MapboxMap.CancelableCallback() {
+        MapLibreMap.CancelableCallback callback = new MapLibreMap.CancelableCallback() {
             @Override
             public void onCancel() {
                 mUserTrackingState = UserTrackingState.CHANGED;
@@ -497,7 +497,7 @@ public class RCTMLNCamera extends AbstractMapFeature {
         }
     }
 
-    MapboxMap getMapboxMap() {
+    MapLibreMap getMapboxMap() {
         if (mMapView == null) {
             return null;
         }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCameraManager.java

@@ -1,6 +1,6 @@
 package com.maplibre.rctmln.components.camera;
 
-import com.mapbox.geojson.FeatureCollection;
+import org.maplibre.geojson.FeatureCollection;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/images/RCTMLNImages.java

@@ -8,9 +8,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
 
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.utils.BitmapUtils;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.Style;
+import org.maplibre.android.utils.BitmapUtils;
 import com.maplibre.rctmln.R;
 import com.maplibre.rctmln.components.AbstractMapFeature;
 import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
@@ -35,7 +35,7 @@ public class RCTMLNImages extends AbstractMapFeature {
     private Map<String, BitmapDrawable> mNativeImages;
     private RCTMLNImagesManager mManager;
     private boolean mSendMissingImageEvents = false;
-    private MapboxMap mMap;
+    private MapLibreMap mMap;
 
     protected String mID;
 
@@ -132,7 +132,7 @@ public class RCTMLNImages extends AbstractMapFeature {
         return Collections.singletonList((Map.Entry<K,V>)new AbstractMap.SimpleEntry<K, V>(k, v));
     }
 
-    public boolean addMissingImageToStyle(@NonNull String id, @NonNull MapboxMap map) {
+    public boolean addMissingImageToStyle(@NonNull String id, @NonNull MapLibreMap map) {
         if (mNativeImages != null) {
             BitmapDrawable drawable = mNativeImages.get(id);
             if (drawable != null) {
@@ -151,25 +151,25 @@ public class RCTMLNImages extends AbstractMapFeature {
         return false;
     }
 
-    public void addImagesToStyle(Map<String, ImageEntry> images, @NonNull MapboxMap map) {
+    public void addImagesToStyle(Map<String, ImageEntry> images, @NonNull MapLibreMap map) {
         if (images != null) {
             addRemoteImages(new ArrayList<>(images.entrySet()), map);
         }
     }
 
-    public void addNativeImagesToStyle(Map<String, BitmapDrawable> images, @NonNull MapboxMap map) {
+    public void addNativeImagesToStyle(Map<String, BitmapDrawable> images, @NonNull MapLibreMap map) {
         if (images != null) {
             addNativeImages(new ArrayList<>(images.entrySet()), map);
         }
     }
 
-    public void sendImageMissingEvent(@NonNull String id, @NonNull MapboxMap map) {
+    public void sendImageMissingEvent(@NonNull String id, @NonNull MapLibreMap map) {
         if (mSendMissingImageEvents) {
             mManager.handleEvent(ImageMissingEvent.makeImageMissingEvent(this, id));
         }
     }
 
-    private boolean hasImage(String imageId, @NonNull MapboxMap map) {
+    private boolean hasImage(String imageId, @NonNull MapLibreMap map) {
         Style style = map.getStyle();
         return style != null && style.getImage(imageId) != null;
     }
@@ -182,7 +182,7 @@ public class RCTMLNImages extends AbstractMapFeature {
         mapView.getStyle(new Style.OnStyleLoaded() {
             @Override
             public void onStyleLoaded(@NonNull Style style) {
-                MapboxMap map = mapView.getMapboxMap();
+                MapLibreMap map = mapView.getMapboxMap();
                 mMap = map;
                 addNativeImagesToStyle(mNativeImages, map);
                 addImagesToStyle(mImages, map);
@@ -191,7 +191,7 @@ public class RCTMLNImages extends AbstractMapFeature {
         });
     }
 
-    private void addNativeImages(@Nullable List<Map.Entry<String, BitmapDrawable>> imageEntries, @NonNull MapboxMap map) {
+    private void addNativeImages(@Nullable List<Map.Entry<String, BitmapDrawable>> imageEntries, @NonNull MapLibreMap map) {
         Style style = map.getStyle();
         if (style == null || imageEntries == null) return;
 
@@ -203,7 +203,7 @@ public class RCTMLNImages extends AbstractMapFeature {
         }
     }
 
-    private void addRemoteImages(@Nullable List<Map.Entry<String, ImageEntry>> imageEntries, @NonNull MapboxMap map) {
+    private void addRemoteImages(@Nullable List<Map.Entry<String, ImageEntry>> imageEntries, @NonNull MapLibreMap map) {
         Style style = map.getStyle();
         if (style == null || imageEntries == null) return;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/LocationComponentManager.java

@@ -3,14 +3,14 @@ package com.maplibre.rctmln.components.location;
 import android.annotation.SuppressLint;
 import android.content.Context;
 
-import com.mapbox.mapboxsdk.location.LocationComponent;
-import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions;
-import com.mapbox.mapboxsdk.location.LocationComponentOptions;
-import com.mapbox.mapboxsdk.location.OnCameraTrackingChangedListener;
-import com.mapbox.mapboxsdk.location.modes.CameraMode;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.Style;
+import org.maplibre.android.location.LocationComponent;
+import org.maplibre.android.location.LocationComponentActivationOptions;
+import org.maplibre.android.location.LocationComponentOptions;
+import org.maplibre.android.location.OnCameraTrackingChangedListener;
+import org.maplibre.android.location.modes.CameraMode;
+import org.maplibre.android.location.modes.RenderMode;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.Style;
 import com.maplibre.rctmln.R;
 import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
 import com.maplibre.rctmln.location.LocationManager;
@@ -24,7 +24,7 @@ import androidx.annotation.NonNull;
  */
 public class LocationComponentManager {
     private RCTMLNMapView mMapView = null;
-    private MapboxMap mMap = null;
+    private MapLibreMap mMap = null;
 
     private LocationManager mLocationManager = null;
     private LocationComponent mLocationComponent = null;

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocation.java

@@ -4,17 +4,17 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.NonNull;
 
-import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Style;
+import org.maplibre.android.location.permissions.PermissionsManager;
+import org.maplibre.android.location.modes.RenderMode;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.OnMapReadyCallback;
+import org.maplibre.android.maps.Style;
 import com.maplibre.rctmln.components.AbstractMapFeature;
 import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
 
 public class RCTMLNNativeUserLocation extends AbstractMapFeature implements OnMapReadyCallback, Style.OnStyleLoaded {
     private boolean mEnabled = true;
-    private MapboxMap mMap;
+    private MapLibreMap mMap;
     private RCTMLNMapView mMapView;
     private @RenderMode.Mode int mRenderMode = RenderMode.COMPASS;
 
@@ -38,7 +38,7 @@ public class RCTMLNNativeUserLocation extends AbstractMapFeature implements OnMa
 
     @SuppressLint("MissingPermission")
     @Override
-    public void onMapReady(@NonNull MapboxMap mapboxMap) {
+    public void onMapReady(@NonNull MapLibreMap mapboxMap) {
         mMap = mapboxMap;
         mapboxMap.getStyle(this);
     }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocationManager.java

@@ -3,7 +3,7 @@ package com.maplibre.rctmln.components.location;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.mapbox.mapboxsdk.location.modes.RenderMode;
+import org.maplibre.android.location.modes.RenderMode;
 
 import javax.annotation.Nonnull;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/LayerSourceInfo.java

@@ -1,14 +1,14 @@
 package com.maplibre.rctmln.components.mapview;
 
-import com.mapbox.mapboxsdk.style.layers.CircleLayer;
-import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
-import com.mapbox.mapboxsdk.style.layers.FillLayer;
-import com.mapbox.mapboxsdk.style.layers.HeatmapLayer;
-import com.mapbox.mapboxsdk.style.layers.HillshadeLayer;
-import com.mapbox.mapboxsdk.style.layers.Layer;
-import com.mapbox.mapboxsdk.style.layers.LineLayer;
-import com.mapbox.mapboxsdk.style.layers.RasterLayer;
-import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
+import org.maplibre.android.style.layers.CircleLayer;
+import org.maplibre.android.style.layers.FillExtrusionLayer;
+import org.maplibre.android.style.layers.FillLayer;
+import org.maplibre.android.style.layers.HeatmapLayer;
+import org.maplibre.android.style.layers.HillshadeLayer;
+import org.maplibre.android.style.layers.Layer;
+import org.maplibre.android.style.layers.LineLayer;
+import org.maplibre.android.style.layers.RasterLayer;
+import org.maplibre.android.style.layers.SymbolLayer;
 
 import javax.annotation.Nullable;
 

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapView.java

@@ -1,7 +1,7 @@
 package com.maplibre.rctmln.components.mapview;
 
 import android.content.Context;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
+import org.maplibre.android.maps.MapLibreMapOptions;
 /**
  * Created by hernanmateo on 12/11/18.
  */
@@ -10,7 +10,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
 public class RCTMLNAndroidTextureMapView extends RCTMLNMapView {
 	public static final String LOG_TAG = "RCTMLNAndroidTextureMapView";
 	
-    public RCTMLNAndroidTextureMapView(Context context, RCTMLNAndroidTextureMapViewManager manager, MapboxMapOptions options) {
+    public RCTMLNAndroidTextureMapView(Context context, RCTMLNAndroidTextureMapViewManager manager, MapLibreMapOptions options) {
         super(context, manager, options);
     }
 }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapViewManager.java

@@ -1,7 +1,7 @@
 package com.maplibre.rctmln.components.mapview;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
+import org.maplibre.android.maps.MapLibreMapOptions;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
@@ -24,7 +24,7 @@ public class RCTMLNAndroidTextureMapViewManager extends RCTMLNMapViewManager {
 
     @Override
     protected RCTMLNAndroidTextureMapView createViewInstance(ThemedReactContext themedReactContext) {
-        MapboxMapOptions options = new MapboxMapOptions();
+        MapLibreMapOptions options = new MapLibreMapOptions();
         options.textureMode(true);
         return new RCTMLNAndroidTextureMapView(themedReactContext, this, options);
     }

package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNMapView.java

@@ -17,7 +17,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import com.mapbox.mapboxsdk.log.Logger;
+import org.maplibre.android.log.Logger;
 
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactContext;
@@ -28,27 +28,27 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.mapbox.android.gestures.MoveGestureDetector;
-import com.mapbox.geojson.Feature;
-import com.mapbox.geojson.FeatureCollection;
-import com.mapbox.mapboxsdk.camera.CameraPosition;
-import com.mapbox.mapboxsdk.camera.CameraUpdate;
-import com.mapbox.mapboxsdk.geometry.LatLng;
-import com.mapbox.mapboxsdk.geometry.VisibleRegion;
-import com.mapbox.mapboxsdk.maps.AttributionDialogManager;
-import com.mapbox.mapboxsdk.maps.MapView;
-import com.mapbox.mapboxsdk.maps.MapboxMap;
-import com.mapbox.mapboxsdk.maps.MapboxMapOptions;
-import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.mapboxsdk.maps.Style;
-import com.mapbox.mapboxsdk.maps.UiSettings;
-import com.mapbox.mapboxsdk.plugins.localization.LocalizationPlugin;
-import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolClickListener;
-import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolDragListener;
-import com.mapbox.mapboxsdk.plugins.annotation.Symbol;
-import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager;
-import com.mapbox.mapboxsdk.style.expressions.Expression;
-import com.mapbox.mapboxsdk.style.layers.Layer;
-import com.mapbox.mapboxsdk.style.layers.Property;
+import org.maplibre.geojson.Feature;
+import org.maplibre.geojson.FeatureCollection;
+import org.maplibre.android.camera.CameraPosition;
+import org.maplibre.android.camera.CameraUpdate;
+import org.maplibre.android.geometry.LatLng;
+import org.maplibre.android.geometry.VisibleRegion;
+import org.maplibre.android.maps.AttributionDialogManager;
+import org.maplibre.android.maps.MapView;
+import org.maplibre.android.maps.MapLibreMap;
+import org.maplibre.android.maps.MapLibreMapOptions;
+import org.maplibre.android.maps.OnMapReadyCallback;
+import org.maplibre.android.maps.Style;
+import org.maplibre.android.maps.UiSettings;
+import org.maplibre.android.plugins.localization.LocalizationPlugin;
+import org.maplibre.android.plugins.annotation.OnSymbolClickListener;
+import org.maplibre.android.plugins.annotation.OnSymbolDragListener;
+import org.maplibre.android.plugins.annotation.Symbol;
+import org.maplibre.android.plugins.annotation.SymbolManager;
+import org.maplibre.android.style.expressions.Expression;
+import org.maplibre.android.style.layers.Layer;
+import org.maplibre.android.style.layers.Property;
 import com.maplibre.rctmln.R;
 import com.maplibre.rctmln.components.AbstractMapFeature;
 import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
@@ -84,7 +84,7 @@ import org.json.*;
 
 import javax.annotation.Nullable;
 
-import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility;
+import static org.maplibre.android.style.layers.PropertyFactory.visibility;
 import static com.maplibre.rctmln.modules.RCTMLNOfflineModule.DEFAULT_STYLE_URL;
 
 /**
@@ -92,11 +92,11 @@ import static com.maplibre.rctmln.modules.RCTMLNOfflineModule.DEFAULT_STYLE_URL;
  */
 
 @SuppressWarnings({ "MissingPermission" })
-public class RCTMLNMapView extends MapView implements OnMapReadyCallback, MapboxMap.OnMapClickListener,
-        MapboxMap.OnMapLongClickListener, MapView.OnCameraIsChangingListener, MapView.OnCameraDidChangeListener,
+public class RCTMLNMapView extends MapView implements OnMapReadyCallback, MapLibreMap.OnMapClickListener,
+        MapLibreMap.OnMapLongClickListener, MapView.OnCameraIsChangingListener, MapView.OnCameraDidChangeListener,
         MapView.OnDidFailLoadingMapListener, MapView.OnDidFinishLoadingMapListener,
-        MapView.OnWillStartRenderingFrameListener, MapView.OnDidFinishRenderingFrameListener,
-        MapView.OnWillStartRenderingMapListener, MapView.OnDidFinishRenderingMapListener,
+        MapView.OnWillStartRenderingFrameListener, MapView.OnWillStartRenderingMapListener,
+        MapView.OnDidFinishRenderingFrameListener, MapView.OnDidFinishRenderingMapListener,
         MapView.OnDidFinishLoadingStyleListener, MapView.OnStyleImageMissingListener {
     public static final String LOG_TAG = "RCTMLNMapView";
 
@@ -117,7 +117,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
     private CameraChangeTracker mCameraChangeTracker = new CameraChangeTracker();
     private List<Pair<Integer, ReadableArray>> mPreRenderMethods = new ArrayList<>();
 
-    private MapboxMap mMap;
+    private MapLibreMap mMap;
 
     private LocalizationPlugin mLocalizationPlugin;
 
@@ -156,7 +156,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
 
     private @Nullable Integer mTintColor = null;
 
-    public RCTMLNMapView(Context context, RCTMLNMapViewManager manager, MapboxMapOptions options) {
+    public RCTMLNMapView(Context context, RCTMLNMapViewManager manager, MapLibreMapOptions options) {
         super(context, options);
 
         mContext = context;
@@ -338,11 +338,11 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         return mMap.getCameraPosition();
     }
 
-    public void animateCamera(CameraUpdate cameraUpdate, MapboxMap.CancelableCallback callback) {
+    public void animateCamera(CameraUpdate cameraUpdate, MapLibreMap.CancelableCallback callback) {
         mMap.animateCamera(cameraUpdate, callback);
     }
 
-    public void moveCamera(CameraUpdate cameraUpdate, MapboxMap.CancelableCallback callback) {
+    public void moveCamera(CameraUpdate cameraUpdate, MapLibreMap.CancelableCallback callback) {
         mMap.moveCamera(cameraUpdate, callback);
     }
 
@@ -350,7 +350,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         mMap.moveCamera(cameraUpdate);
     }
 
-    public void easeCamera(CameraUpdate cameraUpdate, int duration, boolean easingInterpolator, MapboxMap.CancelableCallback callback) {
+    public void easeCamera(CameraUpdate cameraUpdate, int duration, boolean easingInterpolator, MapLibreMap.CancelableCallback callback) {
         mMap.easeCamera(cameraUpdate, duration, easingInterpolator, callback);
     }
 
@@ -386,7 +386,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         return null;
     }
 
-    public MapboxMap getMapboxMap() {
+    public MapLibreMap getMapboxMap() {
         return mMap;
     }
 
@@ -437,7 +437,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
 
 
     @Override
-    public void onMapReady(final MapboxMap mapboxMap) {
+    public void onMapReady(final MapLibreMap mapboxMap) {
         mMap = mapboxMap;
 
         if (isJSONValid(mStyleURL)) {
@@ -463,14 +463,14 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         updateInsets();
         updateUISettings();
 
-        mMap.addOnCameraIdleListener(new MapboxMap.OnCameraIdleListener() {
+        mMap.addOnCameraIdleListener(new MapLibreMap.OnCameraIdleListener() {
             @Override
             public void onCameraIdle() {
                 sendRegionDidChangeEvent();
             }
         });
 
-        mMap.addOnCameraMoveStartedListener(new MapboxMap.OnCameraMoveStartedListener() {
+        mMap.addOnCameraMoveStartedListener(new MapLibreMap.OnCameraMoveStartedListener() {
             @Override
             public void onCameraMoveStarted(int reason) {
                 mCameraChangeTracker.setReason(reason);
@@ -478,7 +478,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
             }
         });
 
-        mMap.addOnCameraMoveListener(new MapboxMap.OnCameraMoveListener() {
+        mMap.addOnCameraMoveListener(new MapLibreMap.OnCameraMoveListener() {
             @Override
             public void onCameraMove() {
                 if (markerViewManager != null) {
@@ -487,7 +487,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
             }
         });
 
-        mMap.addOnMoveListener(new MapboxMap.OnMoveListener() {
+        mMap.addOnMoveListener(new MapLibreMap.OnMoveListener() {
             @Override
             public void onMoveBegin(MoveGestureDetector detector) {
                 mCameraChangeTracker.setReason(CameraChangeTracker.USER_GESTURE);
@@ -732,7 +732,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
     }
 
     @Override
-    public void onDidFinishRenderingFrame(boolean fully) {
+    public void onDidFinishRenderingFrame(boolean fully, double frameEncodingTime, double frameRenderingTime) {
         if (fully) {
             handleMapChangedEvent(EventTypes.DID_FINISH_RENDERING_FRAME_FULLY);
         } else {
@@ -848,7 +848,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         if (position == null) {
             // reset from explicit to default
             if (mLogoGravity != null) {
-                MapboxMapOptions defaultOptions = MapboxMapOptions.createFromAttributes(mContext);
+                MapLibreMapOptions defaultOptions = MapLibreMapOptions.createFromAttributes(mContext);
                 mLogoGravity = defaultOptions.getLogoGravity();
                 mLogoMargins = Arrays.copyOf(defaultOptions.getLogoMargins(), 4);
                 updateUISettings();
@@ -903,7 +903,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         if (position == null) {
             // reset from explicit to default
             if (mAttributionGravity != null) {
-                MapboxMapOptions defaultOptions = MapboxMapOptions.createFromAttributes(mContext);
+                MapLibreMapOptions defaultOptions = MapLibreMapOptions.createFromAttributes(mContext);
                 mAttributionGravity = defaultOptions.getAttributionGravity();
                 mAttributionMargin = Arrays.copyOf(defaultOptions.getAttributionMargins(), 4);
                 updateUISettings();
@@ -1016,7 +1016,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
             throw new Error("takeSnap should only be called after the map has rendered");
         }
 
-        mMap.snapshot(new MapboxMap.SnapshotReadyCallback() {
+        mMap.snapshot(new MapLibreMap.SnapshotReadyCallback() {
             @Override
             public void onSnapshotReady(Bitmap snapshot) {
                 WritableMap payload = new WritableNativeMap();
@@ -1496,7 +1496,7 @@ public class RCTMLNMapView extends MapView implements OnMapReadyCallback, Mapbox
         return mOffscreenAnnotationViewContainer;
     }
 
-    public MarkerViewManager getMarkerViewManager(MapboxMap map) {
+    public MarkerViewManager getMarkerViewManager(MapLibreMap map) {
         if (markerViewManager == null) {
             if (map == null) {
                 throw new Error("makerViewManager should be called one the map has loaded");