Fixes based on code reviews

2 files changed, 9 insertions, 8 deletions

diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index 371593a..6b45a36 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -120,10 +120,7 @@ void Alarm::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
       return;
     }
     if (obj == btnMessage) {
-      lv_obj_del(txtMessage);
-      lv_obj_del(btnMessage);
-      txtMessage = nullptr;
-      btnMessage = nullptr;
+      HideInfo();
       return;
     }
     // If any other button was pressed, disable the alarm
@@ -176,10 +173,7 @@ void Alarm::OnButtonEvent(lv_obj_t* obj, lv_event_t event) {
 
 bool Alarm::OnButtonPushed() {
   if (txtMessage != nullptr && btnMessage != nullptr) {
-    lv_obj_del(txtMessage);
-    lv_obj_del(btnMessage);
-    txtMessage = nullptr;
-    btnMessage = nullptr;
+    HideInfo();
     return true;
   }
   return false;
@@ -235,6 +229,12 @@ void Alarm::ShowInfo() {
   }
 }
 
+void Alarm::HideInfo() {
+  lv_obj_del(btnMessage);
+  txtMessage = nullptr;
+  btnMessage = nullptr;
+}
+
 void Alarm::SetRecurButtonState() {
   using Pinetime::Controllers::AlarmController;
   switch (alarmController.Recurrence()) {
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index edd211b..32a14d2 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -47,6 +47,7 @@ namespace Pinetime {
         void SetRecurButtonState();
         void SetAlarm();
         void ShowInfo();
+        void HideInfo();
         void ToggleRecurrence();
         void UpdateAlarmTime();
       };