[android] Allow apps to override map resources

Fixes #2858
mapbox · Oct 29, 2015 · 665fdc0 · tobrun · Oct 29, 2015 · 665fdc0
1 parent dd56e83
commit 665fdc0
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 10 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
@@ -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 @@ private void initialize(Context context) {
 
         // Setup the custom paint
         Resources resources = context.getResources();
+        int accuracyColor = resources.getColor(R.color.user_location_ring);
+
         mDensity = resources.getDisplayMetrics().density;
         mMarkerCoordinate = new LatLng(0.0, 0.0);
         mMarkerScreenPoint = new PointF();
@@ -145,14 +145,14 @@ private void initialize(Context context) {
         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();

diff --git 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="user_location" type="drawable" />
+    <public name="user_location_bearing" type="drawable" />
+    <public name="user_location_stale" type="drawable" />
+    <public name="user_location_ring" type="color" />
+    <public name="mapbox_blue" type="color" />
 </resources>
diff --git a/...res/drawable-hdpi/ic_info_blue_normal.png → ...awable-hdpi/attribution_button_normal.png b/...res/drawable-hdpi/ic_info_blue_normal.png → ...awable-hdpi/attribution_button_normal.png
diff --git a/...es/drawable-hdpi/ic_info_blue_pressed.png → ...wable-hdpi/attribution_button_pressed.png b/...es/drawable-hdpi/ic_info_blue_pressed.png → ...wable-hdpi/attribution_button_pressed.png
diff --git a/...res/drawable-mdpi/ic_info_blue_normal.png → ...awable-mdpi/attribution_button_normal.png b/...res/drawable-mdpi/ic_info_blue_normal.png → ...awable-mdpi/attribution_button_normal.png
diff --git a/...es/drawable-mdpi/ic_info_blue_pressed.png → ...wable-mdpi/attribution_button_pressed.png b/...es/drawable-mdpi/ic_info_blue_pressed.png → ...wable-mdpi/attribution_button_pressed.png
diff --git a/...es/drawable-xhdpi/ic_info_blue_normal.png → ...wable-xhdpi/attribution_button_normal.png b/...es/drawable-xhdpi/ic_info_blue_normal.png → ...wable-xhdpi/attribution_button_normal.png
diff --git a/...s/drawable-xhdpi/ic_info_blue_pressed.png → ...able-xhdpi/attribution_button_pressed.png b/...s/drawable-xhdpi/ic_info_blue_pressed.png → ...able-xhdpi/attribution_button_pressed.png
diff --git a/...s/drawable-xxhdpi/ic_info_blue_normal.png → ...able-xxhdpi/attribution_button_normal.png b/...s/drawable-xxhdpi/ic_info_blue_normal.png → ...able-xxhdpi/attribution_button_normal.png
diff --git a/.../drawable-xxhdpi/ic_info_blue_pressed.png → ...ble-xxhdpi/attribution_button_pressed.png b/.../drawable-xxhdpi/ic_info_blue_pressed.png → ...ble-xxhdpi/attribution_button_pressed.png
diff --git a/.../drawable-xxxhdpi/ic_info_blue_normal.png → ...ble-xxxhdpi/attribution_button_normal.png b/.../drawable-xxxhdpi/ic_info_blue_normal.png → ...ble-xxxhdpi/attribution_button_normal.png
diff --git a/...drawable-xxxhdpi/ic_info_blue_pressed.png → ...le-xxxhdpi/attribution_button_pressed.png b/...drawable-xxxhdpi/ic_info_blue_pressed.png → ...le-xxxhdpi/attribution_button_pressed.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
@@ -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>
diff --git a/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml b/android/MapboxGLAndroidSDK/src/main/res/drawable/ic_info_selector.xml
diff --git 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
@@ -3,4 +3,5 @@
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="mapbox_blue">#1E8CAB</color>
+    <color name="user_location_ring">@color/mapbox_blue</color>
 </resources>