Update PrimaryButton to scale with text size. (#7752)

stripe · Jan 12, 2024 · 7417a06 · 7417a06
1 parent 362e973
commit 7417a06
Show file tree

Hide file tree

Showing 74 changed files with 6 additions and 2 deletions.
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/ui/PrimaryButton.kt b/paymentsheet/src/main/java/com/stripe/android/common/ui/PrimaryButton.kt
@@ -3,8 +3,8 @@ package com.stripe.android.common.ui
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -21,9 +21,11 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
+import com.stripe.android.paymentsheet.R
 import com.stripe.android.uicore.StripeTheme
 import com.stripe.android.uicore.getBackgroundColor
 import com.stripe.android.uicore.getBorderStrokeColor
@@ -65,7 +67,9 @@ internal fun PrimaryButton(
                 onClick = onButtonClick,
                 modifier = Modifier
                     .fillMaxWidth()
-                    .height(44.dp),
+                    .defaultMinSize(
+                        minHeight = dimensionResource(id = R.dimen.stripe_paymentsheet_primary_button_height)
+                    ),
                 enabled = isEnabled,
                 shape = shape,
                 border = borderStroke,

diff --git a/...aryButtonScreenshotTest_testDisabled[DarkTheme,CrazyAppearance,DefaultFont].png b/...aryButtonScreenshotTest_testDisabled[DarkTheme,CrazyAppearance,DefaultFont].png
diff --git a/...imaryButtonScreenshotTest_testDisabled[DarkTheme,CrazyAppearance,LargeFont].png b/...imaryButtonScreenshotTest_testDisabled[DarkTheme,CrazyAppearance,LargeFont].png
diff --git a/...ryButtonScreenshotTest_testDisabled[DarkTheme,CustomAppearance,DefaultFont].png b/...ryButtonScreenshotTest_testDisabled[DarkTheme,CustomAppearance,DefaultFont].png
diff --git a/...maryButtonScreenshotTest_testDisabled[DarkTheme,CustomAppearance,LargeFont].png b/...maryButtonScreenshotTest_testDisabled[DarkTheme,CustomAppearance,LargeFont].png
diff --git a/...yButtonScreenshotTest_testDisabled[DarkTheme,DefaultAppearance,DefaultFont].png b/...yButtonScreenshotTest_testDisabled[DarkTheme,DefaultAppearance,DefaultFont].png
diff --git a/...aryButtonScreenshotTest_testDisabled[DarkTheme,DefaultAppearance,LargeFont].png b/...aryButtonScreenshotTest_testDisabled[DarkTheme,DefaultAppearance,LargeFont].png
diff --git a/...ryButtonScreenshotTest_testDisabled[LightTheme,CrazyAppearance,DefaultFont].png b/...ryButtonScreenshotTest_testDisabled[LightTheme,CrazyAppearance,DefaultFont].png
diff --git a/...maryButtonScreenshotTest_testDisabled[LightTheme,CrazyAppearance,LargeFont].png b/...maryButtonScreenshotTest_testDisabled[LightTheme,CrazyAppearance,LargeFont].png
diff --git a/...yButtonScreenshotTest_testDisabled[LightTheme,CustomAppearance,DefaultFont].png b/...yButtonScreenshotTest_testDisabled[LightTheme,CustomAppearance,DefaultFont].png
diff --git a/...aryButtonScreenshotTest_testDisabled[LightTheme,CustomAppearance,LargeFont].png b/...aryButtonScreenshotTest_testDisabled[LightTheme,CustomAppearance,LargeFont].png
diff --git a/...ButtonScreenshotTest_testDisabled[LightTheme,DefaultAppearance,DefaultFont].png b/...ButtonScreenshotTest_testDisabled[LightTheme,DefaultAppearance,DefaultFont].png
diff --git a/...ryButtonScreenshotTest_testDisabled[LightTheme,DefaultAppearance,LargeFont].png b/...ryButtonScreenshotTest_testDisabled[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/...maryButtonScreenshotTest_testEnabled[DarkTheme,CrazyAppearance,DefaultFont].png b/...maryButtonScreenshotTest_testEnabled[DarkTheme,CrazyAppearance,DefaultFont].png
diff --git a/...rimaryButtonScreenshotTest_testEnabled[DarkTheme,CrazyAppearance,LargeFont].png b/...rimaryButtonScreenshotTest_testEnabled[DarkTheme,CrazyAppearance,LargeFont].png
diff --git a/...aryButtonScreenshotTest_testEnabled[DarkTheme,CustomAppearance,DefaultFont].png b/...aryButtonScreenshotTest_testEnabled[DarkTheme,CustomAppearance,DefaultFont].png
diff --git a/...imaryButtonScreenshotTest_testEnabled[DarkTheme,CustomAppearance,LargeFont].png b/...imaryButtonScreenshotTest_testEnabled[DarkTheme,CustomAppearance,LargeFont].png
diff --git a/...ryButtonScreenshotTest_testEnabled[DarkTheme,DefaultAppearance,DefaultFont].png b/...ryButtonScreenshotTest_testEnabled[DarkTheme,DefaultAppearance,DefaultFont].png
diff --git a/...maryButtonScreenshotTest_testEnabled[DarkTheme,DefaultAppearance,LargeFont].png b/...maryButtonScreenshotTest_testEnabled[DarkTheme,DefaultAppearance,LargeFont].png
diff --git a/...aryButtonScreenshotTest_testEnabled[LightTheme,CrazyAppearance,DefaultFont].png b/...aryButtonScreenshotTest_testEnabled[LightTheme,CrazyAppearance,DefaultFont].png
diff --git a/...imaryButtonScreenshotTest_testEnabled[LightTheme,CrazyAppearance,LargeFont].png b/...imaryButtonScreenshotTest_testEnabled[LightTheme,CrazyAppearance,LargeFont].png
diff --git a/...ryButtonScreenshotTest_testEnabled[LightTheme,CustomAppearance,DefaultFont].png b/...ryButtonScreenshotTest_testEnabled[LightTheme,CustomAppearance,DefaultFont].png
diff --git a/...maryButtonScreenshotTest_testEnabled[LightTheme,CustomAppearance,LargeFont].png b/...maryButtonScreenshotTest_testEnabled[LightTheme,CustomAppearance,LargeFont].png
diff --git a/...yButtonScreenshotTest_testEnabled[LightTheme,DefaultAppearance,DefaultFont].png b/...yButtonScreenshotTest_testEnabled[LightTheme,DefaultAppearance,DefaultFont].png
diff --git a/...aryButtonScreenshotTest_testEnabled[LightTheme,DefaultAppearance,LargeFont].png b/...aryButtonScreenshotTest_testEnabled[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/...PrimaryButtonScreenshotTest_testLock[DarkTheme,CrazyAppearance,DefaultFont].png b/...PrimaryButtonScreenshotTest_testLock[DarkTheme,CrazyAppearance,DefaultFont].png
diff --git a/...i_PrimaryButtonScreenshotTest_testLock[DarkTheme,CrazyAppearance,LargeFont].png b/...i_PrimaryButtonScreenshotTest_testLock[DarkTheme,CrazyAppearance,LargeFont].png
diff --git a/...rimaryButtonScreenshotTest_testLock[DarkTheme,CustomAppearance,DefaultFont].png b/...rimaryButtonScreenshotTest_testLock[DarkTheme,CustomAppearance,DefaultFont].png
diff --git a/..._PrimaryButtonScreenshotTest_testLock[DarkTheme,CustomAppearance,LargeFont].png b/..._PrimaryButtonScreenshotTest_testLock[DarkTheme,CustomAppearance,LargeFont].png
diff --git a/...imaryButtonScreenshotTest_testLock[DarkTheme,DefaultAppearance,DefaultFont].png b/...imaryButtonScreenshotTest_testLock[DarkTheme,DefaultAppearance,DefaultFont].png
diff --git a/...PrimaryButtonScreenshotTest_testLock[DarkTheme,DefaultAppearance,LargeFont].png b/...PrimaryButtonScreenshotTest_testLock[DarkTheme,DefaultAppearance,LargeFont].png
diff --git a/...rimaryButtonScreenshotTest_testLock[LightTheme,CrazyAppearance,DefaultFont].png b/...rimaryButtonScreenshotTest_testLock[LightTheme,CrazyAppearance,DefaultFont].png
diff --git a/..._PrimaryButtonScreenshotTest_testLock[LightTheme,CrazyAppearance,LargeFont].png b/..._PrimaryButtonScreenshotTest_testLock[LightTheme,CrazyAppearance,LargeFont].png
diff --git a/...imaryButtonScreenshotTest_testLock[LightTheme,CustomAppearance,DefaultFont].png b/...imaryButtonScreenshotTest_testLock[LightTheme,CustomAppearance,DefaultFont].png
diff --git a/...PrimaryButtonScreenshotTest_testLock[LightTheme,CustomAppearance,LargeFont].png b/...PrimaryButtonScreenshotTest_testLock[LightTheme,CustomAppearance,LargeFont].png
diff --git a/...maryButtonScreenshotTest_testLock[LightTheme,DefaultAppearance,DefaultFont].png b/...maryButtonScreenshotTest_testLock[LightTheme,DefaultAppearance,DefaultFont].png
diff --git a/...rimaryButtonScreenshotTest_testLock[LightTheme,DefaultAppearance,LargeFont].png b/...rimaryButtonScreenshotTest_testLock[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/..._testAddFirstPaymentMethodDisabled[DarkTheme,DefaultFont,DefaultAppearance].png b/..._testAddFirstPaymentMethodDisabled[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...testAddFirstPaymentMethodDisabled[LightTheme,DefaultFont,DefaultAppearance].png b/...testAddFirstPaymentMethodDisabled[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...t_testAddFirstPaymentMethodEnabled[DarkTheme,DefaultFont,DefaultAppearance].png b/...t_testAddFirstPaymentMethodEnabled[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/..._testAddFirstPaymentMethodEnabled[LightTheme,DefaultFont,DefaultAppearance].png b/..._testAddFirstPaymentMethodEnabled[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...tTest_testAddPaymentMethodDisabled[DarkTheme,DefaultFont,DefaultAppearance].png b/...tTest_testAddPaymentMethodDisabled[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...Test_testAddPaymentMethodDisabled[LightTheme,DefaultFont,DefaultAppearance].png b/...Test_testAddPaymentMethodDisabled[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...otTest_testAddPaymentMethodEnabled[DarkTheme,DefaultFont,DefaultAppearance].png b/...otTest_testAddPaymentMethodEnabled[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...tTest_testAddPaymentMethodEnabled[LightTheme,DefaultFont,DefaultAppearance].png b/...tTest_testAddPaymentMethodEnabled[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...eenshotTest_testConfirmCloseDialog[DarkTheme,DefaultFont,DefaultAppearance].png b/...eenshotTest_testConfirmCloseDialog[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...enshotTest_testConfirmCloseDialog[LightTheme,DefaultFont,DefaultAppearance].png b/...enshotTest_testConfirmCloseDialog[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...SheetScreenshotTest_testEditScreen[DarkTheme,DefaultFont,DefaultAppearance].png b/...SheetScreenshotTest_testEditScreen[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...heetScreenshotTest_testEditScreen[LightTheme,DefaultFont,DefaultAppearance].png b/...heetScreenshotTest_testEditScreen[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...Test_testMandateAbovePrimaryButton[DarkTheme,DefaultFont,DefaultAppearance].png b/...Test_testMandateAbovePrimaryButton[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...est_testMandateAbovePrimaryButton[LightTheme,DefaultFont,DefaultAppearance].png b/...est_testMandateAbovePrimaryButton[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...Test_testMandateBelowPrimaryButton[DarkTheme,DefaultFont,DefaultAppearance].png b/...Test_testMandateBelowPrimaryButton[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...est_testMandateBelowPrimaryButton[LightTheme,DefaultFont,DefaultAppearance].png b/...est_testMandateBelowPrimaryButton[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...enshotTest_testSelectUSBankAccount[DarkTheme,DefaultFont,DefaultAppearance].png b/...enshotTest_testSelectUSBankAccount[DarkTheme,DefaultFont,DefaultAppearance].png
diff --git a/...nshotTest_testSelectUSBankAccount[LightTheme,DefaultFont,DefaultAppearance].png b/...nshotTest_testSelectUSBankAccount[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...dateButtonScreenshotTest_testPrimary[DarkTheme,CrazyAppearance,DefaultFont].png b/...dateButtonScreenshotTest_testPrimary[DarkTheme,CrazyAppearance,DefaultFont].png
diff --git a/...andateButtonScreenshotTest_testPrimary[DarkTheme,CrazyAppearance,LargeFont].png b/...andateButtonScreenshotTest_testPrimary[DarkTheme,CrazyAppearance,LargeFont].png
diff --git a/...ateButtonScreenshotTest_testPrimary[DarkTheme,CustomAppearance,DefaultFont].png b/...ateButtonScreenshotTest_testPrimary[DarkTheme,CustomAppearance,DefaultFont].png
diff --git a/...ndateButtonScreenshotTest_testPrimary[DarkTheme,CustomAppearance,LargeFont].png b/...ndateButtonScreenshotTest_testPrimary[DarkTheme,CustomAppearance,LargeFont].png
diff --git a/...teButtonScreenshotTest_testPrimary[DarkTheme,DefaultAppearance,DefaultFont].png b/...teButtonScreenshotTest_testPrimary[DarkTheme,DefaultAppearance,DefaultFont].png
diff --git a/...dateButtonScreenshotTest_testPrimary[DarkTheme,DefaultAppearance,LargeFont].png b/...dateButtonScreenshotTest_testPrimary[DarkTheme,DefaultAppearance,LargeFont].png
diff --git a/...ateButtonScreenshotTest_testPrimary[LightTheme,CrazyAppearance,DefaultFont].png b/...ateButtonScreenshotTest_testPrimary[LightTheme,CrazyAppearance,DefaultFont].png
diff --git a/...ndateButtonScreenshotTest_testPrimary[LightTheme,CrazyAppearance,LargeFont].png b/...ndateButtonScreenshotTest_testPrimary[LightTheme,CrazyAppearance,LargeFont].png
diff --git a/...teButtonScreenshotTest_testPrimary[LightTheme,CustomAppearance,DefaultFont].png b/...teButtonScreenshotTest_testPrimary[LightTheme,CustomAppearance,DefaultFont].png
diff --git a/...dateButtonScreenshotTest_testPrimary[LightTheme,CustomAppearance,LargeFont].png b/...dateButtonScreenshotTest_testPrimary[LightTheme,CustomAppearance,LargeFont].png
diff --git a/...eButtonScreenshotTest_testPrimary[LightTheme,DefaultAppearance,DefaultFont].png b/...eButtonScreenshotTest_testPrimary[LightTheme,DefaultAppearance,DefaultFont].png
diff --git a/...ateButtonScreenshotTest_testPrimary[LightTheme,DefaultAppearance,LargeFont].png b/...ateButtonScreenshotTest_testPrimary[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/...tionFormScreenshotTest_testFullForm[LightTheme,DefaultAppearance,LargeFont].png b/...tionFormScreenshotTest_testFullForm[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/...iScreenshotTest_testDisabledState[LightTheme,DefaultFont,DefaultAppearance].png b/...iScreenshotTest_testDisabledState[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...UiScreenshotTest_testEnabledState[LightTheme,DefaultFont,DefaultAppearance].png b/...UiScreenshotTest_testEnabledState[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...odUiScreenshotTest_testErrorState[LightTheme,DefaultFont,DefaultAppearance].png b/...odUiScreenshotTest_testErrorState[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...Test_testRemovalConfirmationState[LightTheme,DefaultFont,DefaultAppearance].png b/...Test_testRemovalConfirmationState[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...iScreenshotTest_testRemovingState[LightTheme,DefaultFont,DefaultAppearance].png b/...iScreenshotTest_testRemovingState[LightTheme,DefaultFont,DefaultAppearance].png
diff --git a/...iScreenshotTest_testUpdatingState[LightTheme,DefaultFont,DefaultAppearance].png b/...iScreenshotTest_testUpdatingState[LightTheme,DefaultFont,DefaultAppearance].png