From 15c3807a761b00a6dcdcc3a516e67e584f0a55c9 Mon Sep 17 00:00:00 2001
From: SteveAmor <SteveAmor@users.noreply.github.com>
Date: Tue, 4 Jan 2022 19:32:29 +0000
Subject: [PATCH] Adds enum class for chimes option

---
 src/components/settings/Settings.h               | 13 +++++++------
 .../screens/settings/SettingChimes.cpp           | 16 ++++++++++++----
 src/systemtask/SystemTask.cpp                    |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index f87b6938..006b8c74 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -11,6 +11,7 @@ namespace Pinetime {
     public:
       enum class ClockType : uint8_t { H24, H12 };
       enum class Notification : uint8_t { ON, OFF };
+      enum class ChimesOption : uint8_t { None, Hours, HalfHours };
       enum class WakeUpMode : uint8_t {
         SingleTap = 0,
         DoubleTap = 1,
@@ -40,14 +41,14 @@ namespace Pinetime {
         return settings.clockFace;
       };
 
-      void SetChimesState(uint8_t state) {
-        if (state != settings.chimesState) {
+      void SetChimeOption(ChimesOption chimeOption) {
+        if (chimeOption != settings.chimesOption) {
           settingsChanged = true;
         }
-        settings.chimesState = state;
+        settings.chimesOption = chimeOption;
       };
-      uint8_t GetChimesState() const {
-        return settings.chimesState;
+      ChimesOption GetChimeOption() const {
+        return settings.chimesOption;
       };
 
       void SetPTSColorTime(Colors colorTime) {
@@ -182,7 +183,7 @@ namespace Pinetime {
         Notification notificationStatus = Notification::ON;
 
         uint8_t clockFace = 0;
-        uint8_t chimesState = 0;
+        ChimesOption chimesOption = ChimesOption::None;
 
         PineTimeStyle PTS;
 
diff --git a/src/displayapp/screens/settings/SettingChimes.cpp b/src/displayapp/screens/settings/SettingChimes.cpp
index 0f008802..3ee7537b 100644
--- a/src/displayapp/screens/settings/SettingChimes.cpp
+++ b/src/displayapp/screens/settings/SettingChimes.cpp
@@ -44,7 +44,7 @@ SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::
   lv_checkbox_set_text_static(cbOption[optionsTotal], " Off");
   cbOption[optionsTotal]->user_data = this;
   lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  if (settingsController.GetChimesState() == 0) {
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::None) {
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
@@ -53,7 +53,7 @@ SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::
   lv_checkbox_set_text_static(cbOption[optionsTotal], " Every hour");
   cbOption[optionsTotal]->user_data = this;
   lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  if (settingsController.GetChimesState() == 1) {
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours) {
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
@@ -62,7 +62,7 @@ SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::
   lv_checkbox_set_text_static(cbOption[optionsTotal], " Every 30 mins");
   cbOption[optionsTotal]->user_data = this;
   lv_obj_set_event_cb(cbOption[optionsTotal], event_handler);
-  if (settingsController.GetChimesState() == 2) {
+  if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours) {
     lv_checkbox_set_checked(cbOption[optionsTotal], true);
   }
 
@@ -79,7 +79,15 @@ void SettingChimes::UpdateSelected(lv_obj_t* object, lv_event_t event) {
     for (uint8_t i = 0; i < optionsTotal; i++) {
       if (object == cbOption[i]) {
         lv_checkbox_set_checked(cbOption[i], true);
-        settingsController.SetChimesState(i);
+        if (i == 0) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::None);
+        }
+        if (i == 1) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::Hours);
+        }
+        if (i == 2) {
+          settingsController.SetChimeOption(Controllers::Settings::ChimesOption::HalfHours);
+        }
       } else {
         lv_checkbox_set_checked(cbOption[i], false);
       }
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index b2926936..7fc3ba8f 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -405,7 +405,7 @@ void SystemTask::Work() {
           break;
         case Messages::OnNewHour:
           using Pinetime::Controllers::AlarmController;
-          if (settingsController.GetChimesState() == 1 && alarmController.State() != AlarmController::AlarmState::Alerting) {
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::Hours && alarmController.State() != AlarmController::AlarmState::Alerting) {
             if (isSleeping && !isWakingUp) {
               GoToRunning();
               displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);
@@ -415,7 +415,7 @@ void SystemTask::Work() {
           break;
         case Messages::OnNewHalfHour:
           using Pinetime::Controllers::AlarmController;
-          if (settingsController.GetChimesState() == 2 && alarmController.State() != AlarmController::AlarmState::Alerting) {
+          if (settingsController.GetChimeOption() == Controllers::Settings::ChimesOption::HalfHours && alarmController.State() != AlarmController::AlarmState::Alerting) {
             if (isSleeping && !isWakingUp) {
               GoToRunning();
               displayApp.PushMessage(Pinetime::Applications::Display::Messages::Clock);