Skip to content

Fix watchlist last-item left navigation #78

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

Closed
EierKopZA wants to merge 2 commits into from
Closed

Fix watchlist last-item left navigation #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a33878
fix: allow left navigation in watchlist grid when focus is not on sid…
EierKopZA Mar 30, 2026
f700a33
fix: back from search results returns to sidebar instead of staying i…
EierKopZA Mar 30, 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
7 changes: 3 additions & 4 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/search/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,13 @@ fun SearchScreen(
when (event.key) {
Key.Back, Key.Escape -> when (focusZone) {
FocusZone.RESULTS -> {
if (showFilters) focusZone = FocusZone.FILTERS
else { focusZone = FocusZone.SEARCH_INPUT; searchFocusRequester.requestFocus() }
// Directly return to sidebar/topbar from results for expected back behavior
focusZone = FocusZone.SIDEBAR
true
}
FocusZone.FILTERS -> { focusZone = FocusZone.SEARCH_INPUT; searchFocusRequester.requestFocus(); true }
FocusZone.SEARCH_INPUT -> {
// If we have search results, go back to results instead of sidebar
// This fixes the issue where back from details goes to keyboard instead of results
// If we have active results, go back to results. Otherwise go to sidebar.
if (activeCategories.isNotEmpty() || hasAiResults) {
focusZone = FocusZone.RESULTS
currentRowIndex = 0
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/kotlin/com/arflix/tv/ui/screens/watchlist/WatchlistScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ fun WatchlistScreen(
}
Key.DirectionLeft -> {
if (!isSidebarFocused) {
true
// Let the grid handle left movement within items.
false
} else {
if (sidebarFocusIndex > 0) {
sidebarFocusIndex = (sidebarFocusIndex - 1).coerceIn(0, maxSidebarIndex)
Expand All @@ -177,6 +178,7 @@ fun WatchlistScreen(
}
true
} else {
// Let the grid handle right movement within items.
false
}
}
Expand Down
Loading