Improve format audtio duration. (MixinNetwork#378)

moatazeldebsy · Nov 5, 2021 · 05976af · 05976af
1 parent 316e596
commit 05976af
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/lib/utils/extension/extension.dart b/lib/utils/extension/extension.dart
@@ -59,5 +59,6 @@ part 'src/stream.dart';
 part 'src/string.dart';
 part 'src/ui.dart';
 part 'src/info.dart';
+part 'src/duration.dart';
 
 void importExtension() {}
diff --git a/lib/utils/extension/src/duration.dart b/lib/utils/extension/src/duration.dart
@@ -0,0 +1,11 @@
+part of '../extension.dart';
+
+extension DurationToMinutesSecondsExtension on Duration {
+  String get asMinutesSeconds {
+    var duration = this;
+    if (inMilliseconds < 1000) {
+      duration = const Duration(milliseconds: 1000);
+    }
+    return '${duration.inMinutes.toString().padLeft(2, '0')}:${duration.inSeconds.remainder(60).toString().padLeft(2, '0')}';
+  }
+}
diff --git a/lib/widgets/message/item/audio_message.dart b/lib/widgets/message/item/audio_message.dart
@@ -116,7 +116,7 @@ class AudioMessage extends HookWidget {
                   ),
                   const SizedBox(height: 8),
                   Text(
-                    '${duration.inSeconds}‘',
+                    duration.asMinutesSeconds,
                     style: TextStyle(
                       fontSize: MessageItemWidget.tertiaryFontSize,
                       color: context.theme.secondaryText,

diff --git a/lib/widgets/message/item/video_message.dart b/lib/widgets/message/item/video_message.dart
@@ -127,9 +127,11 @@ class VideoMessageWidget extends HookWidget {
                     ),
                     HookBuilder(builder: (context) {
                       final durationText = useMessageConverter(
-                        converter: (state) => formatVideoDuration(Duration(
-                            milliseconds:
-                                int.tryParse(state.mediaDuration ?? '') ?? 0)),
+                        converter: (state) => Duration(
+                                milliseconds:
+                                    int.tryParse(state.mediaDuration ?? '') ??
+                                        0)
+                            .asMinutesSeconds,
                       );
 
                       return Positioned(
@@ -182,6 +184,3 @@ class VideoMessageWidget extends HookWidget {
     );
   }
 }
-
-String formatVideoDuration(Duration duration) =>
-    '${duration.inMinutes.toString().padLeft(2, '0')}:${duration.inSeconds.remainder(60).toString().padLeft(2, '0')}';
diff --git a/test/widgets/message/video_message_test.dart b/test/widgets/message/video_message_test.dart
@@ -1,24 +1,27 @@
-import 'package:flutter_app/widgets/message/item/video_message.dart';
+import 'package:flutter_app/utils/extension/extension.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   test('test format video duration', () {
     var duration = const Duration(minutes: 12, seconds: 20);
-    expect(formatVideoDuration(duration), '12:20');
+    expect(duration.asMinutesSeconds, '12:20');
 
     duration = const Duration(seconds: 20);
-    expect(formatVideoDuration(duration), '00:20');
+    expect(duration.asMinutesSeconds, '00:20');
 
     duration = const Duration(seconds: 120);
-    expect(formatVideoDuration(duration), '02:00');
+    expect(duration.asMinutesSeconds, '02:00');
 
     duration = const Duration(minutes: 1200, seconds: 20);
-    expect(formatVideoDuration(duration), '1200:20');
+    expect(duration.asMinutesSeconds, '1200:20');
 
     duration = const Duration(minutes: 120, seconds: 20);
-    expect(formatVideoDuration(duration), '120:20');
+    expect(duration.asMinutesSeconds, '120:20');
 
     duration = const Duration(seconds: 121);
-    expect(formatVideoDuration(duration), '02:01');
+    expect(duration.asMinutesSeconds, '02:01');
+
+    duration = const Duration(milliseconds: 999);
+    expect(duration.asMinutesSeconds, '00:01');
   });
 }