From dc7fe226140dca16354d715e1cbfd8edc86fc6e2 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Tue, 1 Feb 2022 11:56:14 +0100 Subject: [PATCH] Fix handling of maxPower in Google build variant --- app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 d1f69fc4..8df60cb0 100644 --- a/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt +++ b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt @@ -159,7 +159,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole } private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row { - val markerTint = if (charger.maxPower > 100) { + val markerTint = if ((charger.maxPower ?: 0.0) > 100) { R.color.charger_100kw_dark // slightly darker color for better contrast } else { getMarkerTint(charger) @@ -207,8 +207,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole } // power - if (text.isNotEmpty()) text.append(" · ") - text.append("${charger.maxPower.roundToInt()} kW") + val power = charger.maxPower; + if (power != null) { + if (text.isNotEmpty()) text.append(" · ") + text.append("${power.roundToInt()} kW") + } // availability availabilities[charger.id]?.second?.let { av ->