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 --- src/displayapp/DisplayApp.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/displayapp/DisplayApp.cpp') diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 69830ead..725caaf4 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -43,8 +43,7 @@ #include "displayapp/screens/settings/SettingWakeUp.h" #include "displayapp/screens/settings/SettingDisplay.h" #include "displayapp/screens/settings/SettingSteps.h" -#include "displayapp/screens/settings/SettingSetDate.h" -#include "displayapp/screens/settings/SettingSetTime.h" +#include "displayapp/screens/settings/SettingSetDateTime.h" #include "displayapp/screens/settings/SettingChimes.h" #include "displayapp/screens/settings/SettingShakeThreshold.h" #include "displayapp/screens/settings/SettingBluetooth.h" @@ -430,11 +429,8 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio case Apps::SettingSteps: currentScreen = std::make_unique(this, settingsController); break; - case Apps::SettingSetDate: - currentScreen = std::make_unique(this, dateTimeController); - break; - case Apps::SettingSetTime: - currentScreen = std::make_unique(this, dateTimeController, settingsController); + case Apps::SettingSetDateTime: + currentScreen = std::make_unique(this, dateTimeController, settingsController); break; case Apps::SettingChimes: currentScreen = std::make_unique(this, settingsController); -- cgit v1.2.3-70-g09d2