From 9c2e2ec76ce52eac6a663d626e8e3a4f740c3c13 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 19 Oct 2023 22:39:49 -0400 Subject: [PATCH] continue swapping variables (cherry picked from commit bbfef9ee5c8e607f2bac52779d3e7d8a305f33b0) --- src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 8 ++++---- src/displayapp/screens/WatchFaceCasioStyleG7710.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp index 1dda5574..cb010289 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp @@ -155,10 +155,10 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text); lv_obj_align(stepIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2); - heartbeatValue = lv_label_create(lv_scr_act(), nullptr); - lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text); - lv_label_set_text_static(heartbeatValue, ""); - lv_obj_align(heartbeatValue, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0); + oldStepValue = lv_label_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_text_color(oldStepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text); + lv_label_set_text_static(oldStepValue, ""); + lv_obj_align(oldStepValue, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0); oldStepValue = lv_label_create(lv_scr_act(), nullptr); lv_obj_set_style_local_text_color(oldStepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text); diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h index 0f46a692..c147577f 100644 --- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h +++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h @@ -80,8 +80,10 @@ namespace Pinetime { lv_obj_t* label_battery_value; lv_obj_t* heartbeatIcon; lv_obj_t* heartbeatValue; - lv_obj_t* stepIcon; + lv_obj_t* stepIcon; //TODO: remove unused variables + lv_obj_t* oldStepIcon; lv_obj_t* stepValue; + lv_obj_t* oldStepValue; lv_obj_t* notificationIcon; lv_obj_t* line_icons;