CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Combine Date and Time Settings (#1465)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
src/displayapp/screens/settings/SettingSetDate.h
View File

@@ -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;