From 99e8b69c0ec914498b9d33b2ef83cb991736f656 Mon Sep 17 00:00:00 2001
From: damontecres <154766448+damontecres@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:04:45 -0500
Subject: [PATCH] Fix nav drawer focus when pressing back on home page (#274)

Fixes the nav drawer not being focused on when pressing back to open it
on the home page

Dev notes: I think the bug was introduced in #228 due to the new
`Column` not being focusable, but we don't need it to be since we want
to focus on the selected page.
---
 .../com/github/damontecres/wholphin/ui/nav/NavDrawer.kt   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
index 41a6b88e..f3131fae 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/NavDrawer.kt
@@ -218,14 +218,14 @@ fun NavDrawer(
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
     val context = LocalContext.current
-    val drawerFocusRequester = remember { FocusRequester() }
+
     val focusRequester = remember { FocusRequester() }
     val searchFocusRequester = remember { FocusRequester() }
 
     // If the user presses back while on the home page, open the nav drawer, another back press will quit the app
     BackHandler(enabled = (drawerState.currentValue == DrawerValue.Closed && destination is Destination.Home)) {
         drawerState.setValue(DrawerValue.Open)
-        drawerFocusRequester.requestFocus()
+        focusRequester.requestFocus()
     }
     val moreLibraries by viewModel.moreLibraries.observeAsState(listOf())
     val libraries by viewModel.libraries.observeAsState(listOf())
@@ -305,9 +305,7 @@ fun NavDrawer(
     )
     val spacedBy = 4.dp
     NavigationDrawer(
-        modifier =
-            modifier
-                .focusRequester(drawerFocusRequester),
+        modifier = modifier,
         drawerState = drawerState,
         drawerContent = {
             ProvideTextStyle(MaterialTheme.typography.labelMedium) {