Fix button spacing

12 files changed, 50 insertions, 48 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
index 52f11babe7..89af2eafe9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
@@ -68,7 +68,7 @@ private fun ChangeListItem(text: String) {
                 text = "•",
                 style = MaterialTheme.typography.labelMedium,
                 color = MaterialTheme.colorScheme.onBackground,
-                modifier = Modifier.width(Dimens.buttonSeparation),
+                modifier = Modifier.width(Dimens.buttonSpacing),
                 textAlign = TextAlign.Center
             )
             Text(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
index 69c5a95ba1..a30e525e6d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
@@ -1,10 +1,10 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -61,7 +61,7 @@ fun CustomPortDialog(
             )
         },
         confirmButton = {
-            Column {
+            Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) {
                 PrimaryButton(
                     text = stringResource(id = R.string.custom_port_dialog_submit),
                     onClick = { onSave(port.value) },
@@ -72,13 +72,11 @@ fun CustomPortDialog(
                 if (showReset) {
                     NegativeButton(
                         text = stringResource(R.string.custom_port_dialog_remove),
-                        onClick = onReset,
-                        modifier = Modifier.padding(top = Dimens.mediumPadding),
+                        onClick = onReset
                     )
                 }
                 PrimaryButton(
                     text = stringResource(id = R.string.cancel),
-                    modifier = Modifier.padding(top = Dimens.mediumPadding),
                     onClick = onDismissRequest
                 )
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
index 0c83bfba10..527fcf8738 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
@@ -137,7 +137,7 @@ fun DnsDialog(
             }
         },
         confirmButton = {
-            Column(verticalArrangement = Arrangement.spacedBy(Dimens.mediumPadding)) {
+            Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) {
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = onAttemptToSave,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
index 5877964ec8..bc28169bb2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
@@ -1,5 +1,6 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -82,7 +83,7 @@ fun MtuDialog(
             }
         },
         confirmButton = {
-            Column {
+            Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) {
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     isEnabled = isValidMtu,
@@ -96,13 +97,13 @@ fun MtuDialog(
                 )
 
                 PrimaryButton(
-                    modifier = Modifier.padding(top = Dimens.mediumPadding).fillMaxWidth(),
+                    modifier = Modifier.fillMaxWidth(),
                     text = stringResource(R.string.reset_to_default_button),
                     onClick = onRestoreDefaultValue
                 )
 
                 PrimaryButton(
-                    modifier = Modifier.padding(top = Dimens.mediumPadding).fillMaxWidth(),
+                    modifier = Modifier.fillMaxWidth(),
                     text = stringResource(R.string.cancel),
                     onClick = onDismiss
                 )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
index 19180d4e40..14afdbcf24 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
@@ -111,7 +111,7 @@ fun RedeemVoucherDialog(
                     VariantButton(
                         text = stringResource(id = R.string.redeem),
                         onClick = { onRedeem(uiState.voucherInput) },
-                        modifier = Modifier.padding(bottom = Dimens.mediumPadding),
+                        modifier = Modifier.padding(bottom = Dimens.buttonSpacing),
                         isEnabled = uiState.voucherInput.length == VOUCHER_LENGTH
                     )
                 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
index e09a9a28dd..34ba02d756 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
@@ -120,25 +120,26 @@ fun AccountScreen(
 
             Spacer(modifier = Modifier.weight(1f))
 
-            if (IS_PLAY_BUILD.not()) {
-                ExternalButton(
-                    text = stringResource(id = R.string.manage_account),
-                    onClick = onManageAccountClick,
-                    modifier = Modifier.padding(bottom = Dimens.screenVerticalMargin)
-                )
-            }
+            Column(modifier = Modifier.padding(bottom = Dimens.screenVerticalMargin)) {
+                if (IS_PLAY_BUILD.not()) {
+                    ExternalButton(
+                        text = stringResource(id = R.string.manage_account),
+                        onClick = onManageAccountClick,
+                        modifier = Modifier.padding(bottom = Dimens.buttonSpacing)
+                    )
+                }
 
-            RedeemVoucherButton(
-                onClick = onRedeemVoucherClick,
-                modifier = Modifier.padding(bottom = Dimens.screenVerticalMargin),
-                isEnabled = true
-            )
+                RedeemVoucherButton(
+                    onClick = onRedeemVoucherClick,
+                    modifier = Modifier.padding(bottom = Dimens.buttonSpacing),
+                    isEnabled = true
+                )
 
-            NegativeButton(
-                text = stringResource(id = R.string.log_out),
-                onClick = onLogoutClick,
-                modifier = Modifier.padding(bottom = Dimens.screenVerticalMargin)
-            )
+                NegativeButton(
+                    text = stringResource(id = R.string.log_out),
+                    onClick = onLogoutClick,
+                )
+            }
         }
     }
 }
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 0b8de0e095..7528b46e42 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
@@ -216,7 +216,7 @@ fun ConnectScreen(
                         .padding(horizontal = Dimens.sideMargin)
                         .testTag(LOCATION_INFO_TEST_TAG)
             )
-            Spacer(modifier = Modifier.height(Dimens.buttonSeparation))
+            Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
             SwitchLocationButton(
                 modifier =
                     Modifier.fillMaxWidth()
@@ -231,7 +231,7 @@ fun ConnectScreen(
                         stringResource(id = R.string.switch_location)
                     }
             )
-            Spacer(modifier = Modifier.height(Dimens.buttonSeparation))
+            Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
             ConnectionButton(
                 state = uiState.tunnelUiState,
                 modifier =
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
index 19a06e453d..f5764f069e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -7,10 +7,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -238,7 +236,7 @@ fun DeviceListScreen(
                 PrimaryButton(
                     text = stringResource(id = R.string.back),
                     onClick = onBackClick,
-                    modifier = Modifier.padding(top = Dimens.mediumPadding)
+                    modifier = Modifier.padding(top = Dimens.buttonSpacing)
                 )
             }
         }
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 7192f5475a..efb07acfa2 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
@@ -187,7 +187,7 @@ fun OutOfTimeScreen(
                         Modifier.padding(
                             start = Dimens.sideMargin,
                             end = Dimens.sideMargin,
-                            bottom = Dimens.buttonSeparation
+                            bottom = Dimens.buttonSpacing
                         )
                 )
             }
@@ -199,7 +199,7 @@ fun OutOfTimeScreen(
                         Modifier.padding(
                             start = Dimens.sideMargin,
                             end = Dimens.sideMargin,
-                            bottom = Dimens.buttonSeparation
+                            bottom = Dimens.buttonSpacing
                         )
                 )
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
index ee076c801b..fbfb632e23 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
@@ -162,16 +162,18 @@ fun ReportProblemScreen(
                 colors = mullvadWhiteTextFieldColors()
             )
 
-            PrimaryButton(
-                onClick = onNavigateToViewLogs,
-                text = stringResource(id = R.string.view_logs)
-            )
-
-            VariantButton(
-                onClick = { onSendReport(email, description) },
-                isEnabled = description.isNotEmpty(),
-                text = stringResource(id = R.string.send)
-            )
+            Column {
+                PrimaryButton(
+                    onClick = onNavigateToViewLogs,
+                    text = stringResource(id = R.string.view_logs)
+                )
+                Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
+                VariantButton(
+                    onClick = { onSendReport(email, description) },
+                    isEnabled = description.isNotEmpty(),
+                    text = stringResource(id = R.string.send)
+                )
+            }
         }
     }
 }
@@ -265,7 +267,9 @@ private fun ColumnScope.ErrorContent(retry: () -> Unit, onDismiss: () -> Unit) {
     )
     Spacer(modifier = Modifier.weight(1f))
     PrimaryButton(
-        modifier = Modifier.fillMaxWidth().padding(vertical = Dimens.mediumPadding),
+        modifier =
+            Modifier.fillMaxWidth()
+                .padding(top = Dimens.mediumPadding, bottom = Dimens.buttonSpacing),
         onClick = onDismiss,
         text = stringResource(id = R.string.edit_message)
     )
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 c983f69528..f3c9f9dc7e 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
@@ -282,7 +282,7 @@ private fun PaymentPanel(
                     Modifier.padding(
                         start = Dimens.sideMargin,
                         end = Dimens.sideMargin,
-                        bottom = Dimens.screenVerticalMargin
+                        bottom = Dimens.buttonSpacing
                     )
             )
         }
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
index f039853890..20a1c2f3e1 100644
--- 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
@@ -9,7 +9,7 @@ data class Dimensions(
     val backButtonSideMargin: Dp = 30.dp,
     val bigIconSize: Dp = 44.dp,
     val buttonHeight: Dp = 44.dp,
-    val buttonSeparation: Dp = 18.dp,
+    val buttonSpacing: Dp = 12.dp,
     val buttonVerticalPadding: Dp = 8.dp,
     val cellEndPadding: Dp = 16.dp,
     val cellFooterTopPadding: Dp = 6.dp,