summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/ApplicationList.h
diff options
context:
space:
mode:
authorJF <jf@codingfield.com>2021-05-21 09:38:38 (GMT)
committerGitea <gitea@fake.local>2021-05-21 09:38:38 (GMT)
commitde69905c0647997091d9e385538c96de30be93e6 (patch)
tree4775001d808da520c93a7552da1bea80e7714a30 /src/displayapp/screens/ApplicationList.h
parenta80e782f267cd2424d22da23d809c0c6a8ff8761 (diff)
parent7c9513be8a3bf36fda5706cb0fb1bd6232d42ffd (diff)
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/displayapp/screens/ApplicationList.h')
-rw-r--r--src/displayapp/screens/ApplicationList.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index e334ccd..88534ec 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -12,24 +12,24 @@ namespace Pinetime {
namespace Applications {
namespace Screens {
class ApplicationList : public Screen {
- public:
- explicit ApplicationList(DisplayApp* app,
- Pinetime::Controllers::Settings &settingsController,
- Pinetime::Controllers::Battery& batteryController,
- Controllers::DateTime& dateTimeController);
- ~ApplicationList() override;
- bool Refresh() override;
- bool OnTouchEvent(TouchEvents event) override;
- private:
+ public:
+ explicit ApplicationList(DisplayApp* app,
+ Pinetime::Controllers::Settings& settingsController,
+ Pinetime::Controllers::Battery& batteryController,
+ Controllers::DateTime& dateTimeController);
+ ~ApplicationList() override;
+ bool Refresh() override;
+ bool OnTouchEvent(TouchEvents event) override;
- Controllers::Settings& settingsController;
- Pinetime::Controllers::Battery& batteryController;
- Controllers::DateTime& dateTimeController;
+ private:
+ Controllers::Settings& settingsController;
+ Pinetime::Controllers::Battery& batteryController;
+ Controllers::DateTime& dateTimeController;
- ScreenList<2> screens;
- std::unique_ptr<Screen> CreateScreen1();
- std::unique_ptr<Screen> CreateScreen2();
- //std::unique_ptr<Screen> CreateScreen3();
+ ScreenList<2> screens;
+ std::unique_ptr<Screen> CreateScreen1();
+ std::unique_ptr<Screen> CreateScreen2();
+ // std::unique_ptr<Screen> CreateScreen3();
};
}
}