From bbeb1c048801981332f4be50148c71d3aa6df651 Mon Sep 17 00:00:00 2001 From: Damontecres Date: Wed, 12 Nov 2025 19:23:04 -0500 Subject: [PATCH] Fix focus issues w/ next/previous --- .../damontecres/wholphin/ui/components/CircularProgress.kt | 7 +++++-- .../damontecres/wholphin/ui/playback/PlaybackPage.kt | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CircularProgress.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CircularProgress.kt index 15e4a695..c519500d 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/CircularProgress.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/CircularProgress.kt @@ -30,7 +30,10 @@ fun CircularProgress(modifier: Modifier = Modifier) { * Fill the space with a loading indicator and take focus */ @Composable -fun LoadingPage(modifier: Modifier = Modifier) { +fun LoadingPage( + modifier: Modifier = Modifier, + focusEnabled: Boolean = true, +) { val focusRequester = remember { FocusRequester() } LaunchedEffect(Unit) { focusRequester.tryRequestFocus() } Box( @@ -39,7 +42,7 @@ fun LoadingPage(modifier: Modifier = Modifier) { modifier .fillMaxSize() .focusRequester(focusRequester) - .focusable(), + .focusable(focusEnabled), ) { CircularProgressIndicator( color = MaterialTheme.colorScheme.border, diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt index 0eaacc2f..7b0c7046 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt @@ -257,7 +257,7 @@ fun PlaybackPage( .matchParentSize() .background(Color.Black), ) { - LoadingPage() + LoadingPage(focusEnabled = false) } }