|
2 | 2 | #include <lvgl/lvgl.h>
|
3 | 3 | #include "displayapp/DisplayApp.h"
|
4 | 4 | #include "displayapp/screens/Symbols.h"
|
| 5 | +#include "displayapp/InfiniTimeTheme.h" |
5 | 6 |
|
6 | 7 | using namespace Pinetime::Applications::Screens;
|
7 | 8 |
|
@@ -42,22 +43,29 @@ SettingSteps::SettingSteps(Pinetime::Applications::DisplayApp* app, Pinetime::Co
|
42 | 43 | lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
|
43 | 44 | lv_label_set_text_fmt(stepValue, "%lu", settingsController.GetStepsGoal());
|
44 | 45 | lv_label_set_align(stepValue, LV_LABEL_ALIGN_CENTER);
|
45 |
| - lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -10); |
| 46 | + lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_CENTER, 0, -20); |
| 47 | + |
| 48 | + static constexpr uint8_t btnWidth = 115; |
| 49 | + static constexpr uint8_t btnHeight = 80; |
46 | 50 |
|
47 | 51 | btnPlus = lv_btn_create(lv_scr_act(), nullptr);
|
48 | 52 | btnPlus->user_data = this;
|
49 |
| - lv_obj_set_size(btnPlus, 80, 50); |
50 |
| - lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_CENTER, 55, 80); |
| 53 | + lv_obj_set_size(btnPlus, btnWidth, btnHeight); |
| 54 | + lv_obj_align(btnPlus, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); |
| 55 | + lv_obj_set_style_local_bg_color(btnPlus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt); |
51 | 56 | lv_obj_t* lblPlus = lv_label_create(btnPlus, nullptr);
|
| 57 | + lv_obj_set_style_local_text_font(lblPlus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); |
52 | 58 | lv_label_set_text_static(lblPlus, "+");
|
53 | 59 | lv_obj_set_event_cb(btnPlus, event_handler);
|
54 | 60 |
|
55 | 61 | btnMinus = lv_btn_create(lv_scr_act(), nullptr);
|
56 | 62 | btnMinus->user_data = this;
|
57 |
| - lv_obj_set_size(btnMinus, 80, 50); |
| 63 | + lv_obj_set_size(btnMinus, btnWidth, btnHeight); |
58 | 64 | lv_obj_set_event_cb(btnMinus, event_handler);
|
59 |
| - lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_CENTER, -55, 80); |
| 65 | + lv_obj_align(btnMinus, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 0, 0); |
| 66 | + lv_obj_set_style_local_bg_color(btnMinus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt); |
60 | 67 | lv_obj_t* lblMinus = lv_label_create(btnMinus, nullptr);
|
| 68 | + lv_obj_set_style_local_text_font(lblMinus, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42); |
61 | 69 | lv_label_set_text_static(lblMinus, "-");
|
62 | 70 | }
|
63 | 71 |
|
|
0 commit comments