From d55ec42b1783a2857b8be67a87a27229fadca850 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
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 <lvgl/lvgl.h>
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
+#include <array>
 
 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<Option, 3> 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


From ecb3cd3e315ebd88fb4eb031562f60491d1765eb Mon Sep 17 00:00:00 2001
From: Reinhold Gschweicher <pyro4hell@gmail.com>
Date: Sun, 1 May 2022 20:21:37 +0200
Subject: SettingChimes: private Option struct, use std::array for cbOption

---
 src/displayapp/screens/settings/SettingChimes.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 70b080a8..e48432c6 100644
--- a/src/displayapp/screens/settings/SettingChimes.h
+++ b/src/displayapp/screens/settings/SettingChimes.h
@@ -13,24 +13,23 @@ 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:
+        struct Option {
+          Controllers::Settings::ChimesOption chimesOption;
+          const char* name;
+        };
         static constexpr std::array<Option, 3> 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()];
+        std::array<lv_obj_t*, options.size()> cbOption;
 
         Controllers::Settings& settingsController;
       };
-- 
cgit v1.2.3-70-g09d2