leblane/WatchyWatchFace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaning up indentation in WatchFace.cpp
Some checks failed
Compile / Compile (push) Failing after 1m3s
Details

Browse source
This commit is contained in:
Lewis Jackson 2023-06-01 03:09:32 +03:00
parent 90c66be515
commit 24e04577f8
1 changed files with 105 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

210
src/WatchFace.cpp
View file

@ -24,7 +24,7 @@ void WatchFace::InitBoot()
void WatchFace::InitWake() void WatchFace::InitWake()
{ {
SetupVolatileMenuStuff(); SetupVolatileMenuStuff();
for (auto & page : m_pages) { for (auto & page : m_pages) {
page->InitWake(); page->InitWake();
@ -97,105 +97,105 @@ void WatchFace::DrawWatchFace(bool partialRefresh)
void WatchFace::SetupVolatileMenuStuff() void WatchFace::SetupVolatileMenuStuff()
{ {
static const std::vector<MenuPage> menuPages = { static const std::vector<MenuPage> menuPages = {
{ {
0, // backPageNum 0, // backPageNum
"WATCHY", // title "WATCHY", // title
ALIGNMENT_CENTER, // titleAlignment ALIGNMENT_CENTER, // titleAlignment
"", // body "", // body
{ // Menu items { // Menu items
{ {
"Sync NTP", // title "Sync NTP", // title
nullptr, // callback nullptr, // callback
1 // pageNum 1 // pageNum
}, },
{ {
"Set Timezone", // title "Set Timezone", // title
nullptr, // callback nullptr, // callback
2 // pageNum 2 // pageNum
}, },
{ {
"Reset Steps", // title "Reset Steps", // title
nullptr, // callback nullptr, // callback
3 // pageNum 3 // pageNum
}, },
{ {
"Back", // title "Back", // title
nullptr, // callback nullptr, // callback
0 // pageNum 0 // pageNum
} }
}, },
}, },
{ {
0, // backPageNum 0, // backPageNum
"SYNC NTP", // title "SYNC NTP", // title
ALIGNMENT_CENTER, // titleAlignment ALIGNMENT_CENTER, // titleAlignment
"Sync with:\n" NTP_SERVER, // body "Sync with:\n" NTP_SERVER, // body
{ // Menu items { // Menu items
{ {
"Sync", // title "Sync", // title
std::bind(&WatchFace::MenuNTPSyncSelected, this), // callback std::bind(&WatchFace::MenuNTPSyncSelected, this), // callback
1 // pageNum 1 // pageNum
}, },
{ {
"Back", // title "Back", // title
nullptr, // callback nullptr, // callback
0 // pageNum 0 // pageNum
} }
}, },
}, },
{ {
0, // backPageNum 0, // backPageNum
"TIMEZONE", // title "TIMEZONE", // title
ALIGNMENT_CENTER, // titleAlignment ALIGNMENT_CENTER, // titleAlignment
"", // body "", // body
{ // Menu items { // Menu items
{ {
"+0", // title "+0", // title
std::bind(&WatchFace::MenuTimeZoneSelected, this, 0), // callback std::bind(&WatchFace::MenuTimeZoneSelected, this, 0), // callback
0 // pageNum 0 // pageNum
}, },
{ {
"+1", // title "+1", // title
std::bind(&WatchFace::MenuTimeZoneSelected, this, 3600), // callback std::bind(&WatchFace::MenuTimeZoneSelected, this, 3600), // callback
0 // pageNum 0 // pageNum
}, },
{ {
"+2", // title "+2", // title
std::bind(&WatchFace::MenuTimeZoneSelected, this, 7200), // callback std::bind(&WatchFace::MenuTimeZoneSelected, this, 7200), // callback
0 // pageNum 0 // pageNum
}, },
{ {
"+3", // title "+3", // title
std::bind(&WatchFace::MenuTimeZoneSelected, this, 10800), // callback std::bind(&WatchFace::MenuTimeZoneSelected, this, 10800), // callback
0 // pageNum 0 // pageNum
}, },
{ {
"Back", // title "Back", // title
nullptr, // callback nullptr, // callback
0 // pageNum 0 // pageNum
} }
}, },
}, },
{ {
0, // backPageNum 0, // backPageNum
"RESET STEPS", // title "RESET STEPS", // title
ALIGNMENT_CENTER, // titleAlignment ALIGNMENT_CENTER, // titleAlignment
"Confirm?", // body "Confirm?", // body
{ // Menu items { // Menu items
{ {
"No", // title "No", // title
nullptr, // callback nullptr, // callback
0 // pageNum 0 // pageNum
}, },
{ {
"Yes", // title "Yes", // title
std::bind(&WatchFace::MenuConfirmResetSteps, this), // callback std::bind(&WatchFace::MenuConfirmResetSteps, this), // callback
0 // pageNum 0 // pageNum
} }
} }
} }
}; };
m_menu.SetPages(menuPages); m_menu.SetPages(menuPages);
m_menu.SetExitCallback(std::bind(&WatchFace::MenuExited, this)); m_menu.SetExitCallback(std::bind(&WatchFace::MenuExited, this));
@ -216,22 +216,22 @@ void WatchFace::MenuNTPSyncSelected()
DisconnectWiFi(); DisconnectWiFi();
m_features.rtc.Resync(); m_features.rtc.Resync();
if (m_inMenu) { if (m_inMenu) {
m_inMenu = false; m_inMenu = false;
m_menu.Reset(); m_menu.Reset();
DrawWatchFace(false); DrawWatchFace(false);
} }
} }
void WatchFace::MenuTimeZoneSelected(int tzOffset) void WatchFace::MenuTimeZoneSelected(int tzOffset)
{ {
m_features.storage.SetTzOffset(tzOffset); m_features.storage.SetTzOffset(tzOffset);
if (m_inMenu) { if (m_inMenu) {
m_inMenu = false; m_inMenu = false;
m_menu.Reset(); m_menu.Reset();
DrawWatchFace(false); DrawWatchFace(false);
} }
} }
void WatchFace::MenuConfirmResetSteps() void WatchFace::MenuConfirmResetSteps()