diff options
author | John Quigley <Elements6007@gmail.com> | 2023-01-14 14:50:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-14 21:50:21 +0200 |
commit | a7f8b59bfb1641dea7f30a267c6bf7e882d9edbf (patch) | |
tree | aa0a46d0da410c83165014af1007acf7be349530 /src/displayapp/screens/settings/SettingSetDate.h | |
parent | 6f6ea68acaf2d72dcef479dce429df214b51651c (diff) |
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 <riksu9000@gmail.com>
Diffstat (limited to 'src/displayapp/screens/settings/SettingSetDate.h')
-rw-r--r-- | src/displayapp/screens/settings/SettingSetDate.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/SettingSetDate.h b/src/displayapp/screens/settings/SettingSetDate.h index a0ffc683..dfb0e0d2 100644 --- a/src/displayapp/screens/settings/SettingSetDate.h +++ b/src/displayapp/screens/settings/SettingSetDate.h @@ -5,13 +5,17 @@ #include "components/datetime/DateTimeController.h" #include "displayapp/screens/Screen.h" #include "displayapp/widgets/Counter.h" +#include "displayapp/widgets/DotIndicator.h" +#include "displayapp/screens/settings/SettingSetDateTime.h" namespace Pinetime { namespace Applications { namespace Screens { class SettingSetDate : public Screen { public: - SettingSetDate(DisplayApp* app, Pinetime::Controllers::DateTime& dateTimeController); + SettingSetDate(DisplayApp* app, + Pinetime::Controllers::DateTime& dateTimeController, + Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime); ~SettingSetDate() override; void HandleButtonPress(); @@ -19,6 +23,7 @@ namespace Pinetime { private: Controllers::DateTime& dateTimeController; + Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime; lv_obj_t* btnSetTime; lv_obj_t* lblSetTime; |