Add getStyleExtension to the MapboxCarMapLoader (#6571)

Author: kmadsen

libnavui-androidauto/CHANGELOG.md

@@ -5,6 +5,7 @@ Mapbox welcomes participation and contributions from everyone.
 ## Unreleased
 #### Features
 #### Bug fixes and improvements
+- Added `MapboxCarMapLoader.getStyleExtension` to get access to the values set. [#6571](https://github.com/mapbox/mapbox-navigation-android/pull/6571)
 
 ## androidauto-v0.16.0 - 04 November, 2022
 ### Changelog

libnavui-androidauto/api/current.txt

@@ -253,6 +253,7 @@ package com.mapbox.androidauto.map {
 
   public final class MapboxCarMapLoader implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
     ctor public MapboxCarMapLoader();
+    method public com.mapbox.maps.extension.style.StyleContract.StyleExtension getStyleExtension(boolean isDarkMode);
     method public com.mapbox.androidauto.map.MapboxCarMapLoader onCarConfigurationChanged(androidx.car.app.CarContext carContext);
     method public com.mapbox.androidauto.map.MapboxCarMapLoader setDarkStyleOverride(com.mapbox.maps.extension.style.StyleContract.StyleExtension? styleContract);
     method public com.mapbox.androidauto.map.MapboxCarMapLoader setLightStyleOverride(com.mapbox.maps.extension.style.StyleContract.StyleExtension? styleContract);

libnavui-androidauto/src/main/java/com/mapbox/androidauto/map/MapboxCarMapLoader.kt

@@ -46,7 +46,7 @@ class MapboxCarMapLoader : MapboxCarMapObserver {
         with(mapboxCarMapSurface) {
             logAndroidAuto("onAttached load style")
             mapSurface.getMapboxMap().loadStyle(
-                mapStyle(carContext.isDarkMode),
+                getStyleExtension(carContext.isDarkMode),
                 onStyleLoaded = { style ->
                     logAndroidAuto("onAttached style loaded")
                     style.addPersistentStyleCustomLayer(
@@ -65,6 +65,17 @@ class MapboxCarMapLoader : MapboxCarMapObserver {
         mapboxMap = null
     }
 
+    /**
+     * Returns the current style contract. If an override has not been set the default is returned.
+     */
+    fun getStyleExtension(isDarkMode: Boolean): StyleContract.StyleExtension {
+        return if (isDarkMode) {
+            darkStyleOverride ?: DEFAULT_NIGHT_STYLE
+        } else {
+            lightStyleOverride ?: DEFAULT_DAY_STYLE
+        }
+    }
+
     /**
      * Set the map style to apply when [CarContext.isDarkMode] is false. Setting to `null` will use
      * a default map style.
@@ -96,7 +107,7 @@ class MapboxCarMapLoader : MapboxCarMapObserver {
      */
     fun onCarConfigurationChanged(carContext: CarContext) = apply {
         mapboxMap?.loadStyle(
-            mapStyle(carContext.isDarkMode),
+            getStyleExtension(carContext.isDarkMode),
             onStyleLoaded = { style ->
                 logAndroidAuto("updateMapStyle styleAvailable ${style.styleURI}")
             },
@@ -106,14 +117,6 @@ class MapboxCarMapLoader : MapboxCarMapObserver {
         )
     }
 
-    private fun mapStyle(isDarkMode: Boolean): StyleContract.StyleExtension {
-        return if (isDarkMode) {
-            darkStyleOverride ?: DEFAULT_NIGHT_STYLE
-        } else {
-            lightStyleOverride ?: DEFAULT_DAY_STYLE
-        }
-    }
-
     private companion object {
         private val DEFAULT_DAY_STYLE = style(NavigationStyles.NAVIGATION_DAY_STYLE) { }
         private val DEFAULT_NIGHT_STYLE = style(NavigationStyles.NAVIGATION_NIGHT_STYLE) { }

libnavui-androidauto/src/test/java/com/mapbox/androidauto/map/MapboxCarMapLoaderTest.kt

@@ -87,6 +87,33 @@ class MapboxCarMapLoaderTest {
         assertEquals("test-dark-override", styleExtensionSlot.captured.styleUri)
     }
 
+    @Test
+    fun `getStyleExtension will return the default styles`() {
+        assertEquals(
+            NavigationStyles.NAVIGATION_DAY_STYLE,
+            sut.getStyleExtension(false).styleUri
+        )
+        assertEquals(
+            NavigationStyles.NAVIGATION_NIGHT_STYLE,
+            sut.getStyleExtension(true).styleUri
+        )
+    }
+
+    @Test
+    fun `getStyleExtension will return the overridden styles`() {
+        sut.setLightStyleOverride(mockk { every { styleUri } returns "test-light-override" })
+        sut.setDarkStyleOverride(mockk { every { styleUri } returns "test-dark-override" })
+
+        assertEquals(
+            "test-light-override",
+            sut.getStyleExtension(false).styleUri
+        )
+        assertEquals(
+            "test-dark-override",
+            sut.getStyleExtension(true).styleUri
+        )
+    }
+
     private fun mockMapboxCarMapSurface(
         styleExtensionSlot: CapturingSlot<StyleContract.StyleExtension>
     ): MapboxCarMapSurface {