fix: properly format duration with all its components

JanMalch · Dec 31, 2023 · bd113ac · bd113ac
1 parent 4adf238
commit bd113ac
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/kotlin/io/github/janmalch/woroboro/ui/components/common/FormatDuration.kt b/app/src/main/kotlin/io/github/janmalch/woroboro/ui/components/common/FormatDuration.kt
@@ -11,10 +11,16 @@ import kotlin.time.Duration
 fun formatDuration(duration: Duration, zero: String = seconds(0)): String {
     if (duration == Duration.ZERO) return zero
     return duration.toComponents { hours, minutes, seconds, _ ->
-        when {
-            seconds != 0 -> seconds(seconds)
-            minutes != 0 -> minutes(minutes)
-            else -> hours(hours)
+        buildString {
+            if (hours > 0) {
+                append(hours(hours))
+            }
+            if (minutes > 0) {
+                append(minutes(minutes))
+            }
+            if (seconds > 0 || isEmpty()) {
+                append(seconds(seconds))
+            }
         }
     }
 }