Fix 24H to 12H time format conversion in timeOfDayToString()

Author: AlienKevin

lib/utils.dart

@@ -31,20 +31,25 @@ String openingHoursToString(OpeningHours hours) {
 
 /// Convert [TimeOfDay] to [String] for display.
 /// Truncates ":00" if minute is 0
+/// For the algorithm to convert from 24H to 12H times,
+/// see https://www.wikihow.com/Convert-from-24-Hour-to-12-Hour-Time
 String timeOfDayToString(TimeOfDay time) {
   String _addLeadingZeroIfNeeded(int value) {
     if (value < 10) return '0$value';
     return value.toString();
   }
 
+  String minuteToString(int minutes) =>
+      (time.minute == 0 ? "" : ":" + _addLeadingZeroIfNeeded(time.minute));
+
   if (time.hour > 12) {
-    return (time.hour - 12).toString() +
-        (time.minute == 0 ? "" : ":" + _addLeadingZeroIfNeeded(time.minute)) +
-        "PM";
+    return (time.hour - 12).toString() + minuteToString(time.minute) + "PM";
+  } else if (time.hour == 12) {
+    return time.hour.toString() + minuteToString(time.minute) + "PM";
+  } else if (time.hour == 0) {
+    return "12" + minuteToString(time.minute) + "AM";
   } else {
-    return time.hour.toString() +
-        (time.minute == 0 ? "" : ":" + _addLeadingZeroIfNeeded(time.minute)) +
-        "AM";
+    return time.hour.toString() + minuteToString(time.minute) + "AM";
   }
 }
 

pubspec.lock

@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "36.0.0"
+    version: "31.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.1"
+    version: "2.8.0"
   archive:
     dependency: transitive
     description:
@@ -49,7 +49,7 @@ packages:
       name: build
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "2.3.0"
   build_config:
     dependency: transitive
     description:
@@ -63,7 +63,7 @@ packages:
       name: build_daemon
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.0"
   build_resolvers:
     dependency: transitive
     description:
@@ -77,7 +77,7 @@ packages:
       name: build_runner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.7"
+    version: "2.1.10"
   build_runner_core:
     dependency: transitive
     description:
@@ -98,7 +98,7 @@ packages:
       name: built_value
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.4"
+    version: "8.2.0"
   characters:
     dependency: transitive
     description:
@@ -120,6 +120,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
   clock:
     dependency: transitive
     description:
@@ -148,6 +155,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.3"
   crypto:
     dependency: transitive
     description:
@@ -161,7 +175,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   fake_async:
     dependency: transitive
     description:
@@ -224,7 +238,7 @@ packages:
       name: flutter_native_splash
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.3+1"
+    version: "2.1.5"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -241,7 +255,7 @@ packages:
       name: freezed
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -269,14 +283,14 @@ packages:
       name: geolocator_android
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
   geolocator_apple:
     dependency: transitive
     description:
       name: geolocator_apple
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1+1"
+    version: "2.1.2"
   geolocator_platform_interface:
     dependency: transitive
     description:
@@ -381,7 +395,14 @@ packages:
       name: json_serializable
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.5"
+    version: "6.1.6"
+  lint:
+    dependency: transitive
+    description:
+      name: lint
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.2"
   lints:
     dependency: transitive
     description:
@@ -424,6 +445,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   package_config:
     dependency: transitive
     description:
@@ -598,7 +626,21 @@ packages:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.0"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -617,14 +659,28 @@ packages:
       name: source_gen
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.0"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
@@ -674,13 +730,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  test:
+    dependency: "direct dev"
+    description:
+      name: test
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.19.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.8"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.9"
   time_range_picker:
     dependency: "direct main"
     description:
@@ -716,6 +786,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.5.0"
   watcher:
     dependency: transitive
     description:
@@ -730,13 +807,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   win32:
     dependency: transitive
     description:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.1"
+    version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:

pubspec.yaml

@@ -25,12 +25,13 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^1.0.0
   build_runner:
-  freezed: ^1.1.1
+  freezed:
   flutter_launcher_icons: "^0.9.2"
   flutter_launcher_name:
     git:
       url: https://github.com/AlienKevin/flutter_launcher_name
       ref: "0.11.1"
+  test:
 
 flutter:
   uses-material-design: false

test/utils_test.dart

@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:mstudy/utils.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('timeOfDayToString', () {
+    expect(timeOfDayToString(const TimeOfDay(hour: 0, minute: 0)), "12AM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 0, minute: 59)), "12:59AM");
+
+    expect(timeOfDayToString(const TimeOfDay(hour: 1, minute: 0)), "1AM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 8, minute: 0)), "8AM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 9, minute: 30)), "9:30AM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 11, minute: 59)), "11:59AM");
+
+    expect(timeOfDayToString(const TimeOfDay(hour: 12, minute: 0)), "12PM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 12, minute: 59)), "12:59PM");
+
+    expect(timeOfDayToString(const TimeOfDay(hour: 13, minute: 0)), "1PM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 14, minute: 30)), "2:30PM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 20, minute: 0)), "8PM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 22, minute: 59)), "10:59PM");
+    expect(timeOfDayToString(const TimeOfDay(hour: 23, minute: 59)), "11:59PM");
+  });
+}