summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/screens/Notifications.cpp23
-rw-r--r--src/displayapp/screens/Notifications.h2
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp2
3 files changed, 11 insertions, 16 deletions
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 60349a64..e4abc67b 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -13,11 +13,11 @@ Notifications::Notifications(DisplayApp* app,
Pinetime::Controllers::AlertNotificationService& alertNotificationService,
Controllers::MotorController& motorController,
Modes mode)
- : Screen(app),
- notificationManager {notificationManager},
- alertNotificationService {alertNotificationService},
- motorController{motorController},
- mode {mode} {
+ : Screen(app),
+ notificationManager{notificationManager},
+ alertNotificationService{alertNotificationService},
+ motorController{motorController},
+ mode{mode} {
notificationManager.ClearNewNotificationFlag();
auto notification = notificationManager.GetLastNotification();
if (notification.valid) {
@@ -45,8 +45,6 @@ Notifications::Notifications(DisplayApp* app,
}
if (mode == Modes::Preview) {
-
-
timeoutLine = lv_line_create(lv_scr_act(), nullptr);
@@ -75,9 +73,8 @@ bool Notifications::Refresh() {
lv_line_set_points(timeoutLine, timeoutLinePoints, 2);
}
//make sure we stop any vibrations before exiting
- if (!running) {
+ if (!running)
motorController.stopRunning();
- }
return running;
}
@@ -173,9 +170,8 @@ Notifications::NotificationItem::NotificationItem(const char* title,
Pinetime::Controllers::AlertNotificationService& alertNotificationService,
Controllers::MotorController& motorController,
uint32_t* timeoutEnd)
- : notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService},
- motorController{motorController}, timeoutEnd{timeoutEnd} {
-
+ : notifNr{notifNr}, notifNb{notifNb}, mode{mode}, alertNotificationService{alertNotificationService},
+ motorController{motorController}, timeoutEnd{timeoutEnd} {
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));
@@ -260,7 +256,6 @@ Notifications::NotificationItem::NotificationItem(const char* title,
timeoutOnHold = true;
} break;
}
-
lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
@@ -291,7 +286,7 @@ void Notifications::NotificationItem::OnRejectIncomingCall(lv_event_t event) {
}
inline void Notifications::NotificationItem::callPreviewInteraction() {
- *timeoutEnd = xTaskGetTickCount() + (5 * 1024);
+ *timeoutEnd = xTaskGetTickCount() + (5 * 1024);
timeoutOnHold = false;
motorController.stopRunning();
}
diff --git a/src/displayapp/screens/Notifications.h b/src/displayapp/screens/Notifications.h
index 89b676ec..99c95a8e 100644
--- a/src/displayapp/screens/Notifications.h
+++ b/src/displayapp/screens/Notifications.h
@@ -45,6 +45,7 @@ namespace Pinetime {
void OnAcceptIncomingCall(lv_event_t event);
void OnMuteIncomingCall(lv_event_t event);
void OnRejectIncomingCall(lv_event_t event);
+
bool timeoutOnHold = false;
private:
void callPreviewInteraction();
@@ -81,7 +82,6 @@ namespace Pinetime {
std::unique_ptr<NotificationItem> currentItem;
Controllers::NotificationManager::Notification::Id currentId;
Controllers::MotorController& motorController;
-
bool validDisplay = false;
lv_point_t timeoutLinePoints[2] {{0, 1}, {239, 1}};
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 7681546f..501aee4f 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -140,7 +140,7 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
if (lv_obj_get_state(btn3, LV_BTN_PART_MAIN) & LV_STATE_CHECKED) {
settingsController.SetVibrationStatus(Controllers::Settings::Vibration::ON);
- motorController.RunForDuration(35);
+ motorController.runForDuration(35);
lv_label_set_text_static(btn3_lvl, Symbols::notificationsOn);
} else {
settingsController.SetVibrationStatus(Controllers::Settings::Vibration::OFF);