Skip to content

Add navigation shortcuts to apps #2423

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

Add navigation shortcuts to apps #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d99f12f
gitignore: add Node and local environment files to ignore list
Apr 11, 2025
0c9610f
feat: enhance app navigation with swipe direction handling and previo…
Apr 11, 2025
732fb76
feat: Apps started from tile are confiigured to be set as the "previo…
Apr 11, 2025
6fd00c7
feat: remove swipe right event handling for music navigation
Apr 11, 2025
24ecb84
feat: prevent swipe left navigation from QuickSettings
Apr 11, 2025
8a8d6d1
Merge branch 'main' into app-shortcut
Feb 28, 2026
2c04eed
Fix clang-format violation in app shortcut feature (#3)
Copilot Mar 8, 2026
42eeb7f
Restoring support for swipe right gesture to play previous track in M…
Mar 9, 2026
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
26 changes: 25 additions & 1 deletion src/displayapp/DisplayApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ void DisplayApp::Refresh() {
case FullRefreshDirections::RightAnim:
returnDirection = FullRefreshDirections::LeftAnim;
break;
case FullRefreshDirections::Left:
returnDirection = FullRefreshDirections::Right;
break;
case FullRefreshDirections::Right:
returnDirection = FullRefreshDirections::Left;
break;
default:
returnDirection = FullRefreshDirections::None;
break;
Expand Down Expand Up @@ -416,6 +422,10 @@ void DisplayApp::Refresh() {
return TouchEvents::SwipeRight;
case DisplayApp::FullRefreshDirections::RightAnim:
return TouchEvents::SwipeLeft;
case DisplayApp::FullRefreshDirections::Left:
return TouchEvents::SwipeRight;
case DisplayApp::FullRefreshDirections::Right:
return TouchEvents::SwipeLeft;
}
};
if (!currentScreen->OnTouchEvent(gesture)) {
Expand All @@ -430,6 +440,11 @@ void DisplayApp::Refresh() {
case TouchEvents::SwipeRight:
LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
break;
case TouchEvents::SwipeLeft:
if (previousApp != Apps::None) {
LoadNewScreen(previousApp, DisplayApp::FullRefreshDirections::LeftAnim);
}
break;
case TouchEvents::DoubleTap:
PushMessageToSystemTask(System::Messages::GoToSleep);
break;
Expand All @@ -438,6 +453,10 @@ void DisplayApp::Refresh() {
}
} else if (gesture == LoadDirToReturnSwipe(appStackDirections.Top())) {
LoadPreviousScreen();
} else if (gesture == TouchEvents::SwipeRight && currentApp != Apps::QuickSettings) {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::RightAnim);
appStackDirections.Reset();
returnAppStack.Reset();
}
} else {
lvgl.CancelTap();
Expand All @@ -458,6 +477,8 @@ void DisplayApp::Refresh() {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::Up);
} else if (currentApp == Apps::QuickSettings) {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::LeftAnim);
} else if (currentApp == previousApp) {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::RightAnim);
} else {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::Down);
}
Expand Down Expand Up @@ -498,7 +519,10 @@ void DisplayApp::Refresh() {
}
}

void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction) {
void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction, bool setPrevious) {
if (setPrevious) {
previousApp = app;
}
nextApp = app;
nextDirection = direction;
}
Expand Down
4 changes: 3 additions & 1 deletion src/displayapp/DisplayApp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ namespace Pinetime {
void Start(System::BootErrors error);
void PushMessage(Display::Messages msg);

void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
void StartApp(Apps app, DisplayApp::FullRefreshDirections direction, bool setPrevious = false);

void SetFullRefresh(FullRefreshDirections direction);

Expand Down Expand Up @@ -118,7 +118,9 @@ namespace Pinetime {
std::unique_ptr<Screens::Screen> currentScreen;

Apps currentApp = Apps::None;
Apps previousApp = Apps::None;
Apps returnToApp = Apps::None;

FullRefreshDirections returnDirection = FullRefreshDirections::None;
TouchEvents returnTouchEvent = TouchEvents::None;

Expand Down
2 changes: 1 addition & 1 deletion src/displayapp/screens/Tile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ void Tile::OnValueChangedEvent(lv_obj_t* obj, uint32_t buttonId) {
return;
}

app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up, true);
running = false;
}