From 8cf38a34697baf6803c2661357504a6ba1eb8a9f Mon Sep 17 00:00:00 2001 From: Ryan Rix Date: Sun, 9 Jun 2024 20:28:35 -0700 Subject: [PATCH] remove unused open sans light --- src/displayapp/fonts/CMakeLists.txt | 2 +- src/displayapp/fonts/fonts.json | 19 ++++--------------- .../screens/settings/SettingWatchFace.h | 4 ++-- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt index 22627efc..0baecf4a 100644 --- a/src/displayapp/fonts/CMakeLists.txt +++ b/src/displayapp/fonts/CMakeLists.txt @@ -1,6 +1,6 @@ set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20 jetbrains_mono_extrabold_compressed lv_font_sys_48 - open_sans_light fontawesome_weathericons) + fontawesome_weathericons) find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin") message(STATUS "Using ${LV_FONT_CONV} to generate font files") diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 41c383c0..1a07d8cf 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -2,8 +2,8 @@ "jetbrains_mono_bold_20": { "sources": [ { - "file": "JetBrainsMono-Bold.ttf", - "range": "0x20-0x7e, 0x410-0x44f, 0xB0" + "file": "Vulf_Mono-Italic.woff", + "range": "0x20-0x7e, 0xB0" }, { "file": "FontAwesome5-Solid+Brands+Regular.woff", @@ -11,13 +11,12 @@ } ], "bpp": 1, - "size": 20, - "patches": ["jetbrains_mono_bold_20.c_zero.patch", "jetbrains_mono_bold_20.c_M.patch"] + "size": 20 }, "jetbrains_mono_42": { "sources": [ { - "file": "JetBrainsMono-Regular.ttf", + "file": "Vulf Mono Light Italic.ttf", "range": "0x25, 0x2b, 0x2d, 0x2e, 0x30-0x3a, 0x43, 0x46, 0x4b-0x4d, 0x66, 0x69, 0x6b, 0x6d, 0x74, 0xb0" } ], @@ -44,16 +43,6 @@ "bpp": 1, "size": 80 }, - "open_sans_light": { - "sources": [ - { - "file": "open_sans_light.ttf", - "symbols": "0123456789" - } - ], - "bpp": 1, - "size": 150 - }, "lv_font_sys_48": { "sources": [ { diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h index 4c75b0ab..2dee4b82 100644 --- a/src/displayapp/screens/settings/SettingWatchFace.h +++ b/src/displayapp/screens/settings/SettingWatchFace.h @@ -9,8 +9,8 @@ #include "displayapp/screens/Screen.h" #include "displayapp/screens/Symbols.h" #include "displayapp/screens/CheckboxList.h" -#include "displayapp/screens/WatchFaceInfineat.h" -#include "displayapp/screens/WatchFaceCasioStyleG7710.h" +// #include "displayapp/screens/WatchFaceInfineat.h" +// #include "displayapp/screens/WatchFaceCasioStyleG7710.h" namespace Pinetime {