From b4184dc2deafedab8ba753031cc1dea0d0c0be3d Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Thu, 26 May 2022 18:18:47 +0200
Subject: [PATCH] show charge amount and average charge speed in Chargeprice
 page

fixes #171
---
 .../main/res/layout/fragment_chargeprice.xml   | 18 ++++++++----------
 app/src/main/res/values-de/strings.xml         |  2 +-
 app/src/main/res/values/strings.xml            |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/fragment_chargeprice.xml b/app/src/main/res/layout/fragment_chargeprice.xml
index a760e8e3..1641dfba 100644
--- a/app/src/main/res/layout/fragment_chargeprice.xml
+++ b/app/src/main/res/layout/fragment_chargeprice.xml
@@ -102,20 +102,17 @@
                     app:layout_constraintTop_toBottomOf="@+id/connectors_list"
                     tools:text="Charge from 20% to 80%" />
 
+
                 <TextView
                     android:id="@+id/textView4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="8dp"
-                    android:text="@{@string/chargeprice_duration(BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)))}"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-                    android:textColor="?colorPrimary"
+                    android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.power)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                     app:invisibleUnlessAnimated="@{!vm.batteryRangeSliderDragging &amp;&amp; vm.chargepriceMetaForChargepoint.status == Status.SUCCESS}"
-                    app:layout_constraintStart_toEndOf="@+id/textView2"
-                    app:layout_constraintTop_toBottomOf="@+id/connectors_list"
-                    tools:text="(25 min)" />
-
+                    app:layout_constraintStart_toStartOf="@+id/textView2"
+                    app:layout_constraintTop_toBottomOf="@+id/textView2"
+                    tools:text="(18 kWh, approx. 23 min, ⌀ 50 kW)" />
 
                 <TextView
                     android:id="@+id/tvVehicleHeader"
@@ -155,8 +152,9 @@
                     android:valueFrom="0.0"
                     android:valueTo="100.0"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView2"
+                    app:layout_constraintTop_toBottomOf="@+id/textView4"
                     app:values="@={vm.batteryRange}" />
 
                 <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6d29fd09..53692aa0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -192,7 +192,7 @@
     <string name="chargeprice_battery_range">Laden von %1$.0f%% bis %2$.0f%%</string>
     <string name="chargeprice_battery_range_from">Laden von</string>
     <string name="chargeprice_battery_range_to">bis</string>
-    <string name="chargeprice_duration">(ca. %s)</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, ca. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Fahrzeug</string>
     <string name="edit_on_goingelectric_info">Falls hier nur eine leere Seite erscheint, logge dich bitte zuerst bei GoingElectric.de ein.</string>
     <string name="close">schließen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e483dce..aa870078 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -191,7 +191,7 @@
     <string name="chargeprice_battery_range">Charge from %1$.0f%% to %2$.0f%%</string>
     <string name="chargeprice_battery_range_from">Charge from</string>
     <string name="chargeprice_battery_range_to">to</string>
-    <string name="chargeprice_duration">(approx. %s)</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, approx. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Vehicle</string>
     <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Some providers offer cheaper plans exclusively to their customers (e.g., household electricity, gas)</string>
     <string name="close">close</string>