summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
authorMichele Bini <michele.bini@gmail.com>2022-03-26 06:49:50 (GMT)
committerMichele Bini <michele.bini@gmail.com>2022-03-26 06:49:50 (GMT)
commit1a8621c7b31746c86f59af0aa3f24c99b2eb0a69 (patch)
treea3c250cb4b25cb05e6626ff804bb746804265e8c /src/displayapp/screens
parent82fdffe8ad9b567655a81353b2b498bea19222fe (diff)
Revert "sans animations"
This reverts commit 268ddbdc7622ab2a6b0490701064ffdde13fee51.
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/List.cpp2
-rw-r--r--src/displayapp/screens/Notifications.cpp2
-rw-r--r--src/displayapp/screens/ScreenList.h5
-rw-r--r--src/displayapp/screens/Tile.cpp2
-rw-r--r--src/displayapp/screens/settings/QuickSettings.cpp2
5 files changed, 10 insertions, 3 deletions
diff --git a/src/displayapp/screens/List.cpp b/src/displayapp/screens/List.cpp
index 47e3a4c..af3f30f 100644
--- a/src/displayapp/screens/List.cpp
+++ b/src/displayapp/screens/List.cpp
@@ -102,7 +102,7 @@ void List::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_CLICKED) {
for (int i = 0; i < MAXLISTITEMS; i++) {
if (apps[i] != Apps::None && object == itemApps[i]) {
- app->StartApp(apps[i]);
+ app->StartApp(apps[i], DisplayApp::FullRefreshDirections::Up);
running = false;
return;
}
diff --git a/src/displayapp/screens/Notifications.cpp b/src/displayapp/screens/Notifications.cpp
index 221633d..c10a60d 100644
--- a/src/displayapp/screens/Notifications.cpp
+++ b/src/displayapp/screens/Notifications.cpp
@@ -120,6 +120,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
validDisplay = true;
currentId = previousNotification.id;
currentItem.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down);
currentItem = std::make_unique<NotificationItem>(previousNotification.Title(),
previousNotification.Message(),
previousNotification.index,
@@ -145,6 +146,7 @@ bool Notifications::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
validDisplay = true;
currentId = nextNotification.id;
currentItem.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up);
currentItem = std::make_unique<NotificationItem>(nextNotification.Title(),
nextNotification.Message(),
nextNotification.index,
diff --git a/src/displayapp/screens/ScreenList.h b/src/displayapp/screens/ScreenList.h
index 4178704..e316e36 100644
--- a/src/displayapp/screens/ScreenList.h
+++ b/src/displayapp/screens/ScreenList.h
@@ -37,6 +37,7 @@ namespace Pinetime {
case TouchEvents::SwipeDown:
if (screenIndex > 0) {
current.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::Down);
screenIndex--;
current = screens[screenIndex]();
return true;
@@ -47,6 +48,7 @@ namespace Pinetime {
case TouchEvents::SwipeUp:
if (screenIndex < screens.size() - 1) {
current.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::Up);
screenIndex++;
current = screens[screenIndex]();
}
@@ -59,6 +61,7 @@ namespace Pinetime {
case TouchEvents::SwipeRight:
if (screenIndex > 0) {
current.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
screenIndex--;
current = screens[screenIndex]();
return true;
@@ -69,6 +72,7 @@ namespace Pinetime {
case TouchEvents::SwipeLeft:
if (screenIndex < screens.size() - 1) {
current.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
screenIndex++;
current = screens[screenIndex]();
}
@@ -83,6 +87,7 @@ namespace Pinetime {
screenIndex = 0;
}
current.reset(nullptr);
+ app->SetFullRefresh(DisplayApp::FullRefreshDirections::None);
current = screens[screenIndex]();
return true;
}
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index f33408c..23d9bca 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -126,6 +126,6 @@ void Tile::UpdateScreen() {
void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) {
if(obj != btnm1) return;
- app->StartApp(apps[buttonId]);
+ app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
running = false;
}
diff --git a/src/displayapp/screens/settings/QuickSettings.cpp b/src/displayapp/screens/settings/QuickSettings.cpp
index 191d587..c00518e 100644
--- a/src/displayapp/screens/settings/QuickSettings.cpp
+++ b/src/displayapp/screens/settings/QuickSettings.cpp
@@ -149,6 +149,6 @@ void QuickSettings::OnButtonEvent(lv_obj_t* object, lv_event_t event) {
} else if (object == btn4 && event == LV_EVENT_CLICKED) {
running = false;
settingsController.SetSettingsMenu(0);
- app->StartApp(Apps::Settings);
+ app->StartApp(Apps::Settings, DisplayApp::FullRefreshDirections::Up);
}
}