From 6fd737f6e948ca85f188f4868978036e7dbf2e5d Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 5 Sep 2021 21:39:05 +0200 Subject: [PATCH] Android Auto: Disable Chargeprice in unsupported countries see also: cf6c6628, #117 --- .../evmap/auto/ChargerDetailScreen.kt | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt index 12a55bb8..e1e1c791 100644 --- a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt +++ b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt @@ -20,6 +20,7 @@ import kotlinx.coroutines.withContext import net.vonforst.evmap.* import net.vonforst.evmap.api.availability.ChargeLocationStatus import net.vonforst.evmap.api.availability.getAvailability +import net.vonforst.evmap.api.chargeprice.ChargepriceApi import net.vonforst.evmap.api.createApi import net.vonforst.evmap.api.nameForPlugType import net.vonforst.evmap.api.stringProvider @@ -150,21 +151,24 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : navigateToCharger(charger) } .build()) - addAction(Action.Builder() - .setIcon( - CarIcon.Builder( - IconCompat.createWithResource( - carContext, - R.drawable.ic_chargeprice + charger.chargepriceData?.country?.let { country -> + if (ChargepriceApi.isCountrySupported(country, charger.dataSource)) { + addAction(Action.Builder() + .setIcon( + CarIcon.Builder( + IconCompat.createWithResource( + carContext, + R.drawable.ic_chargeprice + ) + ).build() ) - ).build() - ) - .setTitle(carContext.getString(R.string.auto_prices)) - .setOnClickListener { - screenManager.push(ChargepriceScreen(carContext, charger)) + .setTitle(carContext.getString(R.string.auto_prices)) + .setOnClickListener { + screenManager.push(ChargepriceScreen(carContext, charger)) + } + .build()) } - .build()) - + } } ?: setLoading(true) }.build() ).apply {