haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix fonts after merge mess

Browse source
This commit is contained in:
ecarlett 2024-05-29 15:33:21 +02:00
parent 5ac1e90040
commit ce13c721be
2 changed files with 1 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/displayapp/fonts/fonts.json
View file

@ -7,15 +7,7 @@
}, },
{ {
"file": "FontAwesome5-Solid+Brands+Regular.woff", "file": "FontAwesome5-Solid+Brands+Regular.woff",
<<<<<<< HEAD "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"
<<<<<<< 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"
=======
"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"
>>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
=======
"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)
} }
], ],
"bpp": 1, "bpp": 1,

26
src/displayapp/screens/Symbols.h
View file

@ -10,27 +10,11 @@ namespace Pinetime {
static constexpr const char* bluetooth = "\xEF\x8A\x94"; static constexpr const char* bluetooth = "\xEF\x8A\x94";
static constexpr const char* plug = "\xEF\x87\xA6"; static constexpr const char* plug = "\xEF\x87\xA6";
static constexpr const char* shoe = "\xEF\x95\x8B"; static constexpr const char* shoe = "\xEF\x95\x8B";
<<<<<<< HEAD
<<<<<<< HEAD
static constexpr const char* paw = "\xEF\x86\xB0"; static constexpr const char* paw = "\xEF\x86\xB0";
static constexpr const char* clock = "\xEF\x80\x97"; static constexpr const char* clock = "\xEF\x80\x97";
static constexpr const char* bell = "\xEF\x83\xB3"; static constexpr const char* bell = "\xEF\x83\xB3";
static constexpr const char* notbell = "\xEF\x87\xB6"; static constexpr const char* notbell = "\xEF\x87\xB6";
static constexpr const char* info = "\xEF\x84\xA9"; static constexpr const char* info = "\xEF\x84\xA9";
=======
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";
static constexpr const char* info = "\xEF\x84\xA9";
>>>>>>> 504f5774 (copy :( files from gitlab repo)
=======
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";
static constexpr const char* info = "\xEF\x84\xA9";
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
static constexpr const char* list = "\xEF\x80\xBA"; static constexpr const char* list = "\xEF\x80\xBA";
static constexpr const char* sun = "\xEF\x86\x85"; static constexpr const char* sun = "\xEF\x86\x85";
static constexpr const char* check = "\xEF\x95\xA0"; static constexpr const char* check = "\xEF\x95\xA0";
@ -57,18 +41,8 @@ namespace Pinetime {
static constexpr const char* eye = "\xEF\x81\xAE"; static constexpr const char* eye = "\xEF\x81\xAE";
static constexpr const char* home = "\xEF\x80\x95"; static constexpr const char* home = "\xEF\x80\x95";
static constexpr const char* sleep = "\xEE\xBD\x84"; static constexpr const char* sleep = "\xEE\xBD\x84";
<<<<<<< HEAD
<<<<<<< HEAD
static constexpr const char* bird = "\xEF\x92\xBA"; static constexpr const char* bird = "\xEF\x92\xBA";
static constexpr const char* zzz = "\xEF\x88\xB6"; 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 // fontawesome_weathericons.c
// static constexpr const char* sun = "\xEF\x86\x85"; // static constexpr const char* sun = "\xEF\x86\x85";