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>
This commit is contained in:
John Quigley
2023-01-14 14:50:21 -05:00
committed by GitHub
parent 6f6ea68aca
commit a7f8b59bfb
12 changed files with 170 additions and 35 deletions

View File

@@ -0,0 +1,54 @@
#include "displayapp/screens/settings/SettingSetDateTime.h"
#include "displayapp/screens/settings/SettingSetDate.h"
#include "displayapp/screens/settings/SettingSetTime.h"
#include "displayapp/DisplayApp.h"
#include "displayapp/screens/ScreenList.h"
#include "components/settings/Settings.h"
#include "displayapp/widgets/DotIndicator.h"
using namespace Pinetime::Applications::Screens;
bool SettingSetDateTime::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
return screens.OnTouchEvent(event);
}
SettingSetDateTime::SettingSetDateTime(Pinetime::Applications::DisplayApp* app,
Pinetime::Controllers::DateTime& dateTimeController,
Pinetime::Controllers::Settings& settingsController)
: Screen(app),
dateTimeController {dateTimeController},
settingsController {settingsController},
screens {app,
0,
{[this]() -> std::unique_ptr<Screen> {
return screenSetDate();
},
[this]() -> std::unique_ptr<Screen> {
return screenSetTime();
}},
Screens::ScreenListModes::UpDown} {
}
std::unique_ptr<Screen> SettingSetDateTime::screenSetDate() {
Widgets::DotIndicator dotIndicator(0, 2);
dotIndicator.Create();
return std::make_unique<Screens::SettingSetDate>(app, dateTimeController, *this);
}
std::unique_ptr<Screen> SettingSetDateTime::screenSetTime() {
Widgets::DotIndicator dotIndicator(1, 2);
dotIndicator.Create();
return std::make_unique<Screens::SettingSetTime>(app, dateTimeController, settingsController, *this);
}
SettingSetDateTime::~SettingSetDateTime() {
lv_obj_clean(lv_scr_act());
}
void SettingSetDateTime::Advance() {
screens.OnTouchEvent(Pinetime::Applications::TouchEvents::SwipeUp);
}
void SettingSetDateTime::Quit() {
running = false;
}