summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-François Milants <jf@codingfield.com>2022-10-11 21:11:23 +0200
committerJF <JF002@users.noreply.github.com>2022-10-11 21:16:33 +0200
commit8c7be1fbb1d172ffc5cf99ec2b013f11f35dc421 (patch)
tree2807e32c74255e22038e40c5414ce0069e44658d /src
parent4ec49bde8a8cce78b8b72c978b3e3b1d529cef48 (diff)
CheckboxList : fix formatting.
Diffstat (limited to 'src')
-rw-r--r--src/displayapp/screens/CheckboxList.cpp7
-rw-r--r--src/displayapp/screens/CheckboxList.h4
-rw-r--r--src/displayapp/screens/settings/SettingWatchFace.cpp46
3 files changed, 28 insertions, 29 deletions
diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index 3d84166c..d97726dd 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -17,12 +17,9 @@ CheckboxList::CheckboxList(const uint8_t screenID,
const char* optionsTitle,
const char* optionsSymbol,
uint32_t originalValue,
- std::function<void(uint32_t)>OnValueChanged,
+ std::function<void(uint32_t)> OnValueChanged,
std::array<const char*, MaxItems> options)
- : Screen(app),
- screenID {screenID},
- OnValueChanged{std::move(OnValueChanged)},
- options {options}, value {originalValue} {
+ : Screen(app), screenID {screenID}, OnValueChanged {std::move(OnValueChanged)}, options {options}, value {originalValue} {
// 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);
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index 1bdb89d2..f9c3bae0 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -20,14 +20,14 @@ namespace Pinetime {
const char* optionsTitle,
const char* optionsSymbol,
uint32_t originalValue,
- std::function<void(uint32_t)>OnValueChanged,
+ std::function<void(uint32_t)> OnValueChanged,
std::array<const char*, MaxItems> options);
~CheckboxList() override;
void UpdateSelected(lv_obj_t* object, lv_event_t event);
private:
const uint8_t screenID;
- std::function<void(uint32_t)>OnValueChanged;
+ std::function<void(uint32_t)> OnValueChanged;
std::array<const char*, MaxItems> options;
std::array<lv_obj_t*, MaxItems> cbOption;
std::array<lv_point_t, 2> pageIndicatorBasePoints;
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index ce1efaa2..6d47f3a5 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -34,30 +34,32 @@ bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
std::array<const char*, 4> watchfaces {"Digital face", "Analog face", "PineTimeStyle", "Terminal"};
- return std::make_unique<Screens::CheckboxList>(0,
- 2,
- app,
- title,
- symbol,
- settingsController.GetClockFace(),
- [&settings = settingsController](uint32_t clockFace) {
- settings.SetClockFace(clockFace);
- settings.SaveSettings();
- },
- watchfaces);
+ return std::make_unique<Screens::CheckboxList>(
+ 0,
+ 2,
+ app,
+ title,
+ symbol,
+ settingsController.GetClockFace(),
+ [&settings = settingsController](uint32_t clockFace) {
+ settings.SetClockFace(clockFace);
+ settings.SaveSettings();
+ },
+ watchfaces);
}
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
std::array<const char*, 4> watchfaces {"Infineat face", "Casio G7710", "", ""};
- return std::make_unique<Screens::CheckboxList>(1,
- 2,
- app,
- title,
- symbol,
- settingsController.GetClockFace(),
- [&settings = settingsController](uint32_t clockFace) {
- settings.SetClockFace(clockFace);
- settings.SaveSettings();
- },
- watchfaces);
+ return std::make_unique<Screens::CheckboxList>(
+ 1,
+ 2,
+ app,
+ title,
+ symbol,
+ settingsController.GetClockFace(),
+ [&settings = settingsController](uint32_t clockFace) {
+ settings.SetClockFace(clockFace);
+ settings.SaveSettings();
+ },
+ watchfaces);
}