From d1c00370d1e2f2536e097392a2e71ea3201c7d51 Mon Sep 17 00:00:00 2001 From: Eve C Date: Thu, 30 May 2024 15:54:21 +0200 Subject: [PATCH] combiner calendar et meow --- src/displayapp/fonts/fonts.json | 4 ++++ src/displayapp/screens/Symbols.h | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json index 30738176..9b6c416e 100644 --- a/src/displayapp/fonts/fonts.json +++ b/src/displayapp/fonts/fonts.json @@ -8,6 +8,7 @@ { "file": "FontAwesome5-Solid+Brands+Regular.woff", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "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, 0xf0f3, 0xf1f6, 0xf073" ======= @@ -25,6 +26,9 @@ "range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 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, 0xf4ba, 0xf236" >>>>>>> 9d04c32f (recovering manually changes to original Infineat) >>>>>>> 055b75d5 (test combiner tout) +======= + "range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 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, 0xf4ba, 0xf236, 0xf0f3, 0xf1f6" +>>>>>>> ce13c721 (fix fonts after merge mess) } ], "bpp": 1, diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 6ddf87a8..14197a11 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -11,14 +11,18 @@ namespace Pinetime { static constexpr const char* plug = "\xEF\x87\xA6"; static constexpr const char* shoe = "\xEF\x95\x8B"; <<<<<<< HEAD +<<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 055b75d5 (test combiner tout) +======= +>>>>>>> ce13c721 (fix fonts after merge mess) static constexpr const char* paw = "\xEF\x86\xB0"; static constexpr const char* clock = "\xEF\x80\x97"; static constexpr const char* bell = "\xEF\x83\xB3"; static constexpr const char* notbell = "\xEF\x87\xB6"; +<<<<<<< HEAD static constexpr const char* info = "\xEF\x84\xA9"; <<<<<<< HEAD ======= @@ -31,6 +35,9 @@ namespace Pinetime { static constexpr const char* info = "\xEF\x84\xA9"; >>>>>>> 9d04c32f (recovering manually changes to original Infineat) >>>>>>> 055b75d5 (test combiner tout) +======= + static constexpr const char* info = "\xEF\x84\xA9"; +>>>>>>> ce13c721 (fix fonts after merge mess) static constexpr const char* list = "\xEF\x80\xBA"; static constexpr const char* sun = "\xEF\x86\x85"; static constexpr const char* check = "\xEF\x95\xA0"; @@ -57,6 +64,7 @@ namespace Pinetime { static constexpr const char* eye = "\xEF\x81\xAE"; static constexpr const char* home = "\xEF\x80\x95"; static constexpr const char* sleep = "\xEE\xBD\x84"; +<<<<<<< HEAD <<<<<<< HEAD static constexpr const char* calendar = "\xEF\x81\xB3"; static constexpr const char* bird = "\xEF\x92\xBA"; @@ -66,16 +74,10 @@ namespace Pinetime { ======= <<<<<<< HEAD <<<<<<< HEAD +======= +>>>>>>> ce13c721 (fix fonts after merge mess) static constexpr const char* bird = "\xEF\x92\xBA"; static constexpr const char* zzz = "\xEF\x88\xB6"; -======= - static constexpr const char* bird = "\xEF\x92\xBA"; - static constexpr const char* zzz = "\xEF\x88\xB6"; ->>>>>>> 504f5774 (copy :( files from gitlab repo) -======= - static constexpr const char* bird = "\xEF\x92\xBA"; - static constexpr const char* zzz = "\xEF\x88\xB6"; ->>>>>>> 9d04c32f (recovering manually changes to original Infineat) // fontawesome_weathericons.c >>>>>>> 055b75d5 (test combiner tout)