Allow setting of custom destination marker in theme (#763)

mapbox · Mar 16, 2018 · 42018cc · 42018cc
1 parent 7d92ea0
commit 42018cc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...vigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java b/...vigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/ThemeSwitcher.java
@@ -90,10 +90,10 @@ static void setMapStyle(Context context, MapboxMap map, MapboxMap.OnStyleLoadedL
    * @return {@link Icon} map marker dark or light
    */
   static Icon retrieveMapMarker(Context context) {
-    SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-    boolean darkThemeEnabled = preferences.getBoolean(context.getString(R.string.dark_theme_enabled), false);
+    TypedValue destinationMarkerResId = obtainTypedValue(context, R.attr.navigationViewDestinationMarker);
+    int markerResId = destinationMarkerResId.resourceId;
     IconFactory iconFactory = IconFactory.getInstance(context);
-    return iconFactory.fromResource(darkThemeEnabled ? R.drawable.map_marker_dark : R.drawable.map_marker_light);
+    return iconFactory.fromResource(markerResId);
   }
 
   /**

diff --git a/libandroid-navigation-ui/src/main/res/values/attrs.xml b/libandroid-navigation-ui/src/main/res/values/attrs.xml
@@ -54,6 +54,9 @@
     <!-- Location layer style -->
     <attr name="navigationViewLocationLayerStyle" format="reference"/>
 
+    <!-- Destination marker drawable -->
+    <attr name="navigationViewDestinationMarker" format="reference"/>
+
     <!-- For setting the styles in XML -->
     <attr name="navigationLightTheme" format="reference"/>
     <attr name="navigationDarkTheme" format="reference"/>

diff --git a/libandroid-navigation-ui/src/main/res/values/styles.xml b/libandroid-navigation-ui/src/main/res/values/styles.xml
@@ -34,6 +34,8 @@
 
         <item name="navigationViewLocationLayerStyle">@style/mapbox_LocationLayer</item>
 
+        <item name="navigationViewDestinationMarker">@drawable/map_marker_light</item>
+
         <item name="navigationViewMapStyle">@string/navigation_guidance_day_v2</item>
     </style>
 
@@ -59,6 +61,8 @@
 
         <item name="navigationViewLocationLayerStyle">@style/mapbox_LocationLayer</item>
 
+        <item name="navigationViewDestinationMarker">@drawable/map_marker_dark</item>
+
         <item name="navigationViewMapStyle">@string/navigation_guidance_night_v2</item>
     </style>