diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-12-01 10:44:58 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-12-01 11:35:54 +0100 |
| commit | dfebc2f1b35d25fe186967f8d4292d55d80be0fb (patch) | |
| tree | c9c709f632f3e22c81d27a91f4bb0e16dfed31fb /android | |
| parent | 233d3845f224505fbf4f3ce60d5db37d4a69d838 (diff) | |
| download | mullvadvpn-dfebc2f1b35d25fe186967f8d4292d55d80be0fb.tar.xz mullvadvpn-dfebc2f1b35d25fe186967f8d4292d55d80be0fb.zip | |
Fix button spacing
Diffstat (limited to 'android')
4 files changed, 6 insertions, 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 index e80e17e444..3815a3bb46 100644 --- 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 index a7fd6bae2f..b7b4744bb2 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 @@ -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 index d26e8c8265..4778756648 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 @@ -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 index 404b556d94..f0eea30fa6 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 @@ -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, |