diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-12 13:16:06 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-16 17:05:41 +0200 |
| commit | 55bd45f59d19d93a11bb49be2a659602db333b58 (patch) | |
| tree | 597f96156182a84139082093aac73c4afe5c2915 | |
| parent | 0890a3f0182f478e5e6b20f1fdf5dd22ce3e7d40 (diff) | |
| download | mullvadvpn-55bd45f59d19d93a11bb49be2a659602db333b58.tar.xz mullvadvpn-55bd45f59d19d93a11bb49be2a659602db333b58.zip | |
Fix DPAD navigation
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt | 5 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt index bd43dc518a..a7d220c4e4 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt @@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.compose.screen import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.defaultMinSize @@ -136,17 +135,15 @@ fun OutOfTimeScreen( timeLeft = null ) { Column( - verticalArrangement = Arrangement.Bottom, - horizontalAlignment = Alignment.Start, modifier = Modifier.fillMaxSize() + .padding(it) .verticalScroll(scrollState) .drawVerticalScrollbar( state = scrollState, color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar) ) .background(color = MaterialTheme.colorScheme.background) - .padding(it) ) { Image( painter = painterResource(id = R.drawable.icon_fail), diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt index 240e84eca3..c983f69528 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt @@ -119,13 +119,13 @@ fun WelcomeScreen( Column( modifier = Modifier.fillMaxSize() + .padding(it) .verticalScroll(scrollState) .drawVerticalScrollbar( state = scrollState, color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaScrollbar) ) .background(color = MaterialTheme.colorScheme.primary) - .padding(it) ) { // Welcome info area WelcomeInfo(snackbarHostState, uiState, showSitePayment) |