diff options
author | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:40:49 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:40:49 +0100 |
commit | ef44b763d94cc6ff1be6f75ff3e638d7d356e99e (patch) | |
tree | a10a4068c592f13057edf3d1f2a94137becd95b8 /src/displayapp/screens/settings/Settings.h | |
parent | 40cdb547727d99ff140a029ae30980001e4a68f6 (diff) |
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
Apply a few changes that were requested in the PR during the review.
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.cpp
Diffstat (limited to 'src/displayapp/screens/settings/Settings.h')
-rw-r--r-- | src/displayapp/screens/settings/Settings.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h index 6c54cdeb..be090075 100644 --- a/src/displayapp/screens/settings/Settings.h +++ b/src/displayapp/screens/settings/Settings.h @@ -19,11 +19,12 @@ namespace Pinetime { private: Controllers::Settings& settingsController; - ScreenList<3> screens; + ScreenList<4> screens; std::unique_ptr<Screen> CreateScreen1(); std::unique_ptr<Screen> CreateScreen2(); std::unique_ptr<Screen> CreateScreen3(); + std::unique_ptr<Screen> CreateScreen4(); }; } } |