diff --git a/platform/android/CHANGELOG.md b/platform/android/CHANGELOG.md index def44855f..24710df55 100644 --- a/platform/android/CHANGELOG.md +++ b/platform/android/CHANGELOG.md @@ -7,6 +7,7 @@ MapLibre welcomes participation and contributions from everyone. Please read [`C ### ✨ Features and improvements * Add your pull request... +* Breaking: Changed resourcePrefix to `maplibre_` from `mapbox_` [647](https://github.com/maplibre/maplibre-gl-native/pull/647) and renamed resources accordingly. Note that this is a breaking change since the names of public resources were renamed as well. Replaced Mapbox logo with MapLibre logo. * GMS location: Replace new LocationRequest() with LocationRequest.Builder, and LocationRequest.PRIORITY_X with Priority.PRIORITY_X ([620](https://github.com/maplibre/maplibre-gl-native/pull/620)) ### 🐞 Bug fixes diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index c0c5cd66f..bea1f00a8 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -53,7 +53,7 @@ android { nativeBuild(nativeTargets) // avoid naming conflicts, force usage of prefix - resourcePrefix 'mapbox_' + resourcePrefix 'maplibre_' sourceSets { // limit amount of exposed library resources diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java index 2fecc1552..b41fe2fc4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubbleLayout.java @@ -67,22 +67,22 @@ public class BubbleLayout extends LinearLayout { public BubbleLayout(@NonNull Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.mapbox_BubbleLayout); + TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.maplibre_BubbleLayout); @ArrowDirection.Value - int location = a.getInt(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowDirection, + int location = a.getInt(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowDirection, ArrowDirection.LEFT); arrowDirection = new ArrowDirection(location); - arrowWidth = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowWidth, + arrowWidth = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowWidth, convertDpToPixel(8, context)); - arrowHeight = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowHeight, + arrowHeight = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowHeight, convertDpToPixel(8, context)); - arrowPosition = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_arrowPosition, + arrowPosition = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_arrowPosition, convertDpToPixel(12, context)); - cornersRadius = a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_cornersRadius, 0); - bubbleColor = a.getColor(R.styleable.mapbox_BubbleLayout_mapbox_bl_bubbleColor, Color.WHITE); + cornersRadius = a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_cornersRadius, 0); + bubbleColor = a.getColor(R.styleable.maplibre_BubbleLayout_maplibre_bl_bubbleColor, Color.WHITE); strokeWidth = - a.getDimension(R.styleable.mapbox_BubbleLayout_mapbox_bl_strokeWidth, DEFAULT_STROKE_WIDTH); - strokeColor = a.getColor(R.styleable.mapbox_BubbleLayout_mapbox_bl_strokeColor, Color.GRAY); + a.getDimension(R.styleable.maplibre_BubbleLayout_maplibre_bl_strokeWidth, DEFAULT_STROKE_WIDTH); + strokeColor = a.getColor(R.styleable.maplibre_BubbleLayout_maplibre_bl_strokeColor, Color.GRAY); a.recycle(); initPadding(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java index f10901017..b174cbc74 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BubblePopupHelper.java @@ -25,9 +25,9 @@ class BubblePopupHelper { // change background color to transparent Drawable drawable; if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - drawable = context.getDrawable(R.drawable.mapbox_popup_window_transparent); + drawable = context.getDrawable(R.drawable.maplibre_popup_window_transparent); } else { - drawable = context.getResources().getDrawable(R.drawable.mapbox_popup_window_transparent); + drawable = context.getResources().getDrawable(R.drawable.maplibre_popup_window_transparent); } popupWindow.setBackgroundDrawable(drawable); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java index 0b9050e3a..09f7365f3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/IconFactory.java @@ -117,7 +117,7 @@ public final class IconFactory { */ public Icon defaultMarker() { if (defaultMarker == null) { - defaultMarker = fromResource(R.drawable.mapbox_marker_icon_default); + defaultMarker = fromResource(R.drawable.maplibre_marker_icon_default); } return defaultMarker; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java index 19e4ccbd5..13f1c29cf 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java @@ -154,8 +154,8 @@ public class InfoWindow { final float mapRight = mapView.getRight(); final float mapLeft = mapView.getLeft(); - float marginHorizontal = resources.getDimension(R.dimen.mapbox_infowindow_margin); - float tipViewOffset = resources.getDimension(R.dimen.mapbox_infowindow_tipview_width) / 2; + float marginHorizontal = resources.getDimension(R.dimen.maplibre_infowindow_margin); + float tipViewOffset = resources.getDimension(R.dimen.maplibre_infowindow_tipview_width) / 2; float tipViewMarginLeft = view.getMeasuredWidth() / 2 - tipViewOffset; boolean outOfBoundsLeft = false; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java index 5d208afce..e51290934 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/Marker.java @@ -244,7 +244,7 @@ public class Marker extends Annotation { @Nullable private InfoWindow getInfoWindow(@NonNull MapView mapView) { if (infoWindow == null && mapView.getContext() != null) { - infoWindow = new InfoWindow(mapView, R.layout.mapbox_infowindow_content, getMapboxMap()); + infoWindow = new InfoWindow(mapView, R.layout.maplibre_infowindow_content, getMapboxMap()); } return infoWindow; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt index cef0f0c69..251f975e8 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/camera/CameraPosition.kt @@ -223,12 +223,12 @@ class CameraPosition */ constructor(typedArray: TypedArray?) : super() { if (typedArray != null) { - bearing = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraBearing, 0.0f).toDouble() - val lat = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLat, 0.0f).toDouble() - val lng = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLng, 0.0f).toDouble() + bearing = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraBearing, 0.0f).toDouble() + val lat = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLat, 0.0f).toDouble() + val lng = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLng, 0.0f).toDouble() target = LatLng(lat, lng) - tilt = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTilt, 0.0f).toDouble() - zoom = typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoom, 0.0f).toDouble() + tilt = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTilt, 0.0f).toDouble() + zoom = typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoom, 0.0f).toDouble() } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java index 0e76b1a8c..da36a039f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LayerBitmapProvider.java @@ -27,7 +27,7 @@ class LayerBitmapProvider { } Bitmap generateShadowBitmap(@NonNull LocationComponentOptions options) { - Drawable shadowDrawable = BitmapUtils.getDrawableFromRes(context, R.drawable.mapbox_user_icon_shadow); + Drawable shadowDrawable = BitmapUtils.getDrawableFromRes(context, R.drawable.maplibre_user_icon_shadow); return generateShadow(shadowDrawable, options.elevation()); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java index d786ee009..072a029b2 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponent.java @@ -248,7 +248,7 @@ public final class LocationComponent { @Deprecated public void activateLocationComponent(@NonNull Context context, @NonNull Style style) { activateLocationComponent(context, style, - LocationComponentOptions.createFromAttributes(context, R.style.mapbox_LocationComponent)); + LocationComponentOptions.createFromAttributes(context, R.style.maplibre_LocationComponent)); } /** @@ -265,9 +265,9 @@ public final class LocationComponent { public void activateLocationComponent(@NonNull Context context, @NonNull Style style, boolean useDefaultLocationEngine) { if (useDefaultLocationEngine) { - activateLocationComponent(context, style, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, R.style.maplibre_LocationComponent); } else { - activateLocationComponent(context, style, null, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, null, R.style.maplibre_LocationComponent); } } @@ -288,9 +288,9 @@ public final class LocationComponent { @NonNull LocationEngineRequest locationEngineRequest) { setLocationEngineRequest(locationEngineRequest); if (useDefaultLocationEngine) { - activateLocationComponent(context, style, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, R.style.maplibre_LocationComponent); } else { - activateLocationComponent(context, style, null, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, null, R.style.maplibre_LocationComponent); } } @@ -402,7 +402,7 @@ public final class LocationComponent { @Deprecated public void activateLocationComponent(@NonNull Context context, @NonNull Style style, @Nullable LocationEngine locationEngine) { - activateLocationComponent(context, style, locationEngine, R.style.mapbox_LocationComponent); + activateLocationComponent(context, style, locationEngine, R.style.maplibre_LocationComponent); } /** @@ -418,7 +418,12 @@ public final class LocationComponent { public void activateLocationComponent(@NonNull Context context, @NonNull Style style, @Nullable LocationEngine locationEngine, @NonNull LocationEngineRequest locationEngineRequest) { - activateLocationComponent(context, style, locationEngine, locationEngineRequest, R.style.mapbox_LocationComponent); + activateLocationComponent( + context, + style, + locationEngine, + locationEngineRequest, + R.style.maplibre_LocationComponent); } /** @@ -472,7 +477,7 @@ public final class LocationComponent { if (options == null) { int styleRes = activationOptions.styleRes(); if (styleRes == 0) { - styleRes = R.style.mapbox_LocationComponent; + styleRes = R.style.maplibre_LocationComponent; } options = LocationComponentOptions.createFromAttributes(activationOptions.context(), styleRes); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java index 7e0d65963..9e0a3d761 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationComponentOptions.java @@ -246,7 +246,7 @@ public class LocationComponentOptions implements Parcelable { @StyleRes int styleRes) { TypedArray typedArray = context.obtainStyledAttributes( - styleRes, R.styleable.mapbox_LocationComponent); + styleRes, R.styleable.maplibre_LocationComponent); LocationComponentOptions.Builder builder = new LocationComponentOptions.Builder() .enableStaleState(true) @@ -256,120 +256,120 @@ public class LocationComponentOptions implements Parcelable { .padding(PADDING_DEFAULT); builder.foregroundDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_foregroundTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_foregroundTintColor)) { builder.foregroundTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_foregroundTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_foregroundTintColor, -1)); } builder.backgroundDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_backgroundDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_backgroundTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_backgroundDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_backgroundTintColor)) { builder.backgroundTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_backgroundTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_backgroundTintColor, -1)); } builder.foregroundDrawableStale(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawableStale, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_foregroundStaleTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawableStale, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_foregroundStaleTintColor)) { builder.foregroundStaleTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_foregroundStaleTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_foregroundStaleTintColor, -1)); } builder.backgroundDrawableStale(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_backgroundDrawableStale, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_backgroundStaleTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_backgroundDrawableStale, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_backgroundStaleTintColor)) { builder.backgroundStaleTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_backgroundStaleTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_backgroundStaleTintColor, -1)); } builder.bearingDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_bearingDrawable, -1)); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_bearingTintColor)) { + R.styleable.maplibre_LocationComponent_maplibre_bearingDrawable, -1)); + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_bearingTintColor)) { builder.bearingTintColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_bearingTintColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_bearingTintColor, -1)); } - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_enableStaleState)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_enableStaleState)) { builder.enableStaleState(typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_enableStaleState, true)); + R.styleable.maplibre_LocationComponent_maplibre_enableStaleState, true)); } - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_staleStateTimeout)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_staleStateTimeout)) { builder.staleStateTimeout(typedArray.getInteger( - R.styleable.mapbox_LocationComponent_mapbox_staleStateTimeout, (int) STALE_STATE_DELAY_MS)); + R.styleable.maplibre_LocationComponent_maplibre_staleStateTimeout, (int) STALE_STATE_DELAY_MS)); } builder.gpsDrawable(typedArray.getResourceId( - R.styleable.mapbox_LocationComponent_mapbox_gpsDrawable, -1)); + R.styleable.maplibre_LocationComponent_maplibre_gpsDrawable, -1)); float elevation = typedArray.getDimension( - R.styleable.mapbox_LocationComponent_mapbox_elevation, 0); + R.styleable.maplibre_LocationComponent_maplibre_elevation, 0); builder.accuracyColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_accuracyColor, -1)); + R.styleable.maplibre_LocationComponent_maplibre_accuracyColor, -1)); builder.accuracyAlpha(typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_accuracyAlpha, ACCURACY_ALPHA_DEFAULT)); + R.styleable.maplibre_LocationComponent_maplibre_accuracyAlpha, ACCURACY_ALPHA_DEFAULT)); builder.elevation(elevation); builder.trackingGesturesManagement(typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_trackingGesturesManagement, false)); + R.styleable.maplibre_LocationComponent_maplibre_trackingGesturesManagement, false)); builder.trackingInitialMoveThreshold(typedArray.getDimension( - R.styleable.mapbox_LocationComponent_mapbox_trackingInitialMoveThreshold, - context.getResources().getDimension(R.dimen.mapbox_locationComponentTrackingInitialMoveThreshold))); + R.styleable.maplibre_LocationComponent_maplibre_trackingInitialMoveThreshold, + context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingInitialMoveThreshold))); builder.trackingMultiFingerMoveThreshold(typedArray.getDimension( - R.styleable.mapbox_LocationComponent_mapbox_trackingMultiFingerMoveThreshold, - context.getResources().getDimension(R.dimen.mapbox_locationComponentTrackingMultiFingerMoveThreshold))); + R.styleable.maplibre_LocationComponent_maplibre_trackingMultiFingerMoveThreshold, + context.getResources().getDimension(R.dimen.maplibre_locationComponentTrackingMultiFingerMoveThreshold))); builder.padding(new int[] { - typedArray.getInt(R.styleable.mapbox_LocationComponent_mapbox_iconPaddingLeft, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_mapbox_iconPaddingTop, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_mapbox_iconPaddingRight, 0), - typedArray.getInt(R.styleable.mapbox_LocationComponent_mapbox_iconPaddingBottom, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingLeft, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingTop, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingRight, 0), + typedArray.getInt(R.styleable.maplibre_LocationComponent_maplibre_iconPaddingBottom, 0), }); builder.layerAbove( - typedArray.getString(R.styleable.mapbox_LocationComponent_mapbox_layer_above)); + typedArray.getString(R.styleable.maplibre_LocationComponent_maplibre_layer_above)); builder.layerBelow( - typedArray.getString(R.styleable.mapbox_LocationComponent_mapbox_layer_below)); + typedArray.getString(R.styleable.maplibre_LocationComponent_maplibre_layer_below)); float minScale = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_minZoomIconScale, MIN_ZOOM_ICON_SCALE_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_minZoomIconScale, MIN_ZOOM_ICON_SCALE_DEFAULT); float maxScale = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_maxZoomIconScale, MAX_ZOOM_ICON_SCALE_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_maxZoomIconScale, MAX_ZOOM_ICON_SCALE_DEFAULT); builder.minZoomIconScale(minScale); builder.maxZoomIconScale(maxScale); float trackingAnimationDurationMultiplier = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_trackingAnimationDurationMultiplier, + R.styleable.maplibre_LocationComponent_maplibre_trackingAnimationDurationMultiplier, TRACKING_ANIMATION_DURATION_MULTIPLIER_DEFAULT ); builder.trackingAnimationDurationMultiplier(trackingAnimationDurationMultiplier); builder.compassAnimationEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_compassAnimationEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_compassAnimationEnabled, true ); builder.accuracyAnimationEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_accuracyAnimationEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_accuracyAnimationEnabled, true ); builder.pulseEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleEnabled, false + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleEnabled, false ); builder.pulseFadeEnabled = typedArray.getBoolean( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleFadeEnabled, true + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleFadeEnabled, true ); - if (typedArray.hasValue(R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleColor)) { + if (typedArray.hasValue(R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleColor)) { builder.pulseColor(typedArray.getColor( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleColor, + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleColor, -1)); } builder.pulseSingleDuration = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleDuration, CIRCLE_PULSING_DURATION_DEFAULT_MS + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleDuration, CIRCLE_PULSING_DURATION_DEFAULT_MS ); builder.pulseMaxRadius = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleRadius, CIRCLE_PULSING_MAX_RADIUS_DEFAULT + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleRadius, CIRCLE_PULSING_MAX_RADIUS_DEFAULT ); builder.pulseAlpha = typedArray.getFloat( - R.styleable.mapbox_LocationComponent_mapbox_pulsingLocationCircleAlpha, CIRCLE_PULSING_ALPHA_DEFAULT); + R.styleable.maplibre_LocationComponent_maplibre_pulsingLocationCircleAlpha, CIRCLE_PULSING_ALPHA_DEFAULT); typedArray.recycle(); @@ -399,7 +399,7 @@ public class LocationComponentOptions implements Parcelable { @NonNull public static Builder builder(@NonNull Context context) { return LocationComponentOptions.createFromAttributes(context, - R.style.mapbox_LocationComponent).toBuilder(); + R.style.maplibre_LocationComponent).toBuilder(); } /** @@ -438,7 +438,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will use this image in place of the provided or default mapbox_foregroundDrawableStale. + * component, will use this image in place of the provided or default maplibre_foregroundDrawableStale. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -465,7 +465,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_foregroundDrawableStale. + * component, will used this image in place of the provided or default maplibre_foregroundDrawableStale. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -492,7 +492,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_gpsDrawable. + * component, will used this image in place of the provided or default maplibre_gpsDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -519,7 +519,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_foregroundDrawable. + * component, will used this image in place of the provided or default maplibre_foregroundDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -546,7 +546,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_backgroundDrawable. + * component, will used this image in place of the provided or default maplibre_backgroundDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -573,7 +573,7 @@ public class LocationComponentOptions implements Parcelable { /** * String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_bearingDrawable. + * component, will used this image in place of the provided or default maplibre_bearingDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1438,7 +1438,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_backgroundDrawableStale. + * component, will used this image in place of the provided or default maplibre_backgroundDrawableStale. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1469,7 +1469,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_foregroundDrawableStale. + * component, will used this image in place of the provided or default maplibre_foregroundDrawableStale. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1500,7 +1500,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_gpsDrawable. + * component, will used this image in place of the provided or default maplibre_gpsDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1531,7 +1531,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_foregroundDrawable. + * component, will used this image in place of the provided or default maplibre_foregroundDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1562,7 +1562,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_backgroundDrawable. + * component, will used this image in place of the provided or default maplibre_backgroundDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. @@ -1593,7 +1593,7 @@ public class LocationComponentOptions implements Parcelable { /** * Given a String image name, identical to one used in * the first parameter of {@link com.mapbox.mapboxsdk.maps.Style.Builder#addImage(String, Bitmap)}, the - * component, will used this image in place of the provided or default mapbox_bearingDrawable. + * component, will used this image in place of the provided or default maplibre_bearingDrawable. *

* A maki-icon name (example: "circle-15") may also be provided. These are images that can be loaded * with certain styles. Note, this will fail if the provided icon name is not provided by the loaded map style. diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java index a33c40976..c1983f310 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java @@ -345,7 +345,7 @@ class AnnotationManager { } private ShapeAnnotationHit getShapeAnnotationHitFromTap(PointF tapPoint) { - float touchTargetSide = Mapbox.getApplicationContext().getResources().getDimension(R.dimen.mapbox_eight_dp); + float touchTargetSide = Mapbox.getApplicationContext().getResources().getDimension(R.dimen.maplibre_eight_dp); RectF tapRect = new RectF( tapPoint.x - touchTargetSide, tapPoint.y - touchTargetSide, diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java index 87037ee3b..df683b1b4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AttributionDialogManager.java @@ -75,8 +75,8 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt protected void showAttributionDialog(@NonNull String[] attributionTitles) { AlertDialog.Builder builder = new AlertDialog.Builder(context); - builder.setTitle(R.string.mapbox_attributionsDialogTitle); - builder.setAdapter(new ArrayAdapter<>(context, R.layout.mapbox_attribution_list_item, attributionTitles), this); + builder.setTitle(R.string.maplibre_attributionsDialogTitle); + builder.setAdapter(new ArrayAdapter<>(context, R.layout.maplibre_attribution_list_item, attributionTitles), this); dialog = builder.show(); } @@ -162,7 +162,7 @@ public class AttributionDialogManager implements View.OnClickListener, DialogInt context.startActivity(intent); } catch (ActivityNotFoundException exception) { // explicitly handling if the device hasn't have a web browser installed. #8899 - Toast.makeText(context, R.string.mapbox_attributionErrorNoBrowser, Toast.LENGTH_LONG).show(); + Toast.makeText(context, R.string.maplibre_attributionErrorNoBrowser, Toast.LENGTH_LONG).show(); MapStrictMode.strictModeViolation(exception); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java index 94e29f311..0e41e6311 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java @@ -126,16 +126,16 @@ final class MapGestureDetector { com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold)); MoveGestureListener moveGestureListener = new MoveGestureListener(); ScaleGestureListener scaleGestureListener = new ScaleGestureListener( - context.getResources().getDimension(R.dimen.mapbox_density_constant), - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_speed), - context.getResources().getDimension(R.dimen.mapbox_minimum_angled_scale_speed), - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_velocity) + context.getResources().getDimension(R.dimen.maplibre_density_constant), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_speed), + context.getResources().getDimension(R.dimen.maplibre_minimum_angled_scale_speed), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_velocity) ); RotateGestureListener rotateGestureListener = new RotateGestureListener( - context.getResources().getDimension(R.dimen.mapbox_minimum_scale_span_when_rotating), - context.getResources().getDimension(R.dimen.mapbox_density_constant), - context.getResources().getDimension(R.dimen.mapbox_angular_velocity_multiplier), - context.getResources().getDimension(R.dimen.mapbox_minimum_angular_velocity), + context.getResources().getDimension(R.dimen.maplibre_minimum_scale_span_when_rotating), + context.getResources().getDimension(R.dimen.maplibre_density_constant), + context.getResources().getDimension(R.dimen.maplibre_angular_velocity_multiplier), + context.getResources().getDimension(R.dimen.maplibre_minimum_angular_velocity), context.getResources().getDimension( com.mapbox.android.gestures.R.dimen.mapbox_defaultScaleSpanSinceStartThreshold)); ShoveGestureListener shoveGestureListener = new ShoveGestureListener(); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index fe8804b62..b609c7d17 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -144,7 +144,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { mapboxMapOptions = options; // add accessibility support - setContentDescription(context.getString(R.string.mapbox_mapActionDescription)); + setContentDescription(context.getString(R.string.maplibre_mapActionDescription)); setWillNotDraw(false); initialiseDrawingSurface(options); } @@ -209,7 +209,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { compassView.setTag("compassView"); compassView.getLayoutParams().width = LayoutParams.WRAP_CONTENT; compassView.getLayoutParams().height = LayoutParams.WRAP_CONTENT; - compassView.setContentDescription(getResources().getString(R.string.mapbox_compassContentDescription)); + compassView.setContentDescription(getResources().getString(R.string.maplibre_compassContentDescription)); compassView.injectCompassAnimationListener(createCompassAnimationListener(cameraDispatcher)); compassView.setOnClickListener(createCompassClickListener(cameraDispatcher)); return compassView; @@ -224,8 +224,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { attrView.setAdjustViewBounds(true); attrView.setClickable(true); attrView.setFocusable(true); - attrView.setContentDescription(getResources().getString(R.string.mapbox_attributionsIconContentDescription)); - attrView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.mapbox_info_bg_selector)); + attrView.setContentDescription(getResources().getString(R.string.maplibre_attributionsIconContentDescription)); + attrView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.maplibre_info_bg_selector)); // inject widgets with MapboxMap attrView.setOnClickListener(attributionClickListener = new AttributionClickListener(getContext(), mapboxMap)); return attrView; @@ -237,7 +237,7 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { logoView.setTag("logoView"); logoView.getLayoutParams().width = LayoutParams.WRAP_CONTENT; logoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT; - logoView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.mapbox_logo_icon)); + logoView.setImageDrawable(BitmapUtils.getDrawableFromRes(getContext(), R.drawable.maplibre_logo_icon)); return logoView; } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java index dd699c4cf..6b58c2d13 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java @@ -173,7 +173,7 @@ public class MapboxMapOptions implements Parcelable { */ @NonNull public static MapboxMapOptions createFromAttributes(@NonNull Context context, @Nullable AttributeSet attrs) { - TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.mapbox_MapView, 0, 0); + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.maplibre_MapView, 0, 0); return createFromAttributes(new MapboxMapOptions(), context, typedArray); } @@ -186,103 +186,103 @@ public class MapboxMapOptions implements Parcelable { mapboxMapOptions.camera(new CameraPosition.Builder(typedArray).build()); // deprecated - mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.mapbox_MapView_mapbox_apiBaseUrl)); + mapboxMapOptions.apiBaseUrl(typedArray.getString(R.styleable.maplibre_MapView_maplibre_apiBaseUrl)); - String baseUri = typedArray.getString(R.styleable.mapbox_MapView_mapbox_apiBaseUri); + String baseUri = typedArray.getString(R.styleable.maplibre_MapView_maplibre_apiBaseUri); if (!TextUtils.isEmpty(baseUri)) { // override deprecated property if a value of the new type was provided mapboxMapOptions.apiBaseUri(baseUri); } mapboxMapOptions.zoomGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiZoomGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiZoomGestures, true)); mapboxMapOptions.scrollGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiScrollGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiScrollGestures, true)); mapboxMapOptions.horizontalScrollGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiHorizontalScrollGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiHorizontalScrollGestures, true)); mapboxMapOptions.rotateGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiRotateGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiRotateGestures, true)); mapboxMapOptions.tiltGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiTiltGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiTiltGestures, true)); mapboxMapOptions.doubleTapGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiDoubleTapGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiDoubleTapGestures, true)); mapboxMapOptions.quickZoomGesturesEnabled( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiQuickZoomGestures, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiQuickZoomGestures, true)); - mapboxMapOptions.maxZoomPreference(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoomMax, + mapboxMapOptions.maxZoomPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoomMax, MapboxConstants.MAXIMUM_ZOOM)); - mapboxMapOptions.minZoomPreference(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoomMin, + mapboxMapOptions.minZoomPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoomMin, MapboxConstants.MINIMUM_ZOOM)); - mapboxMapOptions.maxPitchPreference(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraPitchMax, + mapboxMapOptions.maxPitchPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraPitchMax, MapboxConstants.MAXIMUM_PITCH)); - mapboxMapOptions.minPitchPreference(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraPitchMin, + mapboxMapOptions.minPitchPreference(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraPitchMin, MapboxConstants.MINIMUM_PITCH)); - mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiCompass, true)); - mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiCompassGravity, + mapboxMapOptions.compassEnabled(typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiCompass, true)); + mapboxMapOptions.compassGravity(typedArray.getInt(R.styleable.maplibre_MapView_maplibre_uiCompassGravity, Gravity.TOP | Gravity.END)); mapboxMapOptions.compassMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginLeft, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginTop, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginTop, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginRight, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginRight, FOUR_DP * pxlRatio)), - ((int) typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiCompassMarginBottom, + ((int) typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiCompassMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.compassFadesWhenFacingNorth(typedArray.getBoolean( - R.styleable.mapbox_MapView_mapbox_uiCompassFadeFacingNorth, true)); + R.styleable.maplibre_MapView_maplibre_uiCompassFadeFacingNorth, true)); Drawable compassDrawable = typedArray.getDrawable( - R.styleable.mapbox_MapView_mapbox_uiCompassDrawable); + R.styleable.maplibre_MapView_maplibre_uiCompassDrawable); if (compassDrawable == null) { - compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.mapbox_compass_icon, null); + compassDrawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.maplibre_compass_icon, null); } mapboxMapOptions.compassImage(compassDrawable); - mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_uiLogo, true)); - mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.mapbox_MapView_mapbox_uiLogoGravity, + mapboxMapOptions.logoEnabled(typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_uiLogo, true)); + mapboxMapOptions.logoGravity(typedArray.getInt(R.styleable.maplibre_MapView_maplibre_uiLogoGravity, Gravity.BOTTOM | Gravity.START)); mapboxMapOptions.logoMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginLeft, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginTop, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginTop, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginRight, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginRight, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiLogoMarginBottom, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiLogoMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.attributionTintColor(typedArray.getColor( - R.styleable.mapbox_MapView_mapbox_uiAttributionTintColor, UNDEFINED_COLOR)); + R.styleable.maplibre_MapView_maplibre_uiAttributionTintColor, UNDEFINED_COLOR)); mapboxMapOptions.attributionEnabled(typedArray.getBoolean( - R.styleable.mapbox_MapView_mapbox_uiAttribution, true)); + R.styleable.maplibre_MapView_maplibre_uiAttribution, true)); mapboxMapOptions.attributionGravity(typedArray.getInt( - R.styleable.mapbox_MapView_mapbox_uiAttributionGravity, Gravity.BOTTOM | Gravity.START)); + R.styleable.maplibre_MapView_maplibre_uiAttributionGravity, Gravity.BOTTOM | Gravity.START)); mapboxMapOptions.attributionMargins(new int[] { - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginLeft, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginLeft, NINETY_TWO_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginTop, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginTop, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginRight, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginRight, FOUR_DP * pxlRatio)), - (int) (typedArray.getDimension(R.styleable.mapbox_MapView_mapbox_uiAttributionMarginBottom, + (int) (typedArray.getDimension(R.styleable.maplibre_MapView_maplibre_uiAttributionMarginBottom, FOUR_DP * pxlRatio))}); mapboxMapOptions.textureMode( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_renderTextureMode, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_renderTextureMode, false)); mapboxMapOptions.translucentTextureSurface( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_renderTextureTranslucentSurface, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_renderTextureTranslucentSurface, false)); mapboxMapOptions.setPrefetchesTiles( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableTilePrefetch, true)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_enableTilePrefetch, true)); mapboxMapOptions.setPrefetchZoomDelta( - typedArray.getInt(R.styleable.mapbox_MapView_mapbox_prefetchZoomDelta, 4)); + typedArray.getInt(R.styleable.maplibre_MapView_maplibre_prefetchZoomDelta, 4)); mapboxMapOptions.renderSurfaceOnTop( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableZMediaOverlay, false)); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_enableZMediaOverlay, false)); mapboxMapOptions.localIdeographFontFamilyEnabled = - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_localIdeographEnabled, true); + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_localIdeographEnabled, true); int localIdeographFontFamiliesResId = - typedArray.getResourceId(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamilies, 0); + typedArray.getResourceId(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamilies, 0); if (localIdeographFontFamiliesResId != 0) { String[] localIdeographFontFamilies = context.getResources().getStringArray(localIdeographFontFamiliesResId); @@ -290,7 +290,7 @@ public class MapboxMapOptions implements Parcelable { } else { // did user provide xml font string? String localIdeographFontFamily = - typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily); + typedArray.getString(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamily); if (localIdeographFontFamily == null) { localIdeographFontFamily = MapboxConstants.DEFAULT_FONT; } @@ -298,12 +298,12 @@ public class MapboxMapOptions implements Parcelable { } mapboxMapOptions.pixelRatio( - typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_pixelRatio, 0)); + typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_pixelRatio, 0)); mapboxMapOptions.foregroundLoadColor( - typedArray.getInt(R.styleable.mapbox_MapView_mapbox_foregroundLoadColor, LIGHT_GRAY) + typedArray.getInt(R.styleable.maplibre_MapView_maplibre_foregroundLoadColor, LIGHT_GRAY) ); mapboxMapOptions.crossSourceCollisions( - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_cross_source_collisions, true) + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_cross_source_collisions, true) ); } finally { typedArray.recycle(); @@ -411,9 +411,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * Specifies the visibility state of a mapbox_compass_icon for a map view. + * Specifies the visibility state of a maplibre_compass_icon for a map view. * - * @param enabled True and mapbox_compass_icon is shown + * @param enabled True and maplibre_compass_icon is shown * @return This */ @NonNull @@ -423,7 +423,7 @@ public class MapboxMapOptions implements Parcelable { } /** - * Specifies the gravity state of mapbox_compass_icon for a map view. + * Specifies the gravity state of maplibre_compass_icon for a map view. * * @param gravity Android SDK Gravity. * @return This @@ -435,7 +435,7 @@ public class MapboxMapOptions implements Parcelable { } /** - * Specifies the margin state of mapbox_compass_icon for a map view + * Specifies the margin state of maplibre_compass_icon for a map view * * @param margins 4 long array for LTRB margins * @return This @@ -447,12 +447,12 @@ public class MapboxMapOptions implements Parcelable { } /** - * Specifies if the mapbox_compass_icon fades to invisible when facing north. + * Specifies if the maplibre_compass_icon fades to invisible when facing north. *

* By default this value is true. *

* - * @param compassFadeWhenFacingNorth true is mapbox_compass_icon fades to invisble + * @param compassFadeWhenFacingNorth true is maplibre_compass_icon fades to invisble * @return This */ @NonNull @@ -464,7 +464,7 @@ public class MapboxMapOptions implements Parcelable { /** * Specifies the image of the CompassView. *

- * By default this value is R.drawable.mapbox_compass_icon. + * By default this value is R.drawable.maplibre_compass_icon. *

* * @param compass the drawable to show as image compass @@ -905,36 +905,36 @@ public class MapboxMapOptions implements Parcelable { } /** - * Get the current configured visibility state for mapbox_compass_icon for a map view. + * Get the current configured visibility state for maplibre_compass_icon for a map view. * - * @return Visibility state of the mapbox_compass_icon + * @return Visibility state of the maplibre_compass_icon */ public boolean getCompassEnabled() { return compassEnabled; } /** - * Get the current configured gravity state for mapbox_compass_icon for a map view. + * Get the current configured gravity state for maplibre_compass_icon for a map view. * - * @return Gravity state of the mapbox_compass_icon + * @return Gravity state of the maplibre_compass_icon */ public int getCompassGravity() { return compassGravity; } /** - * Get the current configured margins for mapbox_compass_icon for a map view. + * Get the current configured margins for maplibre_compass_icon for a map view. * - * @return Margins state of the mapbox_compass_icon + * @return Margins state of the maplibre_compass_icon */ public int[] getCompassMargins() { return compassMargins; } /** - * Get the current configured state for fading the mapbox_compass_icon when facing north. + * Get the current configured state for fading the maplibre_compass_icon when facing north. * - * @return True if mapbox_compass_icon fades to invisible when facing north + * @return True if maplibre_compass_icon fades to invisible when facing north */ public boolean getCompassFadeFacingNorth() { return fadeCompassFacingNorth; @@ -950,9 +950,9 @@ public class MapboxMapOptions implements Parcelable { } /** - * Get the current configured visibility state for mapbox_compass_icon for a map view. + * Get the current configured visibility state for maplibre_compass_icon for a map view. * - * @return Visibility state of the mapbox_compass_icon + * @return Visibility state of the maplibre_compass_icon */ public boolean getLogoEnabled() { return logoEnabled; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java index b59e944d5..1a4bbcc86 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/UiSettings.java @@ -189,12 +189,12 @@ public final class UiSettings { if (compassMargins != null) { setCompassMargins(compassMargins[0], compassMargins[1], compassMargins[2], compassMargins[3]); } else { - int tenDp = (int) resources.getDimension(R.dimen.mapbox_four_dp); + int tenDp = (int) resources.getDimension(R.dimen.maplibre_four_dp); setCompassMargins(tenDp, tenDp, tenDp, tenDp); } setCompassFadeFacingNorth(options.getCompassFadeFacingNorth()); if (options.getCompassImage() == null) { - options.compassImage(ResourcesCompat.getDrawable(resources, R.drawable.mapbox_compass_icon, null)); + options.compassImage(ResourcesCompat.getDrawable(resources, R.drawable.maplibre_compass_icon, null)); } setCompassImage(options.getCompassImage()); } @@ -241,7 +241,7 @@ public final class UiSettings { setLogoMargins(logoMargins[0], logoMargins[1], logoMargins[2], logoMargins[3]); } else { // user did not specify margins when programmatically creating a map - int fourDp = (int) resources.getDimension(R.dimen.mapbox_four_dp); + int fourDp = (int) resources.getDimension(R.dimen.maplibre_four_dp); setLogoMargins(fourDp, fourDp, fourDp, fourDp); } } @@ -287,8 +287,8 @@ public final class UiSettings { } else { // user did not specify margins when programmatically creating a map Resources resources = context.getResources(); - int margin = (int) resources.getDimension(R.dimen.mapbox_four_dp); - int leftMargin = (int) resources.getDimension(R.dimen.mapbox_ninety_two_dp); + int margin = (int) resources.getDimension(R.dimen.maplibre_four_dp); + int leftMargin = (int) resources.getDimension(R.dimen.maplibre_ninety_two_dp); setAttributionMargins(leftMargin, margin, margin, margin); } } @@ -383,7 +383,7 @@ public final class UiSettings { /** * Specifies the CompassView image. *

- * By default this value is R.drawable.mapbox_compass_icon. + * By default this value is R.drawable.maplibre_compass_icon. *

* * @param compass the drawable to show as image compass @@ -718,7 +718,7 @@ public final class UiSettings { } if (Color.alpha(tintColor) == 0) { ColorUtils.setTintList(attributionsView, - ContextCompat.getColor(attributionsView.getContext(), R.color.mapbox_blue)); + ContextCompat.getColor(attributionsView.getContext(), R.color.maplibre_blue)); } else { ColorUtils.setTintList(attributionsView, tintColor); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index da199f931..1ffd942ab 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -607,7 +607,7 @@ public class OfflineManager { @NonNull final CreateOfflineRegionCallback callback) { if (!isValidOfflineRegionDefinition(definition)) { callback.onError( - String.format(context.getString(R.string.mapbox_offline_error_region_definition_invalid), + String.format(context.getString(R.string.maplibre_offline_error_region_definition_invalid), definition.getBounds()) ); return; diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java index 360b4eb77..ce51a4ad9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java @@ -617,7 +617,7 @@ public class MapSnapshotter { @NonNull private TextView createTextView(@NonNull MapSnapshot mapSnapshot, boolean shortText, float scale) { - int textColor = ResourcesCompat.getColor(context.getResources(), R.color.mapbox_gray_dark, context.getTheme()); + int textColor = ResourcesCompat.getColor(context.getResources(), R.color.maplibre_gray_dark, context.getTheme()); int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); TextView textView = new TextView(context); @@ -628,7 +628,7 @@ public class MapSnapshotter { textView.setSingleLine(true); textView.setTextSize(10 * scale); textView.setTextColor(textColor); - textView.setBackgroundResource(R.drawable.mapbox_rounded_corner); + textView.setBackgroundResource(R.drawable.maplibre_rounded_corner); textView.setText(Html.fromHtml(createAttributionString(mapSnapshot, shortText))); textView.measure(widthMeasureSpec, heightMeasureSpec); textView.layout(0, 0, textView.getMeasuredWidth(), textView.getMeasuredHeight()); @@ -660,11 +660,11 @@ public class MapSnapshotter { * @return the scaled large logo */ private Logo createScaledLogo(@NonNull Bitmap snapshot) { - Bitmap logo = BitmapFactory.decodeResource(context.getResources(), R.drawable.mapbox_logo_icon, null); + Bitmap logo = BitmapFactory.decodeResource(context.getResources(), R.drawable.maplibre_logo_icon, null); float scale = calculateLogoScale(snapshot, logo); Matrix matrix = new Matrix(); matrix.postScale(scale, scale); - Bitmap helmet = BitmapFactory.decodeResource(context.getResources(), R.drawable.mapbox_logo_helmet, null); + Bitmap helmet = BitmapFactory.decodeResource(context.getResources(), R.drawable.maplibre_logo_helmet, null); Bitmap large = Bitmap.createBitmap(logo, 0, 0, logo.getWidth(), logo.getHeight(), matrix, true); Bitmap small = Bitmap.createBitmap(helmet, 0, 0, helmet.getWidth(), helmet.getHeight(), matrix, true); return new Logo(large, small, scale); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java index bb75efb03..e771dec26 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/ColorUtils.java @@ -41,7 +41,7 @@ public class ColorUtils { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_blue); + return getColorCompat(context, R.color.maplibre_blue); } } @@ -60,7 +60,7 @@ public class ColorUtils { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_blue); + return getColorCompat(context, R.color.maplibre_blue); } } @@ -79,7 +79,7 @@ public class ColorUtils { theme.resolveAttribute(id, typedValue, true); return typedValue.data; } catch (Exception exception) { - return getColorCompat(context, R.color.mapbox_gray); + return getColorCompat(context, R.color.maplibre_gray); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml index 95dbebdd8..84939ddea 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -5,167 +5,167 @@ - + - + - - - - + + + + - - - - - + + + + + - - + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - + - + - - - - - - - + + + + + + + - - - - + + + + - - + + - + - - + + - - - - + + + + - - + + - - - + + + - + - + - + - - + + - - - - - - - + + + + + + + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png deleted file mode 100644 index 7568387a8..000000000 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_icon.png and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png new file mode 100644 index 000000000..ae8090918 Binary files /dev/null and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_logo_icon.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png deleted file mode 100644 index 9cdec5151..000000000 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_icon.png and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png new file mode 100644 index 000000000..edcde33bb Binary files /dev/null and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_logo_icon.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png deleted file mode 100644 index 7eec45f4b..000000000 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_icon.png and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png new file mode 100644 index 000000000..8ee90cb0b Binary files /dev/null and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_logo_icon.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png deleted file mode 100644 index 5876056f1..000000000 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_icon.png and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png new file mode 100644 index 000000000..743bce99c Binary files /dev/null and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_logo_icon.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png deleted file mode 100644 index e5780ccc0..000000000 Binary files a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_icon.png and /dev/null differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_compass_icon.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_compass_icon.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_logo_helmet.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_helmet.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png new file mode 100644 index 000000000..4199a6564 Binary files /dev/null and b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_logo_icon.png differ diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_marker_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_marker_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_markerview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_markerview_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/maplibre_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml deleted file mode 100644 index 01fc7cc2e..000000000 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_bg_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml new file mode 100644 index 000000000..d22f210ec --- /dev/null +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_bg_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_default.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_default.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_selected.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_info_icon_selected.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_info_icon_selected.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml similarity index 58% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml index 21054aabc..91d2681e1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_mylocation_bg_shape.xml @@ -5,6 +5,6 @@ + android:width="@dimen/maplibre_my_locationview_outer_circle" + android:height="@dimen/maplibre_my_locationview_outer_circle" /> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_popup_window_transparent.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_popup_window_transparent.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_rounded_corner.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_rounded_corner.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_bearing_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_bearing_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_shadow.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_shadow.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_icon_stale.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_icon_stale.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_puck_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_puck_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_user_stroke_icon.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/maplibre_user_stroke_icon.xml diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml similarity index 91% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml index f275860d5..dd3bcab89 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_attribution_list_item.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_attribution_list_item.xml @@ -11,4 +11,4 @@ android:textAllCaps="true" android:textIsSelectable="false" android:textAppearance="?android:attr/textAppearanceButton" - android:textColor="@color/mapbox_blue"/> + android:textColor="@color/maplibre_blue"/> diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml similarity index 78% rename from platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml index 3a3539625..1428949b3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_infowindow_content.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/maplibre_infowindow_content.xml @@ -9,14 +9,14 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:paddingTop="14dp" - app:mapbox_bl_arrowDirection="bottom" - app:mapbox_bl_arrowHeight="8dp" - app:mapbox_bl_arrowPosition="16dp" - app:mapbox_bl_arrowWidth="8dp" - app:mapbox_bl_bubbleColor="@android:color/white" - app:mapbox_bl_cornersRadius="6dp" - app:mapbox_bl_strokeColor="@android:color/darker_gray" - app:mapbox_bl_strokeWidth="1dp"> + app:maplibre_bl_arrowDirection="bottom" + app:maplibre_bl_arrowHeight="8dp" + app:maplibre_bl_arrowPosition="16dp" + app:maplibre_bl_arrowWidth="8dp" + app:maplibre_bl_bubbleColor="@android:color/white" + app:maplibre_bl_cornersRadius="6dp" + app:maplibre_bl_strokeColor="@android:color/darker_gray" + app:maplibre_bl_strokeWidth="1dp"> - Компас на картата. Активирай, за да насочиш картата на север. - Иконка функции. Активирай, за да покажеш диалог функции. - Изглед локация. Това показва местоположението ти на картата. - Показва карта създадена с MapLibre. Скролни с два пръста. Мащабирай с два пръста. - MapLibre Android SDK - Предоставените OfflineRegionDefinition не пасват в границите на света: %s + Компас на картата. Активирай, за да насочиш картата на север. + Иконка функции. Активирай, за да покажеш диалог функции. + Изглед локация. Това показва местоположението ти на картата. + Показва карта създадена с MapLibre. Скролни с два пръста. Мащабирай с два пръста. + MapLibre Android SDK + Предоставените OfflineRegionDefinition не пасват в границите на света: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml index 43fe96660..e0e4e250a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ca/strings.xml @@ -1,10 +1,10 @@ - Brúixola del mapa. Activa per restablir la rotació del mapa al Nord. - Icona d’atribució. Activa per mostrar el diàleg de l’atribució. - Vista de posició. Mostra la teva posició al mapa. - Mostrant un mapa creat amb MapLibre. Desplaça’t arrossegant amb dos dits. Fes zoom pessigant amb dos dits. - MapLibre Android SDK - La OfflineRegionDefinition proporcionada no encaixa amb els límits del món: %s + Brúixola del mapa. Activa per restablir la rotació del mapa al Nord. + Icona d’atribució. Activa per mostrar el diàleg de l’atribució. + Vista de posició. Mostra la teva posició al mapa. + Mostrant un mapa creat amb MapLibre. Desplaça’t arrossegant amb dos dits. Fes zoom pessigant amb dos dits. + MapLibre Android SDK + La OfflineRegionDefinition proporcionada no encaixa amb els límits del món: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml index bf7f13a39..e9b2978f7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-cs/strings.xml @@ -1,10 +1,10 @@ - Kompas. Nastavit natočení mapy k severu. - Atributy. Zobrazit nastavení atributů. - Zobrazení polohy. Zobrazit umístění na mapě. - Zobrazení mapy vytvořené s MapLibre. Posunout tažením dvěma prsty. Změnit velikost roztažením dvou prstů. - MapLibre Maps SDK pro Android - Na zařízení není nainstalován webový prohlížeč, webovou stránku nelze zobrazit. - Pokud OfflineRegionDefinition neodpovídá hranicím: %s + Kompas. Nastavit natočení mapy k severu. + Atributy. Zobrazit nastavení atributů. + Zobrazení polohy. Zobrazit umístění na mapě. + Zobrazení mapy vytvořené s MapLibre. Posunout tažením dvěma prsty. Změnit velikost roztažením dvou prstů. + MapLibre Maps SDK pro Android + Na zařízení není nainstalován webový prohlížeč, webovou stránku nelze zobrazit. + Pokud OfflineRegionDefinition neodpovídá hranicím: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml index 5a247ad9c..a5f148553 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-es/strings.xml @@ -1,10 +1,10 @@ - Brújula del mapa. Actívala para restablecer la rotación del mapa al norte. - Ícono de atribución. Actívalo para mostrar el diálogo de atribución. - Vista de ubicación. Muestra tu ubicación en el mapa. - Se está mostrando un mapa creado con MapLibre. Arrastra dos dedos para desplazarte o pellizca para acercar. - MapLibre Maps SDK para Android - No puede abrir la página Web porque no hay un navegador Web en el dispositivo. - El parámetro OfflineRegionDefinition que se ingresó no coincide con los límites mundiales: %s + Brújula del mapa. Actívala para restablecer la rotación del mapa al norte. + Ícono de atribución. Actívalo para mostrar el diálogo de atribución. + Vista de ubicación. Muestra tu ubicación en el mapa. + Se está mostrando un mapa creado con MapLibre. Arrastra dos dedos para desplazarte o pellizca para acercar. + MapLibre Maps SDK para Android + No puede abrir la página Web porque no hay un navegador Web en el dispositivo. + El parámetro OfflineRegionDefinition que se ingresó no coincide con los límites mundiales: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml index f77f2b16f..18d0933a3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-fr/strings.xml @@ -1,10 +1,10 @@ - Boussole. Activer pour rétablir l’orientation de la carte vers le nord. - Icône d’attribution. Activer pour afficher le dialogue d’attribution. - Vue de géolocalisation. Ceci affiche votre localisation sur la carte. - Affichage d’une carte créée avec MapLibre. Faites la glisser en traînant deux doigts. Zoomez ou dézoomez en écartant ou rapprochant deux doigts. - SDK MapLibre Maps pour Android - Aucun navigateur web installé sur l’appareil, impossible d’ouvrir une page web. - Le cadre OfflineRegionDefinition pour définir la région de navigation ne tient pas dans les limites du monde : %s + Boussole. Activer pour rétablir l’orientation de la carte vers le nord. + Icône d’attribution. Activer pour afficher le dialogue d’attribution. + Vue de géolocalisation. Ceci affiche votre localisation sur la carte. + Affichage d’une carte créée avec MapLibre. Faites la glisser en traînant deux doigts. Zoomez ou dézoomez en écartant ou rapprochant deux doigts. + SDK MapLibre Maps pour Android + Aucun navigateur web installé sur l’appareil, impossible d’ouvrir une page web. + Le cadre OfflineRegionDefinition pour définir la région de navigation ne tient pas dans les limites du monde : %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml index fd472829b..94e9c0e22 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-gl/strings.xml @@ -1,10 +1,10 @@ - Compás do mapa. Actívao para restabelecer a rotación do mapa cara o norte. - Icona de atribución. Actívaa para amosar o diálogo de atribución. - Vista de ubicación. Amosa a túa ubicación no mapa. - Estase a amosar un mapa feito co MapLibre. Belisca dous dedos para desprazarte ou belisca para achegar. - MapLibre Maps SDK para o Android - Non podes abrir a páxina web porque non hai un navegador web no dispositivo. - O parámetro OfflineRegionDefinition que se ingresou non coincide cos límites mundiais: %s + Compás do mapa. Actívao para restabelecer a rotación do mapa cara o norte. + Icona de atribución. Actívaa para amosar o diálogo de atribución. + Vista de ubicación. Amosa a túa ubicación no mapa. + Estase a amosar un mapa feito co MapLibre. Belisca dous dedos para desprazarte ou belisca para achegar. + MapLibre Maps SDK para o Android + Non podes abrir a páxina web porque non hai un navegador web no dispositivo. + O parámetro OfflineRegionDefinition que se ingresou non coincide cos límites mundiais: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml index a75733758..1a1017456 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-he/strings.xml @@ -1,10 +1,10 @@ - מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. - סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. - סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. - מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. - MapLibre Maps SDK for Android - לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. - בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s + מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. + סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. + סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. + מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. + MapLibre Maps SDK for Android + לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. + בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml index 72c201872..6bfa6eb0d 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-hu/strings.xml @@ -1,8 +1,8 @@ - Hely nézet. Megmutatja, hol vagy a térképen. - Egy MapLibre-szal készült térkép megjelenítése. Húzd két ujjadat a görgetéshez. Csippentsd össze a nagyításhoz. - MapLibre Maps SDK Androidhoz - Nincs webböngésző telepítve a készüléken, nem lehet megnyitni weboldalt. - A megadott OfflineRegionDefinition nem fér bele a világ kereteibe: %s + Hely nézet. Megmutatja, hol vagy a térképen. + Egy MapLibre-szal készült térkép megjelenítése. Húzd két ujjadat a görgetéshez. Csippentsd össze a nagyításhoz. + MapLibre Maps SDK Androidhoz + Nincs webböngésző telepítve a készüléken, nem lehet megnyitni weboldalt. + A megadott OfflineRegionDefinition nem fér bele a világ kereteibe: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml index a75733758..1a1017456 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-iw/strings.xml @@ -1,10 +1,10 @@ - מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. - סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. - סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. - מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. - MapLibre Maps SDK for Android - לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. - בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s + מצפן. הפעל בכדי לקבע את כיוון המפה צפונה. + סמל שיוך. הפעל כדי להציג תיבת דו-שיח של שיוך. + סמן מיקום. מציג את המיקום הנוכחי שלך על המפה. + מציג מפה שנוצרה עם MapLibre. גלול באמצעות גרירה עם שתי אצבעות, זום באמצעות צביטה עם שתי אצבעות. + MapLibre Maps SDK for Android + לא מותקן דפדפן אינטרנט במכשיר, לא ניתן לפתוח את דף האינטרנט. + בתנאי ש- OfflineRegionDefinition אינו מתאים לגבולות העולם: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml index 1f503d5b5..3e8653681 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ko/strings.xml @@ -1,10 +1,10 @@ - 지도 나침반. 지도회전를 북쪽으로 재설정합니다. - 속성 정보. 속성 대화를 표시합니다. - 로케이션 뷰. 지도에서 현재 위치를 보여줍니다. - 맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요. - 안드로이드를 위한 맵박스 맵 SDK - 웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다. - 제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s + 지도 나침반. 지도회전를 북쪽으로 재설정합니다. + 속성 정보. 속성 대화를 표시합니다. + 로케이션 뷰. 지도에서 현재 위치를 보여줍니다. + 맵박스로 생성된 지도 표시. 두 손가락으로 드래그하여 화면을 위 아래로 움직이세요. 두 손가락을 이용해 화면을 확대 축소 하세요. + 안드로이드를 위한 맵박스 맵 SDK + 웹 브라우저가 설치 되어 있지 않아, 웹 페이지를 열 수 없습니다. + 제공된 오프라인지역정의가 월드바운즈에 적합하지 않습니다: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml index 052951eff..042fa1e47 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-lt/strings.xml @@ -1,10 +1,10 @@ - Žemėlapio kompasas. Spustelk, kad atstatytum žemėlapio pasukimą į šiaurę. - Įnašo ikona. Paspausk norėdamas pamatyti dialogą su detalėmis - Vartotojo vietos vaizdas. Nurodo tavo poziciją žemėlapyje - Rodomas MapLibre kurtas žemėlapis. Naviguok tempdamas du pirštus. Valdyk žemėlapio pritraukimą suimdamas/atitolindamas du pirštus. - MapLibre Android SDK - Pasirinktas OfflineRegionDefinition netalpa į rėžius: %s + Žemėlapio kompasas. Spustelk, kad atstatytum žemėlapio pasukimą į šiaurę. + Įnašo ikona. Paspausk norėdamas pamatyti dialogą su detalėmis + Vartotojo vietos vaizdas. Nurodo tavo poziciją žemėlapyje + Rodomas MapLibre kurtas žemėlapis. Naviguok tempdamas du pirštus. Valdyk žemėlapio pritraukimą suimdamas/atitolindamas du pirštus. + MapLibre Android SDK + Pasirinktas OfflineRegionDefinition netalpa į rėžius: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml index 2bae63f96..4bda0d7fc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-nl/strings.xml @@ -1,10 +1,10 @@ - Kompas van de map. Activeer om de map rotatie te herzetten naar het noorden. - Attributie icoon. Activeer voor het tonen van het attributie dialoog. - Locatie Element. Dit toont jouw locatie op de map. - Toont een map gemaakt met MapLibre. Scroll door het slepen met twee vingers. Zoom door vingers te nijpen. - MapLibre Android SDK - Aangeleverde OfflineRegionDefinition past niet in de wereld omtrek: %s + Kompas van de map. Activeer om de map rotatie te herzetten naar het noorden. + Attributie icoon. Activeer voor het tonen van het attributie dialoog. + Locatie Element. Dit toont jouw locatie op de map. + Toont een map gemaakt met MapLibre. Scroll door het slepen met twee vingers. Zoom door vingers te nijpen. + MapLibre Android SDK + Aangeleverde OfflineRegionDefinition past niet in de wereld omtrek: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml index f3bf3f6c5..8596defcc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pl/strings.xml @@ -1,10 +1,10 @@ - Kompas. Naciśnij, żeby skierować mapę na północ. - Atrybucja. Aktywuj, żeby pokazać więcej informacji. - Widok lokalizacji. Pokazuje twoją pozycję na mapie. - Pokazuje mapę stworzoną za pomocą biblioteki MapLibre. Przesuń mapę za pomocą przeciągnięcia dwoma palcami. Przybliż za pomocą uszczypnięcia dwoma palcami. - MapLibre Maps SDK dla Androida - Nie potrafię otworzyć strony, brak przeglądarki internetowej zainstalowanej na urządzeniu. - Wymagany region nie mieści się w granicach świata: %s + Kompas. Naciśnij, żeby skierować mapę na północ. + Atrybucja. Aktywuj, żeby pokazać więcej informacji. + Widok lokalizacji. Pokazuje twoją pozycję na mapie. + Pokazuje mapę stworzoną za pomocą biblioteki MapLibre. Przesuń mapę za pomocą przeciągnięcia dwoma palcami. Przybliż za pomocą uszczypnięcia dwoma palcami. + MapLibre Maps SDK dla Androida + Nie potrafię otworzyć strony, brak przeglądarki internetowej zainstalowanej na urządzeniu. + Wymagany region nie mieści się w granicach świata: %s \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml index fd3ba98cc..1e4a91445 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-pt-rPT/strings.xml @@ -1,10 +1,10 @@ - Compasso do mapa. Ativar para virar o mapa para Norte. - Ícone de atribuição. Ativar para mostrar a janela de atribuição. - Vista de localização. Isto mostra a sua localização no mapa. - A mostrar um Mapa criado com MapLibre. Desloque arrastanto com 2 dedos. Zoom afastando ou aproximando os 2 dedos. - Mapas MapLibre SDK para Android - Não está nenhum navegador de Internet instalado no dispositivo. Não é possível abrir a página web. - O OfflineRegionDefinition não cabe nos limites do mundo: %s + Compasso do mapa. Ativar para virar o mapa para Norte. + Ícone de atribuição. Ativar para mostrar a janela de atribuição. + Vista de localização. Isto mostra a sua localização no mapa. + A mostrar um Mapa criado com MapLibre. Desloque arrastanto com 2 dedos. Zoom afastando ou aproximando os 2 dedos. + Mapas MapLibre SDK para Android + Não está nenhum navegador de Internet instalado no dispositivo. Não é possível abrir a página web. + O OfflineRegionDefinition não cabe nos limites do mundo: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml index 6741b76fe..d60dbb14e 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-ru/strings.xml @@ -1,10 +1,10 @@ - Компас. Активируйте, чтобы развернуть карту на север. - Значок атрибутов. Активируйте, чтобы показать диалог. - Местоположение. Отображает вашу позицию на карте. - Отображает карту, созданную при помощи MapLibre. Пролистывайте двумя пальцами. Меняйте масштаб сведением пальцев. - MapLibre Maps SDK для Android - На устройстве нет веб-браузера, нельзя показать веб-страницу. - Запрошенный OfflineRegionDefinition не входит в допустимые границы: %s + Компас. Активируйте, чтобы развернуть карту на север. + Значок атрибутов. Активируйте, чтобы показать диалог. + Местоположение. Отображает вашу позицию на карте. + Отображает карту, созданную при помощи MapLibre. Пролистывайте двумя пальцами. Меняйте масштаб сведением пальцев. + MapLibre Maps SDK для Android + На устройстве нет веб-браузера, нельзя показать веб-страницу. + Запрошенный OfflineRegionDefinition не входит в допустимые границы: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml index 09b44a6c8..7f25c919b 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-sv/strings.xml @@ -1,10 +1,10 @@ - Kompass. Aktivera för att nollställa kartans rotation mot norr. - Tillskrivningsikon. Aktivera för att visa tillskrivningsdialog. - Positionsvy. Denna visar din position på kartan. - Visar en karta skapad med MapLibre. Scrolla genom att dra med två fingrar. Zooma genom att nypa med två fingrar. - MapLibre Maps SDK for Android - Ingen webbläsare installerad på enheten. Kan inte visa sidan. - Försedd OfflineRegionDefinition passar inte världens gränser: %s + Kompass. Aktivera för att nollställa kartans rotation mot norr. + Tillskrivningsikon. Aktivera för att visa tillskrivningsdialog. + Positionsvy. Denna visar din position på kartan. + Visar en karta skapad med MapLibre. Scrolla genom att dra med två fingrar. Zooma genom att nypa med två fingrar. + MapLibre Maps SDK for Android + Ingen webbläsare installerad på enheten. Kan inte visa sidan. + Försedd OfflineRegionDefinition passar inte världens gränser: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml index ee323fdab..e49faa844 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-uk/strings.xml @@ -1,10 +1,10 @@ - Компас. Натисніть щоб зорієнтувати мапу на північ. - Значок атрибуції. Натисніть, щоб показати діалог атрибуції. - Визначення положення. Показує ваше місцеположення на мапі. - Показує мапи створені за допомоги MapLibre. Пересувайте мапу двома пальцями. Змінюйте масштаб стуляючи/розводячи два пальці. - MapLibre Maps SDK для Android - Веб-оглядач відсутній на цьому пристрої, неможливо відкрити веб-сторінку - Межі ділянки для оффлайнового користування даними за межами світу: %s + Компас. Натисніть щоб зорієнтувати мапу на північ. + Значок атрибуції. Натисніть, щоб показати діалог атрибуції. + Визначення положення. Показує ваше місцеположення на мапі. + Показує мапи створені за допомоги MapLibre. Пересувайте мапу двома пальцями. Змінюйте масштаб стуляючи/розводячи два пальці. + MapLibre Maps SDK для Android + Веб-оглядач відсутній на цьому пристрої, неможливо відкрити веб-сторінку + Межі ділянки для оффлайнового користування даними за межами світу: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml index 214ab24db..17c29537c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-vi/strings.xml @@ -1,10 +1,10 @@ - La bàn bản đồ. Kích hoạt để quay bản đồ lại hướng bắc. - Biểu tượng ghi công. Kích hoạt để xem hộp thoại ghi công. - Cái chỉ vị trí. Cái này chỉ vị trí của bạn trên bản đồ. - Đang xem bản đồ được xây dựng dùng MapLibre. Kéo hai ngón tay để cuộn. Chụm các ngón tay lại để phóng to. Tách các ngón tay ra để thu nhỏ. - MapLibre Maps SDK cho Android - Không thể mở trang Web vì thiết bị thiếu trình duyệt. - OfflineRegionDefinition được cung cấp không vừa thế giới: %s + La bàn bản đồ. Kích hoạt để quay bản đồ lại hướng bắc. + Biểu tượng ghi công. Kích hoạt để xem hộp thoại ghi công. + Cái chỉ vị trí. Cái này chỉ vị trí của bạn trên bản đồ. + Đang xem bản đồ được xây dựng dùng MapLibre. Kéo hai ngón tay để cuộn. Chụm các ngón tay lại để phóng to. Tách các ngón tay ra để thu nhỏ. + MapLibre Maps SDK cho Android + Không thể mở trang Web vì thiết bị thiếu trình duyệt. + OfflineRegionDefinition được cung cấp không vừa thế giới: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml index 4e9bf4e06..5a5a53ca3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rCN/strings.xml @@ -1,10 +1,10 @@ - 指南针,点击使地图旋转重置到正北方向。 - Attribution图标,点击以显示attribution对话框。 - 定位视图,在地图上显示当前位置。 - 显示由MapLibre创建的地图,通过拖动两个手指来滚动,捏两个手指来放大。 - MapLibre Maps SDK for Android - 设备中未安装任何浏览器,不能打开该网页 - 提供的OfflineRegionDefinition不符合标准地理范围:%s + 指南针,点击使地图旋转重置到正北方向。 + Attribution图标,点击以显示attribution对话框。 + 定位视图,在地图上显示当前位置。 + 显示由MapLibre创建的地图,通过拖动两个手指来滚动,捏两个手指来放大。 + MapLibre Maps SDK for Android + 设备中未安装任何浏览器,不能打开该网页 + 提供的OfflineRegionDefinition不符合标准地理范围:%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml index ad4a56400..d3b9659f7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rHK/strings.xml @@ -1,10 +1,10 @@ - 指南針,点击使地图旋转重置到正北方向。 - Attribution圖標,點擊以顯示attribution對話框。 - 定位視圖,在地圖上顯示當前位置。 - 顯示由MapLibre創建的地圖,通過拖動兩個手指來滾動,捏兩個手指來放大。 - MapLibre Maps SDK for Android - 設備中未安裝任何瀏覽器,不能打開該網頁 - 提供的OfflineRegionDefinition不符合標準地理範圍:%s + 指南針,点击使地图旋转重置到正北方向。 + Attribution圖標,點擊以顯示attribution對話框。 + 定位視圖,在地圖上顯示當前位置。 + 顯示由MapLibre創建的地圖,通過拖動兩個手指來滾動,捏兩個手指來放大。 + MapLibre Maps SDK for Android + 設備中未安裝任何瀏覽器,不能打開該網頁 + 提供的OfflineRegionDefinition不符合標準地理範圍:%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml index ad4a56400..d3b9659f7 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values-zh-rTW/strings.xml @@ -1,10 +1,10 @@ - 指南針,点击使地图旋转重置到正北方向。 - Attribution圖標,點擊以顯示attribution對話框。 - 定位視圖,在地圖上顯示當前位置。 - 顯示由MapLibre創建的地圖,通過拖動兩個手指來滾動,捏兩個手指來放大。 - MapLibre Maps SDK for Android - 設備中未安裝任何瀏覽器,不能打開該網頁 - 提供的OfflineRegionDefinition不符合標準地理範圍:%s + 指南針,点击使地图旋转重置到正北方向。 + Attribution圖標,點擊以顯示attribution對話框。 + 定位視圖,在地圖上顯示當前位置。 + 顯示由MapLibre創建的地圖,通過拖動兩個手指來滾動,捏兩個手指來放大。 + MapLibre Maps SDK for Android + 設備中未安裝任何瀏覽器,不能打開該網頁 + 提供的OfflineRegionDefinition不符合標準地理範圍:%s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml index 4acf3301c..ff471520c 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/attrs.xml @@ -1,44 +1,44 @@ - + - + - - + + - - - - - + + + + + - - - - - + + + + + - - + + - - + + - - - - - - - + + + + + + + - - + + @@ -54,16 +54,16 @@ - - - - - - + + + + + + - - + + @@ -79,14 +79,14 @@ - - - - + + + + - - + + @@ -102,34 +102,34 @@ - - - - - + + + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - + @@ -137,65 +137,65 @@ - - - - - - - - + + + + + + + + - - - - + + + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - - + + + - + - + - + - - - - - - - + + + + + + + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml index 565d1c99c..50df758fb 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ - #5F5F5F - #7D7F80 - #1E8CAB + #5F5F5F + #7D7F80 + #1E8CAB - #4A90E2 - #A1B0C0 + #4A90E2 + #A1B0C0 diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml index 012e46cc0..6252cbf68 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/dimens.xml @@ -1,29 +1,29 @@ - 8dp - 8dp - 4dp - 0.6dp - 0.9dp - 8dp - 92dp - 18dp + 8dp + 8dp + 4dp + 0.6dp + 0.9dp + 8dp + 92dp + 18dp - 225dp + 225dp - 75dp + 75dp - 0.10dp + 0.10dp - 1.3dp + 1.3dp - 0.29dp + 0.29dp - 25dp - 400dp + 25dp + 400dp diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml index ecb6381ec..c46c01795 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ - Map compass. Activate to reset the map rotation to North. - Attribution icon. Activate to show attribution dialog. - Location View. This shows your location on the map. - Showing a Map created with MapLibre. Scroll by dragging two fingers. Zoom by pinching two fingers. - MapLibre Maps SDK for Android - No web browser installed on device, can\'t open web page. - Provided OfflineRegionDefinition doesn\'t fit the world bounds: %s + Map compass. Activate to reset the map rotation to North. + Attribution icon. Activate to show attribution dialog. + Location View. This shows your location on the map. + Showing a Map created with MapLibre. Scroll by dragging two fingers. Zoom by pinching two fingers. + MapLibre Maps SDK for Android + No web browser installed on device, can\'t open web page. + Provided OfflineRegionDefinition doesn\'t fit the world bounds: %s diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml index b38b3758c..539ffc246 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res/values/styles.xml @@ -1,46 +1,46 @@ - \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java index a720963e7..6ae801ba6 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/camera/CameraPositionTest.java @@ -50,11 +50,11 @@ public class CameraPositionTest { float tilt = 44; TypedArray typedArray = mock(TypedArray.class); - when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraBearing, 0.0f)).thenReturn(bearing); - when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLat, 0.0f)).thenReturn(latitude); - when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTargetLng, 0.0f)).thenReturn(longitude); - when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraZoom, 0.0f)).thenReturn(zoom); - when(typedArray.getFloat(R.styleable.mapbox_MapView_mapbox_cameraTilt, 0.0f)).thenReturn(tilt); + when(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraBearing, 0.0f)).thenReturn(bearing); + when(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLat, 0.0f)).thenReturn(latitude); + when(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTargetLng, 0.0f)).thenReturn(longitude); + when(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraZoom, 0.0f)).thenReturn(zoom); + when(typedArray.getFloat(R.styleable.maplibre_MapView_maplibre_cameraTilt, 0.0f)).thenReturn(tilt); doNothing().when(typedArray).recycle(); CameraPosition cameraPosition = new CameraPosition.Builder(typedArray).build(); diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java index 9f4648468..73a88f33f 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentActivationOptionsTest.java @@ -45,10 +45,10 @@ public class LocationComponentActivationOptionsTest { @Before public void setUp() throws Exception { - when(context.obtainStyledAttributes(R.style.mapbox_LocationComponent, R.styleable.mapbox_LocationComponent)) + when(context.obtainStyledAttributes(R.style.maplibre_LocationComponent, R.styleable.maplibre_LocationComponent)) .thenReturn(array); - when(array.getResourceId(R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawable, -1)) - .thenReturn(R.drawable.mapbox_user_icon); + when(array.getResourceId(R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawable, -1)) + .thenReturn(R.drawable.maplibre_user_icon); when(context.getResources()).thenReturn(resources); } @@ -121,7 +121,7 @@ public class LocationComponentActivationOptionsTest { LocationComponentActivationOptions.builder(context, style) .locationComponentOptions(locationComponentOptions) - .styleRes(R.style.mapbox_LocationComponent) + .styleRes(R.style.maplibre_LocationComponent) .build(); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java index 0a29dcc00..d89287fa3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentOptionsTest.java @@ -35,10 +35,10 @@ public class LocationComponentOptionsTest { @Before public void setUp() throws Exception { - when(context.obtainStyledAttributes(R.style.mapbox_LocationComponent, R.styleable.mapbox_LocationComponent)) + when(context.obtainStyledAttributes(R.style.maplibre_LocationComponent, R.styleable.maplibre_LocationComponent)) .thenReturn(array); - when(array.getResourceId(R.styleable.mapbox_LocationComponent_mapbox_foregroundDrawable, -1)) - .thenReturn(R.drawable.mapbox_user_icon); + when(array.getResourceId(R.styleable.maplibre_LocationComponent_maplibre_foregroundDrawable, -1)) + .thenReturn(R.drawable.maplibre_user_icon); when(context.getResources()).thenReturn(resources); } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt index e0accd3ec..68830f911 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/location/LocationComponentTest.kt @@ -93,15 +93,15 @@ class LocationComponentTest { Assert.assertEquals(locationEngineRequest, locationComponent.locationEngineRequest) doReturn(mock(TypedArray::class.java)).`when`(context) - .obtainStyledAttributes(R.style.mapbox_LocationComponent, R.styleable.mapbox_LocationComponent) + .obtainStyledAttributes(R.style.maplibre_LocationComponent, R.styleable.maplibre_LocationComponent) val resources = mock(Resources::class.java) doReturn(resources).`when`(context).resources doReturn(0f).`when`(resources) - .getDimension(R.dimen.mapbox_locationComponentTrackingMultiFingerMoveThreshold) + .getDimension(R.dimen.maplibre_locationComponentTrackingMultiFingerMoveThreshold) doReturn(0f).`when`(resources) - .getDimension(R.dimen.mapbox_locationComponentTrackingMultiFingerMoveThreshold) + .getDimension(R.dimen.maplibre_locationComponentTrackingMultiFingerMoveThreshold) locationComponent.activateLocationComponent(context, mock(Style::class.java), true, locationEngineRequest) Assert.assertEquals(locationEngineRequest, locationComponent.locationEngineRequest) } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt index 1d478b0c5..568b3dec1 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/maps/MapboxMapOptionsAttrsTest.kt @@ -77,13 +77,13 @@ class MapboxMapOptionsAttrsTest { private fun mockEnableLocalIdeograph(enabled: Boolean) { every { - typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_localIdeographEnabled, true) + typedArray.getBoolean(R.styleable.maplibre_MapView_maplibre_localIdeographEnabled, true) }.returns(enabled) } private fun mockLocalIdeographString(font: String) { every { - typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily) + typedArray.getString(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamily) }.returns(font) } @@ -91,7 +91,7 @@ class MapboxMapOptionsAttrsTest { val resId = 9000 every { - typedArray.getResourceId(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamilies, 0) + typedArray.getResourceId(R.styleable.maplibre_MapView_maplibre_localIdeographFontFamilies, 0) }.returns(resId) every { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java index 09869b511..bc66e2d2d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/annotations/IconTest.java @@ -53,7 +53,7 @@ public class IconTest extends EspressoTest { @UiThreadTest public void testAddDifferentIconMarker() { validateTestSetup(); - Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon); + Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.maplibre_logo_icon); mapboxMap.addMarker(new MarkerOptions().icon(icon).position(new LatLng())); mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1))); assertEquals(iconMap.size(), 2); @@ -65,7 +65,7 @@ public class IconTest extends EspressoTest { @UiThreadTest public void testAddRemoveIconMarker() { validateTestSetup(); - Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.mapbox_logo_icon); + Icon icon = IconFactory.getInstance(rule.getActivity()).fromResource(R.drawable.maplibre_logo_icon); Marker marker = mapboxMap.addMarker(new MarkerOptions().icon(icon).position(new LatLng())); mapboxMap.addMarker(new MarkerOptions().position(new LatLng(1, 1))); assertEquals(iconMap.size(), 2); @@ -104,11 +104,11 @@ public class IconTest extends EspressoTest { // add 4 unique icon markers mapboxMap.addMarker(new MarkerOptions() - .icon(iconFactory.fromResource(R.drawable.mapbox_logo_icon)) + .icon(iconFactory.fromResource(R.drawable.maplibre_logo_icon)) .position(new LatLng(3, 1)) ); mapboxMap.addMarker(new MarkerOptions() - .icon(iconFactory.fromResource(R.drawable.mapbox_compass_icon)) + .icon(iconFactory.fromResource(R.drawable.maplibre_compass_icon)) .position(new LatLng(4, 1)) ); mapboxMap.addMarker(new MarkerOptions() diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java index af3c78051..018c5a7de 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/maps/widgets/AttributionTest.java @@ -74,7 +74,7 @@ public class AttributionTest extends EspressoTest { // click on View to open dialog onView(withTagValue(is("attrView"))).perform(click()); - onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed())); + onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed())); // test for trigger url intent Matcher expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[0].getURL()))); @@ -95,7 +95,7 @@ public class AttributionTest extends EspressoTest { // click on View to open dialog onView(withTagValue(is("attrView"))).perform(click()); - onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed())); + onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed())); // test for trigger url intent Matcher expectedIntent = allOf(hasAction(Intent.ACTION_VIEW), hasData(Uri.parse(urlSpans[1].getURL()))); @@ -116,7 +116,7 @@ public class AttributionTest extends EspressoTest { // click on View to open dialog onView(withTagValue(is("attrView"))).perform(click()); - onView(withText(R.string.mapbox_attributionsDialogTitle)).check(matches(isDisplayed())); + onView(withText(R.string.maplibre_attributionsDialogTitle)).check(matches(isDisplayed())); // test for trigger url intent Matcher expectedIntent = hasAction(Intent.ACTION_VIEW); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt index 5afe27054..4b4ecbde1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.kt @@ -43,7 +43,7 @@ class QueryRenderedFeaturesBoxSymbolCountActivity : AppCompatActivity() { R.raw.test_points_utrecht ) val markerImage = - BitmapFactory.decodeResource(resources, R.drawable.mapbox_marker_icon_default) + BitmapFactory.decodeResource(resources, R.drawable.maplibre_marker_icon_default) mapboxMap.setStyle( Style.Builder() .withLayer( diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt index cb0debd04..1b7d474d6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/infowindow/DynamicInfoWindowAdapterActivity.kt @@ -85,7 +85,7 @@ class DynamicInfoWindowAdapterActivity : AppCompatActivity(), OnMapReadyCallback IconUtils.drawableToIcon( this, R.drawable.ic_location_city, - ResourcesCompat.getColor(resources, R.color.mapbox_blue, theme) + ResourcesCompat.getColor(resources, R.color.maplibre_blue, theme) ) ) ) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.kt index acd03f733..fd7afdde1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationComponentActivationActivity.kt @@ -73,7 +73,7 @@ class LocationComponentActivationActivity : AppCompatActivity(), OnMapReadyCallb .elevation(5f) .accuracyAlpha(.6f) .accuracyColor(Color.GREEN) - .foregroundDrawable(R.drawable.mapbox_logo_helmet) + .foregroundDrawable(R.drawable.maplibre_logo_helmet) .build() val locationComponentActivationOptions = LocationComponentActivationOptions .builder(this, style) diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.kt index 90ffa55c2..975fb8eb2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/location/LocationModesActivity.kt @@ -204,7 +204,7 @@ class LocationModesActivity : defaultStyle = !defaultStyle var options = LocationComponentOptions.createFromAttributes( this, - if (defaultStyle) R.style.mapbox_LocationComponent else R.style.CustomLocationComponent + if (defaultStyle) R.style.maplibre_LocationComponent else R.style.CustomLocationComponent ) if (defaultStyle) { val padding: IntArray diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt index 382c5fc87..d322fe05e 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DoubleMapActivity.kt @@ -20,7 +20,7 @@ import com.mapbox.mapboxsdk.utils.MapFragmentUtils * Test activity showcasing having 2 maps on top of each other. * * - * The small map is using the `mapbox_enableZMediaOverlay="true"` configuration + * The small map is using the `maplibre_enableZMediaOverlay="true"` configuration * */ class DoubleMapActivity : AppCompatActivity() { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt index 4a8dfcd5c..caee05380 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterBitMapOverlayActivity.kt @@ -86,7 +86,7 @@ class MapSnapshotterBitMapOverlayActivity : private fun addMarker(snapshot: MapSnapshot): Bitmap { val canvas = Canvas(snapshot.bitmap) val marker = - BitmapFactory.decodeResource(resources, R.drawable.mapbox_marker_icon_default, null) + BitmapFactory.decodeResource(resources, R.drawable.maplibre_marker_icon_default, null) // Dom toren val markerLocation = snapshot.pixelForLatLng(LatLng(52.090649433011315, 5.121310651302338)) canvas.drawBitmap( diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml index 6c550f7ba..0bb8106d0 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml @@ -10,9 +10,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.519003" - app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.519003" + app:maplibre_cameraTargetLng="13.400972" + app:maplibre_cameraZoom="16"/> + app:maplibre_cameraTargetLat="41.9567" + app:maplibre_cameraTargetLng="-78.6430" + app:maplibre_cameraZoom="5"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml index a8dbefc1b..43bce296d 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - app:mapbox_cameraTargetLat="38.90962" - app:mapbox_cameraTargetLng="-77.04341" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="38.90962" + app:maplibre_cameraTargetLng="-77.04341" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml index bb34d83d7..263540acc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_building_layer.xml @@ -6,10 +6,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="40.7135" - app:mapbox_cameraTargetLng="-74.0066" - app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="40.7135" + app:maplibre_cameraTargetLng="-74.0066" + app:maplibre_cameraTilt="45" + app:maplibre_cameraZoom="15"/> + app:maplibre_cameraTargetLat="51.50325" + app:maplibre_cameraTargetLng="-0.11968" + app:maplibre_cameraZoom="15"/> + app:maplibre_cameraTargetLat="37.787947" + app:maplibre_cameraTargetLng="-122.407432" + app:maplibre_cameraZoom="11"/> + app:maplibre_localIdeographFontFamilies="@array/array_local_ideograph_family_test" + app:maplibre_uiAttributionTintColor="@color/redAccent"/> + app:maplibre_pixelRatio="1" + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml index f5bd0c001..7c4711fd7 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circle_layer.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="1.350057" - app:mapbox_cameraTargetLng="103.849218" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="1.350057" + app:maplibre_cameraTargetLng="103.849218" + app:maplibre_cameraZoom="10"/> + app:maplibre_cameraBearing="90" + app:maplibre_cameraTargetLat="51.506675" + app:maplibre_cameraTargetLng="-0.128699" + app:maplibre_cameraTilt="40" + app:maplibre_cameraZoom="10" + app:maplibre_uiCompassFadeFacingNorth="false"/> + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml index 2f14d5b94..4119c3316 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_extrusion_test.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="40.7135" - app:mapbox_cameraTargetLng="-74.0066" - app:mapbox_cameraTilt="45" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="40.7135" + app:maplibre_cameraTargetLng="-74.0066" + app:maplibre_cameraTilt="45" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml index cfe68ad62..e0c48ff86 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_fill_extrusion_layer.xml @@ -9,10 +9,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="46.343350" - app:mapbox_cameraTargetLng="7.497989" - app:mapbox_cameraZoom="9" - app:mapbox_cameraBearing="140" - app:mapbox_cameraTilt="60"/> + app:maplibre_cameraTargetLat="46.343350" + app:maplibre_cameraTargetLng="7.497989" + app:maplibre_cameraZoom="9" + app:maplibre_cameraBearing="140" + app:maplibre_cameraTilt="60"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml index d692e55e4..131d4fa57 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_gesture_detector.xml @@ -10,10 +10,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_localIdeographEnabled="false" - app:mapbox_cameraTargetLat="51.50325" - app:mapbox_cameraTargetLng="-0.11968" - app:mapbox_cameraZoom="15" /> + app:maplibre_localIdeographEnabled="false" + app:maplibre_cameraTargetLat="51.50325" + app:maplibre_cameraTargetLng="-0.11968" + app:maplibre_cameraZoom="15" /> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml index 3ced7c8e2..b43cdf1b6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_grid_source.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="41.9567" - app:mapbox_cameraTargetLng="-78.6430" - app:mapbox_cameraZoom="5"/> + app:maplibre_cameraTargetLat="41.9567" + app:maplibre_cameraTargetLng="-78.6430" + app:maplibre_cameraZoom="5"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml index 9f48c0809..ef6e1030f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_hillshade_layer.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.090710" - app:mapbox_cameraTargetLng="5.121125" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="52.090710" + app:maplibre_cameraTargetLng="5.121125" + app:maplibre_cameraZoom="10"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml index ad8be7179..cc7cd0544 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="38.897705003219784" - app:mapbox_cameraTargetLng="-77.03655168667463" - app:mapbox_cameraZoom="15"/> + app:maplibre_cameraTargetLat="38.897705003219784" + app:maplibre_cameraTargetLng="-77.03655168667463" + app:maplibre_cameraZoom="15"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml index 970e77114..41482259a 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml @@ -10,8 +10,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="47.798202" - app:mapbox_cameraTargetLng="7.573781" - app:mapbox_cameraZoom="4"/> + app:maplibre_cameraTargetLat="47.798202" + app:maplibre_cameraTargetLng="7.573781" + app:maplibre_cameraZoom="4"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml index 856dd2475..f84764c26 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml @@ -12,6 +12,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_localIdeographFontFamily="Droid Sans" /> + app:maplibre_localIdeographFontFamily="Droid Sans" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml index 935f35b83..e5f1cbadd 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_activation_builder.xml @@ -12,6 +12,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="0dp" - app:mapbox_uiAttribution="false"/> + app:maplibre_uiAttribution="false"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml index 9b4c82b37..fd00745ad 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_basic_pulsing_circle.xml @@ -8,6 +8,6 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_uiAttribution="false"/> + app:maplibre_uiAttribution="false"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml index d277e4485..d25d7d479 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_location_layer_customized_pulsing_circle.xml @@ -14,7 +14,7 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:mapbox_uiAttribution="false" /> + app:maplibre_uiAttribution="false" /> + app:maplibre_uiAttribution="false"/> + app:maplibre_uiAttribution="false" /> + app:maplibre_uiAttribution="false" /> + app:maplibre_cameraBearing="220" + app:maplibre_cameraTargetLat="50.871062" + app:maplibre_cameraTargetLng="1.583210" + app:maplibre_cameraZoom="10"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml index cd4aa4bde..7cf6d38e9 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_map_padding.xml @@ -10,7 +10,7 @@ android:layout_width="@dimen/map_padding_left" android:layout_height="match_parent" android:alpha="0.5" - android:background="@color/mapbox_blue"/> + android:background="@color/maplibre_blue"/> + android:background="@color/maplibre_blue"/> + android:background="@color/maplibre_blue"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml index e2c07c6fd..1c534a6b1 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml @@ -10,8 +10,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - app:mapbox_cameraTargetLat="38.87031" - app:mapbox_cameraTargetLng="-77.00897" - app:mapbox_cameraZoom="10"/> + app:maplibre_cameraTargetLat="38.87031" + app:maplibre_cameraTargetLng="-77.00897" + app:maplibre_cameraZoom="10"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml index c9df5a857..99a0b4417 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml @@ -9,8 +9,8 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="wrap_content" - app:mapbox_cameraTargetLat="-1.063510" - app:mapbox_cameraTargetLng=" 32.895425" - app:mapbox_cameraZoom="4"/> + app:maplibre_cameraTargetLat="-1.063510" + app:maplibre_cameraTargetLng=" 32.895425" + app:maplibre_cameraZoom="4"/> \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml index 1f856bcd9..716e73971 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_multi_map.xml @@ -21,9 +21,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" - mapbox:mapbox_cameraTargetLat="38.913187" - mapbox:mapbox_cameraTargetLng="-77.032546" - mapbox:mapbox_cameraZoom="12" /> + mapbox:maplibre_cameraTargetLat="38.913187" + mapbox:maplibre_cameraTargetLng="-77.032546" + mapbox:maplibre_cameraZoom="12" /> + mapbox:maplibre_cameraTargetLat="37.775732" + mapbox:maplibre_cameraTargetLng="-122.413985" + mapbox:maplibre_cameraZoom="13"/> + mapbox:maplibre_cameraTargetLat="12.97913" + mapbox:maplibre_cameraTargetLng="77.59188" + mapbox:maplibre_cameraZoom="14" /> + mapbox:maplibre_cameraTargetLat="-13.155980" + mapbox:maplibre_cameraTargetLng="-74.217134" + mapbox:maplibre_cameraZoom="15" /> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml index 4c88a8770..fdf041539 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_pixel_test.xml @@ -8,9 +8,9 @@ + app:maplibre_pixelRatio="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml index 97ea61c0d..cefeb5ee3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml @@ -9,10 +9,10 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_uiAttributionTintColor="@android:color/holo_green_dark" - app:mapbox_cameraTargetLat="47.798202" - app:mapbox_cameraTargetLng="7.573781" - app:mapbox_cameraZoom="4" /> + app:maplibre_uiAttributionTintColor="@android:color/holo_green_dark" + app:maplibre_cameraTargetLat="47.798202" + app:maplibre_cameraTargetLng="7.573781" + app:maplibre_cameraZoom="4" /> + app:maplibre_cameraTargetLat="45.1855569" + app:maplibre_cameraTargetLng="5.7215506" + app:maplibre_cameraZoom="11" + app:maplibre_uiAttributionGravity="top|end" + app:maplibre_uiLogoGravity="top|end" + app:maplibre_uiLogoMarginRight="28dp"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml index 3ddd7d64b..a5e4b01dc 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_features_box.xml @@ -10,9 +10,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/toolbar" - app:mapbox_cameraTargetLat="52.0907" - app:mapbox_cameraTargetLng="5.1214" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.0907" + app:maplibre_cameraTargetLng="5.1214" + app:maplibre_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.0907" + app:maplibre_cameraTargetLng="5.1214" + app:maplibre_cameraZoom="16"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml index 148bab50c..aca449206 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_query_source_features.xml @@ -10,9 +10,9 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="51" - app:mapbox_cameraTargetLng="17.25" - app:mapbox_cameraZoom="8" /> + app:maplibre_cameraTargetLat="51" + app:maplibre_cameraTargetLng="17.25" + app:maplibre_cameraZoom="8" /> + app:maplibre_cameraTargetLat="64.840048" + app:maplibre_cameraTargetLng="-18.910457" + app:maplibre_cameraZoom="4"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml index 0740ff404..7e364a90f 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml @@ -84,9 +84,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="37.176546" - app:mapbox_cameraTargetLng="-3.599007" - app:mapbox_cameraZoom="15" /> + app:maplibre_cameraTargetLat="37.176546" + app:maplibre_cameraTargetLng="-3.599007" + app:maplibre_cameraZoom="15" /> + app:maplibre_cameraZoom="1"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml index 19f68f136..5233e9ef3 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml @@ -9,9 +9,9 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_cameraTargetLat="52.519003" - app:mapbox_cameraTargetLng="13.400972" - app:mapbox_cameraZoom="16"/> + app:maplibre_cameraTargetLat="52.519003" + app:maplibre_cameraTargetLng="13.400972" + app:maplibre_cameraZoom="16"/> @@ -14,7 +14,7 @@ android:layout_margin="50dp" android:layout_width="match_parent" android:layout_height="match_parent" - app:mapbox_renderTextureMode="true"/> + app:maplibre_renderTextureMode="true"/> + app:maplibre_renderTextureMode="true" + app:maplibre_uiAttribution="false" + app:maplibre_uiCompass="false" + app:maplibre_uiLogo="false"/> + app:maplibre_renderTextureMode="true"/> + app:maplibre_cameraTargetLat="40.730648" + app:maplibre_cameraTargetLng="-73.993619" + app:maplibre_cameraZoom="11"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml index c2e3270eb..297d0e9b7 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml @@ -9,8 +9,8 @@ android:id="@+id/mapView" android:layout_width="match_parent" android:layout_height="match_parent" - mapbox:mapbox_cameraTargetLat="47.6077" - mapbox:mapbox_cameraTargetLng="-122.3421" - mapbox:mapbox_cameraZoom="11"/> + mapbox:maplibre_cameraTargetLat="47.6077" + mapbox:maplibre_cameraTargetLng="-122.3421" + mapbox:maplibre_cameraZoom="11"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml index c7bb16732..28ddaba47 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_double_map.xml @@ -16,7 +16,7 @@ diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml index 850399e35..10484c4f2 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_gl.xml @@ -5,6 +5,6 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="256dp" - app:mapbox_cameraTargetLat="45.38301927899065" - app:mapbox_cameraTargetLng="8.63525390625" - app:mapbox_cameraZoom="7"/> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml index 3224b7347..789e46b09 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/item_map_texture.xml @@ -5,7 +5,7 @@ android:id="@id/mapView" android:layout_width="match_parent" android:layout_height="256dp" - app:mapbox_cameraTargetLat="45.38301927899065" - app:mapbox_cameraTargetLng="8.63525390625" - app:mapbox_renderTextureMode="true" - app:mapbox_cameraZoom="7"/> + app:maplibre_cameraTargetLat="45.38301927899065" + app:maplibre_cameraTargetLng="8.63525390625" + app:maplibre_renderTextureMode="true" + app:maplibre_cameraZoom="7"/> diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml index 8d7da603f..81a3659b5 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml @@ -38,20 +38,20 @@