diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 1ad2c6cb..dbdbdc02 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -30,7 +30,6 @@ #include "displayapp/screens/Weather.h" #include "displayapp/screens/PassKey.h" #include "displayapp/screens/Error.h" -#include "displayapp/screens/Symbols.h" #include "drivers/Cst816s.h" #include "drivers/St7789.h" diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt index 3f032808..22627efc 100644 --- a/src/displayapp/fonts/CMakeLists.txt +++ b/src/displayapp/fonts/CMakeLists.txt @@ -1,5 +1,5 @@ set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 - jetbrains_mono_extrabold_compressed lv_font_sys_48 lv_font_sys_80 + jetbrains_mono_extrabold_compressed lv_font_sys_48 open_sans_light fontawesome_weathericons) find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin") diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 59afed0f..41c383c0 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -64,16 +64,6 @@ "bpp": 1, "size": 48 }, - "lv_font_sys_80": { - "sources": [ - { - "file": "material-design-icons/MaterialIcons-Regular.ttf", - "range": "0xe897" - } - ], - "bpp": 1, - "size": 80 - }, "fontawesome_weathericons": { "sources": [ { diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 323fc73a..bd958b28 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -64,9 +64,6 @@ namespace Pinetime { static constexpr const char* flashlight = "\xEF\x80\x8B"; static constexpr const char* paintbrushLg = "\xEE\x90\x8A"; - - // wake-up screenlock icon, from material icons - static constexpr const char* lock = "\xEE\xA2\x97"; } } } diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 9bf21fb8..c23647f2 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -419,8 +419,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in LV_FONT_DECLARE(jetbrains_mono_76) \ LV_FONT_DECLARE(open_sans_light) \ LV_FONT_DECLARE(fontawesome_weathericons) \ - LV_FONT_DECLARE(lv_font_sys_48) \ - LV_FONT_DECLARE(lv_font_sys_80) + LV_FONT_DECLARE(lv_font_sys_48) /* Enable it if you have fonts with a lot of characters. * The limit depends on the font size, font face and bpp