Prevent lap count check when watch is stopped

Author: Louis Pearson

src/displayapp/screens/StopWatch.cpp

@@ -63,12 +63,13 @@ StopWatch::StopWatch(DisplayApp* app,
   lv_label_set_text(time, "00:00");
   lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -45);
 
+  // Create millisecond label
   msecTime = lv_label_create(lv_scr_act(), nullptr);
-  // lv_obj_set_style_local_text_font(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
   lv_obj_set_style_local_text_color(msecTime, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
   lv_label_set_text(msecTime, "00");
   lv_obj_align(msecTime, lv_scr_act(), LV_ALIGN_CENTER, 0, 3);
 
+  // Create play/pause button
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;
   lv_obj_set_event_cb(btnPlayPause, play_pause_event_handler);
@@ -78,6 +79,7 @@ StopWatch::StopWatch(DisplayApp* app,
   txtPlayPause = lv_label_create(btnPlayPause, nullptr);
   lv_label_set_text(txtPlayPause, Symbols::play);
 
+  // Create stop/lap button
   btnStopLap = lv_btn_create(lv_scr_act(), nullptr);
   btnStopLap->user_data = this;
   lv_obj_set_event_cb(btnStopLap, stop_lap_event_handler);
@@ -91,19 +93,19 @@ StopWatch::StopWatch(DisplayApp* app,
   lv_obj_set_state(btnStopLap, LV_STATE_DISABLED);
   lv_obj_set_state(txtStopLap, LV_STATE_DISABLED);
 
+  // Create first lap text label
   lapOneText = lv_label_create(lv_scr_act(), nullptr);
-  // lv_obj_set_style_local_text_font(lapOneText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
   lv_obj_set_style_local_text_color(lapOneText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_align(lapOneText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 30);
   lv_label_set_text(lapOneText, "");
 
+  // Create second lap text label
   lapTwoText = lv_label_create(lv_scr_act(), nullptr);
-  // lv_obj_set_style_local_text_font(lapTwoText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
   lv_obj_set_style_local_text_color(lapTwoText, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_YELLOW);
   lv_obj_align(lapTwoText, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 50, 55);
   lv_label_set_text(lapTwoText, "");
 
-  // Date time
+  // Create Date time label
   dateTime = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_fmt(dateTime, "%02i:%02i", dateTimeController.Hours(), dateTimeController.Minutes());
   lv_label_set_align(dateTime, LV_LABEL_ALIGN_CENTER);
@@ -112,22 +114,26 @@ StopWatch::StopWatch(DisplayApp* app,
 
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 
-  if (stopWatchController.isRunning()) {
-    displayRunning();
-  } else if (stopWatchController.isPaused()) {
-    displayPaused();
-    currentTimeSeparated = convertTicksToTimeSegments(stopWatchController.getElapsedPreviously());
-
-    lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
-    lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
-    lv_obj_set_state(btnStopLap, LV_STATE_DEFAULT);
-    lv_obj_set_state(txtStopLap, LV_STATE_DEFAULT);
-  } else {
+  // Figure out what the current state of the stopwatch is and select the correct display
+  if (stopWatchController.isCleared()) {
     displayCleared();
-  }
+  } else  {
+    // Add laps if there are any
+    if (stopWatchController.getLapCount() > 0) {
+      updateLaps();
+    }
 
-  if (stopWatchController.getLapCount() > 0) {
-    updateLaps();
+    if (stopWatchController.isRunning()) {
+      displayRunning();
+    } else if (stopWatchController.isPaused()) {
+      displayPaused();
+      currentTimeSeparated = convertTicksToTimeSegments(stopWatchController.getElapsedPreviously());
+
+      lv_label_set_text_fmt(time, "%02d:%02d", currentTimeSeparated.mins, currentTimeSeparated.secs);
+      lv_label_set_text_fmt(msecTime, "%02d", currentTimeSeparated.hundredths);
+      lv_obj_set_state(btnStopLap, LV_STATE_DEFAULT);
+      lv_obj_set_state(txtStopLap, LV_STATE_DEFAULT);
+    }
   }
 }