diff --git a/doc/alarmStatusOnInfineat/alarmStatusOnInfineat.md b/doc/alarmStatusOnInfineat/alarmStatusOnInfineat.md new file mode 100644 index 00000000..22885a84 --- /dev/null +++ b/doc/alarmStatusOnInfineat/alarmStatusOnInfineat.md @@ -0,0 +1,22 @@ +# [InfiniTime : show alarm status on infineat watchface](https://github.com/Eve1374/InfiniTime/tree/alarm-status-on-infineat) +- I forked from [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime) and added a branch alarm-status-on-infineat +- I modified the watchface settings to have the possibility to show alarm status on watchface + +Here are pictures with alarm set in 12 and 24hrs format : + +![alarm set and shown, 12hrs format](infineat_alarm_set_12hrs.png "alarm set and shown, 12hrs format") +![alarm set and shown, 24hrs format](infineat_alarm_set_24hrs.png "alarm set and shown, 24hrs format") + +Alarm not set : + +![alarm shown and not set](infineat_alarm_notset.png "alarm shown and not set") + +Settings view : + +![settings](infineat_settings.png "settings modified with a button to turn on or off alarm display") + + +## Possible further development : +- Move this setting to the Alarm app and include alarm display in all watchfaces ? + + diff --git a/doc/alarmStatusOnInfineat/infineat_alarm_notset.png b/doc/alarmStatusOnInfineat/infineat_alarm_notset.png new file mode 100644 index 00000000..a8883db0 Binary files /dev/null and b/doc/alarmStatusOnInfineat/infineat_alarm_notset.png differ diff --git a/doc/alarmStatusOnInfineat/infineat_alarm_set_12hrs.png b/doc/alarmStatusOnInfineat/infineat_alarm_set_12hrs.png new file mode 100644 index 00000000..259c0983 Binary files /dev/null and b/doc/alarmStatusOnInfineat/infineat_alarm_set_12hrs.png differ diff --git a/doc/alarmStatusOnInfineat/infineat_alarm_set_24hrs.png b/doc/alarmStatusOnInfineat/infineat_alarm_set_24hrs.png new file mode 100644 index 00000000..d31de798 Binary files /dev/null and b/doc/alarmStatusOnInfineat/infineat_alarm_set_24hrs.png differ diff --git a/doc/alarmStatusOnInfineat/infineat_settings.png b/doc/alarmStatusOnInfineat/infineat_settings.png new file mode 100644 index 00000000..0dffd5e7 Binary files /dev/null and b/doc/alarmStatusOnInfineat/infineat_settings.png differ diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index 1849e0fb..20d0beb3 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -257,6 +257,7 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController, if (!settingsController.GetInfineatShowAlarmStatus()) { lv_obj_set_hidden(labelAlarm, true); lv_obj_set_hidden(alarmIcon, true); + lv_obj_set_hidden(labelTimeAmPmAlarm, true); } stepValue = lv_label_create(lv_scr_act(), nullptr); @@ -417,6 +418,7 @@ void WatchFaceInfineat::UpdateSelected(lv_obj_t* object, lv_event_t event) { bool newShowAlarmStatus = settingsController.GetInfineatShowAlarmStatus(); lv_obj_set_hidden(labelAlarm, !newShowAlarmStatus); lv_obj_set_hidden(alarmIcon, !newShowAlarmStatus); + lv_obj_set_hidden(labelTimeAmPmAlarm, !newShowAlarmStatus); const char* labelToggleAlarm = newShowAlarmStatus ? Symbols::bell : Symbols::notbell; lv_label_set_text_static(lblAlarm, labelToggleAlarm); }