🐛 Fix the display of timers on the Timers page

AssistantNMS · Feb 16, 2023 · 3b162b2 · 3b162b2
1 parent 191f489
commit 3b162b2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/lib/components/tilePresenters/timer_tile_presenter.dart b/lib/components/tilePresenters/timer_tile_presenter.dart
@@ -10,6 +10,25 @@ Widget timerTilePresenter(
   void Function(TimerItem) onEdit,
   void Function(String) onDelete,
 ) {
+  DateTime tweakedStart = (DateTime(
+    timer.startDate.year,
+    timer.startDate.month,
+    timer.startDate.day,
+    timer.startDate.hour,
+    timer.startDate.minute,
+    timer.startDate.second,
+    timer.startDate.millisecond,
+  ));
+  DateTime tweakedEnd = (DateTime(
+    timer.completionDate.year,
+    timer.completionDate.month,
+    timer.completionDate.day,
+    timer.completionDate.hour,
+    timer.completionDate.minute,
+    timer.completionDate.second,
+    timer.completionDate.millisecond,
+  ));
+
   return genericListTileWithSubtitle(
     context,
     leadingImage: timer.icon,
@@ -18,8 +37,8 @@ Widget timerTilePresenter(
       padding: const EdgeInsets.only(top: 4.0, bottom: 4.0),
       child: getProgressbarFromDates(
         context,
-        timer.startDate,
-        timer.completionDate,
+        tweakedStart,
+        tweakedEnd,
         animation: false,
       ),
     ),

diff --git a/lib/contracts/timer/timer_item.dart b/lib/contracts/timer/timer_item.dart
@@ -59,7 +59,7 @@ class TimerItem {
         'uuid': uuid,
         'name': name,
         'icon': icon,
-        'startDate': startDate.toString(),
-        'completionDate': completionDate.toString(),
+        'startDate': startDate.toIso8601String(),
+        'completionDate': completionDate.toIso8601String(),
       };
 }
diff --git a/lib/pages/timer/add_edit_timer_page.dart b/lib/pages/timer/add_edit_timer_page.dart
@@ -30,11 +30,11 @@ class _AddEditTimerState extends State<AddEditTimerPage> {
   DateTime now = DateTime.now();
 
   _AddEditTimerState(this.timer, this.isEdit) {
-    int selectedIndex = UserSelectionIcons.timer.indexOf(timer.icon!);
+    int selectedIndex = UserSelectionIcons.timer.indexOf(timer.icon ?? '');
     selectedImageIndex = selectedIndex >= 0 ? selectedIndex : 0;
     timer.icon = UserSelectionIcons.timer[selectedImageIndex];
 
-    var diff =
+    int diff =
         now.millisecondsSinceEpoch - timer.startDate.millisecondsSinceEpoch;
     if (diff.abs() < millisecondsDrift) {
       // If startDate is set to now-ish
@@ -131,6 +131,7 @@ class _AddEditTimerState extends State<AddEditTimerPage> {
     ));
 
     widgets.add(Wrap(
+      spacing: 4,
       alignment: WrapAlignment.center,
       children: getQuickAccessButtons(context),
     ));

diff --git a/lib/pages/timer/timer_page_view.dart b/lib/pages/timer/timer_page_view.dart
@@ -94,7 +94,11 @@ class _TimersPageViewState extends State<TimersPageView> {
       void Function()? onTap,
     }) =>
         timerTilePresenter(
-            presenterContext, timer, onEdit, (String id) => deleteTimer(id));
+          presenterContext,
+          timer,
+          onEdit,
+          (String id) => deleteTimer(id),
+        );
 
     return SearchableList<TimerItem>(
       getSearchListFutureFromList(

diff --git a/release_notes.txt b/release_notes.txt
@@ -3,6 +3,7 @@
 - 💫 Improve the transition after selecting/deselecting platforms | Closes #175
 - ⚡️ Improve itemDetails page loading performance
 - 🐛 Remove focus on navigating away from searchList (commit is in AA common library) | Closes #183
+- 🐛 Fix the display of timers on the Timers page 
 
 ⠀