From 928870e12d0f3d890822075f410338e00f033542 Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Thu, 25 Jul 2024 05:32:05 -0400 Subject: [PATCH] Fix the simpleLabel to round up/down at 50% mark --- lib/utils/dateutils.dart | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/utils/dateutils.dart b/lib/utils/dateutils.dart index 31eaf10..dc2f0a0 100644 --- a/lib/utils/dateutils.dart +++ b/lib/utils/dateutils.dart @@ -81,24 +81,24 @@ extension DateTimeExtensions on DateTime { extension DurationExtensions on Duration { String get simpleLabel { - final days = (inHours / 24.0).round(); - if (days != 0) { - return days == 1 ? '1 day' : '$days days'; + final days = inHours / 24.0; + if (days >= 1) { + return days.round() == 1 ? '1 day' : '${days.round()} days'; } - final hours = (inMinutes / 60.0).round(); - if (hours != 0) { - return hours == 1 ? '1 hour' : '$hours hours'; + final hours = inMinutes / 60.0; + if (hours >= 1) { + return hours.round() == 1 ? '1 hour' : '${hours.round()} hours'; } - final minutes = (inSeconds / 60.0).round(); - if (minutes != 0) { - return minutes == 1 ? '1 minute' : '$minutes minutes'; + final minutes = inSeconds / 60.0; + if (minutes >= 1) { + return minutes.round() == 1 ? '1 minute' : '${minutes.round()} minutes'; } - final seconds = (inMilliseconds / 1000.0).round(); - if (seconds != 0) { - return seconds == 1 ? '1 second' : '$seconds seconds'; + final seconds = inMilliseconds / 1000.0; + if (seconds >= 1) { + return seconds.round() == 1 ? '1 second' : '${seconds.round()} seconds'; } if (inMilliseconds != 0) {