diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-07-15 10:31:30 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-07-17 11:17:09 +0200 |
| commit | 00bba9cdbdfcb7719b1e89ede22d30896bd827df (patch) | |
| tree | 7025723afdb1b7a853a063a64c9d056a721202b6 /android/app | |
| parent | 176f0a8569e6c0d99d0ff5b79d88a69ad1183880 (diff) | |
| download | mullvadvpn-00bba9cdbdfcb7719b1e89ede22d30896bd827df.tar.xz mullvadvpn-00bba9cdbdfcb7719b1e89ede22d30896bd827df.zip | |
Fix focus on notification close
Diffstat (limited to 'android/app')
2 files changed, 5 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt index 1605b83cdb..2279e47407 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import java.time.Duration @@ -68,6 +69,7 @@ fun NotificationBanner( modifier: Modifier = Modifier, notification: InAppNotification?, isPlayBuild: Boolean, + contentFocusRequester: FocusRequester = FocusRequester(), openAppListing: () -> Unit, onClickShowAccount: () -> Unit, onClickShowChangelog: () -> Unit, @@ -81,6 +83,7 @@ fun NotificationBanner( notification = notification, isPlayBuild = isPlayBuild, openAppListing = openAppListing, + contentFocusRequester = contentFocusRequester, onClickShowAccount = onClickShowAccount, onClickShowChangelog = onClickShowChangelog, onClickDismissChangelog = onClickDismissChangelog, @@ -94,6 +97,7 @@ fun NotificationBanner( notification = notification, isPlayBuild = isPlayBuild, openAppListing = openAppListing, + contentFocusRequester = contentFocusRequester, onClickShowAccount = onClickShowAccount, onClickShowChangelog = onClickShowChangelog, onClickDismissChangelog = onClickDismissChangelog, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 82d6736c99..88a4c30922 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -450,6 +450,7 @@ private fun Content( modifier = Modifier.align(Alignment.TopCenter), notification = state.inAppNotification, isPlayBuild = state.isPlayBuild, + contentFocusRequester = focusRequester, openAppListing = onOpenAppListing, onClickShowAccount = onManageAccountClick, onClickShowChangelog = onChangelogClick, |