From bcee975124c912a9afbac463a649312e4dea7e43 Mon Sep 17 00:00:00 2001
From: Johan von Forstner <johan.forstner@gmail.com>
Date: Thu, 29 Jul 2021 17:55:37 +0200
Subject: [PATCH] remove now unneeded @ExperimentalCarApi annotations

---
 app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt    | 2 --
 app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt        | 1 -
 app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt | 1 -
 app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt    | 1 -
 4 files changed, 5 deletions(-)

diff --git a/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt b/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
index a92ecb8b..d2085a44 100644
--- a/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
@@ -21,7 +21,6 @@ interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
-@androidx.car.app.annotations.ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
@@ -38,7 +37,6 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
-@androidx.car.app.annotations.ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     var mapScreen: LocationAwareScreen? = null
         set(value) {
diff --git a/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
index daad6911..7de85d43 100644
--- a/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
@@ -40,7 +40,6 @@ import kotlin.math.roundToInt
 /**
  * Main map screen showing either nearby chargers or favorites
  */
-@androidx.car.app.annotations.ExperimentalCarApi
 class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
     Screen(ctx), LocationAwareScreen {
     private var updateCoroutine: Job? = null
diff --git a/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt
index 6a5aadb3..01457f8c 100644
--- a/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt
@@ -9,7 +9,6 @@ import net.vonforst.evmap.R
 /**
  * Screen to grant location permission
  */
-@androidx.car.app.annotations.ExperimentalCarApi
 class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     override fun onGetTemplate(): Template {
         return MessageTemplate.Builder(carContext.getString(R.string.auto_location_permission_needed))
diff --git a/app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt
index bc2bc06f..28d0996d 100644
--- a/app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/WelcomeScreen.kt
@@ -10,7 +10,6 @@ import net.vonforst.evmap.R
 /**
  * Welcome screen with selection between favorites and nearby chargers
  */
-@androidx.car.app.annotations.ExperimentalCarApi
 class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
     private var location: Location? = null