summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-05-01 16:33:17 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-05-07 09:28:12 +0200
commit1741f05da5fb0d3365a635441628dec9b011fed9 (patch)
treeff4472b2296b0c10fc539288de4abee765e6e2c4
parent08a19d1221facfc462a5ba6058c81380fe4c1662 (diff)
downloadmullvadvpn-1741f05da5fb0d3365a635441628dec9b011fed9.tar.xz
mullvadvpn-1741f05da5fb0d3365a635441628dec9b011fed9.zip
Fix crash from focus requester
-rw-r--r--android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt12
1 files changed, 3 insertions, 9 deletions
diff --git a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
index 0c4ad74922..ea6e3e976d 100644
--- a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
+++ b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
@@ -103,9 +103,7 @@ fun NavigationDrawerTv(
ModalNavigationDrawer(
modifier =
- Modifier.focusRequester(focusRequester).focusProperties {
- onEnter = { if (focusRequester.restoreFocusedChild()) Cancel else Default }
- },
+ Modifier.focusRequester(focusRequester),
drawerState = drawerState,
scrimBrush = brush,
drawerContent = {
@@ -135,18 +133,14 @@ fun NavigationDrawerTv(
)
DrawerItemTv(
modifier =
- Modifier.align(Alignment.CenterStart).onFocusChanged {
- focusRequester.saveFocusedChild()
- },
+ Modifier.align(Alignment.CenterStart),
icon = Icons.Default.AccountCircle,
text = stringResource(R.string.settings_account),
onClick = onAccountClick,
)
DrawerItemTv(
modifier =
- Modifier.align(Alignment.BottomStart).onFocusChanged {
- focusRequester.saveFocusedChild()
- },
+ Modifier.align(Alignment.BottomStart),
icon = Icons.Default.Settings,
text = stringResource(R.string.settings),
onClick = onSettingsClick,