Skip to content

Add Timer's Time Remaining to the StatusIcons bar #2373

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Timer's Time Remaining to the StatusIcons bar #2373

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
4 changes: 2 additions & 2 deletions src/components/timer/Timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void Timer::StartTimer(std::chrono::milliseconds duration) {

// nullopt if timer stopped (StopTimer called / StartTimer not yet called)
// otherwise TimerStatus with the ticks until/since expiry (depending on state of expired flag)
std::optional<Timer::TimerStatus> Timer::GetTimerState() {
std::optional<Timer::TimerStatus> Timer::GetTimerState() const {
if (IsRunning()) {
TickType_t remainingTime = expiry - xTaskGetTickCount();
return std::make_optional<Timer::TimerStatus>(
Expand All @@ -38,6 +38,6 @@ void Timer::StopTimer() {
triggered = false;
}

bool Timer::IsRunning() {
bool Timer::IsRunning() const {
return (xTimerIsTimerActive(timer) == pdTRUE);
}
4 changes: 2 additions & 2 deletions src/components/timer/Timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ namespace Pinetime {

void StopTimer();

std::optional<TimerStatus> GetTimerState();
std::optional<TimerStatus> GetTimerState() const;

bool IsRunning();
bool IsRunning() const;

private:
TimerHandle_t timer;
Expand Down
4 changes: 3 additions & 1 deletion src/displayapp/DisplayApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
batteryController,
bleController,
alarmController,
timer,
dateTimeController,
filesystem,
std::move(apps));
Expand Down Expand Up @@ -584,7 +585,8 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
motorController,
settingsController,
bleController,
alarmController);
alarmController,
timer);
break;
case Apps::Settings:
currentScreen = std::make_unique<Screens::Settings>(this, settingsController);
Expand Down
3 changes: 3 additions & 0 deletions src/displayapp/screens/ApplicationList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ApplicationList::ApplicationList(DisplayApp* app,
const Pinetime::Controllers::Battery& batteryController,
const Pinetime::Controllers::Ble& bleController,
const Pinetime::Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
Controllers::DateTime& dateTimeController,
Pinetime::Controllers::FS& filesystem,
std::array<Tile::Applications, UserAppTypes::Count>&& apps)
Expand All @@ -30,6 +31,7 @@ ApplicationList::ApplicationList(DisplayApp* app,
batteryController {batteryController},
bleController {bleController},
alarmController {alarmController},
timer {timer},
dateTimeController {dateTimeController},
filesystem {filesystem},
apps {std::move(apps)},
Expand Down Expand Up @@ -62,6 +64,7 @@ std::unique_ptr<Screen> ApplicationList::CreateScreen(unsigned int screenNum) co
batteryController,
bleController,
alarmController,
timer,
dateTimeController,
pageApps);
}
2 changes: 2 additions & 0 deletions src/displayapp/screens/ApplicationList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ namespace Pinetime {
const Pinetime::Controllers::Battery& batteryController,
const Pinetime::Controllers::Ble& bleController,
const Pinetime::Controllers::AlarmController& alarmController,
const Pinetime::Controllers::Timer& timer,
Controllers::DateTime& dateTimeController,
Pinetime::Controllers::FS& filesystem,
std::array<Tile::Applications, UserAppTypes::Count>&& apps);
Expand All @@ -34,6 +35,7 @@ namespace Pinetime {
const Pinetime::Controllers::Battery& batteryController;
const Pinetime::Controllers::Ble& bleController;
const Pinetime::Controllers::AlarmController& alarmController;
const Pinetime::Controllers::Timer& timer;
Controllers::DateTime& dateTimeController;
Pinetime::Controllers::FS& filesystem;
std::array<Tile::Applications, UserAppTypes::Count> apps;
Expand Down
5 changes: 3 additions & 2 deletions src/displayapp/screens/Tile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ Tile::Tile(uint8_t screenID,
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
Controllers::DateTime& dateTimeController,
std::array<Applications, 6>& applications)
: app {app},
dateTimeController {dateTimeController},
pageIndicator(screenID, numScreens),
statusIcons(batteryController, bleController, alarmController) {
statusIcons(batteryController, bleController, alarmController, timer, settingsController) {

settingsController.SetAppMenu(screenID);

Expand Down Expand Up @@ -86,7 +87,7 @@ Tile::Tile(uint8_t screenID,
btnm1->user_data = this;
lv_obj_set_event_cb(btnm1, event_handler);

taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this);
taskUpdate = lv_task_create(lv_update_task, 500, LV_TASK_PRIO_MID, this);

UpdateScreen();
}
Expand Down
1 change: 1 addition & 0 deletions src/displayapp/screens/Tile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ namespace Pinetime {
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
Controllers::DateTime& dateTimeController,
std::array<Applications, 6>& applications);

Expand Down
3 changes: 2 additions & 1 deletion src/displayapp/screens/WatchFaceDigital.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
Expand All @@ -32,7 +33,7 @@ WatchFaceDigital::WatchFaceDigital(Controllers::DateTime& dateTimeController,
heartRateController {heartRateController},
motionController {motionController},
weatherService {weatherService},
statusIcons(batteryController, bleController, alarmController) {
statusIcons(batteryController, bleController, alarmController, timer, settingsController) {

statusIcons.Create();

Expand Down
3 changes: 3 additions & 0 deletions src/displayapp/screens/WatchFaceDigital.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Pinetime {
class NotificationManager;
class HeartRateController;
class MotionController;
class Timer;
}

namespace Applications {
Expand All @@ -32,6 +33,7 @@ namespace Pinetime {
const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
Controllers::NotificationManager& notificationManager,
Controllers::Settings& settingsController,
Controllers::HeartRateController& heartRateController,
Expand Down Expand Up @@ -87,6 +89,7 @@ namespace Pinetime {
controllers.batteryController,
controllers.bleController,
controllers.alarmController,
controllers.timer,
controllers.notificationManager,
controllers.settingsController,
controllers.heartRateController,
Expand Down
7 changes: 4 additions & 3 deletions src/displayapp/screens/settings/QuickSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
Controllers::MotorController& motorController,
Pinetime::Controllers::Settings& settingsController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController)
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer)
: app {app},
dateTimeController {dateTimeController},
brightness {brightness},
motorController {motorController},
settingsController {settingsController},
statusIcons(batteryController, bleController, alarmController) {
statusIcons(batteryController, bleController, alarmController, timer, settingsController) {

statusIcons.Create();

Expand Down Expand Up @@ -119,7 +120,7 @@ QuickSettings::QuickSettings(Pinetime::Applications::DisplayApp* app,
lv_obj_set_style_local_text_font(lbl_btn, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
lv_label_set_text_static(lbl_btn, Symbols::settings);

taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_MID, this);
taskUpdate = lv_task_create(lv_update_task, 500, LV_TASK_PRIO_MID, this);

UpdateScreen();
}
Expand Down
3 changes: 2 additions & 1 deletion src/displayapp/screens/settings/QuickSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ namespace Pinetime {
Controllers::MotorController& motorController,
Pinetime::Controllers::Settings& settingsController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController);
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer);

~QuickSettings() override;

Expand Down
84 changes: 82 additions & 2 deletions src/displayapp/widgets/StatusIcons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@ using namespace Pinetime::Applications::Widgets;

StatusIcons::StatusIcons(const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController)
: batteryIcon(true), batteryController {batteryController}, bleController {bleController}, alarmController {alarmController} {
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
const Controllers::Settings& settingsController)
: batteryIcon(true),
batteryController {batteryController},
bleController {bleController},
alarmController {alarmController},
timer {timer},
settingsController {settingsController} {
}

void StatusIcons::Create() {
Expand All @@ -17,12 +24,29 @@ void StatusIcons::Create() {
lv_obj_set_style_local_pad_inner(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
lv_obj_set_style_local_bg_opa(container, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);

timerContainer = lv_cont_create(container, nullptr);
lv_cont_set_layout(timerContainer, LV_LAYOUT_ROW_TOP);
lv_cont_set_fit(timerContainer, LV_FIT_TIGHT);
lv_obj_set_style_local_pad_inner(timerContainer, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 1);
lv_obj_set_style_local_bg_opa(timerContainer, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);

timerIcon = lv_label_create(timerContainer, nullptr);
lv_label_set_text_static(timerIcon, Screens::Symbols::hourGlass);
lv_obj_set_style_local_text_color(timerIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));

timeRemaining = lv_label_create(timerContainer, nullptr);
lv_obj_set_style_local_text_color(timeRemaining, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x999999));
lv_obj_set_style_local_text_letter_space(timeRemaining, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, -1);

bleIcon = lv_label_create(container, nullptr);
lv_label_set_text_static(bleIcon, Screens::Symbols::bluetooth);

batteryPlug = lv_label_create(container, nullptr);
lv_label_set_text_static(batteryPlug, Screens::Symbols::plug);

soloTimerIcon = lv_label_create(container, nullptr);
lv_label_set_text_static(soloTimerIcon, Screens::Symbols::hourGlass);

alarmIcon = lv_label_create(container, nullptr);
lv_label_set_text_static(alarmIcon, Screens::Symbols::bell);

Expand Down Expand Up @@ -54,5 +78,61 @@ void StatusIcons::Update() {
lv_obj_set_hidden(bleIcon, !bleState.Get());
}

if (timer.IsRunning()) {
uint8_t activeIconCounter = 0;
uint8_t maxIcons = 0;
lv_obj_t* child = lv_obj_get_child(container, NULL);

while (child != NULL) {
if (!lv_obj_get_hidden(child)) {
activeIconCounter++;
}
child = lv_obj_get_child(container, child);
}

// Subtract batteryIcon as it doesn't count (always active)
activeIconCounter--;

// Subtract individually because switching pages initially sets all icons
// to visible. This causes soloTimerIcon to briefly appear before the
// timerContainer is set to visible.
if (!lv_obj_get_hidden(timerContainer)) {
activeIconCounter--;
}
if (!lv_obj_get_hidden(soloTimerIcon)) {
activeIconCounter--;
}

std::chrono::seconds secondsRemaining =
std::chrono::duration_cast<std::chrono::seconds>(timer.GetTimerState().value_or(Controllers::Timer::TimerStatus {}).distanceToExpiry);
uint8_t timerMinutes = (secondsRemaining.count() % 3600) / 60;
uint8_t timerSeconds = secondsRemaining.count() % 60;
if (timerMinutes > 0) {
maxIcons = 2;
lv_label_set_text_fmt(timeRemaining, "%02d:%02d", timerMinutes, timerSeconds);
} else {
maxIcons = 4;
lv_label_set_text_fmt(timeRemaining, "%02d", timerSeconds);
}

if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
maxIcons++;
if (timerMinutes > 0) {
maxIcons++;
}
}

if (activeIconCounter > maxIcons) {
lv_obj_set_hidden(timerContainer, true);
lv_obj_set_hidden(soloTimerIcon, false);
} else {
lv_obj_set_hidden(soloTimerIcon, true);
lv_obj_set_hidden(timerContainer, false);
}
} else {
lv_obj_set_hidden(soloTimerIcon, true);
lv_obj_set_hidden(timerContainer, true);
}

lv_obj_realign(container);
}
15 changes: 12 additions & 3 deletions src/displayapp/widgets/StatusIcons.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "components/alarm/AlarmController.h"
#include "components/settings/Settings.h"
#include "displayapp/screens/BatteryIcon.h"
#include "utility/DirtyValue.h"

Expand All @@ -16,7 +17,9 @@ namespace Pinetime {
public:
StatusIcons(const Controllers::Battery& batteryController,
const Controllers::Ble& bleController,
const Controllers::AlarmController& alarmController);
const Controllers::AlarmController& alarmController,
const Controllers::Timer& timer,
const Controllers::Settings& settingsController);
void Align();
void Create();

Expand All @@ -31,17 +34,23 @@ namespace Pinetime {
const Pinetime::Controllers::Battery& batteryController;
const Controllers::Ble& bleController;
const Controllers::AlarmController& alarmController;
const Controllers::Timer& timer;
const Controllers::Settings& settingsController;

Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
Utility::DirtyValue<bool> powerPresent {};
Utility::DirtyValue<bool> bleState {};
Utility::DirtyValue<bool> bleRadioEnabled {};
Utility::DirtyValue<bool> alarmEnabled {};

lv_obj_t* container;
lv_obj_t* timerContainer;
lv_obj_t* timerIcon;
lv_obj_t* timeRemaining;
lv_obj_t* bleIcon;
lv_obj_t* alarmIcon;
lv_obj_t* batteryPlug;
lv_obj_t* container;
lv_obj_t* soloTimerIcon;
lv_obj_t* alarmIcon;
};
}
}
Expand Down