Make bottom padding on manage screen consistent. (#10254)

stripe · Feb 21, 2025 · 4e152d5 · 4e152d5
1 parent 69caba2
commit 4e152d5
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 5 deletions.
diff --git a/...tsheet/src/main/java/com/stripe/android/paymentelement/embedded/manage/ManageNavigator.kt b/...tsheet/src/main/java/com/stripe/android/paymentelement/embedded/manage/ManageNavigator.kt
@@ -1,12 +1,15 @@
 package com.stripe.android.paymentelement.embedded.manage
 
+import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.stripe.android.core.strings.ResolvableString
 import com.stripe.android.paymentsheet.navigation.NavigationHandler
 import com.stripe.android.paymentsheet.ui.PaymentSheetTopBarState
 import com.stripe.android.paymentsheet.ui.UpdatePaymentMethodInteractor
 import com.stripe.android.paymentsheet.ui.UpdatePaymentMethodUI
+import com.stripe.android.paymentsheet.utils.PaymentSheetContentPadding
 import com.stripe.android.paymentsheet.verticalmode.ManageScreenInteractor
 import com.stripe.android.paymentsheet.verticalmode.ManageScreenUI
 import com.stripe.android.uicore.utils.mapAsStateFlow
@@ -83,7 +86,10 @@ internal class ManageNavigator private constructor(
 
             @Composable
             override fun Content() {
-                ManageScreenUI(interactor = interactor)
+                Column {
+                    ManageScreenUI(interactor = interactor)
+                    PaymentSheetContentPadding(subtractingExtraPadding = 12.dp)
+                }
             }
 
             override fun close() {
@@ -102,7 +108,10 @@ internal class ManageNavigator private constructor(
 
             @Composable
             override fun Content() {
-                UpdatePaymentMethodUI(interactor = interactor, modifier = Modifier)
+                Column {
+                    UpdatePaymentMethodUI(interactor = interactor, modifier = Modifier)
+                    PaymentSheetContentPadding(subtractingExtraPadding = 16.dp)
+                }
             }
         }
     }

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/UpdatePaymentMethodUI.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/ui/UpdatePaymentMethodUI.kt
@@ -133,7 +133,7 @@ private fun DetailsCannotBeChangedText(
             color = MaterialTheme.stripeColors.subtitle,
             fontWeight = FontWeight.Normal,
             modifier = Modifier
-                .padding(top = 10.dp)
+                .padding(top = 8.dp)
                 .testTag(UPDATE_PM_DETAILS_SUBTITLE_TEST_TAG)
         )
     }

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/utils/ComposeUtils.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/utils/ComposeUtils.kt
@@ -7,12 +7,14 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import com.stripe.android.paymentsheet.R
 
 @Composable
-internal fun PaymentSheetContentPadding() {
+internal fun PaymentSheetContentPadding(subtractingExtraPadding: Dp = 0.dp) {
     val bottomPadding = dimensionResource(R.dimen.stripe_paymentsheet_button_container_spacing_bottom)
-    Spacer(modifier = Modifier.requiredHeight(bottomPadding))
+    Spacer(modifier = Modifier.requiredHeight(bottomPadding - subtractingExtraPadding))
 }
 
 @Composable

diff --git a/...Test_testUpdatePaymentMethodScreen[DarkTheme,DefaultFont,DefaultAppearance].png b/...Test_testUpdatePaymentMethodScreen[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...est_testUpdatePaymentMethodScreen[LightTheme,DefaultFont,DefaultAppearance].png b/...est_testUpdatePaymentMethodScreen[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...ePaymentMethodScreen_withoutRemove[DarkTheme,DefaultFont,DefaultAppearance].png b/...ePaymentMethodScreen_withoutRemove[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...PaymentMethodScreen_withoutRemove[LightTheme,DefaultFont,DefaultAppearance].png b/...PaymentMethodScreen_withoutRemove[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...ScreenUpdatePaymentMethodScreenshotTest_updatePaymentMethodScreen_forCard[].png b/...ScreenUpdatePaymentMethodScreenshotTest_updatePaymentMethodScreen_forCard[].png
diff --git a/...ntMethodScreenshotTest_updatePaymentMethodScreen_forCard_withRemoveButton[].png b/...ntMethodScreenshotTest_updatePaymentMethodScreen_forCard_withRemoveButton[].png
diff --git a/...reenshotTest_updatePaymentMethodScreen_forCard_withRemoveButton_withError[].png b/...reenshotTest_updatePaymentMethodScreen_forCard_withRemoveButton_withError[].png
diff --git a/...ScreenshotTest_updatePaymentMethodScreen_forCard_withSetAsDefaultCheckbox[].png b/...ScreenshotTest_updatePaymentMethodScreen_forCard_withSetAsDefaultCheckbox[].png
diff --git a/...ePaymentMethodScreenshotTest_updatePaymentMethodScreen_forCbcEligibleCard[].png b/...ePaymentMethodScreenshotTest_updatePaymentMethodScreen_forCbcEligibleCard[].png
diff --git a/...shotTest_updatePaymentMethodScreen_forCbcEligibleCard_withoutRemoveButton[].png b/...shotTest_updatePaymentMethodScreen_forCbcEligibleCard_withoutRemoveButton[].png
diff --git a/...hodScreenshotTest_updatePaymentMethodScreen_forSepaDebit_withRemoveButton[].png b/...hodScreenshotTest_updatePaymentMethodScreen_forSepaDebit_withRemoveButton[].png
diff --git a/...creenshotTest_updatePaymentMethodScreen_forUsBankAccount_withRemoveButton[].png b/...creenshotTest_updatePaymentMethodScreen_forUsBankAccount_withRemoveButton[].png