From 15c3807a761b00a6dcdcc3a516e67e584f0a55c9 Mon Sep 17 00:00:00 2001 From: SteveAmor Date: Tue, 4 Jan 2022 19:32:29 +0000 Subject: Adds enum class for chimes option --- src/displayapp/screens/settings/SettingChimes.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/displayapp') 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); } -- cgit v1.2.3