diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 123e686..b0c710d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ android { minSdk = 30 targetSdk = 36 versionCode = 1 - versionName = "0.1.2" + versionName = "0.1.3" setProperty("archivesBaseName", "navi-$versionName") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/common/car/src/main/java/com/kouros/navigation/car/MapView.kt b/common/car/src/main/java/com/kouros/navigation/car/MapView.kt index 54c4e20..9f8da93 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/MapView.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/MapView.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox import androidx.compose.material3.Icon +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -114,13 +115,13 @@ fun BuildingLayer(tiles: Source) { } @Composable -fun DrawImage(width: Int, height: Int, location: Location) { - NavigationImage(height) +fun DrawImage(width: Int, height: Int, location: Location, street: String) { + NavigationImage(height, street) Speed(width, height, location) } @Composable -fun NavigationImage(height: Int) { +fun NavigationImage(height: Int, street: String) { val vector = ImageVector.vectorResource(id = R.drawable.assistant_navigation_48px) val color = remember { NavigationColor } BadgedBox( @@ -137,6 +138,8 @@ fun NavigationImage(height: Int) { contentDescription = "Navigation", tint = color ) + if (street.isNotEmpty()) + Text(text=street) } } @Composable diff --git a/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt b/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt index 27ff33c..e469486 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/NavigationSession.kt @@ -7,7 +7,9 @@ import android.content.Intent import android.content.pm.PackageManager import android.location.Location import android.location.LocationManager +import android.os.Build import android.util.Log +import androidx.annotation.RequiresApi import androidx.car.app.CarContext import androidx.car.app.Screen import androidx.car.app.ScreenManager @@ -85,6 +87,7 @@ class NavigationSession : Session(), NavigationScreen.Listener { lifecycle.addObserver(mLifeCycleObserver) } + @RequiresApi(Build.VERSION_CODES.M) override fun onCreateScreen(intent: Intent): Screen { routeModel = RouteCarModel() diff --git a/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt b/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt index dddfed5..25011f6 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/SurfaceRenderer.kt @@ -13,7 +13,6 @@ import androidx.car.app.AppManager import androidx.car.app.CarContext import androidx.car.app.SurfaceCallback import androidx.car.app.SurfaceContainer -import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -197,7 +196,11 @@ class SurfaceRenderer( var target = position.target var localTilt = tilt if (!preview) { - DrawImage(width, height,lastLocation) + if (routeModel.isNavigating()) { + DrawImage(width, height, lastLocation, "") + } else { + DrawImage(width, height, lastLocation, "") + } } else { bearing = 0.0 zoom = previewZoom()