diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-10-10 16:01:43 +0200 |
commit | cf9e149b33885c67c84697a9b422e123c090bc72 (patch) | |
tree | c59c322655180d670ebaa3a47e9686eaada5eff7 /src/displayapp/screens/settings/Settings.cpp | |
parent | 977faebcb8b26212e0868b30e1af5c38076ff6cb (diff) | |
parent | 3e9c30a18fb0a0fa7cc69e62821ca0d11e518f47 (diff) |
Merge with develop and fix conflicts from timaios:set-datetime-manually.
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index e3319f03..1daf311e 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -49,9 +49,9 @@ std::unique_ptr<Screen> Settings::CreateScreen2() { std::array<Screens::List::Applications, 4> applications {{ {Symbols::shoe, "Steps", Apps::SettingSteps}, - {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}, - {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, - {Symbols::check, "Firmware", Apps::FirmwareValidation}, + {Symbols::clock, "Set date", Apps::SettingSetDate}, + {Symbols::clock, "Set time", Apps::SettingSetTime}, + {Symbols::batteryHalf, "Battery", Apps::BatteryInfo} }}; return std::make_unique<Screens::List>(1, 3, app, settingsController, applications); @@ -60,10 +60,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() { std::unique_ptr<Screen> Settings::CreateScreen3() { std::array<Screens::List::Applications, 4> applications {{ + {Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, + {Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::list, "About", Apps::SysInfo}, {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None}, }}; return std::make_unique<Screens::List>(2, 3, app, settingsController, applications); |