diff options
author | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
---|---|---|
committer | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
commit | b9e56843a29672b2befa65bf036f6db21078291f (patch) | |
tree | c2fa91e352127c09abd0f9b4959cd1f47d628ea8 /src/displayapp/screens/Notifications.h | |
parent | cdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff) | |
parent | 3eb73774a39e255cd4b5de76441a59f1525a989c (diff) |
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to 'src/displayapp/screens/Notifications.h')
-rw-r--r-- | src/displayapp/screens/Notifications.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h index f6f8b4c3..0b5271e7 100644 --- a/src/displayapp/screens/Notifications.h +++ b/src/displayapp/screens/Notifications.h @@ -43,21 +43,13 @@ namespace Pinetime { void OnCallButtonEvent(lv_obj_t*, lv_event_t event); private: - uint8_t notifNr = 0; - uint8_t notifNb = 0; - char pageText[4]; - lv_obj_t* container1; - lv_obj_t* t1; - lv_obj_t* l1; - lv_obj_t* l2; lv_obj_t* bt_accept; lv_obj_t* bt_mute; lv_obj_t* bt_reject; lv_obj_t* label_accept; lv_obj_t* label_mute; lv_obj_t* label_reject; - lv_obj_t* bottomPlaceholder; Modes mode; Pinetime::Controllers::AlertNotificationService& alertNotificationService; bool running = true; |