diff --git a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt index 43f0234c..3ad2ac11 100644 --- a/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt +++ b/app/src/main/kotlin/com/subtracks/ui/library/SongsContent.kt @@ -317,7 +317,7 @@ internal fun formatTrackTime(seconds: Long): String { return if (hours > 0) { "%d:%02d:%02d".format(hours, minutes, secs) } else { - "%02d:%02d".format(minutes, secs) + "%d:%02d".format(minutes, secs) } } diff --git a/app/src/test/kotlin/com/subtracks/ui/library/TrackTimeTest.kt b/app/src/test/kotlin/com/subtracks/ui/library/TrackTimeTest.kt index 9aa5b914..376c7467 100644 --- a/app/src/test/kotlin/com/subtracks/ui/library/TrackTimeTest.kt +++ b/app/src/test/kotlin/com/subtracks/ui/library/TrackTimeTest.kt @@ -5,8 +5,14 @@ import org.junit.Test class TrackTimeTest { @Test - fun minutesAndSecondsAreZeroPadded() { - assertEquals("04:11", formatTrackTime(251)) + fun minutesAreNotPaddedButSecondsAre() { + assertEquals("4:11", formatTrackTime(251)) + assertEquals("12:05", formatTrackTime(725)) + } + + @Test + fun underAMinuteKeepsASingleLeadingZero() { + assertEquals("0:05", formatTrackTime(5)) } @Test @@ -16,6 +22,6 @@ class TrackTimeTest { @Test fun negativeDurationsClampToZero() { - assertEquals("00:00", formatTrackTime(-5)) + assertEquals("0:00", formatTrackTime(-5)) } }