Compress code for WatchFaceTerminal

1 files changed, 15 insertions, 9 deletions

diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
index d236da3..d01e50f 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/screens/WatchFaceTerminal.h
@@ -55,16 +55,22 @@ namespace Pinetime {
         DirtyValue<bool> heartbeatRunning {};
         DirtyValue<bool> notificationState {};
 
-        lv_obj_t* label_time;
-        lv_obj_t* label_date;
-        lv_obj_t* label_prompt_1;
-        lv_obj_t* label_prompt_2;
+        union {
+          struct {
+            // line order should be the same as in the screen, top to bottom
+            lv_obj_t* notificationIcon;
+            lv_obj_t* label_prompt_1;
+            lv_obj_t* label_time;
+            lv_obj_t* label_date;
+            lv_obj_t* batteryValue;
+            lv_obj_t* stepValue;
+            lv_obj_t* heartbeatValue;
+            lv_obj_t* connectState;
+            lv_obj_t* label_prompt_2;
+          };
+          lv_obj_t *lines[9]; // This should match exactly the number of labels in the struct above!
+        };
         lv_obj_t* backgroundLabel;
-        lv_obj_t* batteryValue;
-        lv_obj_t* heartbeatValue;
-        lv_obj_t* stepValue;
-        lv_obj_t* notificationIcon;
-        lv_obj_t* connectState;
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;