Fixes based on code reviews (formatting, UI code)

1 files changed, 37 insertions, 19 deletions

diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index 30bcb73..43bbc6f 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -1,3 +1,16 @@
+/*  Copyright (C) 2021 JF, Adam Pigg, Avamander
+    This file is part of InfiniTime.
+    InfiniTime is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    InfiniTime is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 #pragma once
 
 #include "Screen.h"
@@ -5,27 +18,32 @@
 #include "../LittleVgl.h"
 #include "components/alarm/AlarmController.h"
 
-namespace Pinetime::Applications::Screens {
-  class Alarm : public Screen {
-  public:
-    Alarm(DisplayApp* app, Controllers::AlarmController& alarmController);
-    ~Alarm() override;
-    void SetAlerting();
-    void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
+      class Alarm : public Screen {
+      public:
+        Alarm(DisplayApp* app, Controllers::AlarmController& alarmController);
+        ~Alarm() override;
+        void SetAlerting();
+        void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
 
-  private:
-    bool running;
-    uint8_t alarmHours = 0;
-    uint8_t alarmMinutes = 0;
-    Controllers::AlarmController& alarmController;
+      private:
+        bool running;
+        uint8_t alarmHours = 0;
+        uint8_t alarmMinutes = 0;
+        Controllers::AlarmController& alarmController;
 
-    lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown, *txtHrUp,
-      *txtHrDown, *btnRecur, *txtRecur, *btnMessage, *txtMessage, *btnInfo, *txtInfo;
+        lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown,
+          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnMessage, *txtMessage, *btnInfo, *txtInfo;
 
-    enum class EnableButtonState { On, Off, Alerting };
-    void setEnableButtonState();
-    void setRecurButtonState();
-    void setAlarm();
-    void showInfo();
+        enum class EnableButtonState { On, Off, Alerting };
+        void SetEnableButtonState();
+        void SetRecurButtonState();
+        void SetAlarm();
+        void ShowInfo();
+        void ToggleRecurrence();
+      };
+    };
   };
 }
\ No newline at end of file