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

Merge branch 'develop' into refresh_rework

Browse Source
This commit is contained in:
Riku Isokoski
2021-08-03 12:16:40 +03:00
parent fc93bdbbba 514481ef7f
commit 10b5d30ec3
40 changed files with 340 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/displayapp/screens/settings/Settings.cpp
View File

@@ -34,9 +34,9 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
std::array<Screens::List::Applications, 4> applications {{
{Symbols::sun, "Display", Apps::SettingDisplay},
{Symbols::clock, "Wake Up", Apps::SettingWakeUp},
{Symbols::eye, "Wake Up", Apps::SettingWakeUp},
{Symbols::clock, "Time format", Apps::SettingTimeFormat},
{Symbols::clock, "Watch face", Apps::SettingWatchFace},
{Symbols::home, "Watch face", Apps::SettingWatchFace},
}};
return std::make_unique<Screens::List>(0, 2, app, settingsController, applications);