Skip to content

Commit

Permalink
move date 1 px
Browse files Browse the repository at this point in the history
  • Loading branch information
Lennart Jahn committed Jun 4, 2024
1 parent 8138097 commit c5abbee
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/displayapp/screens/WatchFaceStarTrek.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) {
// with the future vision to make this all canvas size independent :)
// -- list for date and stuff
constexpr uint8_t gap = 3;
constexpr uint8_t labelgap = 4;
constexpr uint8_t cellheight = 26;
constexpr uint8_t cellwidth = 72;
constexpr uint8_t cells_x = 34;
Expand Down Expand Up @@ -218,10 +219,10 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) {
bleIcon = label(visible, COLOR_ICONS, listItem3[1], LV_ALIGN_CENTER, -gap, 0, Symbols::bluetooth);
batteryPlug = label(visible, COLOR_ICONS, listItem4[1], LV_ALIGN_CENTER, -gap, 0, Symbols::plug);

label_dayname = label(visible, COLOR_DATE, listItem1[0], LV_ALIGN_IN_LEFT_MID, gap);
label_day = label(visible, COLOR_DATE, listItem2[0], LV_ALIGN_IN_LEFT_MID, gap);
label_month = label(visible, COLOR_DATE, listItem3[0], LV_ALIGN_IN_LEFT_MID, gap);
label_year = label(visible, COLOR_DATE, listItem4[0], LV_ALIGN_IN_LEFT_MID, gap);
label_dayname = label(visible, COLOR_DATE, listItem1[0], LV_ALIGN_IN_LEFT_MID, labelgap);
label_day = label(visible, COLOR_DATE, listItem2[0], LV_ALIGN_IN_LEFT_MID, labelgap);
label_month = label(visible, COLOR_DATE, listItem3[0], LV_ALIGN_IN_LEFT_MID, labelgap);
label_year = label(visible, COLOR_DATE, listItem4[0], LV_ALIGN_IN_LEFT_MID, labelgap);

hourAnchor = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(hourAnchor, "");
Expand All @@ -239,10 +240,10 @@ void WatchFaceStarTrek::drawWatchFace(bool visible) {
label_time_seconds = label(settingsController.GetStarTrekDisplaySeconds(), COLOR_TIME, minuteAnchor, LV_ALIGN_CENTER, 0, 46, "00");
label_time_ampm = label(visible, COLOR_DATE, upperShape[2], LV_ALIGN_IN_BOTTOM_RIGHT, -30, -30);

temperature = label(visible, COLOR_DATE, upperShape[1], LV_ALIGN_IN_BOTTOM_LEFT, gap, -2);
weatherIcon = label(visible, COLOR_ICONS, temperature, LV_ALIGN_OUT_TOP_LEFT, 0, -gap);
temperature = label(visible, COLOR_DATE, upperShape[1], LV_ALIGN_IN_BOTTOM_LEFT, labelgap, -2);
weatherIcon = label(visible, COLOR_ICONS, temperature, LV_ALIGN_OUT_TOP_LEFT, gap, -gap);
lv_obj_set_style_local_text_font(weatherIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &fontawesome_weathericons);
heartbeatIcon = label(visible, COLOR_HEARTBEAT_OFF, lowerShape[3], LV_ALIGN_IN_TOP_LEFT, 5, gap, Symbols::heartBeat);
heartbeatIcon = label(visible, COLOR_HEARTBEAT_OFF, lowerShape[3], LV_ALIGN_IN_TOP_LEFT, 6, gap, Symbols::heartBeat);
heartbeatValue = label(visible, COLOR_ICONS, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5);
stepIcon = label(visible, COLOR_STEPS, imgBracketLeft, LV_ALIGN_OUT_RIGHT_MID, -2, 0, Symbols::shoe);
stepValue = label(visible, COLOR_STEPS, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0, "0");
Expand Down

0 comments on commit c5abbee

Please sign in to comment.