diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4381050..f599391 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,7 +29,7 @@ android { minSdk = 31 targetSdk = 35 versionCode = ciRunNumber ?: 1 - versionName = "0.6.0" + (ciRunNumber?.let { "+build.$it" } ?: "-dev") + versionName = "0.6.1" + (ciRunNumber?.let { "+build.$it" } ?: "-dev") } signingConfigs { diff --git a/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeScreen.kt b/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeScreen.kt index 53724de..9af1885 100644 --- a/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeScreen.kt +++ b/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeScreen.kt @@ -51,6 +51,10 @@ fun HomeScreen( val displayName by viewModel.displayName.collectAsStateWithLifecycle() val kcalToday by viewModel.kcalToday.collectAsStateWithLifecycle() + // ViewModellen överlever i navigationsstacken — hämta om dagens kcal + // varje gång skärmen kommer tillbaka (t.ex. efter loggad aktivitet). + androidx.compose.runtime.LaunchedEffect(Unit) { viewModel.refresh() } + Column( modifier = Modifier .fillMaxSize() diff --git a/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeViewModel.kt b/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeViewModel.kt index 8d7075e..53ebf57 100644 --- a/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeViewModel.kt +++ b/app/src/main/java/eu/brassepc/fitnessdroid/ui/home/HomeViewModel.kt @@ -79,6 +79,11 @@ class HomeViewModel( } } + /** Uppdatera mätaren — anropas när hemskärmen visas (igen). */ + fun refresh() { + viewModelScope.launch { refreshKcal() } + } + private fun secondsIntoToday(): Long = java.time.Duration.between( java.time.LocalDate.now().atStartOfDay(), java.time.LocalDateTime.now() ).seconds.coerceAtLeast(0)