From a7f8b59bfb1641dea7f30a267c6bf7e882d9edbf Mon Sep 17 00:00:00 2001 From: John Quigley Date: Sat, 14 Jan 2023 14:50:21 -0500 Subject: Combine Date and Time Settings (#1465) Replace separate SettingSetDate and SettingSetTime with a combined screenlist. Add DotIndicators. Similar to PageIndicator, but for use when separating screens instead of pages of a list. Co-authored-by: Riku Isokoski --- .../screens/settings/SettingSetDateTime.h | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/displayapp/screens/settings/SettingSetDateTime.h (limited to 'src/displayapp/screens/settings/SettingSetDateTime.h') diff --git a/src/displayapp/screens/settings/SettingSetDateTime.h b/src/displayapp/screens/settings/SettingSetDateTime.h new file mode 100644 index 00000000..dea283f8 --- /dev/null +++ b/src/displayapp/screens/settings/SettingSetDateTime.h @@ -0,0 +1,32 @@ +#pragma once + +#include +#include +#include "displayapp/screens/Screen.h" +#include "displayapp/screens/ScreenList.h" + +namespace Pinetime { + namespace Applications { + namespace Screens { + class SettingSetDateTime : public Screen { + public: + SettingSetDateTime(DisplayApp* app, + Pinetime::Controllers::DateTime& dateTimeController, + Pinetime::Controllers::Settings& settingsController); + ~SettingSetDateTime() override; + + bool OnTouchEvent(TouchEvents event) override; + void Advance(); + void Quit(); + + private: + Controllers::DateTime& dateTimeController; + Controllers::Settings& settingsController; + + ScreenList<2> screens; + std::unique_ptr screenSetDate(); + std::unique_ptr screenSetTime(); + }; + } + } +} -- cgit v1.2.3-70-g09d2