Skip to content

Replace dot indicator with page indicator on settings Date & Time #2475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SteveAmor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace dot indicator with page indicator on settings Date & Time #2475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ list(APPEND SOURCE_FILES
displayapp/Colors.cpp
displayapp/widgets/Counter.cpp
displayapp/widgets/PageIndicator.cpp
displayapp/widgets/DotIndicator.cpp
displayapp/widgets/StatusIcons.cpp

## Settings
Expand Down Expand Up @@ -622,7 +621,6 @@ set(INCLUDE_FILES
displayapp/Colors.h
displayapp/widgets/Counter.h
displayapp/widgets/PageIndicator.h
displayapp/widgets/DotIndicator.h
displayapp/widgets/StatusIcons.h
drivers/St7789.h
drivers/SpiNorFlash.h
Expand Down
2 changes: 2 additions & 0 deletions src/displayapp/screens/settings/SettingSetDate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ SettingSetDate::SettingSetDate(Pinetime::Controllers::DateTime& dateTimeControll
lblSetTime = lv_label_create(btnSetTime, nullptr);
lv_label_set_text_static(lblSetTime, "Set");
lv_obj_set_event_cb(btnSetTime, event_handler);

pageIndicator.Create();
}

SettingSetDate::~SettingSetDate() {
Expand Down
3 changes: 2 additions & 1 deletion src/displayapp/screens/settings/SettingSetDate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "components/datetime/DateTimeController.h"
#include "displayapp/screens/Screen.h"
#include "displayapp/widgets/Counter.h"
#include "displayapp/widgets/DotIndicator.h"
#include "displayapp/widgets/PageIndicator.h"
#include "displayapp/screens/settings/SettingSetDateTime.h"

namespace Pinetime {
Expand All @@ -30,6 +30,7 @@ namespace Pinetime {
Widgets::Counter dayCounter = Widgets::Counter(1, 31, jetbrains_mono_bold_20);
Widgets::Counter monthCounter = Widgets::Counter(1, 12, jetbrains_mono_bold_20);
Widgets::Counter yearCounter = Widgets::Counter(1970, 9999, jetbrains_mono_bold_20);
Widgets::PageIndicator pageIndicator = Widgets::PageIndicator(0, 2);
};
}
}
Expand Down
5 changes: 0 additions & 5 deletions src/displayapp/screens/settings/SettingSetDateTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "displayapp/DisplayApp.h"
#include "displayapp/screens/ScreenList.h"
#include "components/settings/Settings.h"
#include "displayapp/widgets/DotIndicator.h"

using namespace Pinetime::Applications::Screens;

Expand All @@ -29,14 +28,10 @@ SettingSetDateTime::SettingSetDateTime(Pinetime::Applications::DisplayApp* app,
}

std::unique_ptr<Screen> SettingSetDateTime::screenSetDate() {
Widgets::DotIndicator dotIndicator(0, 2);
dotIndicator.Create();
return std::make_unique<Screens::SettingSetDate>(dateTimeController, *this);
}

std::unique_ptr<Screen> SettingSetDateTime::screenSetTime() {
Widgets::DotIndicator dotIndicator(1, 2);
dotIndicator.Create();
return std::make_unique<Screens::SettingSetTime>(dateTimeController, settingsController, *this);
}

Expand Down
1 change: 1 addition & 0 deletions src/displayapp/screens/settings/SettingSetTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ SettingSetTime::SettingSetTime(Pinetime::Controllers::DateTime& dateTimeControll
lv_obj_set_style_local_text_color(lblSetTime, LV_LABEL_PART_MAIN, LV_STATE_DISABLED, LV_COLOR_GRAY);
lv_obj_set_event_cb(btnSetTime, SetTimeEventHandler);

pageIndicator.Create();
UpdateScreen();
}

Expand Down
3 changes: 2 additions & 1 deletion src/displayapp/screens/settings/SettingSetTime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "components/settings/Settings.h"
#include "displayapp/widgets/Counter.h"
#include "displayapp/screens/Screen.h"
#include "displayapp/widgets/DotIndicator.h"
#include "displayapp/widgets/PageIndicator.h"
#include "displayapp/screens/settings/SettingSetDateTime.h"

namespace Pinetime {
Expand All @@ -32,6 +32,7 @@ namespace Pinetime {
lv_obj_t* lblSetTime;
Widgets::Counter hourCounter = Widgets::Counter(0, 23, jetbrains_mono_42);
Widgets::Counter minuteCounter = Widgets::Counter(0, 59, jetbrains_mono_42);
Widgets::PageIndicator pageIndicator = Widgets::PageIndicator(1, 2);
};
}
}
Expand Down
28 changes: 0 additions & 28 deletions src/displayapp/widgets/DotIndicator.cpp
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/displayapp/widgets/DotIndicator.h
View file
Open in desktop

This file was deleted.

Loading