mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
fix AlarmIcon.cpp and WatchFaceInfineat.cpp after merge mess
This commit is contained in:
parent
e8b1b94507
commit
055b9a93c4
|
@ -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::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)
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue