mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-19 21:58:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reload Chargeprice data when vehicles have changed

Browse Source 
fixes #209
This commit is contained in:
johan12345
2022-08-16 21:04:44 +02:00
parent 4a82250a3d
commit 62f2002e5c
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
View File

@@ -60,6 +60,11 @@ class ChargepriceFragment : Fragment() {
}
}
override fun onResume() {
super.onResume()
vm.reloadPrefs()
}
private fun showDonationDialog() {
AlertDialog.Builder(requireContext())
.setTitle(R.string.chargeprice_donation_dialog_title)

48
app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
View File

@@ -33,13 +33,30 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
MutableLiveData<Chargepoint>()
}
val vehicles: MutableLiveData<Resource<List<ChargepriceCar>>> by lazy {
MutableLiveData<Resource<List<ChargepriceCar>>>().apply {
if (prefs.chargepriceMyVehicles.isEmpty()) {
value = Resource.success(emptyList())
} else {
value = Resource.loading(null)
loadVehicles()
private val vehicleIds: MutableLiveData<Set<String>> by lazy {
MutableLiveData<Set<String>>().apply {
value = prefs.chargepriceMyVehicles
}
}
val vehicles: LiveData<Resource<List<ChargepriceCar>>> by lazy {
MediatorLiveData<Resource<List<ChargepriceCar>>>().apply {
addSource(vehicleIds.distinctUntilChanged()) { vehicleIds ->
if (vehicleIds.isEmpty()) {
value = Resource.success(emptyList())
} else {
value = Resource.loading(null)
viewModelScope.launch {
value = try {
val result = api.getVehicles()
Resource.success(result.filter {
it.id in vehicleIds
})
} catch (e: IOException) {
Resource.error(e.message, null)
}
}
}
}
observeForever {
vehicle.value = it.data?.firstOrNull()
@@ -157,6 +174,10 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
}
}
fun reloadPrefs() {
vehicleIds.value = prefs.chargepriceMyVehicles
}
private fun getChargepricePlugType(chargepoint: Chargepoint): String {
val index = charger.value!!.chargepointsMerged.indexOf(chargepoint)
val type = charger.value!!.chargepriceData!!.plugTypes?.get(index) ?: chargepoint.type
@@ -261,17 +282,4 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
}
}
}
private fun loadVehicles() {
viewModelScope.launch {
try {
val result = api.getVehicles()
vehicles.value = Resource.success(result.filter {
it.id in prefs.chargepriceMyVehicles
})
} catch (e: IOException) {
vehicles.value = Resource.error(e.message, null)
}
}
}
}