CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Jean-François Milants
2022-09-11 20:18:01 +02:00
parent 970d5b368d
commit 58bb0e77db
6 changed files with 135 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/displayapp/screens/settings/SettingWatchFace.cpp
View File

@@ -17,14 +17,12 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
settingsController {settingsController},
screens {app,
settingsController.GetWatchfacesMenu(),
{
[this]() -> std::unique_ptr<Screen> {
return CreateScreen1();
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen2();
}
},
{[this]() -> std::unique_ptr<Screen> {
return CreateScreen1();
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen2();
}},
Screens::ScreenListModes::UpDown} {
}
@@ -39,16 +37,26 @@ 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, settingsController, title,
symbol, &Controllers::Settings::SetClockFace,
return std::make_unique<Screens::CheckboxList>(0,
2,
app,
settingsController,
title,
symbol,
&Controllers::Settings::SetClockFace,
&Controllers::Settings::GetClockFace,
watchfaces);
}
std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
std::array<const char*, 4> watchfaces {"Infineat face", "", "", ""};
return std::make_unique<Screens::CheckboxList>(1, 2, app, settingsController, title,
symbol, &Controllers::Settings::SetClockFace,
return std::make_unique<Screens::CheckboxList>(1,
2,
app,
settingsController,
title,
symbol,
&Controllers::Settings::SetClockFace,
&Controllers::Settings::GetClockFace,
watchfaces);
}