From 161b48789fcdd9bf1d591e376adad2ce8dca8200 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sun, 9 Mar 2025 23:07:37 +0100
Subject: [PATCH] Chargeprice: reset to default charging range when tapping
 title

---
 .../evmap/fragment/ChargepriceFragment.kt     |  5 ++++
 .../evmap/viewmodel/ChargepriceViewModel.kt   | 23 +++++++++++++++++--
 .../layout/fragment_chargeprice_header.xml    |  9 +++++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
index 0de84bfc..b710aa70 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
@@ -216,6 +216,11 @@ class ChargepriceFragment : Fragment() {
             }
             false
         }
+        headerBinding.tvChargeFromTo.setOnClickListener {
+            it.postDelayed({
+                vm.resetBatteryRangeToDefault()
+            }, 250)
+        }
 
         binding.toolbar.setOnMenuItemClickListener {
             when (it.itemId) {
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 a578471f..875cecbf 100644
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -1,14 +1,29 @@
 package net.vonforst.evmap.viewmodel
 
 import android.app.Application
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.viewModelScope
 import jsonapi.Meta
 import jsonapi.Relationship
 import jsonapi.Relationships
 import jsonapi.ResourceIdentifier
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.api.chargeprice.*
+import net.vonforst.evmap.api.chargeprice.ChargePrice
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
+import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceInclude
+import net.vonforst.evmap.api.chargeprice.ChargepriceMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceOptions
+import net.vonforst.evmap.api.chargeprice.ChargepriceRequest
+import net.vonforst.evmap.api.chargeprice.ChargepriceRequestTariffMeta
+import net.vonforst.evmap.api.chargeprice.ChargepriceStation
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
@@ -298,4 +313,8 @@ class ChargepriceViewModel(
             }
         }
     }
+
+    fun resetBatteryRangeToDefault() {
+        batteryRange.value = prefs.chargepriceBatteryRangeAndroidAuto
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_chargeprice_header.xml b/app/src/main/res/layout/fragment_chargeprice_header.xml
index 674e1f7f..8e4ead55 100644
--- a/app/src/main/res/layout/fragment_chargeprice_header.xml
+++ b/app/src/main/res/layout/fragment_chargeprice_header.xml
@@ -48,11 +48,14 @@
             tools:orientation="horizontal" />
 
         <TextView
-            android:id="@+id/textView2"
+            android:id="@+id/tvChargeFromTo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="8dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?selectableItemBackground"
             android:text="@{String.format(@string/chargeprice_battery_range, vm.batteryRange[0], vm.batteryRange[1])}"
             android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
             android:textColor="?colorPrimary"
@@ -68,8 +71,8 @@
             android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.energy / vm.chargepriceMetaForChargepoint.data.duration * 60)}"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             app:invisibleUnlessAnimated="@{!vm.batteryRangeSliderDragging &amp;&amp; vm.chargepriceMetaForChargepoint.status == Status.SUCCESS}"
-            app:layout_constraintStart_toStartOf="@+id/textView2"
-            app:layout_constraintTop_toBottomOf="@+id/textView2"
+            app:layout_constraintStart_toStartOf="@+id/tvChargeFromTo"
+            app:layout_constraintTop_toBottomOf="@+id/tvChargeFromTo"
             tools:text="(18 kWh, approx. 23 min, ⌀ 50 kW)" />
 
         <TextView