Merge branch 'wrong-button-spacing-on-outoftimewelcome-droid-553'

mullvad · Dec 1, 2023 · 9fcd047 · 9fcd047
2 parents 233d384 + dfebc2f
commit 9fcd047
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt
@@ -135,7 +135,9 @@ private fun ConnectionButton(
     modifier: Modifier = Modifier,
     reconnectButtonTestTag: String = ""
 ) {
-    ConstraintLayout(modifier = modifier.fillMaxWidth()) {
+    ConstraintLayout(
+        modifier = modifier.padding(vertical = Dimens.connectButtonExtraPadding).fillMaxWidth()
+    ) {
         // initial height set at 0.dp
         var componentHeight by remember { mutableStateOf(0.dp) }
 

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
@@ -230,7 +230,7 @@ fun OutOfTimeScreen(
                         Modifier.padding(
                                 start = Dimens.sideMargin,
                                 end = Dimens.sideMargin,
-                                bottom = Dimens.screenVerticalMargin
+                                bottom = Dimens.buttonSpacing
                             )
                             .align(Alignment.CenterHorizontally)
                 )

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
@@ -333,7 +333,7 @@ private fun PaymentPanel(
                     Modifier.padding(
                             start = Dimens.sideMargin,
                             end = Dimens.sideMargin,
-                            bottom = Dimens.screenVerticalMargin
+                            bottom = Dimens.buttonSpacing
                         )
                         .align(Alignment.CenterHorizontally)
             )

diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/dimensions/Dimensions.kt
@@ -26,6 +26,7 @@ data class Dimensions(
     val circularProgressBarSmallSize: Dp = 24.dp,
     val circularProgressBarSmallStrokeWidth: Dp = 3.dp,
     val cityRowPadding: Dp = 34.dp,
+    val connectButtonExtraPadding: Dp = 4.dp,
     val countryRowPadding: Dp = 18.dp,
     val customPortBoxMinWidth: Dp = 80.dp,
     val dialogIconHeight: Dp = 44.dp,