diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-05-14 16:31:57 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-05-15 13:23:27 +0200 |
| commit | 76b0e84fc95ab5bad221c88aefc56782b63055cb (patch) | |
| tree | 284397714a03059fbaab3c2fd85d532549d830e2 /android | |
| parent | fb4cfb4f097b73c3b6d886ef475d9f44a683b92a (diff) | |
| download | mullvadvpn-76b0e84fc95ab5bad221c88aefc56782b63055cb.tar.xz mullvadvpn-76b0e84fc95ab5bad221c88aefc56782b63055cb.zip | |
Remove old buttonVerticalSpacing
Diffstat (limited to 'android')
5 files changed, 5 insertions, 6 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt index 7160f16ba8..250ba7da99 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/MullvadButton.kt @@ -187,7 +187,7 @@ fun PrimaryTextButton( enabled = isEnabled, contentPadding = if (hasIcon) { - PaddingValues(vertical = Dimens.buttonVerticalPadding) + PaddingValues(vertical = Dimens.buttonSpacing) } else { ButtonDefaults.TextButtonContentPadding }, @@ -221,7 +221,7 @@ private fun BaseButton( enabled = isEnabled, contentPadding = if (hasIcon) { - PaddingValues(vertical = Dimens.buttonVerticalPadding) + PaddingValues(vertical = Dimens.buttonSpacing) } else { ButtonDefaults.ContentPadding }, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/InfoConfirmationDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/InfoConfirmationDialog.kt index 0f314dc233..c412fd3800 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/InfoConfirmationDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/info/InfoConfirmationDialog.kt @@ -149,7 +149,7 @@ fun <T> InfoConfirmationDialog( null }, confirmButton = { - Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonVerticalPadding)) { + Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) { PrimaryButton( modifier = Modifier.fillMaxWidth(), text = confirmButtonTitle, 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 26c08e4841..4ff5567b4a 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 @@ -722,7 +722,7 @@ private fun ButtonPanel( .focusRequester(selectButtonFocusRequester), reconnectButtonTestTag = RECONNECT_BUTTON_TEST_TAG, ) - Spacer(Modifier.height(Dimens.buttonVerticalPadding)) + Spacer(Modifier.height(Dimens.buttonSpacing)) ConnectionButton( modifier = Modifier.fillMaxWidth().testTag(CONNECT_BUTTON_TEST_TAG), 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 042701357a..06ed29e298 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 @@ -154,7 +154,7 @@ private fun ReportProblemScreen( .padding( start = Dimens.sideMargin, end = Dimens.sideMargin, - bottom = Dimens.verticalSpace, + bottom = Dimens.screenBottomMargin, ) .height(IntrinsicSize.Max), verticalArrangement = Arrangement.spacedBy(Dimens.mediumPadding), 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 1edad2aef0..e7e38534ba 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 @@ -11,7 +11,6 @@ data class Dimensions( val bottomPadding: Dp = 4.dp, val buttonHeight: Dp = 44.dp, val buttonSpacing: Dp = 8.dp, - val buttonVerticalPadding: Dp = 8.dp, val cellEndPadding: Dp = 16.dp, val cellFooterTopPadding: Dp = 6.dp, val cellHeight: Dp = 56.dp, |