Support custom h1 font modification

Author: samer-stripe

identity/src/main/java/com/stripe/android/identity/ui/IdentityTheme.kt

@@ -14,6 +14,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.text.TextStyle
 import com.google.accompanist.themeadapter.material.createMdcTheme
 import com.stripe.android.uicore.LocalColors
 import com.stripe.android.uicore.LocalShapes
@@ -75,7 +76,9 @@ internal fun AdoptForStripeTheme(
     val stripeTypography: StripeTypography = StripeThemeDefaults.typography.copy(
         body1FontFamily = hostingAppTypography.body1.fontFamily,
         body2FontFamily = hostingAppTypography.body2.fontFamily,
-        h4FontFamily = hostingAppTypography.h4.fontFamily,
+        h4 = TextStyle(
+            fontFamily = hostingAppTypography.h4.fontFamily,
+        ),
         h5FontFamily = hostingAppTypography.h5.fontFamily,
         h6FontFamily = hostingAppTypography.h6.fontFamily,
         subtitle1FontFamily = hostingAppTypography.subtitle1.fontFamily,

paymentsheet/api/paymentsheet.api

@@ -2373,12 +2373,15 @@ public final class com/stripe/android/paymentsheet/PaymentSheet$Typography : and
 	public static final field CREATOR Landroid/os/Parcelable$Creator;
 	public static final field Companion Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Companion;
 	public fun <init> (FLjava/lang/Integer;)V
+	public fun <init> (FLjava/lang/Integer;Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;)V
 	public final fun component1 ()F
 	public final fun component2 ()Ljava/lang/Integer;
-	public final fun copy (FLjava/lang/Integer;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;
-	public static synthetic fun copy$default (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;FLjava/lang/Integer;ILjava/lang/Object;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;
+	public final fun component3 ()Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
+	public final fun copy (FLjava/lang/Integer;Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;
+	public static synthetic fun copy$default (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;FLjava/lang/Integer;Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;ILjava/lang/Object;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography;
 	public final fun describeContents ()I
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCustom ()Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
 	public final fun getFontResId ()Ljava/lang/Integer;
 	public final fun getSizeScaleFactor ()F
 	public fun hashCode ()I
@@ -2398,6 +2401,64 @@ public final class com/stripe/android/paymentsheet/PaymentSheet$Typography$Creat
 	public synthetic fun newArray (I)[Ljava/lang/Object;
 }
 
+public final class com/stripe/android/paymentsheet/PaymentSheet$Typography$Custom : android/os/Parcelable {
+	public static final field $stable I
+	public static final field CREATOR Landroid/os/Parcelable$Creator;
+	public fun <init> ()V
+	public fun <init> (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;)V
+	public synthetic fun <init> (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public final fun copy (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
+	public static synthetic fun copy$default (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;ILjava/lang/Object;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
+	public final fun describeContents ()I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getH1 ()Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+	public final fun writeToParcel (Landroid/os/Parcel;I)V
+}
+
+public final class com/stripe/android/paymentsheet/PaymentSheet$Typography$Custom$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Custom;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
+public final class com/stripe/android/paymentsheet/PaymentSheet$Typography$Font : android/os/Parcelable {
+	public static final field $stable I
+	public static final field CREATOR Landroid/os/Parcelable$Creator;
+	public fun <init> ()V
+	public fun <init> (Landroid/content/Context;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
+	public synthetic fun <init> (Landroid/content/Context;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Integer;Ljava/lang/Float;)V
+	public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Integer;Ljava/lang/Float;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/Integer;
+	public final fun component2 ()Ljava/lang/Float;
+	public final fun component3 ()Ljava/lang/Integer;
+	public final fun component4 ()Ljava/lang/Float;
+	public final fun copy (Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Integer;Ljava/lang/Float;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public static synthetic fun copy$default (Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;Ljava/lang/Integer;Ljava/lang/Float;Ljava/lang/Integer;Ljava/lang/Float;ILjava/lang/Object;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public final fun describeContents ()I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getFontFamily ()Ljava/lang/Integer;
+	public final fun getFontSizeSp ()Ljava/lang/Float;
+	public final fun getFontWeight ()Ljava/lang/Integer;
+	public final fun getLetterSpacingSp ()Ljava/lang/Float;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+	public final fun writeToParcel (Landroid/os/Parcel;I)V
+}
+
+public final class com/stripe/android/paymentsheet/PaymentSheet$Typography$Font$Creator : android/os/Parcelable$Creator {
+	public fun <init> ()V
+	public final fun createFromParcel (Landroid/os/Parcel;)Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public synthetic fun createFromParcel (Landroid/os/Parcel;)Ljava/lang/Object;
+	public final fun newArray (I)[Lcom/stripe/android/paymentsheet/PaymentSheet$Typography$Font;
+	public synthetic fun newArray (I)[Ljava/lang/Object;
+}
+
 public final class com/stripe/android/paymentsheet/PaymentSheetComposeKt {
 	public static final fun rememberPaymentSheet (Lcom/stripe/android/paymentsheet/CreateIntentCallback;Lcom/stripe/android/paymentsheet/ExternalPaymentMethodConfirmHandler;Lcom/stripe/android/paymentsheet/PaymentSheetResultCallback;Landroidx/compose/runtime/Composer;II)Lcom/stripe/android/paymentsheet/PaymentSheet;
 	public static final fun rememberPaymentSheet (Lcom/stripe/android/paymentsheet/CreateIntentCallback;Lcom/stripe/android/paymentsheet/PaymentSheetResultCallback;Landroidx/compose/runtime/Composer;I)Lcom/stripe/android/paymentsheet/PaymentSheet;

paymentsheet/detekt-baseline.xml

@@ -44,7 +44,7 @@
     <ID>LongMethod:PaymentDetails.kt$@Preview(showBackground = true) @Composable private fun PaymentDetailsListItemPreview()</ID>
     <ID>LongMethod:PaymentElementLoader.kt$DefaultPaymentElementLoader$private suspend fun createLinkConfiguration( configuration: CommonConfiguration, customer: CustomerInfo?, elementsSession: ElementsSession, initializationMode: PaymentElementLoader.InitializationMode ): LinkConfiguration?</ID>
     <ID>LongMethod:PaymentMethodVerticalLayoutInteractor.kt$DefaultPaymentMethodVerticalLayoutInteractor.Companion$fun create( viewModel: BaseSheetViewModel, paymentMethodMetadata: PaymentMethodMetadata, customerStateHolder: CustomerStateHolder, bankFormInteractor: BankFormInteractor, ): PaymentMethodVerticalLayoutInteractor</ID>
-    <ID>LongMethod:PaymentSheetConfigurationKtx.kt$internal fun PaymentSheet.Appearance.parseAppearance()</ID>
+    <ID>LongMethod:PaymentSheetConfigurationKtx.kt$@OptIn(ExtendedAppearancePreview::class) internal fun PaymentSheet.Appearance.parseAppearance()</ID>
     <ID>LongMethod:PaymentSheetScreen.kt$@Composable private fun PaymentSheetContent( viewModel: BaseSheetViewModel, headerText: ResolvableString?, walletsState: WalletsState?, walletsProcessingState: WalletsProcessingState?, error: ResolvableString?, currentScreen: PaymentSheetScreen, mandateText: MandateText?, modifier: Modifier )</ID>
     <ID>LongMethod:PaymentSheetViewModelTest.kt$PaymentSheetViewModelTest$@Test fun `Can complete payment after switching to another LPM from card selection with inline Link signup state`()</ID>
     <ID>LongMethod:PlaceholderHelperTest.kt$PlaceholderHelperTest$@Test fun `Test correct placeholder is removed for placeholder spec`()</ID>

paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheet.kt

@@ -1609,7 +1609,7 @@ class PaymentSheet internal constructor(
     }
 
     @Parcelize
-    data class Typography(
+    data class Typography @ExtendedAppearancePreview constructor(
         /**
          * The scale factor for all fonts in PaymentSheet, the default value is 1.0.
          * When this value increases fonts will increase in size and decrease when this value is lowered.
@@ -1620,8 +1620,90 @@ class PaymentSheet internal constructor(
          * The font used in text. This should be a resource ID value.
          */
         @FontRes
-        val fontResId: Int?
+        val fontResId: Int?,
+
+        /**
+         * Custom font configuration for specific text styles
+         * Note: When set, these fonts override the default font calculations for their respective text styles
+         */
+        val custom: Custom,
     ) : Parcelable {
+        @OptIn(ExtendedAppearancePreview::class)
+        constructor(
+            /**
+             * The scale factor for all fonts in PaymentSheet, the default value is 1.0.
+             * When this value increases fonts will increase in size and decrease when this value is lowered.
+             */
+            sizeScaleFactor: Float,
+            /**
+             * The font used in text. This should be a resource ID value.
+             */
+            @FontRes
+            fontResId: Int?
+        ) : this(
+            sizeScaleFactor = sizeScaleFactor,
+            fontResId = fontResId,
+            custom = Custom(),
+        )
+
+        @ExtendedAppearancePreview
+        @Parcelize
+        data class Custom(
+            /**
+             * The font used for headlines (e.g., "Add your payment information")
+             *
+             * Note: If `null`, uses the calculated font based on `base` and `sizeScaleFactor`
+             */
+            val h1: Font? = null,
+        ) : Parcelable
+
+        @ExtendedAppearancePreview
+        @Parcelize
+        data class Font(
+            /**
+             * The font used in text. This should be a resource ID value.
+             */
+            @FontRes
+            val fontFamily: Int? = null,
+            /**
+             * The font size used for the text. This should represent a sp value.
+             */
+            val fontSizeSp: Float? = null,
+            /**
+             * The font weight used for the text.
+             */
+            val fontWeight: Int? = null,
+            /**
+             * The letter spacing used for the text. This should represent a sp value.
+             */
+            val letterSpacingSp: Float? = null,
+        ) : Parcelable {
+            constructor(
+                context: Context,
+                /**
+                 * The font used in text. This should be a resource ID value.
+                 */
+                @FontRes fontFamily: Int?,
+                /**
+                 * The font size resource used for the text. This should represent a sp value.
+                 */
+                @DimenRes fontSizeRes: Int? = null,
+                /**
+                 * The font weight used for the text.
+                 */
+                fontWeight: Int? = null,
+                /**
+                 * The letter spacing resource used for the text. This should represent a sp value.
+                 */
+                @DimenRes letterSpacingRes: Int? = null,
+            ) : this(
+                fontFamily = fontFamily,
+                fontSizeSp = fontSizeRes?.let { context.getRawValueFromDimenResource(it) },
+                fontWeight = fontWeight,
+                letterSpacingSp = letterSpacingRes?.let { context.getRawValueFromDimenResource(it) },
+            )
+        }
+
         companion object {
             val default = Typography(
                 sizeScaleFactor = StripeThemeDefaults.typography.fontSizeMultiplier,

paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetConfigurationKtx.kt

@@ -3,13 +3,20 @@ package com.stripe.android.paymentsheet
 import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
+import com.stripe.android.paymentelement.ExtendedAppearancePreview
 import com.stripe.android.uicore.PrimaryButtonColors
 import com.stripe.android.uicore.PrimaryButtonShape
 import com.stripe.android.uicore.PrimaryButtonTypography
 import com.stripe.android.uicore.StripeTheme
 import com.stripe.android.uicore.StripeThemeDefaults
 
+@OptIn(ExtendedAppearancePreview::class)
 internal fun PaymentSheet.Appearance.parseAppearance() {
     StripeTheme.colorsLightMutable = StripeThemeDefaults.colorsLight.copy(
         component = Color(colorsLight.component),
@@ -51,7 +58,8 @@ internal fun PaymentSheet.Appearance.parseAppearance() {
 
     StripeTheme.typographyMutable = StripeThemeDefaults.typography.copy(
         fontFamily = typography.fontResId,
-        fontSizeMultiplier = typography.sizeScaleFactor
+        fontSizeMultiplier = typography.sizeScaleFactor,
+        h4 = typography.custom.h1?.toTextStyle(),
     )
 
     StripeTheme.primaryButtonStyle = StripeThemeDefaults.primaryButtonStyle.copy(
@@ -89,3 +97,13 @@ internal fun PaymentSheet.Appearance.parseAppearance() {
         bottom = formInsetValues.bottomDp
     )
 }
+
+@OptIn(ExtendedAppearancePreview::class)
+private fun PaymentSheet.Typography.Font.toTextStyle(): TextStyle {
+    return TextStyle(
+        fontSize = fontSizeSp?.sp ?: TextUnit.Unspecified,
+        fontWeight = fontWeight?.let { FontWeight(it) },
+        fontFamily = fontFamily?.let { FontFamily(Font(it)) },
+        letterSpacing = letterSpacingSp?.sp ?: TextUnit.Unspecified,
+    )
+}

paymentsheet/src/test/java/com/stripe/android/customersheet/CustomerSheetFixtures.kt

@@ -27,7 +27,7 @@ internal object CustomerSheetFixtures {
                     cornerRadiusDp = 0.0f,
                     borderStrokeWidthDp = 0.0f
                 ),
-                typography = PaymentSheet.Typography.default.copy(
+                typography = PaymentSheet.Typography(
                     sizeScaleFactor = 1.1f,
                     fontResId = 0
                 ),

paymentsheet/src/test/java/com/stripe/android/paymentelement/confirmation/bacs/BacsConfirmationDefinitionTest.kt

@@ -233,8 +233,9 @@ class BacsConfirmationDefinitionTest {
         val launcher = FakeBacsMandateConfirmationLauncher()
 
         val appearance = PaymentSheet.Appearance().copy(
-            typography = PaymentSheet.Typography.default.copy(
-                sizeScaleFactor = 2f
+            typography = PaymentSheet.Typography(
+                sizeScaleFactor = 2f,
+                fontResId = PaymentSheet.Typography.default.fontResId,
             )
         )
         val bacsMandateData = BacsMandateData(

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetFixtures.kt

@@ -68,7 +68,7 @@ internal object PaymentSheetFixtures {
                 cornerRadiusDp = 0.0f,
                 borderStrokeWidthDp = 0.0f
             ),
-            typography = PaymentSheet.Typography.default.copy(
+            typography = PaymentSheet.Typography(
                 sizeScaleFactor = 1.1f,
                 fontResId = 0
             ),

paymentsheet/src/test/java/com/stripe/android/utils/screenshots/PaymentSheetAppearance.kt

@@ -1,6 +1,7 @@
 package com.stripe.android.utils.screenshots
 
 import android.graphics.Color
+import com.stripe.android.paymentelement.ExtendedAppearancePreview
 import com.stripe.android.paymentsheet.PaymentSheet
 import com.stripe.android.paymentsheet.R
 import com.stripe.android.paymentsheet.parseAppearance
@@ -28,6 +29,7 @@ enum class PaymentSheetAppearance(val appearance: PaymentSheet.Appearance) : Pap
         ),
     ),
 
+    @OptIn(ExtendedAppearancePreview::class)
     CrazyAppearance(
         appearance = PaymentSheet.Appearance(
             colorsLight = PaymentSheet.Colors(
@@ -70,7 +72,19 @@ enum class PaymentSheetAppearance(val appearance: PaymentSheet.Appearance) : Pap
                 topDp = 20f,
                 endDp = 40f,
                 bottomDp = 60f
-            )
+            ),
+            typography = PaymentSheet.Typography(
+                sizeScaleFactor = 1f,
+                fontResId = null,
+                custom = PaymentSheet.Typography.Custom(
+                    h1 = PaymentSheet.Typography.Font(
+                        fontFamily = R.font.cursive,
+                        fontSizeSp = 24f,
+                        fontWeight = 700,
+                        letterSpacingSp = 0.15f,
+                    )
+                )
+            ),
         ),
     );
 

paymentsheet/src/test/snapshots/images/com.stripe.android.customersheet_CustomerSheetScreenshotTest_testConfirmCloseDialog[DarkTheme,DefaultFont,CrazyAppearance].png

@@ -14,6 +14,7 @@
     <ID>FunctionParameterNaming:IdentifierSpec.kt$IdentifierSpec.Companion$_value: String</ID>
     <ID>LongMethod:Html.kt$@Composable @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun annotatedStringResource( text: String, imageGetter: Map&lt;String, EmbeddableImage> = emptyMap(), urlSpanStyle: SpanStyle = SpanStyle(textDecoration = TextDecoration.Underline) ): AnnotatedString</ID>
     <ID>LongMethod:OTPElementUI.kt$@OptIn(ExperimentalComposeUiApi::class) @Composable @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun OTPElementUI( enabled: Boolean, element: OTPElement, modifier: Modifier = Modifier, boxShape: Shape = MaterialTheme.shapes.medium, boxTextStyle: TextStyle = OTPElementUI.defaultTextStyle(), boxSpacing: Dp = 8.dp, middleSpacing: Dp = 20.dp, otpInputPlaceholder: String = "●", colors: OTPElementColors = OTPElementColors( selectedBorder = MaterialTheme.colors.primary, unselectedBorder = MaterialTheme.stripeColors.componentBorder, placeholder = MaterialTheme.stripeColors.placeholderText, background = Color.Transparent ), focusRequester: FocusRequester = remember { FocusRequester() } )</ID>
+    <ID>LongMethod:StripeTheme.kt$@Composable @ReadOnlyComposable @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) fun StripeTypography.toComposeTypography(): Typography</ID>
     <ID>MagicNumber:AnimationConstants.kt$34</ID>
     <ID>MagicNumber:DateConfig.kt$DateConfig$4</ID>
     <ID>MagicNumber:DateConfig.kt$DateConfig.Companion$100</ID>