Fix bottom margin

19 files changed, 36 insertions, 39 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/EmptyRelayListText.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/EmptyRelayListText.kt
index 5e61257d28..eb2fbf7cab 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/EmptyRelayListText.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/EmptyRelayListText.kt
@@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
 fun EmptyRelayListText() {
     Text(
         text = stringResource(R.string.no_locations_found),
-        modifier = Modifier.padding(Dimens.screenVerticalMargin),
+        modifier = Modifier.padding(Dimens.cellVerticalSpacing),
         style = MaterialTheme.typography.labelMedium,
         color = MaterialTheme.colorScheme.onSurfaceVariant,
     )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationsEmptyText.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationsEmptyText.kt
index bf3e36f57e..ecdf446291 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationsEmptyText.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/LocationsEmptyText.kt
@@ -19,6 +19,6 @@ fun LocationsEmptyText(searchTerm: String) {
         color = MaterialTheme.colorScheme.onSurfaceVariant,
         maxLines = 2,
         overflow = TextOverflow.Ellipsis,
-        modifier = Modifier.padding(Dimens.screenVerticalMargin),
+        modifier = Modifier.padding(Dimens.cellVerticalSpacing),
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
index 6c23a4646a..acd8f00443 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
@@ -49,7 +49,7 @@ private fun PreviewPlayPaymentPaymentAvailable() {
                     ),
                 onPurchaseBillingProductClick = {},
                 onInfoClick = {},
-                modifier = Modifier.padding(Dimens.screenVerticalMargin),
+                modifier = Modifier.padding(Dimens.screenBottomMargin),
             )
         }
     }
@@ -64,7 +64,7 @@ private fun PreviewPlayPaymentLoading() {
                 billingPaymentState = PaymentState.Loading,
                 onPurchaseBillingProductClick = {},
                 onInfoClick = {},
-                modifier = Modifier.padding(Dimens.screenVerticalMargin),
+                modifier = Modifier.padding(Dimens.screenBottomMargin),
             )
         }
     }
@@ -89,7 +89,7 @@ private fun PreviewPlayPaymentPaymentPending() {
                     ),
                 onPurchaseBillingProductClick = {},
                 onInfoClick = {},
-                modifier = Modifier.padding(Dimens.screenVerticalMargin),
+                modifier = Modifier.padding(Dimens.screenBottomMargin),
             )
         }
     }
@@ -114,7 +114,7 @@ private fun PreviewPlayPaymentVerificationInProgress() {
                     ),
                 onPurchaseBillingProductClick = {},
                 onInfoClick = {},
-                modifier = Modifier.padding(Dimens.screenVerticalMargin),
+                modifier = Modifier.padding(Dimens.screenBottomMargin),
             )
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
index fc2b02c97e..bcb0763a4e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -241,7 +241,7 @@ fun ScaffoldWithLargeTopBarAndButton(
                 modifier =
                     Modifier.padding(
                         horizontal = Dimens.sideMargin,
-                        vertical = Dimens.screenVerticalMargin,
+                        vertical = Dimens.screenBottomMargin,
                     ),
                 trailingIcon = {
                     Icon(
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 584432f6a6..dfd1f2d8f7 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
@@ -165,7 +165,7 @@ fun AccountScreen(
                 modifier
                     .animateContentSize()
                     .padding(horizontal = Dimens.sideMargin)
-                    .padding(bottom = Dimens.screenVerticalMargin),
+                    .padding(bottom = Dimens.screenBottomMargin),
         ) {
             Column(
                 verticalArrangement = Arrangement.spacedBy(Dimens.accountRowSpacing),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
index ceddf9dc99..6f2f6453d9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AutoConnectAndLockdownModeScreen.kt
@@ -176,7 +176,8 @@ private fun ConstraintLayoutScope.AutoConnectCarousel(
                 text = annotatedTopText,
             )
             Image(
-                modifier = Modifier.padding(top = Dimens.topPadding, bottom = Dimens.bottomPadding),
+                modifier =
+                    Modifier.padding(top = Dimens.smallPadding, bottom = Dimens.bottomPadding),
                 painter = painterResource(id = page.image),
                 contentDescription = null,
             )
@@ -224,7 +225,7 @@ private fun ConstraintLayoutScope.PageIndicator(
     pager: ConstrainedLayoutReference,
 ) {
     Row(
-        Modifier.wrapContentHeight().fillMaxWidth().padding(top = Dimens.topPadding).constrainAs(
+        Modifier.wrapContentHeight().fillMaxWidth().padding(top = Dimens.mediumSpacer).constrainAs(
             pageIndicatorRef
         ) {
             top.linkTo(pager.bottom)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
index 7bac85733c..3d50800137 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt
@@ -177,7 +177,7 @@ private fun LazyListScope.empty() {
     item(contentType = ContentType.EMPTY_TEXT) {
         Text(
             text = stringResource(R.string.no_custom_lists_available),
-            modifier = Modifier.padding(Dimens.screenVerticalMargin),
+            modifier = Modifier.padding(Dimens.mediumPadding),
             style = MaterialTheme.typography.labelMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant,
         )
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 fee2b70973..9d0310e60c 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
@@ -259,7 +259,7 @@ private fun ColumnScope.DeviceListHeader(state: DeviceListUiState) {
             Modifier.padding(
                 start = Dimens.sideMargin,
                 end = Dimens.sideMargin,
-                top = Dimens.screenVerticalMargin,
+                top = Dimens.screenTopMargin,
             ),
     )
 
@@ -301,7 +301,7 @@ private fun DeviceListButtonPanel(
                 start = Dimens.sideMargin,
                 end = Dimens.sideMargin,
                 top = Dimens.spacingAboveButton,
-                bottom = Dimens.screenVerticalMargin,
+                bottom = Dimens.screenBottomMargin,
             )
     ) {
         VariantButton(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt
index 54023670f2..1c0a84c375 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditApiAccessMethodScreen.kt
@@ -238,7 +238,7 @@ fun EditApiAccessMethodScreen(
                         color = MaterialTheme.colorScheme.onSurface.copy(alpha = AlphaScrollbar),
                     )
                     .verticalScroll(scrollState)
-                    .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenVerticalMargin)
+                    .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenBottomMargin)
         ) {
             when (state) {
                 is EditApiAccessMethodUiState.Loading -> Loading()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
index 074af07489..5814e9b377 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/EditCustomListScreen.kt
@@ -143,7 +143,7 @@ fun EditCustomListScreen(
                 EditCustomListUiState.NotFound -> {
                     Text(
                         text = stringResource(id = R.string.not_found),
-                        modifier = Modifier.padding(Dimens.screenVerticalMargin),
+                        modifier = Modifier.padding(Dimens.sideMargin),
                         style = MaterialTheme.typography.labelMedium,
                         color = MaterialTheme.colorScheme.onSurface,
                     )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
index 7baf354e0e..2129b24cf4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
@@ -290,19 +290,10 @@ private fun BottomBar(
         modifier =
             Modifier.fillMaxWidth()
                 .background(color = backgroundColor)
-                .padding(top = Dimens.screenVerticalMargin),
+                .padding(vertical = Dimens.screenBottomMargin, horizontal = Dimens.sideMargin),
         contentAlignment = Alignment.BottomCenter,
     ) {
-        ApplyButton(
-            onClick = onApplyClick,
-            isEnabled = isApplyButtonEnabled,
-            modifier =
-                Modifier.padding(
-                    start = Dimens.sideMargin,
-                    end = Dimens.sideMargin,
-                    bottom = Dimens.screenVerticalMargin,
-                ),
-        )
+        ApplyButton(onClick = onApplyClick, isEnabled = isApplyButtonEnabled)
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
index 5b9499c89e..021fba19d5 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -423,7 +423,7 @@ private fun CreateAccountPanel(onCreateAccountClick: () -> Unit, isEnabled: Bool
     Column(
         Modifier.fillMaxWidth()
             .background(MaterialTheme.colorScheme.background)
-            .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenVerticalMargin)
+            .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenBottomMargin)
     ) {
         Text(
             modifier = Modifier.padding(bottom = Dimens.smallPadding),
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 5330e16d69..522c2f99c7 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
@@ -183,7 +183,7 @@ fun OutOfTimeScreen(
                 contentDescription = null,
                 modifier =
                     Modifier.align(Alignment.CenterHorizontally)
-                        .padding(vertical = Dimens.screenVerticalMargin)
+                        .padding(vertical = Dimens.screenTopMargin)
                         .size(Dimens.bigIconSize),
             )
             Text(
@@ -284,7 +284,7 @@ private fun ButtonPanel(
                 Modifier.padding(
                     start = Dimens.sideMargin,
                     end = Dimens.sideMargin,
-                    bottom = Dimens.screenVerticalMargin,
+                    bottom = Dimens.screenBottomMargin,
                 ),
             isEnabled = state.tunnelState.enableRedeemButton(),
         )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
index 4fafe36c7a..2d17a02fbc 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
@@ -114,7 +114,12 @@ fun PrivacyDisclaimerScreen(state: PrivacyDisclaimerViewState, onAcceptClicked:
                 .fillMaxSize()
                 .background(color = MaterialTheme.colorScheme.surface)
                 .verticalScroll(scrollState)
-                .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenVerticalMargin)
+                .padding(
+                    start = Dimens.sideMargin,
+                    end = Dimens.sideMargin,
+                    top = Dimens.screenTopMargin,
+                    bottom = Dimens.screenBottomMargin,
+                )
                 .drawVerticalScrollbar(
                     state = scrollState,
                     color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaScrollbar),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
index 6dd85cbbc4..c0164483e9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
@@ -236,7 +236,7 @@ fun ServerIpOverridesScreen(
                 text = stringResource(R.string.import_overrides_import),
                 modifier =
                     Modifier.padding(horizontal = Dimens.sideMargin)
-                        .padding(bottom = Dimens.screenVerticalMargin)
+                        .padding(bottom = Dimens.screenBottomMargin)
                         .testTag(SERVER_IP_OVERRIDE_IMPORT_TEST_TAG),
             )
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
index 2b06606a3d..085060db48 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
@@ -142,7 +142,7 @@ private fun Content(state: ViewLogsUiState, paddingValues: PaddingValues) {
                 .padding(
                     start = Dimens.sideMargin,
                     end = Dimens.sideMargin,
-                    bottom = Dimens.screenVerticalMargin,
+                    bottom = Dimens.screenBottomMargin,
                 ),
         colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.onPrimary),
     ) {
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 44b037e35f..482eafe863 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
@@ -240,7 +240,7 @@ private fun WelcomeInfo(
             modifier =
                 Modifier.fillMaxWidth()
                     .padding(
-                        top = Dimens.screenVerticalMargin,
+                        top = Dimens.screenTopMargin,
                         start = Dimens.sideMargin,
                         end = Dimens.sideMargin,
                     ),
@@ -357,7 +357,7 @@ private fun ButtonPanel(
     onDisconnectClick: () -> Unit,
 ) {
     Column(modifier = Modifier.fillMaxWidth().padding(top = Dimens.mediumPadding)) {
-        Spacer(modifier = Modifier.padding(top = Dimens.screenVerticalMargin))
+        Spacer(modifier = Modifier.padding(top = Dimens.screenTopMargin))
         if (showDisconnectButton) {
             NegativeButton(
                 onClick = onDisconnectClick,
@@ -405,7 +405,7 @@ private fun ButtonPanel(
                 Modifier.padding(
                     start = Dimens.sideMargin,
                     end = Dimens.sideMargin,
-                    bottom = Dimens.screenVerticalMargin,
+                    bottom = Dimens.screenBottomMargin,
                 ),
         )
     }
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 346a3a507c..1edad2aef0 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
@@ -57,7 +57,8 @@ data class Dimensions(
     val problemReportIconToTitlePadding: Dp = 60.dp,
     val reconnectButtonMinInteractiveComponentSize: Dp = 40.dp,
     val relayCircleSize: Dp = 16.dp,
-    val screenVerticalMargin: Dp = 24.dp,
+    val screenBottomMargin: Dp = 16.dp,
+    val screenTopMargin: Dp = 24.dp,
     val searchFieldHeight: Dp = 42.dp,
     val searchFieldHeightExpanded: Dp = 72.dp,
     val searchFieldHorizontalPadding: Dp = 22.dp,
@@ -77,7 +78,6 @@ data class Dimensions(
     val switchLocationRetryMinWidth: Dp = 48.dp,
     val tinyPadding: Dp = 4.dp,
     val titleIconSize: Dp = 48.dp,
-    val topPadding: Dp = 20.dp,
     val tvDrawerHeaderStartPadding: Dp = 12.dp,
     val tvDrawerHeaderWithFocusStartPadding: Dp = 16.dp,
     val tvDrawerHorizontalPadding: Dp = 12.dp,
diff --git a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
index 2b74716950..56b15f9616 100644
--- a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
+++ b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt
@@ -103,8 +103,8 @@ fun NavigationDrawerTv(
                 Modifier.fillMaxHeight()
                     .background(brush)
                     .padding(
-                        top = Dimens.screenVerticalMargin,
-                        bottom = Dimens.screenVerticalMargin,
+                        top = Dimens.screenBottomMargin,
+                        bottom = Dimens.screenBottomMargin,
                         start = Dimens.tvDrawerHorizontalPadding,
                         end = Dimens.tvDrawerHorizontalPadding,
                     )