diff --git a/src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff b/src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff deleted file mode 100644 index 791b410139..0000000000 Binary files a/src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff and /dev/null differ diff --git a/src/displayapp/fonts/FontAwesome6-Brands.ttf b/src/displayapp/fonts/FontAwesome6-Brands.ttf new file mode 100644 index 0000000000..08362f3424 Binary files /dev/null and b/src/displayapp/fonts/FontAwesome6-Brands.ttf differ diff --git a/src/displayapp/fonts/FontAwesome6-Solid.ttf b/src/displayapp/fonts/FontAwesome6-Solid.ttf new file mode 100644 index 0000000000..e7e2ecfa34 Binary files /dev/null and b/src/displayapp/fonts/FontAwesome6-Solid.ttf differ diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md index 20fb4a43e8..c52fbe8bce 100644 --- a/src/displayapp/fonts/README.md +++ b/src/displayapp/fonts/README.md @@ -1,7 +1,7 @@ # Fonts - [Jetbrains Mono](https://www.jetbrains.com/lp/mono/) -- [Font Awesome](https://fontawesome.com/v5/cheatsheet/free/solid) +- [Font Awesome](https://fontawesome.com/v6/search?m=free) - [Open Sans Light](https://fonts.google.com/specimen/Open+Sans) - [Material Symbols](https://fonts.google.com/icons) diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 41c383c0d4..f86ab931ce 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -6,8 +6,12 @@ "range": "0x20-0x7e, 0x410-0x44f, 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" + "file": "FontAwesome6-Brands.ttf", + "range": "0xf294" + }, + { + "file": "FontAwesome6-Solid.ttf", + "range": "0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf625, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xe3af, 0xf0f3, 0xf522, 0xf743" } ], "bpp": 1, @@ -67,7 +71,7 @@ "fontawesome_weathericons": { "sources": [ { - "file": "FontAwesome5-Solid+Brands+Regular.woff", + "file": "FontAwesome6-Solid.ttf", "range": "0xf185, 0xf6c4, 0xf743, 0xf740, 0xf75f, 0xf0c2, 0xf05e, 0xf73b, 0xf0e7, 0xf2dc" } ], diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index bd958b285f..ba0bca6cd7 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -17,7 +17,7 @@ namespace Pinetime { static constexpr const char* sun = "\xEF\x86\x85"; static constexpr const char* check = "\xEF\x95\xA0"; static constexpr const char* music = "\xEF\x80\x81"; - static constexpr const char* tachometer = "\xEF\x8F\xBD"; + static constexpr const char* tachometer = "\xEF\x98\xA5"; static constexpr const char* paintbrush = "\xEF\x87\xBC"; static constexpr const char* paddle = "\xEF\x91\x9D"; static constexpr const char* map = "\xEF\x96\xa0"; @@ -37,7 +37,7 @@ namespace Pinetime { static constexpr const char* drum = "\xEF\x95\xA9"; static constexpr const char* dice = "\xEF\x94\xA2"; static constexpr const char* eye = "\xEF\x81\xAE"; - static constexpr const char* home = "\xEF\x80\x95"; + static constexpr const char* home = "\xEE\x8E\xAF"; static constexpr const char* sleep = "\xEE\xBD\x84"; // fontawesome_weathericons.c