[android] Allow apps to override map resources

Fixes #2858

31 files changed, 26 insertions, 13 deletions

diff --git a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
index 349765bdd3..68a3ed7a25 100644
--- a/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
+++ b/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/UserLocationView.java
@@ -43,8 +43,6 @@ final class UserLocationView extends View {
 
     private MapView mMapView;
 
-    private static final int BLUE_COLOR = 0x39ACCBFF;
-
     private float mDensity;
 
     private boolean mShowMarker;
@@ -137,6 +135,8 @@ final class UserLocationView extends View {
 
         // Setup the custom paint
         Resources resources = context.getResources();
+        int accuracyColor = resources.getColor(R.color.my_location_ring);
+
         mDensity = resources.getDisplayMetrics().density;
         mMarkerCoordinate = new LatLng(0.0, 0.0);
         mMarkerScreenPoint = new PointF();
@@ -145,20 +145,20 @@ final class UserLocationView extends View {
         mAccuracyPaintFill = new Paint();
         mAccuracyPaintFill.setAntiAlias(true);
         mAccuracyPaintFill.setStyle(Paint.Style.FILL);
-        mAccuracyPaintFill.setColor(BLUE_COLOR);
+        mAccuracyPaintFill.setColor(accuracyColor);
         mAccuracyPaintFill.setAlpha((int) (255 * 0.25f));
 
         mAccuracyPaintStroke = new Paint();
         mAccuracyPaintStroke.setAntiAlias(true);
         mAccuracyPaintStroke.setStyle(Paint.Style.STROKE);
         mAccuracyPaintStroke.setStrokeWidth(0.5f * mDensity);
-        mAccuracyPaintStroke.setColor(BLUE_COLOR);
+        mAccuracyPaintStroke.setColor(accuracyColor);
         mAccuracyPaintStroke.setAlpha((int) (255 * 0.5f));
 
         mAccuracyPath = new Path();
         mAccuracyBounds = new RectF();
 
-        mUserLocationDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location);
+        mUserLocationDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location);
         mUserLocationDrawableBounds = new Rect(
                 -mUserLocationDrawable.getIntrinsicWidth() / 2,
                 -mUserLocationDrawable.getIntrinsicHeight() / 2,
@@ -171,7 +171,7 @@ final class UserLocationView extends View {
                 mUserLocationDrawable.getIntrinsicHeight() / 2);
         mUserLocationDrawable.setBounds(mUserLocationDrawableBounds);
 
-        mUserLocationBearingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location_bearing);
+        mUserLocationBearingDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location_bearing);
         mUserLocationBearingDrawableBounds = new Rect(
                 -mUserLocationBearingDrawable.getIntrinsicWidth() / 2,
                 -mUserLocationBearingDrawable.getIntrinsicHeight() / 2,
@@ -184,7 +184,7 @@ final class UserLocationView extends View {
                 mUserLocationBearingDrawable.getIntrinsicHeight() / 2);
         mUserLocationBearingDrawable.setBounds(mUserLocationBearingDrawableBounds);
 
-        mUserLocationStaleDrawable = ContextCompat.getDrawable(getContext(), R.drawable.user_location_stale);
+        mUserLocationStaleDrawable = ContextCompat.getDrawable(getContext(), R.drawable.my_location_stale);
         mUserLocationStaleDrawableBounds = new Rect(
                 -mUserLocationStaleDrawable.getIntrinsicWidth() / 2,
                 -mUserLocationStaleDrawable.getIntrinsicHeight() / 2,
diff --git a/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
index 09dee3752a..66149ffcb6 100644
--- a/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res-public/values/public.xml
@@ -40,4 +40,16 @@
     <public name="attribution_margin_right" type="attr" />
     <public name="attribution_margin_bottom" type="attr" />
     <public name="attribution_visibility" type="attr" />
+
+    <public name="attribution_logo" type="drawable" />
+    <public name="compass" type="drawable" />
+    <public name="default_marker" type="drawable" />
+    <public name="attribution_button_pressed_selector" type="drawable" />
+    <public name="attribution_button_pressed_normal" type="drawable" />
+    <public name="attribution_button_pressed_pressed" type="drawable" />
+    <public name="my_location" type="drawable" />
+    <public name="my_location_bearing" type="drawable" />
+    <public name="my_location_stale" type="drawable" />
+    <public name="my_location_ring" type="color" />
+    <public name="mapbox_blue" type="color" />
 </resources>
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png
index de44e3ddc0..de44e3ddc0 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_normal.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png
index fa26786242..fa26786242 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/attribution_button_pressed.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png
index 1ae8d541af..1ae8d541af 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png
index 8ecaffa2e8..8ecaffa2e8 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_bearing.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png
index 0d599c01fa..0d599c01fa 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-hdpi/my_location_stale.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png
index dd50478ac1..dd50478ac1 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_normal.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png
index d377f3cb8c..d377f3cb8c 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/attribution_button_pressed.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png
index 542cd25e22..542cd25e22 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png
index 429f03f648..429f03f648 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_bearing.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png
index 6613c41153..6613c41153 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-mdpi/my_location_stale.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png
index df7d7a8875..df7d7a8875 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_normal.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png
index f5b1833641..f5b1833641 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/attribution_button_pressed.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png
index ca1f1fe630..ca1f1fe630 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png
index 1b88f9f489..1b88f9f489 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_bearing.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png
index 7af3789ff0..7af3789ff0 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xhdpi/my_location_stale.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png
index 0a04d4eaad..0a04d4eaad 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_normal.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png
index faaef0625d..faaef0625d 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/attribution_button_pressed.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png
index 6f175df168..6f175df168 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png
index f4bb454a06..f4bb454a06 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_bearing.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png
index f1d2f2eca0..f1d2f2eca0 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxhdpi/my_location_stale.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png
index bcee96deaa..bcee96deaa 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_normal.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_normal.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png
index 781263f760..781263f760 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/ic_info_blue_pressed.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/attribution_button_pressed.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png
index d43541ac3c..d43541ac3c 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png
index a8cccbb3e2..a8cccbb3e2 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_bearing.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_bearing.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png
index 33e952391f..33e952391f 100755
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/user_location_stale.png
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable-xxxhdpi/my_location_stale.png
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml
new file mode 100644
index 0000000000..b5fedb0fd0
--- /dev/null
+++ b/android/MapboxGLAndroidSDK/src/main/res/drawable/attribution_button_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/attribution_button_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/attribution_button_normal" />
+</selector>
\ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
deleted file mode 100644
index 9f550f66d5..0000000000
--- a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_info_blue_pressed" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_info_blue_normal" />
-</selector>
\ No newline at end of file
diff --git a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
index c4eaecc079..92cd2315f4 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/layout/mapview_internal.xml
@@ -26,7 +26,7 @@
         android:clickable="true"
         android:contentDescription="@string/attributionsIconContentDescription"
         android:padding="7dp"
-        android:src="@drawable/ic_info_selector" />
+        android:src="@drawable/attribution_button_selector" />
 
     <com.mapbox.mapboxsdk.views.UserLocationView
         android:id="@+id/userLocationView"
diff --git a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
index bb1c326a89..55cf3fb1b6 100644
--- a/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
+++ b/android/MapboxGLAndroidSDK/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="mapbox_blue">#1E8CAB</color>
+    <color name="my_location_ring">@color/mapbox_blue</color>
 </resources>