From 7534aa1594c13b48507961299acc4bcc44ee7e1a Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 2 Nov 2016 16:20:47 +0100 Subject: [PATCH] [android] - fix public xml api for drawables, fixup QueryRenderedFeatursBoxSymbolCountActivity (#6879) --- .../mapbox/mapboxsdk/maps/MapFragment.java | 6 +++--- .../mapboxsdk/maps/MapboxMapOptions.java | 6 +++--- .../mapboxsdk/maps/SupportMapFragment.java | 6 +++--- .../src/main/res-public/values/public.xml | 20 +++++++++--------- ...png => mapbox_mylocation_icon_bearing.png} | Bin ...png => mapbox_mylocation_icon_default.png} | Bin ...png => mapbox_mylocation_icon_bearing.png} | Bin ...png => mapbox_mylocation_icon_default.png} | Bin ...png => mapbox_mylocation_icon_bearing.png} | Bin ...png => mapbox_mylocation_icon_default.png} | Bin ...png => mapbox_mylocation_icon_bearing.png} | Bin ...png => mapbox_mylocation_icon_default.png} | Bin ...png => mapbox_mylocation_icon_bearing.png} | Bin ...png => mapbox_mylocation_icon_default.png} | Bin ...ape.xml => mapbox_mylocation_bg_shape.xml} | 0 ...enderedFeaturesBoxSymbolCountActivity.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_mylocationview_icon_bearing.png => mapbox_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/{mapbox_mylocationview_icon_default.png => mapbox_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_mylocationview_icon_bearing.png => mapbox_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/{mapbox_mylocationview_icon_default.png => mapbox_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_mylocationview_icon_bearing.png => mapbox_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/{mapbox_mylocationview_icon_default.png => mapbox_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_mylocationview_icon_bearing.png => mapbox_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/{mapbox_mylocationview_icon_default.png => mapbox_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_mylocationview_icon_bearing.png => mapbox_mylocation_icon_bearing.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/{mapbox_mylocationview_icon_default.png => mapbox_mylocation_icon_default.png} (100%) rename platform/android/MapboxGLAndroidSDK/src/main/res/drawable/{mapbox_mylocationview_bg_shape.xml => mapbox_mylocation_bg_shape.xml} (100%) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java index 84a922ed1..4524a59f0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapFragment.java @@ -94,16 +94,16 @@ public final class MapFragment extends Fragment { Drawable foregroundBearingDrawable = options.getMyLocationForegroundBearingDrawable(); if (foregroundDrawable == null || foregroundBearingDrawable == null) { if (foregroundDrawable == null) { - foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default); + foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default); } if (foregroundBearingDrawable == null) { - foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing); + foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing); } options.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable); } if (options.getMyLocationBackgroundDrawable() == null) { - options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape)); + options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape)); } return map = new MapView(inflater.getContext(), options); 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 30a48be15..51af4c029 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 @@ -218,17 +218,17 @@ public class MapboxMapOptions implements Parcelable { Drawable foregroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground); if (foregroundDrawable == null) { - foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default); + foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default); } Drawable foregroundBearingDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_foreground_bearing); if (foregroundBearingDrawable == null) { - foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing); + foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing); } Drawable backgroundDrawable = typedArray.getDrawable(R.styleable.mapbox_MapView_mapbox_my_location_background); if (backgroundDrawable == null) { - backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape); + backgroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape); } mapboxMapOptions.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java index ff90f3f98..75d6a0119 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/SupportMapFragment.java @@ -103,16 +103,16 @@ public class SupportMapFragment extends Fragment { Drawable foregroundBearingDrawable = options.getMyLocationForegroundBearingDrawable(); if (foregroundDrawable == null || foregroundBearingDrawable == null) { if (foregroundDrawable == null) { - foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_default); + foregroundDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_default); } if (foregroundBearingDrawable == null) { - foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_icon_bearing); + foregroundBearingDrawable = ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_icon_bearing); } options.myLocationForegroundDrawables(foregroundDrawable, foregroundBearingDrawable); } if (options.getMyLocationBackgroundDrawable() == null) { - options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocationview_bg_shape)); + options.myLocationBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.mapbox_mylocation_bg_shape)); } return map = new MapView(inflater.getContext(), options); 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 9d2eb95ef..97f21a7b4 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml +++ b/platform/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml @@ -47,15 +47,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocationview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocationview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocationview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocationview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_bearing.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_bearing.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_bearing.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_default.png b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocationview_icon_default.png rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/mapbox_mylocation_icon_default.png diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocationview_bg_shape.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml similarity index 100% rename from platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocationview_bg_shape.xml rename to platform/android/MapboxGLAndroidSDK/src/main/res/drawable/mapbox_mylocation_bg_shape.xml diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java index 8e9b3a1ff..78fedadda 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/feature/QueryRenderedFeaturesBoxSymbolCountActivity.java @@ -70,7 +70,7 @@ public class QueryRenderedFeaturesBoxSymbolCountActivity extends AppCompatActivi Log.e(TAG, "Could not load geojson: " + e.getMessage()); return; } - mapboxMap.addImage("test-icon", BitmapFactory.decodeResource(getResources(), R.drawable.default_marker)); + mapboxMap.addImage("test-icon", BitmapFactory.decodeResource(getResources(), R.drawable.mapbox_marker_icon_default)); mapboxMap.addLayer(new SymbolLayer("symbols-layer", "symbols-source").withProperties(iconImage("test-icon")));