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

SettingChimes: Use CheckboxList

Browse Source
This commit is contained in:
Riku Isokoski 2023-01-22 12:24:07 +02:00
parent 32875944f9
commit 97123d99c9
2 changed files with 49 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/displayapp/screens/settings/SettingChimes.cpp
View File

@ -4,70 +4,62 @@
#include "displayapp/screens/Styles.h" #include "displayapp/screens/Styles.h"
#include "displayapp/screens/Screen.h" #include "displayapp/screens/Screen.h"
#include "displayapp/screens/Symbols.h" #include "displayapp/screens/Symbols.h"
#include <array>
using namespace Pinetime::Applications::Screens; using namespace Pinetime::Applications::Screens;
namespace { namespace {
void event_handler(lv_obj_t* obj, lv_event_t event) { struct Option {
auto* screen = static_cast<SettingChimes*>(obj->user_data); Pinetime::Controllers::Settings::ChimesOption chimesOption;
screen->UpdateSelected(obj, event); const char* name;
};
constexpr std::array<Option, 3> options = {{
{Pinetime::Controllers::Settings::ChimesOption::None, "Off"},
{Pinetime::Controllers::Settings::ChimesOption::Hours, "Every hour"},
{Pinetime::Controllers::Settings::ChimesOption::HalfHours, "Every 30 mins"},
}};
std::array<CheckboxList::Item, CheckboxList::MaxItems> CreateOptionArray() {
std::array<Pinetime::Applications::Screens::CheckboxList::Item, CheckboxList::MaxItems> optionArray;
for (size_t i = 0; i < CheckboxList::MaxItems; i++) {
if (i >= options.size()) {
optionArray[i].name = "";
optionArray[i].enabled = false;
} else {
optionArray[i].name = options[i].name;
optionArray[i].enabled = true;
}
}
return optionArray;
}
uint32_t GetDefaultOption(Pinetime::Controllers::Settings::ChimesOption currentOption) {
for (size_t i = 0; i < options.size(); i++) {
if (options[i].chimesOption == currentOption) {
return i;
}
}
return 0;
} }
} }
constexpr std::array<SettingChimes::Option, 3> SettingChimes::options;
SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) SettingChimes::SettingChimes(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
: Screen(app), settingsController {settingsController} { : Screen(app),
checkboxList(
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr); 0,
1,
lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP); app,
lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10); "Chimes",
lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5); Symbols::clock,
lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0); GetDefaultOption(settingsController.GetChimeOption()),
[&settings = settingsController](uint32_t index) {
lv_obj_set_pos(container1, 10, 60); settings.SetChimeOption(options[index].chimesOption);
lv_obj_set_width(container1, LV_HOR_RES - 20); settings.SaveSettings();
lv_obj_set_height(container1, LV_VER_RES - 50); },
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT); CreateOptionArray()) {
lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_text_static(title, "Chimes");
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_ORANGE);
lv_label_set_text_static(icon, Symbols::clock);
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
for (unsigned int i = 0; i < options.size(); i++) {
cbOption[i] = lv_checkbox_create(container1, nullptr);
lv_checkbox_set_text(cbOption[i], options[i].name);
if (settingsController.GetChimeOption() == options[i].chimesOption) {
lv_checkbox_set_checked(cbOption[i], true);
}
cbOption[i]->user_data = this;
lv_obj_set_event_cb(cbOption[i], event_handler);
SetRadioButtonStyle(cbOption[i]);
}
} }
SettingChimes::~SettingChimes() { SettingChimes::~SettingChimes() {
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
settingsController.SaveSettings();
}
void SettingChimes::UpdateSelected(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_VALUE_CHANGED) {
for (uint8_t i = 0; i < options.size(); i++) {
if (object == cbOption[i]) {
lv_checkbox_set_checked(cbOption[i], true);
settingsController.SetChimeOption(options[i].chimesOption);
} else {
lv_checkbox_set_checked(cbOption[i], false);
}
}
}
} }

16
src/displayapp/screens/settings/SettingChimes.h
View File

@ -2,9 +2,10 @@
#include <cstdint> #include <cstdint>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
#include "components/settings/Settings.h" #include "components/settings/Settings.h"
#include "displayapp/screens/Screen.h" #include "displayapp/screens/Screen.h"
#include <array> #include "displayapp/screens/CheckboxList.h"
namespace Pinetime { namespace Pinetime {
@ -19,18 +20,7 @@ namespace Pinetime {
void UpdateSelected(lv_obj_t* object, lv_event_t event); void UpdateSelected(lv_obj_t* object, lv_event_t event);
private: private:
struct Option { CheckboxList checkboxList;
Controllers::Settings::ChimesOption chimesOption;
const char* name;
};
static constexpr std::array<Option, 3> options = {{{Controllers::Settings::ChimesOption::None, "Off"},
{Controllers::Settings::ChimesOption::Hours, "Every hour"},
{Controllers::Settings::ChimesOption::HalfHours, "Every 30 mins"}}};
std::array<lv_obj_t*, options.size()> cbOption;
Controllers::Settings& settingsController;
}; };
} }
} }