Fix DPAD navigation

mullvad · Oct 16, 2023 · 55bd45f · 55bd45f
1 parent 0890a3f
commit 55bd45f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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)