dzeio/OpenHealth
1
0
Fork 0
mirror of https://github.com/dzeiocom/OpenHealth.git synced 2025-04-23 03:12:14 +00:00
Code Actions Releases Activity

fix(app): water intake not updated when going to other view

Browse Source
This commit is contained in:
Florian Bouillon 2022-08-25 01:04:31 +02:00
parent 7b6eb75db8
commit 1e8e043e08
Signed by: Florian Bouillon
GPG Key ID: BEEAF3722D0EBF64
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/dzeio/openhealth/ui/home/HomeFragment.kt
View File

@ -48,10 +48,10 @@ class HomeFragment : BaseFragment<HomeViewModel, FragmentHomeBinding>(HomeViewMo
val water = viewModel.water.value val water = viewModel.water.value
if (water == null || !water.isToday()) { if (water == null || !water.isToday()) {
val w = Water() val w = Water()
w.value = viewModel.waterCupSize w.value = viewModel.waterCupSize.value ?: 200
viewModel.updateWater(w) viewModel.updateWater(w)
} else { } else {
water.value += viewModel.waterCupSize water.value += viewModel.waterCupSize.value ?: 200
viewModel.updateWater(water) viewModel.updateWater(water)
} }
} }
@ -67,7 +67,7 @@ class HomeFragment : BaseFragment<HomeViewModel, FragmentHomeBinding>(HomeViewMo
binding.fragmentHomeWaterRemove.setOnClickListener { binding.fragmentHomeWaterRemove.setOnClickListener {
val water = viewModel.water.value val water = viewModel.water.value
if (water != null) { if (water != null) {
water.value -= viewModel.waterCupSize water.value -= viewModel.waterCupSize.value ?: 200
if (water.value <= 0) { if (water.value <= 0) {
viewModel.deleteWater(water) viewModel.deleteWater(water)
} else { } else {

2
app/src/main/java/com/dzeio/openhealth/ui/home/HomeViewModel.kt
View File

@ -32,7 +32,7 @@ class HomeViewModel @Inject internal constructor(
private val _weights = MutableLiveData<List<Weight>?>(null) private val _weights = MutableLiveData<List<Weight>?>(null)
val weights: LiveData<List<Weight>?> = _weights val weights: LiveData<List<Weight>?> = _weights
var waterCupSize = settings.getInt("water_cup_size", 200) var waterCupSize = config.getInt("water_cup_size").toLiveData()
var waterUnit = var waterUnit =
UnitFactory.volume(settings.getString("water_unit", "milliliter") ?: "Milliliter") UnitFactory.volume(settings.getString("water_unit", "milliliter") ?: "Milliliter")