will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove clockType variable by checking for nullptr instead.

Browse Source 
Saves a few bytes
This commit is contained in:
Riku Isokoski 2022-07-26 13:15:07 +03:00 committed by JF
parent 97048121b0
commit 7a6ede112e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/displayapp/screens/Alarm.cpp
View File

@ -43,12 +43,18 @@ Alarm::Alarm(DisplayApp* app,
Controllers::AlarmController& alarmController, Controllers::AlarmController& alarmController,
Controllers::Settings::ClockType clockType, Controllers::Settings::ClockType clockType,
System::SystemTask& systemTask) System::SystemTask& systemTask)
: Screen(app), alarmController {alarmController}, clockType {clockType}, systemTask {systemTask} { : Screen(app), alarmController {alarmController}, systemTask {systemTask} {
hourCounter.Create(); hourCounter.Create();
lv_obj_align(hourCounter.GetObject(), nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0); lv_obj_align(hourCounter.GetObject(), nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 0);
if (clockType == Controllers::Settings::ClockType::H12) { if (clockType == Controllers::Settings::ClockType::H12) {
hourCounter.EnableTwelveHourMode(); hourCounter.EnableTwelveHourMode();
lblampm = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
lv_label_set_text_static(lblampm, "AM");
lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
} }
hourCounter.SetValue(alarmController.Hours()); hourCounter.SetValue(alarmController.Hours());
hourCounter.SetValueChangedEventCallback(this, ValueChangedHandler); hourCounter.SetValueChangedEventCallback(this, ValueChangedHandler);
@ -63,12 +69,6 @@ Alarm::Alarm(DisplayApp* app,
lv_label_set_text_static(colonLabel, ":"); lv_label_set_text_static(colonLabel, ":");
lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29); lv_obj_align(colonLabel, lv_scr_act(), LV_ALIGN_CENTER, 0, -29);
lblampm = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
lv_label_set_text_static(lblampm, " ");
lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
btnStop = lv_btn_create(lv_scr_act(), nullptr); btnStop = lv_btn_create(lv_scr_act(), nullptr);
btnStop->user_data = this; btnStop->user_data = this;
lv_obj_set_event_cb(btnStop, btnEventHandler); lv_obj_set_event_cb(btnStop, btnEventHandler);
@ -179,7 +179,7 @@ void Alarm::OnValueChanged() {
} }
void Alarm::UpdateAlarmTime() { void Alarm::UpdateAlarmTime() {
if (clockType == Controllers::Settings::ClockType::H12) { if (lblampm != nullptr) {
if (hourCounter.GetValue() >= 12) { if (hourCounter.GetValue() >= 12) {
lv_label_set_text_static(lblampm, "PM"); lv_label_set_text_static(lblampm, "PM");
} else { } else {

4
src/displayapp/screens/Alarm.h
View File

@ -42,10 +42,10 @@ namespace Pinetime {
private: private:
Controllers::AlarmController& alarmController; Controllers::AlarmController& alarmController;
const Controllers::Settings::ClockType clockType;
System::SystemTask& systemTask; System::SystemTask& systemTask;
lv_obj_t *lblampm, *btnStop, *txtStop, *btnRecur, *txtRecur, *btnInfo, *enableSwitch; lv_obj_t *btnStop, *txtStop, *btnRecur, *txtRecur, *btnInfo, *enableSwitch;
lv_obj_t* lblampm = nullptr;
lv_obj_t* txtMessage = nullptr; lv_obj_t* txtMessage = nullptr;
lv_obj_t* btnMessage = nullptr; lv_obj_t* btnMessage = nullptr;
lv_task_t* taskStopAlarm = nullptr; lv_task_t* taskStopAlarm = nullptr;