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

add larger font for fuzzy face

Browse Source
This commit is contained in:
Ryan Rix 2024-06-10 20:19:06 -07:00
parent c20db14c43
commit 41518cc529
5 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/displayapp/UserApps.h
View File

@ -2,10 +2,20 @@
#include "displayapp/apps/Apps.h" #include "displayapp/apps/Apps.h"
#include "Controllers.h" #include "Controllers.h"
#include "displayapp/screens/Alarm.h"
#include "displayapp/screens/Dice.h"
#include "displayapp/screens/Timer.h"
#include "displayapp/screens/Twos.h"
#include "displayapp/screens/Tile.h"
#include "displayapp/screens/ApplicationList.h" #include "displayapp/screens/ApplicationList.h"
#include "displayapp/screens/WatchFaceDigital.h"
#include "displayapp/screens/WatchFaceAnalog.h"
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
#include "displayapp/screens/WatchFaceInfineat.h"
#include "displayapp/screens/WatchFacePineTimeStyle.h"
#include "displayapp/screens/WatchFaceTerminal.h"
#include "displayapp/screens/WatchFaceFuzzy.h" #include "displayapp/screens/WatchFaceFuzzy.h"
#include "displayapp/screens/WatchFaceSundial.h" #include "displayapp/screens/WatchFaceSundial.h"
#include "displayapp/screens/WatchFaceDigital.h"
namespace Pinetime { namespace Pinetime {
namespace Applications { namespace Applications {

4
src/displayapp/fonts/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 jetbrains_mono_bold_24
jetbrains_mono_extrabold_compressed lv_font_sys_48 jetbrains_mono_extrabold_compressed lv_font_sys_48
fontawesome_weathericons) open_sans_light fontawesome_weathericons)
find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin") HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
message(STATUS "Using ${LV_FONT_CONV} to generate font files") message(STATUS "Using ${LV_FONT_CONV} to generate font files")

24
src/displayapp/fonts/fonts.json
View File

@ -13,6 +13,20 @@
"bpp": 1, "bpp": 1,
"size": 20 "size": 20
}, },
"jetbrains_mono_bold_24": {
"sources": [
{
"file": "Vulf_Mono-Italic.woff",
"range": "0x20-0x7e, 0xB0"
},
{
"file": "FontAwesome5-Solid+Brands+Regular.woff",
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743"
}
],
"bpp": 1,
"size": 26
},
"jetbrains_mono_42": { "jetbrains_mono_42": {
"sources": [ "sources": [
{ {
@ -43,6 +57,16 @@
"bpp": 1, "bpp": 1,
"size": 80 "size": 80
}, },
"open_sans_light": {
"sources": [
{
"file": "open_sans_light.ttf",
"symbols": "0123456789"
}
],
"bpp": 1,
"size": 150
},
"lv_font_sys_48": { "lv_font_sys_48": {
"sources": [ "sources": [
{ {

2
src/displayapp/screens/WatchFaceFuzzy.cpp
View File

@ -50,7 +50,7 @@ WatchFaceFuzzy::WatchFaceFuzzy(Controllers::DateTime& dateTimeController,
lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999)); lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
label_time = lv_label_create(lv_scr_act(), nullptr); label_time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20); lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_24);
lv_label_set_recolor(label_time, true); lv_label_set_recolor(label_time, true);
lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0); lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 0, 0);

2
src/displayapp/screens/WatchFaceFuzzy.h
View File

@ -12,6 +12,8 @@
#include "utility/DirtyValue.h" #include "utility/DirtyValue.h"
#include "displayapp/apps/Apps.h" #include "displayapp/apps/Apps.h"
extern lv_font_t jetbrains_mono_bold_24;
namespace Pinetime { namespace Pinetime {
namespace Controllers { namespace Controllers {
class Settings; class Settings;