port to font Awesome v6.6.0

* Removed 0xf00c (single checkmark) since it seems unused; the symbol named "check" on src/displayapp/screens/Symbols.h is actually a double checkmark. * Changed codepoint for tachometer to most similar icon in v6. Small remaining difference: the circle is not cut off at the bottom but whole. * Changed codepoint for home to most similar icon in v6, that is with chimney. Small remaining difference: the root is not separated by thin blank line from the body of the house.
InfiniTimeOrg · Nov 2, 2024 · 052db9c · 052db9c
1 parent 57b6db8
commit 052db9c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff b/src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff
diff --git a/src/displayapp/fonts/FontAwesome6-Brands.ttf b/src/displayapp/fonts/FontAwesome6-Brands.ttf
diff --git a/src/displayapp/fonts/FontAwesome6-Solid.ttf b/src/displayapp/fonts/FontAwesome6-Solid.ttf
diff --git 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
@@ -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
@@ -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