Android Auto NDK 27 support

Author: DzmitryFomchyn

Makefile

@@ -176,12 +176,12 @@ ui-unit-tests-release-jacoco:
 .PHONY: publish-local
 publish-local:
 	./gradlew publishToMavenLocal
-	./gradlew publishToMavenLocal -x libnavui-androidauto:mapboxSDKRegistryUpload -PndkMajor=27
+	./gradlew publishToMavenLocal -PndkMajor=27
 
 .PHONY: upload-to-sdk-registry-snapshot
 upload-to-sdk-registry-snapshot:
 	./gradlew mapboxSDKRegistryUpload -Psnapshot=true
-	./gradlew mapboxSDKRegistryUpload -x libnavui-androidauto:mapboxSDKRegistryUpload -Psnapshot=true -PndkMajor=27
+	./gradlew mapboxSDKRegistryUpload -Psnapshot=true -PndkMajor=27
 
 .PHONY: upload-to-sdk-registry
 upload-to-sdk-registry:
@@ -199,7 +199,8 @@ publish-to-sdk-registry:
 
 .PHONY: upload-to-sdk-registry-androidauto
 upload-to-sdk-registry-androidauto:
-	./gradlew libnavui-androidauto:mapboxSDKRegistryUpload;
+	./gradlew libnavui-androidauto:mapboxSDKRegistryUpload
+	./gradlew libnavui-androidauto:mapboxSDKRegistryUpload -PndkMajor=27
 
 .PHONY: publish-to-sdk-registry-androidauto
 publish-to-sdk-registry-androidauto:

android-auto-app/build.gradle

@@ -68,12 +68,7 @@ android {
 dependencies {
     // Mapbox Navigation Android Auto SDK
     implementation project(':libnavui-androidauto')
-
-    // This example is used for development so it may depend on unstable versions.
-    // Examples based on final versions can be found in the examples repository.
-    //   https://github.com/mapbox/mapbox-navigation-android-examples
-    implementation("com.mapbox.navigation:ui-dropin:2.10.3")
-    implementation("com.mapbox.search:mapbox-search-android:1.0.0-rc.1")
+    implementation project(':libnavui-dropin')
 
     // Dependencies needed for this example.
     implementation dependenciesList.androidXCore
@@ -84,4 +79,4 @@ dependencies {
     implementation dependenciesList.androidXFragment
     implementation dependenciesList.androidXLifecycleLivedata
     implementation dependenciesList.androidXLifecycleRuntime
-}
+}

gradle/dependencies.gradle

@@ -35,8 +35,7 @@ ext {
       mapboxCrashMonitor        : '2.0.0',
       mapboxAnnotationPlugin    : '0.8.0',
       mapboxBaseAndroid         : '0.8.0',
-      mapboxMapsAndroidAuto     : '0.5.0',
-      mapboxSearchAndroidAuto   : '1.0.0-rc.1',
+      mapboxMapsAndroidAuto     : '0.6.1',
       androidXLifecycle         : "${androidXLifecycleVersion}",
       androidXCoreVersion       : '1.6.0',
       androidXArchCoreVersion   : '2.1.0',
@@ -88,8 +87,7 @@ ext {
       mapboxSdkRefreshModels    : "com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:${version.mapboxSdkServices}",
       mapboxNavigator           : "com.mapbox.navigator:mapbox-navigation-native$ndkVersionSuffix:${version.mapboxNavigator}",
       mapboxCommonNative        : "com.mapbox.common:common$ndkVersionSuffix:${version.mapboxCommonNative}",
-      mapboxMapsAndroidAuto     : "com.mapbox.extension:maps-androidauto:${version.mapboxMapsAndroidAuto}",
-      mapboxSearchAndroidAuto   : "com.mapbox.search:mapbox-search-android:${version.mapboxSearchAndroidAuto}",
+      mapboxMapsAndroidAuto     : "com.mapbox.extension:maps-androidauto$ndkVersionSuffix:${version.mapboxMapsAndroidAuto}",
 
       /**
        * explicitly define Mapbox OkHttp dependency so that we are sure it's in sync with the Common SDK version we define
@@ -227,4 +225,14 @@ ext {
       mapboxNativeDownload : "com.mapbox.gradle.plugins:native-download:${pluginVersion.mapboxNativeDownload}",
       firebaseCrashlytics  : "com.google.firebase:firebase-crashlytics-gradle:${pluginVersion.firebaseCrashlytics}"
   ]
+
+  androidAutoVersions = [
+      mapboxSearch    : '1.5.0',
+      mapboxNavigation: '2.21.0'
+  ]
+
+  androidAutoDependencies = [
+      mapboxSearch    : "com.mapbox.search:mapbox-search-android$ndkVersionSuffix:${androidAutoVersions.mapboxSearch}",
+      mapboxNavigation: "com.mapbox.navigation:android$ndkVersionSuffix:${androidAutoVersions.mapboxNavigation}"
+  ]
 }

libnavui-androidauto/build.gradle

@@ -38,13 +38,10 @@ dependencies {
     // Jetpack car library.
     api(dependenciesList.mapboxMapsAndroidAuto)
 
-    // This defines the minimum version of Navigation which is included in this SDK. To upgrade the
-    // Navigation versions, you can specify a newer version in your downstream build.gradle.
-    api("com.mapbox.navigation:android:2.10.3")
-
-    // Search is currently in beta so it is not included in this SDK. The functionality of search
-    // is included behind this library's api.
-    implementation(dependenciesList.mapboxSearchAndroidAuto)
+    // This defines the minimum version of Navigation and Search that are included in this SDK.
+    // To upgrade the versions, you can specify a newer versions in your downstream build.gradle.
+    api(androidAutoDependencies.mapboxNavigation)
+    implementation(androidAutoDependencies.mapboxSearch)
 
     implementation(dependenciesList.androidXAppCompat)
     implementation(dependenciesList.coroutinesCore)

libnavui-androidauto/src/main/java/com/mapbox/androidauto/feedback/ui/CarFeedbackIconDownloader.kt

@@ -5,12 +5,12 @@ import android.net.Uri
 import androidx.car.app.Screen
 import androidx.car.app.model.CarIcon
 import androidx.core.graphics.drawable.IconCompat
-import androidx.core.graphics.drawable.toBitmap
 import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.request.target.CustomTarget
 import com.bumptech.glide.request.transition.Transition
+import com.mapbox.navigation.utils.internal.android.toBitmap
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withTimeoutOrNull

libnavui-androidauto/src/main/java/com/mapbox/androidauto/internal/search/CarPlaceSearchImpl.kt

@@ -86,7 +86,7 @@ class CarPlaceSearchImpl(
 
         return suspendCancellableCoroutine { continuation ->
             val selectionCallback = object : SearchSelectionCallback {
-                override fun onCategoryResult(
+                override fun onResults(
                     suggestion: SearchSuggestion,
                     results: List<SearchResult>,
                     responseInfo: ResponseInfo

libnavui-androidauto/src/test/java/com/mapbox/androidauto/placeslistonmap/PlacesListOnMapLayerUtilTest.kt

@@ -58,7 +58,6 @@ class PlacesListOnMapLayerUtilTest : MapboxRobolectricTestRunner() {
     fun initializeFavoritesLayer() {
         mockkStatic("com.mapbox.maps.extension.style.layers.LayerUtils")
         mockkObject(GeoJsonSource)
-        every { GeoJsonSource.directSetterEnabled() } returns true
         val style = mockk<Style>(relaxed = true) {
             every { getStyleImage("MapboxGenericLocationIcon") } returns null
             every { styleSourceExists("MapboxCarPlacesListLayerIdSource") } returns false