[MOBILESDK-2480]update text style for bacs secondary button type (#9745)

* update text style for bacs secondary button type * screenshots for screenshot tests * Apply suggestions from code review Capitalize comment and add period Co-authored-by: Bella Koch <160939932+amk-stripe@users.noreply.github.com>
stripe · Dec 6, 2024 · 947351b · 947351b
1 parent ff9c0f9
commit 947351b
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 10 deletions.
diff --git a/...main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateButton.kt b/...main/java/com/stripe/android/paymentsheet/paymentdatacollection/bacs/BacsMandateButton.kt
@@ -9,6 +9,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import com.stripe.android.common.ui.PrimaryButton
+import com.stripe.android.uicore.StripeTheme
+import com.stripe.android.uicore.getComposeTextStyle
 
 @Composable
 internal fun BacsMandateButton(type: BacsMandateButtonType, label: String, onClick: () -> Unit) {
@@ -18,16 +20,26 @@ internal fun BacsMandateButton(type: BacsMandateButtonType, label: String, onCli
             isEnabled = true,
             onButtonClick = onClick
         )
-        BacsMandateButtonType.Secondary -> TextButton(
-            modifier = Modifier.fillMaxWidth(),
-            shape = MaterialTheme.shapes.small,
-            colors = ButtonDefaults.buttonColors(
-                backgroundColor = Color.Transparent,
-                contentColor = MaterialTheme.colors.primary
-            ),
-            onClick = onClick
-        ) {
-            Text(text = label)
+        BacsMandateButtonType.Secondary -> {
+            // Use the same text style as the primary button but a different color.
+            val textStyle = StripeTheme.primaryButtonStyle.getComposeTextStyle().copy(
+                color = MaterialTheme.colors.primary
+            )
+
+            TextButton(
+                modifier = Modifier.fillMaxWidth(),
+                shape = MaterialTheme.shapes.small,
+                colors = ButtonDefaults.buttonColors(
+                    backgroundColor = Color.Transparent,
+                    contentColor = MaterialTheme.colors.primary
+                ),
+                onClick = onClick
+            ) {
+                Text(
+                    text = label,
+                    style = textStyle
+                )
+            }
         }
     }
 }
diff --git a/...teButtonScreenshotTest_testSecondary[DarkTheme,CrazyAppearance,DefaultFont].png b/...teButtonScreenshotTest_testSecondary[DarkTheme,CrazyAppearance,DefaultFont].png
diff --git a/...dateButtonScreenshotTest_testSecondary[DarkTheme,CrazyAppearance,LargeFont].png b/...dateButtonScreenshotTest_testSecondary[DarkTheme,CrazyAppearance,LargeFont].png
diff --git a/...eButtonScreenshotTest_testSecondary[DarkTheme,CustomAppearance,DefaultFont].png b/...eButtonScreenshotTest_testSecondary[DarkTheme,CustomAppearance,DefaultFont].png
diff --git a/...ateButtonScreenshotTest_testSecondary[DarkTheme,CustomAppearance,LargeFont].png b/...ateButtonScreenshotTest_testSecondary[DarkTheme,CustomAppearance,LargeFont].png
diff --git a/...ButtonScreenshotTest_testSecondary[DarkTheme,DefaultAppearance,DefaultFont].png b/...ButtonScreenshotTest_testSecondary[DarkTheme,DefaultAppearance,DefaultFont].png
diff --git a/...teButtonScreenshotTest_testSecondary[DarkTheme,DefaultAppearance,LargeFont].png b/...teButtonScreenshotTest_testSecondary[DarkTheme,DefaultAppearance,LargeFont].png
diff --git a/...eButtonScreenshotTest_testSecondary[LightTheme,CrazyAppearance,DefaultFont].png b/...eButtonScreenshotTest_testSecondary[LightTheme,CrazyAppearance,DefaultFont].png
diff --git a/...ateButtonScreenshotTest_testSecondary[LightTheme,CrazyAppearance,LargeFont].png b/...ateButtonScreenshotTest_testSecondary[LightTheme,CrazyAppearance,LargeFont].png
diff --git a/...ButtonScreenshotTest_testSecondary[LightTheme,CustomAppearance,DefaultFont].png b/...ButtonScreenshotTest_testSecondary[LightTheme,CustomAppearance,DefaultFont].png
diff --git a/...teButtonScreenshotTest_testSecondary[LightTheme,CustomAppearance,LargeFont].png b/...teButtonScreenshotTest_testSecondary[LightTheme,CustomAppearance,LargeFont].png
diff --git a/...uttonScreenshotTest_testSecondary[LightTheme,DefaultAppearance,DefaultFont].png b/...uttonScreenshotTest_testSecondary[LightTheme,DefaultAppearance,DefaultFont].png
diff --git a/...eButtonScreenshotTest_testSecondary[LightTheme,DefaultAppearance,LargeFont].png b/...eButtonScreenshotTest_testSecondary[LightTheme,DefaultAppearance,LargeFont].png
diff --git a/...atacollection.bacs_BacsMandateConfirmationFormScreenshotTest_testFullForm[].png b/...atacollection.bacs_BacsMandateConfirmationFormScreenshotTest_testFullForm[].png