InfiniTime.git

diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
index ae3f3dbb36aebc1c3b5e2900f0391f3e0b796d27..5822a1e8d00821f80fd6b5998f34b39f4fb4e0d0 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -274,7 +274,8 @@   btnClose->user_data = this;
   lv_obj_set_size(btnClose, 60, 60);
   lv_obj_align(btnClose, lv_scr_act(), LV_ALIGN_CENTER, 0, -80);
   lv_obj_set_style_local_bg_opa(btnClose, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70);
-  lv_obj_set_style_local_value_str(btnClose, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "X");
+  lv_obj_t* lblClose = lv_label_create(btnClose, nullptr);
+  lv_label_set_text_static(lblClose, "X");
   lv_obj_set_event_cb(btnClose, event_handler);
   lv_obj_set_hidden(btnClose, true);
 
@@ -283,7 +284,8 @@   btnNextColor->user_data = this;
   lv_obj_set_size(btnNextColor, 60, 60);
   lv_obj_align(btnNextColor, lv_scr_act(), LV_ALIGN_IN_RIGHT_MID, -15, 0);
   lv_obj_set_style_local_bg_opa(btnNextColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70);
-  lv_obj_set_style_local_value_str(btnNextColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, ">");
+  lv_obj_t* lblNextColor = lv_label_create(btnNextColor, nullptr);
+  lv_label_set_text_static(lblNextColor, ">");
   lv_obj_set_event_cb(btnNextColor, event_handler);
   lv_obj_set_hidden(btnNextColor, true);
 
@@ -292,7 +294,8 @@   btnPrevColor->user_data = this;
   lv_obj_set_size(btnPrevColor, 60, 60);
   lv_obj_align(btnPrevColor, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 15, 0);
   lv_obj_set_style_local_bg_opa(btnPrevColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70);
-  lv_obj_set_style_local_value_str(btnPrevColor, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "<");
+  lv_obj_t* lblPrevColor = lv_label_create(btnPrevColor, nullptr);
+  lv_label_set_text_static(lblPrevColor, "<");
   lv_obj_set_event_cb(btnPrevColor, event_handler);
   lv_obj_set_hidden(btnPrevColor, true);
 
@@ -302,7 +305,8 @@   lv_obj_set_size(btnToggleCover, 60, 60);
   lv_obj_align(btnToggleCover, lv_scr_act(), LV_ALIGN_CENTER, 0, 80);
   lv_obj_set_style_local_bg_opa(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_70);
   const char* labelToggle = settingsController.GetInfineatShowSideCover() ? "ON" : "OFF";
-  lv_obj_set_style_local_value_str(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, labelToggle);
+  lblToggle = lv_label_create(btnToggleCover, nullptr);
+  lv_label_set_text_static(lblToggle, labelToggle);
   lv_obj_set_event_cb(btnToggleCover, event_handler);
   lv_obj_set_hidden(btnToggleCover, true);
 
@@ -406,7 +410,7 @@       lv_obj_set_hidden(line8, showSideCover);
       lv_obj_set_hidden(btnNextColor, showSideCover);
       lv_obj_set_hidden(btnPrevColor, showSideCover);
       const char* labelToggle = showSideCover ? "OFF" : "ON";
-      lv_obj_set_style_local_value_str(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, labelToggle);
+      lv_label_set_text_static(lblToggle, labelToggle);
     }
     if (object == btnNextColor) {
       colorIndex = (colorIndex + 1) % nColors;




diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h
index 4a7dbebdc7a6e16a212677369cffb3e61989f04e..285908e833d10087772ba7aa32ee1e7ce02a4f01 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/screens/WatchFaceInfineat.h
@@ -112,6 +112,7 @@         lv_obj_t* btnToggleCover;
         lv_obj_t* btnPrevColor;
         lv_obj_t* btnSettings;
         lv_obj_t* labelBtnSettings;
+        lv_obj_t* lblToggle;
 
         static constexpr int nLines = 9;
         static constexpr int nColors = 7; // must match number of colors in InfineatColors