diff --git a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt index a35b287a..f463c3fd 100644 --- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt +++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt @@ -22,6 +22,8 @@ import com.google.android.material.slider.RangeSlider import net.vonforst.evmap.R import net.vonforst.evmap.api.availability.ChargepointStatus import net.vonforst.evmap.api.iconForPlugType +import kotlin.math.ceil +import kotlin.math.floor import kotlin.math.roundToInt @@ -265,6 +267,13 @@ fun currency(currency: String): String { } } +fun time(value: Int): String { + val h = floor(value.toDouble() / 60).toInt(); + val min = ceil(value.toDouble() % 60).toInt(); + return if (h == 0 && min > 0) "$min min"; + else "%d:%02d h".format(h, min); +} + @InverseBindingAdapter(attribute = "app:values") fun getRangeSliderValue(slider: RangeSlider) = slider.values diff --git a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt index 8fea26b6..44f68130 100644 --- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt +++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt @@ -209,6 +209,7 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String) private var loadPricesJob: Job? = null fun loadPrices() { chargePrices.value = Resource.loading(null) + chargePriceMeta.value = Resource.loading(null) val charger = charger.value val car = vehicle.value val compatibleConnectors = vehicleCompatibleConnectors.value diff --git a/app/src/main/res/layout/fragment_chargeprice.xml b/app/src/main/res/layout/fragment_chargeprice.xml index 886beced..764530e8 100644 --- a/app/src/main/res/layout/fragment_chargeprice.xml +++ b/app/src/main/res/layout/fragment_chargeprice.xml @@ -7,6 +7,7 @@ + + + + Einige Anbieter bieten für ihre Kunden (z.B. Haushaltsstrom, Gas) günstigere Tarife an Bitte wähle zuerst dein Auto in den Einstellungen aus. Laden von %1$.0f%% bis %2$.0f%% + (ca. %s) Fahrzeug Falls hier nur eine leere Seite erscheint, logge dich bitte zuerst bei GoingElectric.de ein. schließen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index baf04919..9312d38c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -186,6 +186,7 @@ Show customer-exclusive plans Please first select your car model in the settings. Charge from %1$.0f%% to %2$.0f%% + (approx. %s) Vehicle Some providers offer cheaper plans exclusively to their customers (e.g., household electricity, gas) close