josh/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

continue swapping variables

Browse Source 
(cherry picked from commit bbfef9ee5c)
This commit is contained in:
Josh 2023-10-19 22:39:49 -04:00 committed by Josh
parent 5fd0671b1d
commit 9c2e2ec76c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
View File

@ -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_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); lv_obj_align(stepIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
heartbeatValue = lv_label_create(lv_scr_act(), nullptr); oldStepValue = 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_obj_set_style_local_text_color(oldStepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
lv_label_set_text_static(heartbeatValue, ""); lv_label_set_text_static(oldStepValue, "");
lv_obj_align(heartbeatValue, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0); lv_obj_align(oldStepValue, stepIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
oldStepValue = lv_label_create(lv_scr_act(), nullptr); 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_obj_set_style_local_text_color(oldStepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);

4
src/displayapp/screens/WatchFaceCasioStyleG7710.h
View File

@ -80,8 +80,10 @@ namespace Pinetime {
lv_obj_t* label_battery_value; lv_obj_t* label_battery_value;
lv_obj_t* heartbeatIcon; lv_obj_t* heartbeatIcon;
lv_obj_t* heartbeatValue; 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* stepValue;
lv_obj_t* oldStepValue;
lv_obj_t* notificationIcon; lv_obj_t* notificationIcon;
lv_obj_t* line_icons; lv_obj_t* line_icons;