aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/settings/Settings.h
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-08-30 10:15:19 +0300
committerRiku Isokoski <riksu9000@gmail.com>2021-08-30 10:15:19 +0300
commit21d37d1e234b217b3e71dc65eb19db197ee21bad (patch)
treed1082c3dbcddd6d56fbb0f14fc9100f1efbfe441 /src/displayapp/screens/settings/Settings.h
parent085c9ab2e15b35af01d73e823a87994a7a24a76f (diff)
parent6c023785e53c507f7cb20703f5f3a221ea095068 (diff)
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
Diffstat (limited to 'src/displayapp/screens/settings/Settings.h')
-rw-r--r--src/displayapp/screens/settings/Settings.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 711a6be6..6c54cdeb 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -14,17 +14,16 @@ namespace Pinetime {
Settings(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~Settings() override;
- bool Refresh() override;
-
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
private:
Controllers::Settings& settingsController;
- ScreenList<2> screens;
+ ScreenList<3> screens;
std::unique_ptr<Screen> CreateScreen1();
std::unique_ptr<Screen> CreateScreen2();
+ std::unique_ptr<Screen> CreateScreen3();
};
}
}