Skip to content

Commit 3e0c1f1

Browse files
committed
Update UI. Remove "Mild" level button.
1 parent 92b8cd3 commit 3e0c1f1

2 files changed

Lines changed: 10 additions & 20 deletions

File tree

src/displayapp/screens/FindMyPhone.cpp

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ namespace {
1010
static constexpr char defaultLabelText[] = "Find my phone";
1111
static constexpr char alertSentLabelText[] = "Alert sent";
1212
static constexpr char noConnectionLabelText[] = "No connection";
13+
static constexpr char noneLabelText[] = "Stop";
14+
static constexpr char highLabelText[] = "Ring";
1315
static constexpr auto restoreLabelTimeoutTicks = pdMS_TO_TICKS(2 * 1000);
1416

1517
void btnImmediateAlertEventHandler(lv_obj_t* obj, lv_event_t event) {
@@ -44,28 +46,19 @@ FindMyPhone::FindMyPhone(Pinetime::Controllers::ImmediateAlertClient& immediateA
4446
bt_none = lv_btn_create(container, nullptr);
4547
bt_none->user_data = this;
4648
lv_obj_set_event_cb(bt_none, btnImmediateAlertEventHandler);
47-
lv_obj_set_size(bt_none, 76, 76);
49+
lv_obj_set_size(bt_none, 114, 76);
4850
lv_obj_align(bt_none, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
4951
label_none = lv_label_create(bt_none, nullptr);
50-
lv_label_set_text_static(label_none, "None");
52+
lv_label_set_text_static(label_none, noneLabelText);
5153
lv_obj_set_style_local_bg_color(bt_none, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray);
5254

53-
bt_mild = lv_btn_create(container, nullptr);
54-
bt_mild->user_data = this;
55-
lv_obj_set_event_cb(bt_mild, btnImmediateAlertEventHandler);
56-
lv_obj_set_size(bt_mild, 76, 76);
57-
lv_obj_align(bt_mild, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
58-
label_mild = lv_label_create(bt_mild, nullptr);
59-
lv_label_set_text_static(label_mild, "Mild");
60-
lv_obj_set_style_local_bg_color(bt_mild, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight);
61-
6255
bt_high = lv_btn_create(container, nullptr);
6356
bt_high->user_data = this;
6457
lv_obj_set_event_cb(bt_high, btnImmediateAlertEventHandler);
65-
lv_obj_set_size(bt_high, 76, 76);
58+
lv_obj_set_size(bt_high, 114, 76);
6659
lv_obj_align(bt_high, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
6760
label_high = lv_label_create(bt_high, nullptr);
68-
lv_label_set_text_static(label_high, "High");
61+
lv_label_set_text_static(label_high, highLabelText);
6962
lv_obj_set_style_local_bg_color(bt_high, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
7063
}
7164

@@ -77,8 +70,6 @@ void FindMyPhone::OnImmediateAlertEvent(lv_obj_t* obj, lv_event_t event) {
7770
if (event == LV_EVENT_CLICKED) {
7871
if (obj == bt_none) {
7972
last_level = Pinetime::Controllers::ImmediateAlertClient::Levels::NoAlert;
80-
} else if (obj == bt_mild) {
81-
last_level = Pinetime::Controllers::ImmediateAlertClient::Levels::MildAlert;
8273
} else if (obj == bt_high) {
8374
last_level = Pinetime::Controllers::ImmediateAlertClient::Levels::HighAlert;
8475
}
@@ -91,12 +82,13 @@ void FindMyPhone::UpdateImmediateAlerts() {
9182
case Pinetime::Controllers::ImmediateAlertClient::Levels::NoAlert:
9283
lv_obj_set_style_local_text_color(label_title, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray);
9384
break;
94-
case Pinetime::Controllers::ImmediateAlertClient::Levels::MildAlert:
95-
lv_obj_set_style_local_text_color(label_title, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight);
96-
break;
9785
case Pinetime::Controllers::ImmediateAlertClient::Levels::HighAlert:
9886
lv_obj_set_style_local_text_color(label_title, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
9987
break;
88+
case Pinetime::Controllers::ImmediateAlertClient::Levels::MildAlert:
89+
// Not supported.
90+
ASSERT(false);
91+
break;
10092
}
10193
if (immediateAlertClient.sendImmediateAlert(last_level)) {
10294
lv_label_set_text_static(label_title, alertSentLabelText);

src/displayapp/screens/FindMyPhone.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ namespace Pinetime {
3939
lv_obj_t* label_title;
4040
lv_obj_t* bt_none;
4141
lv_obj_t* bt_high;
42-
lv_obj_t* bt_mild;
4342
lv_obj_t* label_none;
4443
lv_obj_t* label_high;
45-
lv_obj_t* label_mild;
4644
lv_task_t* taskRestoreLabelText = nullptr;
4745

4846
Pinetime::Controllers::ImmediateAlertClient::Levels last_level;

0 commit comments

Comments
 (0)