haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove new font, draw with lvgl

Browse source
This commit is contained in:
Reinhold Gschweicher 2024-10-06 20:17:58 +02:00
parent 0954e3b2b0
commit 2a8e953cb6
5 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/displayapp/DisplayApp.cpp
View file

@ -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"

2
src/displayapp/fonts/CMakeLists.txt
View file

@ -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")

10
src/displayapp/fonts/fonts.json
View file

@ -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": [
{

3
src/displayapp/screens/Symbols.h
View file

@ -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";
}
}
}

3
src/libs/lv_conf.h
View file

@ -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