From d55ec42b1783a2857b8be67a87a27229fadca850 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Wed, 27 Apr 2022 13:11:02 +0300 Subject: Simplify SettingChimes code --- src/displayapp/screens/settings/SettingChimes.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/displayapp/screens/settings/SettingChimes.h') diff --git a/src/displayapp/screens/settings/SettingChimes.h b/src/displayapp/screens/settings/SettingChimes.h index a251e95b..70b080a8 100644 --- a/src/displayapp/screens/settings/SettingChimes.h +++ b/src/displayapp/screens/settings/SettingChimes.h @@ -4,6 +4,7 @@ #include #include "components/settings/Settings.h" #include "displayapp/screens/Screen.h" +#include namespace Pinetime { @@ -12,15 +13,26 @@ namespace Pinetime { class SettingChimes : public Screen { public: + struct Option { + Controllers::Settings::ChimesOption chimesOption; + const char* name; + }; + SettingChimes(DisplayApp* app, Pinetime::Controllers::Settings& settingsController); ~SettingChimes() override; void UpdateSelected(lv_obj_t* object, lv_event_t event); private: + static constexpr std::array options = {{ + {Controllers::Settings::ChimesOption::None, " Off"}, + {Controllers::Settings::ChimesOption::Hours, " Every hour"}, + {Controllers::Settings::ChimesOption::HalfHours, " Every 30 mins"} + }}; + + lv_obj_t* cbOption[options.size()]; + Controllers::Settings& settingsController; - uint8_t optionsTotal; - lv_obj_t* cbOption[3]; }; } } -- cgit v1.2.3-70-g09d2