From 304a984110044c38ef454c5558524d322fcb50fe Mon Sep 17 00:00:00 2001 From: timklge <2026103+timklge@users.noreply.github.com> Date: Sat, 9 Aug 2025 15:12:43 +0200 Subject: [PATCH] Fix remaining distance bar shows label "null" if distance is unknown (#50) --- app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt b/app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt index 9f52463..5027a9e 100644 --- a/app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt +++ b/app/src/main/kotlin/de/timklge/karoopowerbar/Window.kt @@ -201,7 +201,7 @@ class Window( data class BarProgress( val progress: Double?, - val label: String, + val label: String?, ) private fun getRouteProgress(userProfile: UserProfile, riddenDistance: Double?, routeEndAt: Double?, distanceToDestination: Double?): BarProgress { @@ -211,7 +211,7 @@ class Window( else -> riddenDistance?.times(0.001)?.roundToInt() // Kilometers } - return BarProgress(routeProgress, "$routeProgressInUserUnit") + return BarProgress(routeProgress, routeProgressInUserUnit?.toString()) } private fun getRemainingRouteProgress(userProfile: UserProfile, riddenDistance: Double?, routeEndAt: Double?, distanceToDestination: Double?): BarProgress { @@ -221,7 +221,7 @@ class Window( else -> distanceToDestination?.times(0.001)?.roundToInt() // Kilometers } - return BarProgress(routeProgress, "$distanceToDestinationInUserUnit") + return BarProgress(routeProgress, distanceToDestinationInUserUnit?.toString()) } private suspend fun streamRouteProgress( @@ -275,7 +275,7 @@ class Window( powerbarsWithRouteProgressSource.forEach { powerbar -> powerbar.progressColor = context.getColor(R.color.zone0) powerbar.progress = barProgress.progress - powerbar.label = barProgress.label + powerbar.label = barProgress.label ?: "" powerbar.invalidate() } }