integration fixes

1 files changed, 5 insertions, 4 deletions

diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index 03dfd58..f5b54f7 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -36,7 +36,7 @@ namespace Pinetime {
         void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
         bool OnButtonPushed() override;
         bool OnTouchEvent(TouchEvents event) override;
-        void StopAlerting();
+        void StopAlarm();
 
       private:
         uint8_t alarmHours;
@@ -45,16 +45,17 @@ namespace Pinetime {
         Controllers::Settings& settingsController;
         System::SystemTask& systemTask;
 
-        lv_obj_t *time, *lblampm, *btnStop, *txtStop, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp,
-          *txtMinDown, *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo, *enableSwitch;
+        lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown,
+          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo;
         lv_obj_t* txtMessage = nullptr;
         lv_obj_t* btnMessage = nullptr;
         lv_task_t* taskStopAlarm = nullptr;
 
         enum class EnableButtonState { On, Off, Alerting };
+        void SetEnableButtonState();
         void SetRecurButtonState();
-        void SetSwitchState(lv_anim_enable_t anim);
         void OnAlarmStart();
+        void SetAlarm();
         void ShowInfo();
         void HideInfo();
         void ToggleRecurrence();