diff options
Diffstat (limited to 'src/displayapp/screens')
| -rw-r--r-- | src/displayapp/screens/HeartRate.cpp | 4 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingHeartRate.cpp | 71 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/SettingHeartRate.h | 44 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/Settings.h | 11 |
4 files changed, 120 insertions, 10 deletions
diff --git a/src/displayapp/screens/HeartRate.cpp b/src/displayapp/screens/HeartRate.cpp index 1a84d349..14c873e2 100644 --- a/src/displayapp/screens/HeartRate.cpp +++ b/src/displayapp/screens/HeartRate.cpp @@ -98,12 +98,12 @@ void HeartRate::Refresh() { void HeartRate::OnStartStopEvent(lv_event_t event) { if (event == LV_EVENT_CLICKED) { if (heartRateController.State() == Controllers::HeartRateController::States::Stopped) { - heartRateController.Start(); + heartRateController.Enable(); UpdateStartStopButton(heartRateController.State() != Controllers::HeartRateController::States::Stopped); wakeLock.Lock(); lv_obj_set_style_local_text_color(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::highlight); } else { - heartRateController.Stop(); + heartRateController.Disable(); UpdateStartStopButton(heartRateController.State() != Controllers::HeartRateController::States::Stopped); wakeLock.Release(); lv_obj_set_style_local_text_color(label_hr, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, Colors::lightGray); diff --git a/src/displayapp/screens/settings/SettingHeartRate.cpp b/src/displayapp/screens/settings/SettingHeartRate.cpp new file mode 100644 index 00000000..a45dc835 --- /dev/null +++ b/src/displayapp/screens/settings/SettingHeartRate.cpp @@ -0,0 +1,71 @@ +#include "displayapp/screens/settings/SettingHeartRate.h" +#include <lvgl/lvgl.h> +#include "displayapp/screens/Styles.h" +#include "displayapp/screens/Symbols.h" + +using namespace Pinetime::Applications::Screens; + +namespace { + void EventHandler(lv_obj_t* obj, lv_event_t event) { + auto* screen = static_cast<SettingHeartRate*>(obj->user_data); + screen->UpdateSelected(obj, event); + } +} + +SettingHeartRate::SettingHeartRate(Pinetime::Controllers::Settings& settingsController) : settingsController {settingsController} { + lv_obj_t* container = lv_cont_create(lv_scr_act(), nullptr); + + lv_obj_set_style_local_bg_opa(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); + lv_obj_set_style_local_pad_all(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5); + lv_obj_set_style_local_pad_inner(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5); + lv_obj_set_style_local_border_width(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); + + lv_obj_set_pos(container, 10, 60); + lv_obj_set_width(container, LV_HOR_RES - 20); + lv_obj_set_height(container, LV_VER_RES - 50); + lv_cont_set_layout(container, LV_LAYOUT_PRETTY_TOP); + + lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr); + lv_label_set_text_static(title, "Backg. Interval"); + lv_label_set_text(title, "Backg. Interval"); + lv_label_set_align(title, LV_LABEL_ALIGN_CENTER); + lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15); + + lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr); + lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED); + lv_label_set_text_static(icon, Symbols::heartBeat); + lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER); + lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0); + + std::optional<uint16_t> currentInterval = settingsController.GetHeartRateBackgroundMeasurementInterval(); + + for (std::size_t i = 0; i < options.size(); i++) { + cbOption[i] = lv_checkbox_create(container, nullptr); + lv_checkbox_set_text(cbOption[i], options[i].name); + cbOption[i]->user_data = this; + lv_obj_set_event_cb(cbOption[i], EventHandler); + SetRadioButtonStyle(cbOption[i]); + + if (options[i].intervalInSeconds == currentInterval) { + lv_checkbox_set_checked(cbOption[i], true); + } + } +} + +SettingHeartRate::~SettingHeartRate() { + lv_obj_clean(lv_scr_act()); + settingsController.SaveSettings(); +} + +void SettingHeartRate::UpdateSelected(lv_obj_t* object, lv_event_t event) { + if (event == LV_EVENT_CLICKED) { + for (std::size_t i = 0; i < options.size(); i++) { + if (object == cbOption[i]) { + lv_checkbox_set_checked(cbOption[i], true); + settingsController.SetHeartRateBackgroundMeasurementInterval(options[i].intervalInSeconds); + } else { + lv_checkbox_set_checked(cbOption[i], false); + } + } + } +} diff --git a/src/displayapp/screens/settings/SettingHeartRate.h b/src/displayapp/screens/settings/SettingHeartRate.h new file mode 100644 index 00000000..736f2b10 --- /dev/null +++ b/src/displayapp/screens/settings/SettingHeartRate.h @@ -0,0 +1,44 @@ +#pragma once + +#include <cstdint> +#include <lvgl/lvgl.h> +#include <optional> +#include <array> + +#include "components/settings/Settings.h" +#include "displayapp/screens/Screen.h" + +namespace Pinetime { + + namespace Applications { + namespace Screens { + class SettingHeartRate : public Screen { + public: + explicit SettingHeartRate(Pinetime::Controllers::Settings& settings); + ~SettingHeartRate() override; + + void UpdateSelected(lv_obj_t* object, lv_event_t event); + + private: + struct Option { + std::optional<uint16_t> intervalInSeconds; + const char* name; + }; + + Pinetime::Controllers::Settings& settingsController; + + static constexpr std::array<Option, 7> options = {{ + {.intervalInSeconds = std::nullopt, .name = " Off"}, + {.intervalInSeconds = 0, .name = "Cont"}, + {.intervalInSeconds = 30, .name = " 30s"}, + {.intervalInSeconds = 60, .name = " 1m"}, + {.intervalInSeconds = 5 * 60, .name = " 5m"}, + {.intervalInSeconds = 10 * 60, .name = " 10m"}, + {.intervalInSeconds = 30 * 60, .name = " 30m"}, + }}; + + lv_obj_t* cbOption[options.size()]; + }; + } + } +} diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h index 370e83f4..32ac3ca9 100644 --- a/src/displayapp/screens/settings/Settings.h +++ b/src/displayapp/screens/settings/Settings.h @@ -38,23 +38,18 @@ namespace Pinetime { {Symbols::home, "Watch face", Apps::SettingWatchFace}, {Symbols::shoe, "Steps", Apps::SettingSteps}, + {Symbols::heartBeat, "Heartrate", Apps::SettingHeartRate}, {Symbols::clock, "Date & Time", Apps::SettingSetDateTime}, {Symbols::cloudSunRain, "Weather", Apps::SettingWeatherFormat}, - {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}, + {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}, {Symbols::clock, "Chimes", Apps::SettingChimes}, {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, - {Symbols::shieldAlt, "Over-the-air", Apps::SettingOTA}, + {Symbols::shieldAlt, "Over-the-air", Apps::SettingOTA}, {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth}, {Symbols::list, "About", Apps::SysInfo}, - - // {Symbols::none, "None", Apps::None}, - // {Symbols::none, "None", Apps::None}, - // {Symbols::none, "None", Apps::None}, - // {Symbols::none, "None", Apps::None}, - }}; ScreenList<nScreens> screens; }; |
