scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

SetingTimeFormat use CheckboxList, reduce duplication

Browse source
This commit is contained in:
Riku Isokoski 2023-01-03 17:09:59 +02:00
parent 96165a8541
commit 3c9b3435a5
3 changed files with 49 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/displayapp/screens/CheckboxList.cpp
View file

@ -28,7 +28,9 @@ CheckboxList::CheckboxList(const uint8_t screenID,
// Set the background to Black // Set the background to Black
lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK); lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
if (numScreens > 1) {
pageIndicator.Create(); pageIndicator.Create();
}
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr); lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);

101
src/displayapp/screens/settings/SettingTimeFormat.cpp
View file

@ -8,69 +8,56 @@
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<SettingTimeFormat*>(obj->user_data); Pinetime::Controllers::Settings::ClockType clockType;
screen->UpdateSelected(obj, event); const char* name;
};
constexpr std::array<Option, 2> options = {{
{Pinetime::Controllers::Settings::ClockType::H12, "12-hour"},
{Pinetime::Controllers::Settings::ClockType::H24, "24-hour"},
}};
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::ClockType currentOption) {
for (size_t i = 0; i < options.size(); i++) {
if (options[i].clockType == currentOption) {
return i;
}
}
return 0;
} }
} }
constexpr std::array<SettingTimeFormat::Option, 2> SettingTimeFormat::options;
SettingTimeFormat::SettingTimeFormat(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController) SettingTimeFormat::SettingTimeFormat(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); "Time format",
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.GetClockType()),
[&settings = settingsController](uint32_t index) {
lv_obj_set_pos(container1, 10, 60); settings.SetClockType(options[index].clockType);
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, "Time format");
lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 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);
cbOption[i]->user_data = this;
lv_obj_set_event_cb(cbOption[i], event_handler);
SetRadioButtonStyle(cbOption[i]);
}
if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
lv_checkbox_set_checked(cbOption[0], true);
} else if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
lv_checkbox_set_checked(cbOption[1], true);
}
} }
SettingTimeFormat::~SettingTimeFormat() { SettingTimeFormat::~SettingTimeFormat() {
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
settingsController.SaveSettings();
}
void SettingTimeFormat::UpdateSelected(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_VALUE_CHANGED) {
for (unsigned int i = 0; i < options.size(); i++) {
if (object == cbOption[i]) {
lv_checkbox_set_checked(cbOption[i], true);
settingsController.SetClockType(options[i].clockType);
} else {
lv_checkbox_set_checked(cbOption[i], false);
}
}
}
} }

15
src/displayapp/screens/settings/SettingTimeFormat.h
View file

@ -6,6 +6,7 @@
#include "components/settings/Settings.h" #include "components/settings/Settings.h"
#include "displayapp/screens/Screen.h" #include "displayapp/screens/Screen.h"
#include "displayapp/screens/CheckboxList.h"
namespace Pinetime { namespace Pinetime {
@ -17,20 +18,8 @@ namespace Pinetime {
SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController); SettingTimeFormat(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingTimeFormat() override; ~SettingTimeFormat() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private: private:
struct Option { CheckboxList checkboxList;
Controllers::Settings::ClockType clockType;
const char* name;
};
static constexpr std::array<Option, 2> options = {{
{Controllers::Settings::ClockType::H12, "12-hour"},
{Controllers::Settings::ClockType::H24, "24-hour"},
}};
Controllers::Settings& settingsController;
lv_obj_t* cbOption[options.size()];
}; };
} }
} }