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 AlarmIcon.cpp and WatchFaceInfineat.cpp after merge mess

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

15
src/displayapp/screens/AlarmIcon.cpp
View file

@ -4,21 +4,8 @@ using namespace Pinetime::Applications::Screens;
const char* AlarmIcon::GetIcon(bool isSet) {
if (isSet) {
<<<<<<< HEAD
<<<<<<< HEAD
return Symbols::bell;
}
return Symbols::notbell;
=======
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
return Symbols::bird;
return Symbols::bird;
}
return Symbols::zzz;
<<<<<<< HEAD
>>>>>>> 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)
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
}

5
src/displayapp/screens/WatchFaceInfineat.cpp
View file

@ -259,11 +259,6 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController,
lv_obj_set_hidden(alarmIcon, true);
lv_obj_set_hidden(labelTimeAmPmAlarm, true);
}
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
stepValue = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, grayColor);
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);