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>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
index b61962c1..edd89b16 100644
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -6,6 +6,8 @@
 #include "components/settings/Settings.h"
 #include "displayapp/widgets/Counter.h"
 #include "displayapp/screens/Screen.h"
+#include "displayapp/widgets/DotIndicator.h"
+#include "displayapp/screens/settings/SettingSetDateTime.h"
 
 namespace Pinetime {
   namespace Applications {
@@ -14,7 +16,8 @@ namespace Pinetime {
       public:
         SettingSetTime(DisplayApp* app,
                        Pinetime::Controllers::DateTime& dateTimeController,
-                       Pinetime::Controllers::Settings& settingsController);
+                       Pinetime::Controllers::Settings& settingsController,
+                       Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime);
         ~SettingSetTime() override;
 
         void SetTime();
@@ -23,6 +26,7 @@ namespace Pinetime {
       private:
         Controllers::DateTime& dateTimeController;
         Controllers::Settings& settingsController;
+        Pinetime::Applications::Screens::SettingSetDateTime& settingSetDateTime;
 
         lv_obj_t* lblampm;
         lv_obj_t* btnSetTime;