diff options
Diffstat (limited to 'src/displayapp/screens/WatchFaceInfineat.h')
| -rw-r--r-- | src/displayapp/screens/WatchFaceInfineat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index 54e3cb74..3e4491fe 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -100,9 +100,14 @@ namespace Pinetime { lv_obj_t* labelHour; lv_obj_t* labelMinutes; lv_obj_t* labelTimeAmPm; +<<<<<<< HEAD lv_obj_t* dateContainer; lv_obj_t* labelDateDay; lv_obj_t* labelDateNum; +======= + lv_obj_t* dateBleContainer; + lv_obj_t* labelDate; +>>>>>>> 5e798689 (Better alignment of the date label) lv_obj_t* bleIcon; lv_obj_t* stepIcon; lv_obj_t* stepValue; |