Better alignment of the date label

2022-04-04 20:48:39 +02:00
parent cb2131ec2c
commit 603af7c372
2 changed files with 18 additions and 21 deletions
--- 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;