From 8d87a9ed2a7ba4c04d24862f85306f7496b3d6f5 Mon Sep 17 00:00:00 2001 From: JustScott Date: Thu, 3 Oct 2024 15:51:00 -0500 Subject: Improved the Terminal Watchfaces UI + Reorder code to match the widgets order in the UI. + Moved all objects (rows) into a container + Use InfintimeTheme Colors instead of hardcoded hex values + Added a new InfinitimeTheme color: gray, using it to turn certain values gray when they contain no data + Implement @vkareh's [variable battery icon](https://github.com/InfiniTimeOrg/InfiniTime/pull/1964) color to the battery percentage text. + Replaced the 'You have mail.' notification message with the message '[1]+ Notify' to better fit the terminal lore. --- src/displayapp/screens/WatchFaceTerminal.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/displayapp/screens/WatchFaceTerminal.h') diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h index be425e7a..85d50b7a 100644 --- a/src/displayapp/screens/WatchFaceTerminal.h +++ b/src/displayapp/screens/WatchFaceTerminal.h @@ -50,16 +50,17 @@ namespace Pinetime { Utility::DirtyValue> currentDate; Utility::DirtyValue> currentWeather {}; + lv_obj_t* container; + lv_obj_t* notificationIcon; + lv_obj_t* label_prompt_1; lv_obj_t* label_time; lv_obj_t* label_date; - lv_obj_t* label_prompt_1; - lv_obj_t* label_prompt_2; lv_obj_t* batteryValue; - lv_obj_t* heartbeatValue; lv_obj_t* stepValue; - lv_obj_t* notificationIcon; - lv_obj_t* connectState; + lv_obj_t* heartbeatValue; lv_obj_t* weather; + lv_obj_t* connectState; + lv_obj_t* label_prompt_2; Controllers::DateTime& dateTimeController; const Controllers::Battery& batteryController; -- cgit v1.2.3-70-g09d2