From 24bf66ddbe5b714df7a55030145bcde013bc000a Mon Sep 17 00:00:00 2001 From: johan12345 Date: Sun, 28 Mar 2021 18:42:07 +0200 Subject: [PATCH] fix calculation of total chargers from filtered availability introduced in a0b0339c8bf7f4bb1662a041d81abe9098825557 --- .../net/vonforst/evmap/api/availability/AvailabilityDetector.kt | 2 ++ app/src/main/res/layout/detail_view.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt index 6ce6c056..d7400725 100644 --- a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt +++ b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt @@ -128,6 +128,8 @@ data class ChargeLocationStatus( } return this.copy(status = statusFiltered) } + + val totalChargepoints = status.map { it.key.count }.sum() } enum class ChargepointStatus { diff --git a/app/src/main/res/layout/detail_view.xml b/app/src/main/res/layout/detail_view.xml index 82730ebd..51cd0e00 100644 --- a/app/src/main/res/layout/detail_view.xml +++ b/app/src/main/res/layout/detail_view.xml @@ -120,7 +120,7 @@ android:gravity="end" android:maxLines="1" android:padding="2dp" - android:text="@{String.format("%s/%d", BindingAdaptersKt.availabilityText(BindingAdaptersKt.flatten(filteredAvailability.data.status.values())), filteredAvailability.data.status.keySet().size())}" + android:text="@{String.format("%s/%d", BindingAdaptersKt.availabilityText(BindingAdaptersKt.flatten(filteredAvailability.data.status.values())), filteredAvailability.data.totalChargepoints)}" android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" android:textColor="@android:color/white" app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(availability.data.status.values())}"