Bump maps version and remove experimental annotation

android-auto-app/src/main/java/com/mapbox/navigation/examples/androidauto/car/MainCarSession.kt

@@ -14,13 +14,12 @@ import com.mapbox.android.core.permissions.PermissionsManager
 import com.mapbox.androidauto.MapboxCarContext
 import com.mapbox.androidauto.deeplink.GeoDeeplinkNavigateAction
 import com.mapbox.androidauto.map.MapboxCarMapLoader
-import com.mapbox.androidauto.map.compass.CarCompassSurfaceRenderer
-import com.mapbox.androidauto.map.logo.CarLogoSurfaceRenderer
+import com.mapbox.androidauto.map.compass.CarCompassRenderer
+import com.mapbox.androidauto.map.logo.CarLogoRenderer
 import com.mapbox.androidauto.screenmanager.MapboxScreen
 import com.mapbox.androidauto.screenmanager.MapboxScreenManager
 import com.mapbox.androidauto.screenmanager.prepareScreens
 import com.mapbox.maps.MapInitOptions
-import com.mapbox.maps.MapboxExperimental
 import com.mapbox.maps.extension.androidauto.MapboxCarMap
 import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
@@ -31,13 +30,11 @@ import com.mapbox.navigation.examples.androidauto.ReplayRouteTripSession
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
-@OptIn(MapboxExperimental::class)
 class MainCarSession : Session() {
 
     private val mapboxCarMapLoader = MapboxCarMapLoader()
     private val mapboxCarMap = MapboxCarMap().registerObserver(mapboxCarMapLoader)
     private val mapboxCarContext = MapboxCarContext(lifecycle, mapboxCarMap).prepareScreens()
-
     private val mapboxNavigation by requireMapboxNavigation()
 
     init {
@@ -46,8 +43,8 @@ class MainCarSession : Session() {
         CarAppSyncComponent.getInstance().setCarSession(this)
 
         // Add BitmapWidgets to the map that will be shown whenever the map is visible.
-        val logoSurfaceRenderer = CarLogoSurfaceRenderer()
-        val compassSurfaceRenderer = CarCompassSurfaceRenderer()
+        val logoSurfaceRenderer = CarLogoRenderer()
+        val compassSurfaceRenderer = CarCompassRenderer()
         lifecycle.addObserver(object : DefaultLifecycleObserver {
             override fun onCreate(owner: LifecycleOwner) {
                 // You must give the MapboxCarMap an instance of the carContext.
@@ -83,6 +80,7 @@ class MainCarSession : Session() {
 
     // Handle the geo deeplink for voice activated navigation. This will handle the case when
     // you ask the head unit to "Navigate to coffee shop".
+    @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         if (PermissionsManager.areLocationPermissionsGranted(carContext)) {

gradle/dependencies.gradle

@@ -27,7 +27,7 @@ ext {
       mapboxCrashMonitor        : '2.0.0',
       mapboxAnnotationPlugin    : '0.8.0',
       mapboxBaseAndroid         : '0.8.0',
-      mapboxMapsAndroidAuto     : '0.3.0',
+      mapboxMapsAndroidAuto     : '0.4.0',
       androidXLifecycle         : '2.4.0',
       androidXCoreVersion       : '1.6.0',
       androidXArchCoreVersion   : '2.1.0',

libnavui-androidauto/CHANGELOG.md

@@ -5,6 +5,15 @@ Mapbox welcomes participation and contributions from everyone.
 ## Unreleased
 #### Features
 #### Bug fixes and improvements
+- Removed `@MapboxExperimental` from `MapboxCarMapObserver` implementations. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `CarCompassSurfaceRenderer` to `CarCompassRenderer`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `CarLogoSurfaceRenderer` to `CarLogoRenderer`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `RoadLabelSurfaceLayer` to `CarRoadLabelRenderer`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `CarRouteLine` to `CarRouteLineRenderer`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `RoadLabelOptions` to `CarRoadLabelOptions`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Renamed `RoadLabelRenderer` to `CarRoadLabelRenderer`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Made `ActiveGuidanceScreen` internal in favor of `MapboxScreen.ACTIVE_GUIDANCE`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
+- Made `NeedsLocationPermissionsScreen` internal in favor of `MapboxScreen.NEEDS_LOCATION_PERMISSION`. [#6588](https://github.com/mapbox/mapbox-navigation-android/pull/6588)
 
 ## androidauto-v0.16.0 - 04 November, 2022
 ### Changelog

libnavui-androidauto/api/current.txt

@@ -87,7 +87,7 @@ package com.mapbox.androidauto.deeplink {
     property public final com.mapbox.api.geocoding.v5.MapboxGeocoding? currentMapboxGeocoding;
   }
 
-  public final class GeoDeeplinkNavigateAction {
+  @com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI public final class GeoDeeplinkNavigateAction {
     ctor public GeoDeeplinkNavigateAction(com.mapbox.androidauto.MapboxCarContext mapboxCarContext);
     method public com.mapbox.androidauto.MapboxCarContext getMapboxCarContext();
     method public boolean onNewIntent(android.content.Intent intent);
@@ -206,19 +206,6 @@ package com.mapbox.androidauto.freedrive {
     method public androidx.car.app.model.ActionStrip.Builder builder();
   }
 
-  public final class FreeDriveCarScreen extends androidx.car.app.Screen {
-    ctor @UiThread public FreeDriveCarScreen(com.mapbox.androidauto.MapboxCarContext mapboxCarContext);
-    method public com.mapbox.androidauto.location.CarLocationRenderer getCarLocationRenderer();
-    method public com.mapbox.androidauto.navigation.CarNavigationCamera getCarNavigationCamera();
-    method public com.mapbox.androidauto.preview.CarRouteLine getCarRouteLine();
-    method public com.mapbox.androidauto.navigation.speedlimit.CarSpeedLimitRenderer getCarSpeedLimitRenderer();
-    method public androidx.car.app.model.Template onGetTemplate();
-    property public final com.mapbox.androidauto.location.CarLocationRenderer carLocationRenderer;
-    property public final com.mapbox.androidauto.navigation.CarNavigationCamera carNavigationCamera;
-    property public final com.mapbox.androidauto.preview.CarRouteLine carRouteLine;
-    property public final com.mapbox.androidauto.navigation.speedlimit.CarSpeedLimitRenderer carSpeedLimitRenderer;
-  }
-
 }
 
 package com.mapbox.androidauto.location {
@@ -262,16 +249,16 @@ package com.mapbox.androidauto.map {
 
 package com.mapbox.androidauto.map.compass {
 
-  public final class CarCompassSurfaceRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
-    ctor public CarCompassSurfaceRenderer();
+  public final class CarCompassRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+    ctor public CarCompassRenderer();
   }
 
 }
 
 package com.mapbox.androidauto.map.logo {
 
-  public final class CarLogoSurfaceRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
-    ctor public CarLogoSurfaceRenderer();
+  public final class CarLogoRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+    ctor public CarLogoRenderer();
   }
 
 }
@@ -340,7 +327,7 @@ package com.mapbox.androidauto.navigation {
     method public androidx.car.app.navigation.model.NavigationTemplate.NavigationInfo? mapNavigationInfo(com.mapbox.bindgen.Expected<com.mapbox.navigation.ui.maneuver.model.ManeuverError,java.util.List<com.mapbox.navigation.ui.maneuver.model.Maneuver>> expectedManeuvers, java.util.List<? extends com.mapbox.navigation.ui.shield.model.RouteShield> routeShields, com.mapbox.navigation.base.trip.model.RouteProgress routeProgress);
   }
 
-  @com.mapbox.maps.MapboxExperimental public final class CarNavigationInfoProvider implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+  public final class CarNavigationInfoProvider implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
     ctor public CarNavigationInfoProvider();
     method public kotlinx.coroutines.flow.StateFlow<com.mapbox.androidauto.navigation.CarNavigationInfo> getCarNavigationInfo();
     method public com.mapbox.androidauto.navigation.CarNavigationInfoProvider invalidateOnChange(androidx.car.app.Screen screen);
@@ -471,53 +458,35 @@ package com.mapbox.androidauto.navigation.maneuver {
 
 package com.mapbox.androidauto.navigation.roadlabel {
 
-  public final class RoadLabelOptions {
+  public final class CarRoadLabelOptions {
     method public int getBackgroundColor();
     method public int getRoundedLabelColor();
     method public Integer? getShadowColor();
     method public int getTextColor();
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Builder toBuilder();
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Builder toBuilder();
     property public final int backgroundColor;
     property public final int roundedLabelColor;
     property public final Integer? shadowColor;
     property public final int textColor;
-    field public static final com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Companion Companion;
-  }
-
-  public static final class RoadLabelOptions.Builder {
-    ctor public RoadLabelOptions.Builder();
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Builder backgroundColor(@ColorInt int backgroundColor);
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions build();
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Builder roundedLabelColor(@ColorInt int roundedLabelColor);
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Builder shadowColor(@ColorInt Integer? shadowColor);
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions.Builder textColor(@ColorInt int textColor);
+    field public static final com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Companion Companion;
   }
 
-  public static final class RoadLabelOptions.Companion {
-    method public com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions getDefault();
-    property public final com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions default;
+  public static final class CarRoadLabelOptions.Builder {
+    ctor public CarRoadLabelOptions.Builder();
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Builder backgroundColor(@ColorInt int backgroundColor);
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions build();
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Builder roundedLabelColor(@ColorInt int roundedLabelColor);
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Builder shadowColor(@ColorInt Integer? shadowColor);
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions.Builder textColor(@ColorInt int textColor);
   }
 
-  public final class RoadLabelRenderer {
-    ctor public RoadLabelRenderer();
-    method public android.graphics.Bitmap? render(android.content.res.Resources resources, java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> road, java.util.List<? extends com.mapbox.navigation.ui.shield.model.RouteShield> shields, com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions options = RoadLabelOptions.default);
+  public static final class CarRoadLabelOptions.Companion {
+    method public com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions getDefault();
+    property public final com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions default;
   }
 
-  public final class RoadLabelSurfaceLayer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
-    ctor public RoadLabelSurfaceLayer();
-  }
-
-  public abstract class RoadNameObserver implements com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
-    ctor public RoadNameObserver(com.mapbox.navigation.ui.shield.api.MapboxRouteShieldApi routeShieldApi, com.mapbox.androidauto.navigation.MapUserStyleObserver mapUserStyleObserver);
-    method public final java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> getCurrentRoad();
-    method public final java.util.List<com.mapbox.navigation.ui.shield.model.RouteShield> getCurrentShields();
-    method public final void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
-    method public final void onDetached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
-    method public abstract void onRoadUpdate(java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> road, java.util.List<? extends com.mapbox.navigation.ui.shield.model.RouteShield> shields);
-    method public final void setCurrentRoad(java.util.List<com.mapbox.navigation.base.road.model.RoadComponent>);
-    method public final void setCurrentShields(java.util.List<? extends com.mapbox.navigation.ui.shield.model.RouteShield>);
-    property public final java.util.List<com.mapbox.navigation.base.road.model.RoadComponent> currentRoad;
-    property public final java.util.List<com.mapbox.navigation.ui.shield.model.RouteShield> currentShields;
+  public final class CarRoadLabelRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+    ctor public CarRoadLabelRenderer();
   }
 
 }
@@ -543,7 +512,7 @@ package com.mapbox.androidauto.navigation.speedlimit {
     method public com.mapbox.androidauto.navigation.speedlimit.SpeedLimitOptions.Builder warningThreshold(int warningThreshold);
   }
 
-  public final class SpeedLimitWidget extends com.mapbox.maps.renderer.widget.BitmapWidget {
+  @com.mapbox.maps.MapboxExperimental public final class SpeedLimitWidget extends com.mapbox.maps.renderer.widget.BitmapWidget {
     ctor public SpeedLimitWidget(com.mapbox.navigation.base.speed.model.SpeedLimitSign initialSignFormat = com.mapbox.navigation.base.speed.model.SpeedLimitSign.MUTCD);
     method public void update(Integer? speedLimit, int speed, com.mapbox.navigation.base.speed.model.SpeedLimitSign? signFormat, int threshold);
     method public void update(com.mapbox.navigation.base.speed.model.SpeedLimitSign? signFormat, int threshold);
@@ -572,15 +541,6 @@ package com.mapbox.androidauto.notification {
 
 }
 
-package com.mapbox.androidauto.permissions {
-
-  public final class NeedsLocationPermissionsScreen extends androidx.car.app.Screen {
-    ctor public NeedsLocationPermissionsScreen(androidx.car.app.CarContext carContext);
-    method public androidx.car.app.model.Template onGetTemplate();
-  }
-
-}
-
 package com.mapbox.androidauto.placeslistonmap {
 
   public final class PlaceMarkerRenderer {
@@ -629,8 +589,8 @@ package com.mapbox.androidauto.placeslistonmap {
 
 package com.mapbox.androidauto.preview {
 
-  public final class CarRouteLine implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
-    ctor public CarRouteLine(com.mapbox.androidauto.routes.CarRoutesProvider carRoutesProvider = com.mapbox.androidauto.routes.NavigationCarRoutesProvider());
+  public final class CarRouteLineRenderer implements com.mapbox.maps.extension.androidauto.MapboxCarMapObserver {
+    ctor public CarRouteLineRenderer(com.mapbox.androidauto.routes.CarRoutesProvider carRoutesProvider = com.mapbox.androidauto.routes.NavigationCarRoutesProvider());
   }
 
   public fun interface CarRouteOptionsInterceptor {
@@ -878,11 +838,6 @@ package com.mapbox.androidauto.search {
 
 package com.mapbox.androidauto.settings {
 
-  public final class CarSettingsScreen extends androidx.car.app.Screen {
-    ctor public CarSettingsScreen(com.mapbox.androidauto.MapboxCarContext mapboxCarContext);
-    method public androidx.car.app.model.Template onGetTemplate();
-  }
-
   public final class MapboxCarStorage {
     method public androidx.car.app.CarContext getCarContext();
     method public boolean readSharedPref(String key, boolean defaultValue);

libnavui-androidauto/src/androidTest/java/com/mapbox/androidauto/car/navigation/roadlabel/RoadLabelRendererTest.kt → libnavui-androidauto/src/androidTest/java/com/mapbox/androidauto/car/navigation/roadlabel/RoadLabelBitmapRendererTest.kt

@@ -6,8 +6,8 @@ import androidx.test.filters.SmallTest
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.GrantPermissionRule
-import com.mapbox.androidauto.navigation.roadlabel.RoadLabelOptions
-import com.mapbox.androidauto.navigation.roadlabel.RoadLabelRenderer
+import com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelBitmapRenderer
+import com.mapbox.androidauto.navigation.roadlabel.CarRoadLabelOptions
 import com.mapbox.androidauto.testing.BitmapTestUtil
 import com.mapbox.api.directions.v5.models.MapboxShield
 import com.mapbox.navigation.base.ExperimentalMapboxNavigationAPI
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith
 @ExperimentalMapboxNavigationAPI
 @RunWith(AndroidJUnit4ClassRunner::class)
 @SmallTest
-class RoadLabelRendererTest {
+class RoadLabelBitmapRendererTest {
 
     @Rule
     @JvmField
@@ -40,7 +40,7 @@ class RoadLabelRendererTest {
         "test_road_label_images"
     )
 
-    private val roadLabelBitmapRenderer = RoadLabelRenderer()
+    private val roadLabelBitmapRenderer = CarRoadLabelBitmapRenderer()
     private val resources = InstrumentationRegistry.getInstrumentation().context.resources
 
     @Test
@@ -49,7 +49,7 @@ class RoadLabelRendererTest {
             resources,
             createRoad("Pennsylvania Avenue"),
             emptyList(),
-            RoadLabelOptions.Builder()
+            CarRoadLabelOptions.Builder()
                 .backgroundColor(0x784D4DD3)
                 .build()
         )
@@ -63,7 +63,7 @@ class RoadLabelRendererTest {
             resources,
             createRoad("11th Street"),
             emptyList(),
-            RoadLabelOptions.Builder()
+            CarRoadLabelOptions.Builder()
                 .backgroundColor(0x784D4DD3)
                 .build()
         )
@@ -80,7 +80,7 @@ class RoadLabelRendererTest {
                     "uakitanatahu"
             ),
             emptyList(),
-            RoadLabelOptions.Builder()
+            CarRoadLabelOptions.Builder()
                 .backgroundColor(0x784D4DD3)
                 .build()
         )
@@ -94,7 +94,7 @@ class RoadLabelRendererTest {
             resources,
             createRoad("Eu Tong Sen Street"),
             emptyList(),
-            RoadLabelOptions.Builder()
+            CarRoadLabelOptions.Builder()
                 .shadowColor(null)
                 .roundedLabelColor(0xFF1A65CA.toInt())
                 .textColor(Color.WHITE)
@@ -124,7 +124,7 @@ class RoadLabelRendererTest {
                     mockk()
                 )
             ),
-            RoadLabelOptions.Builder()
+            CarRoadLabelOptions.Builder()
                 .backgroundColor(0x784D4DD3)
                 .build(),
         )

libnavui-androidauto/src/main/java/com/mapbox/androidauto/MapboxCarContext.kt

@@ -18,7 +18,6 @@ import com.mapbox.androidauto.notification.MapboxCarNotificationOptions
 import com.mapbox.androidauto.preview.CarRoutePreviewRequest
 import com.mapbox.androidauto.screenmanager.MapboxScreenManager
 import com.mapbox.androidauto.settings.MapboxCarStorage
-import com.mapbox.maps.MapboxExperimental
 import com.mapbox.maps.extension.androidauto.MapboxCarMap
 
 /**
@@ -30,7 +29,6 @@ import com.mapbox.maps.extension.androidauto.MapboxCarMap
  * @param lifecycle used to access the [CarContext].
  * @param mapboxCarMap controls the Mapbox car map surface.
  */
-@OptIn(MapboxExperimental::class)
 class MapboxCarContext(
     /**
      * Gives access to the [Lifecycle] that owns the [CarContext].

libnavui-androidauto/src/main/java/com/mapbox/androidauto/deeplink/GeoDeeplinkNavigateAction.kt

@@ -5,11 +5,13 @@ import com.mapbox.androidauto.MapboxCarContext
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.androidauto.screenmanager.MapboxScreen
 import com.mapbox.androidauto.screenmanager.MapboxScreenManager
+import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.core.geodeeplink.GeoDeeplink
 import com.mapbox.navigation.core.geodeeplink.GeoDeeplinkParser
 import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 
+@ExperimentalPreviewMapboxNavigationAPI
 class GeoDeeplinkNavigateAction(val mapboxCarContext: MapboxCarContext) {
     fun onNewIntent(intent: Intent): Boolean {
         val mapboxNavigation = MapboxNavigationApp.current()