Remove MapboxCarApp

Author: kmadsen

libnavui-androidauto/CHANGELOG.md

@@ -11,6 +11,8 @@ Mapbox welcomes participation and contributions from everyone.
 - Removed options from the `MapboxCarContext` constructor so that it can be compatible with future changes. [#6478](https://github.com/mapbox/mapbox-navigation-android/pull/6478)
 - Deleted `RoutePreviewCarContext` in favor of `MapboxCarContext`. [#6478](https://github.com/mapbox/mapbox-navigation-android/pull/6478)
 - Renamed `CarSettingsStorage` to `MapboxCarStorage`. [#6478](https://github.com/mapbox/mapbox-navigation-android/pull/6478)
+- Renamed `CarAppLocation` to `CarLocationProvider` with a `getRegisteredInstance` accessor.
+- Removed `MapboxCarApp` as it is no longer needed. Use `CarLocationProvider.getRegisteredInstance()` if needed.
 
 ## androidauto-v0.14.0 - October 13, 2022
 ### Changelog

libnavui-androidauto/api/current.txt

@@ -1,12 +1,6 @@
 // Signature format: 3.0
 package com.mapbox.androidauto {
 
-  public final class MapboxCarApp {
-    method public com.mapbox.androidauto.navigation.location.CarAppLocation carAppLocationService();
-    method @UiThread public void setup();
-    field public static final com.mapbox.androidauto.MapboxCarApp INSTANCE;
-  }
-
   public final class MapboxCarNavigationManager implements com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
     method public kotlinx.coroutines.flow.StateFlow<java.lang.Boolean> getAutoDriveEnabledFlow();
     method public void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
@@ -216,6 +210,22 @@ package com.mapbox.androidauto.car.feedback.ui {
 
 package com.mapbox.androidauto.car.location {
 
+  public final class CarLocationProvider implements com.mapbox.maps.plugin.locationcomponent.LocationProvider com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
+    method public com.mapbox.navigation.ui.maps.location.NavigationLocationProvider getNavigationLocationProvider();
+    method public static com.mapbox.androidauto.car.location.CarLocationProvider getRegisteredInstance();
+    method public void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
+    method public void onDetached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
+    method public void registerLocationConsumer(com.mapbox.maps.plugin.locationcomponent.LocationConsumer locationConsumer);
+    method public void unRegisterLocationConsumer(com.mapbox.maps.plugin.locationcomponent.LocationConsumer locationConsumer);
+    method public suspend Object? validLocation(kotlin.coroutines.Continuation<? super android.location.Location>);
+    property public final com.mapbox.navigation.ui.maps.location.NavigationLocationProvider navigationLocationProvider;
+    field public static final com.mapbox.androidauto.car.location.CarLocationProvider.Companion Companion;
+  }
+
+  public static final class CarLocationProvider.Companion {
+    method public com.mapbox.androidauto.car.location.CarLocationProvider getRegisteredInstance();
+  }
+
   public final class CarLocationPuck {
     method public com.mapbox.maps.plugin.LocationPuck2D navigationPuck2D(android.content.Context context);
     field public static final com.mapbox.androidauto.car.location.CarLocationPuck INSTANCE;
@@ -712,16 +722,6 @@ package com.mapbox.androidauto.navigation.audioguidance {
 
 }
 
-package com.mapbox.androidauto.navigation.location {
-
-  public interface CarAppLocation extends com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
-    method public com.mapbox.navigation.ui.maps.location.NavigationLocationProvider getNavigationLocationProvider();
-    method public suspend Object? validLocation(kotlin.coroutines.Continuation<? super android.location.Location>);
-    property public abstract com.mapbox.navigation.ui.maps.location.NavigationLocationProvider navigationLocationProvider;
-  }
-
-}
-
 package com.mapbox.androidauto.notification {
 
   public final class MapboxCarNotification implements com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {

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

@@ -1,10 +1,12 @@
-package com.mapbox.androidauto.navigation.location.impl
+package com.mapbox.androidauto.car.location
 
 import android.location.Location
 import com.mapbox.androidauto.internal.logAndroidAuto
-import com.mapbox.androidauto.navigation.location.CarAppLocation
-import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
+import com.mapbox.maps.plugin.locationcomponent.LocationConsumer
+import com.mapbox.maps.plugin.locationcomponent.LocationProvider
 import com.mapbox.navigation.core.MapboxNavigation
+import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
+import com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver
 import com.mapbox.navigation.core.trip.session.LocationMatcherResult
 import com.mapbox.navigation.core.trip.session.LocationObserver
 import com.mapbox.navigation.ui.maps.location.NavigationLocationProvider
@@ -13,13 +15,17 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.withContext
 
-@ExperimentalPreviewMapboxNavigationAPI
-internal class CarAppLocationImpl : CarAppLocation {
+/**
+ * Automatically attaches and detaches from [MapboxNavigationApp] to provide map matched locations.
+ */
+class CarLocationProvider private constructor() : MapboxNavigationObserver, LocationProvider {
 
-    override val navigationLocationProvider = NavigationLocationProvider()
+    /**
+     * Access the [NavigationLocationProvider] directly.
+     */
+    val navigationLocationProvider = NavigationLocationProvider()
 
     private val locationObserver = object : LocationObserver {
-
         override fun onNewLocationMatcherResult(locationMatcherResult: LocationMatcherResult) {
             navigationLocationProvider.changePosition(
                 locationMatcherResult.enhancedLocation,
@@ -33,16 +39,22 @@ internal class CarAppLocationImpl : CarAppLocation {
     }
 
     override fun onAttached(mapboxNavigation: MapboxNavigation) {
-        logAndroidAuto("CarAppLocationImpl onAttached")
         mapboxNavigation.registerLocationObserver(locationObserver)
     }
 
     override fun onDetached(mapboxNavigation: MapboxNavigation) {
-        logAndroidAuto("CarAppLocationImpl onDetached")
         mapboxNavigation.unregisterLocationObserver(locationObserver)
     }
 
-    override suspend fun validLocation(): Location? = withContext(Dispatchers.Unconfined) {
+    override fun registerLocationConsumer(locationConsumer: LocationConsumer) {
+        navigationLocationProvider.registerLocationConsumer(locationConsumer)
+    }
+
+    override fun unRegisterLocationConsumer(locationConsumer: LocationConsumer) {
+        navigationLocationProvider.unRegisterLocationConsumer(locationConsumer)
+    }
+
+    suspend fun validLocation(): Location? = withContext(Dispatchers.Unconfined) {
         var location: Location? = navigationLocationProvider.lastLocation
         while (isActive && location == null) {
             delay(DELAY_MILLISECONDS)
@@ -53,6 +65,14 @@ internal class CarAppLocationImpl : CarAppLocation {
     }
 
     companion object {
-        const val DELAY_MILLISECONDS = 100L
+        private const val DELAY_MILLISECONDS = 100L
+
+        /**
+         * Get the registered instance or create one and register it to [MapboxNavigationApp].
+         */
+        @JvmStatic
+        fun getRegisteredInstance(): CarLocationProvider = MapboxNavigationApp
+            .getObservers(CarLocationProvider::class).firstOrNull()
+            ?: CarLocationProvider().also { MapboxNavigationApp.registerObserver(it) }
     }
 }

…tion/location/impl/CarAppLocationImpl.kt …auto/car/location/CarLocationProvider.ktlibnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/location/impl/CarAppLocationImpl.kt renamed to libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/location/CarLocationProvider.kt libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/location/impl/CarAppLocationImpl.kt renamed to libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/location/CarLocationProvider.kt

@@ -1,6 +1,5 @@
 package com.mapbox.androidauto.car.location
 
-import com.mapbox.androidauto.MapboxCarApp
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.maps.MapboxExperimental
 import com.mapbox.maps.extension.androidauto.MapboxCarMapObserver
@@ -20,7 +19,7 @@ class CarLocationRenderer : MapboxCarMapObserver {
             locationPuck = CarLocationPuck.navigationPuck2D(mapboxCarMapSurface.carContext)
             enabled = true
             pulsingEnabled = true
-            setLocationProvider(MapboxCarApp.carAppLocationService().navigationLocationProvider)
+            setLocationProvider(CarLocationProvider.getRegisteredInstance())
         }
     }
 }

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/location/CarLocationRenderer.kt

@@ -1,12 +1,12 @@
 package com.mapbox.androidauto.car.placeslistonmap
 
 import androidx.car.app.model.ItemList
+import com.mapbox.androidauto.car.location.CarLocationProvider
 import com.mapbox.androidauto.car.search.PlaceRecord
 import com.mapbox.androidauto.internal.car.extensions.handleStyleOnAttached
 import com.mapbox.androidauto.internal.car.extensions.handleStyleOnDetached
 import com.mapbox.androidauto.internal.car.extensions.mapboxNavigationForward
 import com.mapbox.androidauto.internal.logAndroidAuto
-import com.mapbox.androidauto.navigation.location.CarAppLocation
 import com.mapbox.geojson.Feature
 import com.mapbox.geojson.FeatureCollection
 import com.mapbox.geojson.Point
@@ -52,8 +52,8 @@ class PlacesListOnMapManager(
     }
 
     fun currentItemList(): ItemList? {
-        val carAppLocation = MapboxNavigationApp.getObserver(CarAppLocation::class)
-        val currentLocation = carAppLocation.navigationLocationProvider.lastLocation
+        val carLocationProvider = CarLocationProvider.getRegisteredInstance()
+        val currentLocation = carLocationProvider.navigationLocationProvider.lastLocation
             ?: return null
         return placesListItemMapper?.mapToItemList(
             currentLocation,

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/placeslistonmap/PlacesListOnMapManager.kt

@@ -2,10 +2,10 @@ package com.mapbox.androidauto.car.preview
 
 import androidx.annotation.UiThread
 import com.mapbox.androidauto.car.MapboxCarOptions
+import com.mapbox.androidauto.car.location.CarLocationProvider
 import com.mapbox.androidauto.car.search.PlaceRecord
 import com.mapbox.androidauto.internal.logAndroidAuto
 import com.mapbox.androidauto.internal.logAndroidAutoFailure
-import com.mapbox.androidauto.navigation.location.CarAppLocation
 import com.mapbox.api.directions.v5.DirectionsCriteria
 import com.mapbox.api.directions.v5.models.RouteOptions
 import com.mapbox.geojson.Point
@@ -17,7 +17,6 @@ import com.mapbox.navigation.base.route.RouterCallback
 import com.mapbox.navigation.base.route.RouterFailure
 import com.mapbox.navigation.base.route.RouterOrigin
 import com.mapbox.navigation.core.MapboxNavigation
-import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver
 
 /**
@@ -66,8 +65,8 @@ class CarRoutePreviewRequest internal constructor(
         }
         cancelRequest()
 
-        val carAppLocation = MapboxNavigationApp.getObserver(CarAppLocation::class)
-        val location = carAppLocation.navigationLocationProvider.lastLocation
+        val carLocationProvider = CarLocationProvider.getRegisteredInstance()
+        val location = carLocationProvider.navigationLocationProvider.lastLocation
         if (location == null) {
             logAndroidAutoFailure("CarRoutePreview.onUnknownCurrentLocation")
             callback.onUnknownCurrentLocation()

libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/preview/CarRoutePreviewRequest.kt

@@ -1,6 +1,6 @@
 package com.mapbox.androidauto.deeplink
 
-import com.mapbox.androidauto.MapboxCarApp
+import com.mapbox.androidauto.car.location.CarLocationProvider
 import com.mapbox.androidauto.car.placeslistonmap.PlacesListOnMapProvider
 import com.mapbox.androidauto.car.search.GetPlacesError
 import com.mapbox.androidauto.car.search.PlaceRecord
@@ -17,7 +17,7 @@ internal class GeoDeeplinkPlacesListOnMapProvider(
 
     override suspend fun getPlaces(): Expected<GetPlacesError, List<PlaceRecord>> {
         // Wait for an origin location
-        val origin = MapboxCarApp.carAppLocationService().validLocation()
+        val origin = CarLocationProvider.getRegisteredInstance().validLocation()
             ?.run { Point.fromLngLat(longitude, latitude) }
             ?: return ExpectedFactory.createError(
                 GetPlacesError("Did not find current location.", null)

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

@@ -1,37 +1,35 @@
 package com.mapbox.androidauto.car.preview
 
 import com.mapbox.androidauto.car.MapboxCarOptions
-import com.mapbox.androidauto.navigation.location.CarAppLocation
-import com.mapbox.androidauto.testing.CarAppTestRule
+import com.mapbox.androidauto.car.location.CarLocationProvider
 import com.mapbox.api.directions.v5.models.RouteOptions
 import com.mapbox.geojson.Point
 import com.mapbox.navigation.base.formatter.UnitType
 import com.mapbox.navigation.base.route.NavigationRoute
 import com.mapbox.navigation.base.route.NavigationRouterCallback
 import com.mapbox.navigation.core.MapboxNavigation
-import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.testing.LoggingFrontendTestRule
 import com.mapbox.navigation.ui.maps.location.NavigationLocationProvider
 import io.mockk.CapturingSlot
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
 import io.mockk.verify
+import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import java.util.Locale
 
-class CarRouteRequestTest {
+class CarRoutePreviewRequestTest {
 
     @get:Rule
     val loggerRule = LoggingFrontendTestRule()
 
-    @get:Rule
-    val carAppTestRule = CarAppTestRule()
-
     private val routeOptionsSlot = CapturingSlot<RouteOptions>()
     private val routerCallbackSlot = CapturingSlot<NavigationRouterCallback>()
     private val options: MapboxCarOptions = mockk {
@@ -59,11 +57,17 @@ class CarRouteRequestTest {
 
     @Before
     fun setup() {
-        every { MapboxNavigationApp.getObserver(CarAppLocation::class) } returns mockk {
+        mockkObject(CarLocationProvider)
+        every { CarLocationProvider.getRegisteredInstance() } returns mockk {
             every { navigationLocationProvider } returns locationProvider
         }
     }
 
+    @After
+    fun teardown() {
+        unmockkAll()
+    }
+
     private val carRouteRequest = CarRoutePreviewRequest(options)
 
     @Test