remove lv_font_sys

2 files changed, 35 insertions, 11 deletions

diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h
index 13b7c89..8974ae1 100644
--- a/src/displayapp/screens/Symbols.h
+++ b/src/displayapp/screens/Symbols.h
@@ -130,13 +130,41 @@ namespace Pinetime {
         // lv_font_sys_48.c
         static constexpr const char* settings = "\xEE\xA4\x82"; // e902
 
-        static constexpr const char* brightnessHigh = "\xEE\xA4\x84";   // e904
-        static constexpr const char* brightnessLow = "\xEE\xA4\x85";    // e905
-        static constexpr const char* brightnessMedium = "\xEE\xA4\x86"; // e906
-
-        static constexpr const char* notificationsOff = "\xEE\xA4\x8B"; // e90b
-        static constexpr const char* notificationsOn = "\xEE\xA4\x8C";  // e90c
-
+        static constexpr const char brightnessHigh[] =
+          // "\xEE\xA4\x84";   // e904
+          G(X, X, X,
+            _, X, _,
+            X, X, X,
+            _, X, _,
+            X, X, X);
+        static constexpr const char brightnessLow[] =
+          // "\xEE\xA4\x85";    // e905
+          G(_, _, _,
+            _, X, _,
+            X, X, X,
+            _, X, _,
+            _, _, _);
+        static constexpr const char brightnessMedium[] =
+          // "\xEE\xA4\x86"; // e906
+          G(_, X, _,
+            X, X, X,
+            _, X, _,
+            X, X, X,
+            _, X, _);
+        static constexpr const char notificationsOff[] =
+          // "\xEE\xA4\x8B"; // e90b
+          G(_, _, _,
+            _, X, _,
+            _, X, _,
+            X, X, X,
+            X, X, X);
+        static constexpr const char notificationsOn[] =
+          // "\xEE\xA4\x8C";  // e90c
+          G(_, X, _,
+            _, X, _,
+            X, X, X,
+            X, X, X,
+            _, X, _);
         static constexpr const char* highlight = "\xEE\xA4\x87"; // e907
 
       }
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index c00518e..47f4ca5 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -61,7 +61,6 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_obj_align(btn1, nullptr, LV_ALIGN_IN_TOP_LEFT, buttonXOffset, barHeight);
 
   btn1_lvl = lv_label_create(btn1, nullptr);
-  lv_obj_set_style_local_text_font(btn1_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
   lv_label_set_text_static(btn1_lvl, brightness.GetIcon());
 
   btn2 = lv_btn_create(lv_scr_act(), nullptr);
@@ -73,7 +72,6 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
 
   lv_obj_t* lbl_btn;
   lbl_btn = lv_label_create(btn2, nullptr);
-  lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
   lv_label_set_text_static(lbl_btn, Symbols::highlight);
 
   btn3 = lv_btn_create(lv_scr_act(), nullptr);
@@ -86,7 +84,6 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_obj_align(btn3, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, buttonXOffset, 0);
 
   btn3_lvl = lv_label_create(btn3, nullptr);
-  lv_obj_set_style_local_text_font(btn3_lvl, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
 
   if (settingsController.GetNotificationStatus() == Controllers::Settings::Notification::ON) {
     lv_obj_add_state(btn3, LV_STATE_CHECKED);
@@ -103,7 +100,6 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
   lv_obj_align(btn4, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, - buttonXOffset, 0);
 
   lbl_btn = lv_label_create(btn4, nullptr);
-  lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
   lv_label_set_text_static(lbl_btn, Symbols::settings);
 
   lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr);