SettingBluetooth: Use CheckboxList
This commit is contained in:
parent
4b2a61ea4a
commit
32875944f9
|
@ -9,84 +9,52 @@
|
||||||
using namespace Pinetime::Applications::Screens;
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
void OnBluetoothDisabledEvent(lv_obj_t* obj, lv_event_t event) {
|
struct Option {
|
||||||
auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
|
const char* name;
|
||||||
screen->OnBluetoothDisabled(event);
|
bool radioEnabled;
|
||||||
}
|
};
|
||||||
|
|
||||||
void OnBluetoothEnabledEvent(lv_obj_t* obj, lv_event_t event) {
|
constexpr std::array<Option, 2> options = {{
|
||||||
auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
|
{"Enabled", true},
|
||||||
screen->OnBluetoothEnabled(event);
|
{"Disabled", false},
|
||||||
|
}};
|
||||||
|
|
||||||
|
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;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingBluetooth::SettingBluetooth(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
|
SettingBluetooth::SettingBluetooth(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);
|
"Bluetooth",
|
||||||
lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
|
Symbols::bluetooth,
|
||||||
lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
|
settingsController.GetBleRadioEnabled() ? 0 : 1,
|
||||||
|
[&settings = settingsController](uint32_t index) {
|
||||||
lv_obj_set_pos(container1, 10, 60);
|
const bool priorMode = settings.GetBleRadioEnabled();
|
||||||
lv_obj_set_width(container1, LV_HOR_RES - 20);
|
const bool newMode = options[index].radioEnabled;
|
||||||
lv_obj_set_height(container1, LV_VER_RES - 50);
|
if (newMode != priorMode) {
|
||||||
lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
|
settings.SetBleRadioEnabled(newMode);
|
||||||
|
|
||||||
lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
|
|
||||||
lv_label_set_text_static(title, "Bluetooth");
|
|
||||||
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::bluetooth);
|
|
||||||
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
|
|
||||||
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
|
|
||||||
|
|
||||||
cbEnabled = lv_checkbox_create(container1, nullptr);
|
|
||||||
lv_checkbox_set_text(cbEnabled, " Enabled");
|
|
||||||
cbEnabled->user_data = this;
|
|
||||||
lv_obj_set_event_cb(cbEnabled, OnBluetoothEnabledEvent);
|
|
||||||
SetRadioButtonStyle(cbEnabled);
|
|
||||||
|
|
||||||
cbDisabled = lv_checkbox_create(container1, nullptr);
|
|
||||||
lv_checkbox_set_text(cbDisabled, " Disabled");
|
|
||||||
cbDisabled->user_data = this;
|
|
||||||
lv_obj_set_event_cb(cbDisabled, OnBluetoothDisabledEvent);
|
|
||||||
SetRadioButtonStyle(cbDisabled);
|
|
||||||
|
|
||||||
if (settingsController.GetBleRadioEnabled()) {
|
|
||||||
lv_checkbox_set_checked(cbEnabled, true);
|
|
||||||
priorMode = true;
|
|
||||||
} else {
|
|
||||||
lv_checkbox_set_checked(cbDisabled, true);
|
|
||||||
priorMode = false;
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
CreateOptionArray()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingBluetooth::~SettingBluetooth() {
|
SettingBluetooth::~SettingBluetooth() {
|
||||||
lv_obj_clean(lv_scr_act());
|
lv_obj_clean(lv_scr_act());
|
||||||
// Do not call SaveSettings - see src/components/settings/Settings.h
|
// Pushing the message in the OnValueChanged function causes a freeze?
|
||||||
if (priorMode != settingsController.GetBleRadioEnabled()) {
|
|
||||||
app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
|
app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SettingBluetooth::OnBluetoothDisabled(lv_event_t event) {
|
|
||||||
if (event == LV_EVENT_VALUE_CHANGED) {
|
|
||||||
lv_checkbox_set_checked(cbEnabled, false);
|
|
||||||
lv_checkbox_set_checked(cbDisabled, true);
|
|
||||||
settingsController.SetBleRadioEnabled(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void SettingBluetooth::OnBluetoothEnabled(lv_event_t event) {
|
|
||||||
if (event == LV_EVENT_VALUE_CHANGED) {
|
|
||||||
lv_checkbox_set_checked(cbEnabled, true);
|
|
||||||
lv_checkbox_set_checked(cbDisabled, false);
|
|
||||||
settingsController.SetBleRadioEnabled(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,14 +18,8 @@ namespace Pinetime {
|
||||||
SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
|
SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
|
||||||
~SettingBluetooth() override;
|
~SettingBluetooth() override;
|
||||||
|
|
||||||
void OnBluetoothEnabled(lv_event_t event);
|
|
||||||
void OnBluetoothDisabled(lv_event_t event);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Controllers::Settings& settingsController;
|
CheckboxList checkboxList;
|
||||||
lv_obj_t* cbEnabled;
|
|
||||||
lv_obj_t* cbDisabled;
|
|
||||||
bool priorMode;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user