Add PaymentMethodEmbeddedLayoutUI #9808

tjclawson-stripe · 2024-12-19T00:56:56Z

Summary

Add PaymentMethodEmbeddedLayoutUI

Motivation

Testing

Added tests
Modified tests
Manually verified

Screenshots

Before	After

Changelog

github-actions · 2024-12-19T01:02:54Z

Diffuse output:

OLD: identity-example-release-base.apk (signature: V1, V2)
NEW: identity-example-release-pr.apk (signature: V1, V2)

          │          compressed          │         uncompressed         
          ├───────────┬───────────┬──────┼───────────┬───────────┬──────
 APK      │ old       │ new       │ diff │ old       │ new       │ diff 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
      dex │     2 MiB │     2 MiB │  0 B │   4.1 MiB │   4.1 MiB │  0 B 
     arsc │     1 MiB │     1 MiB │  0 B │     1 MiB │     1 MiB │  0 B 
 manifest │   2.3 KiB │   2.3 KiB │  0 B │     8 KiB │     8 KiB │  0 B 
      res │ 301.8 KiB │ 301.8 KiB │  0 B │ 455.5 KiB │ 455.5 KiB │  0 B 
   native │   6.2 MiB │   6.2 MiB │  0 B │  15.8 MiB │  15.8 MiB │  0 B 
    asset │   7.1 KiB │   7.1 KiB │  0 B │   6.9 KiB │   6.9 KiB │  0 B 
    other │  90.2 KiB │  90.2 KiB │ -7 B │ 170.3 KiB │ 170.3 KiB │  0 B 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
    total │   9.6 MiB │   9.6 MiB │ -7 B │  21.5 MiB │  21.5 MiB │  0 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 19970 │ 19970 │ 0 (+0 -0) 
   types │  6191 │  6191 │ 0 (+0 -0) 
 classes │  4982 │  4982 │ 0 (+0 -0) 
 methods │ 29769 │ 29769 │ 0 (+0 -0) 
  fields │ 17540 │ 17540 │ 0 (+0 -0) 

 ARSC    │ old  │ new  │ diff 
─────────┼──────┼──────┼──────
 configs │  164 │  164 │  0   
 entries │ 3622 │ 3622 │  0

APK

   compressed    │   uncompressed   │                                           
──────────┬──────┼───────────┬──────┤                                           
 size     │ diff │ size      │ diff │ path                                      
──────────┼──────┼───────────┼──────┼───────────────────────────────────────────
 25.3 KiB │ -7 B │  62.8 KiB │  0 B │ ∆ META-INF/MANIFEST.MF                    
 28.4 KiB │ +2 B │  62.9 KiB │  0 B │ ∆ META-INF/CERT.SF                        
    271 B │ -1 B │     120 B │  0 B │ ∆ META-INF/version-control-info.textproto 
  1.2 KiB │ -1 B │   1.2 KiB │  0 B │ ∆ META-INF/CERT.RSA                       
──────────┼──────┼───────────┼──────┼───────────────────────────────────────────
 55.2 KiB │ -7 B │ 127.1 KiB │  0 B │ (total)

tjclawson-stripe · 2024-12-19T21:57:28Z

Will remove rowType from PaymentMethodVerticalLayoutInteractor.State in a follow up PR

...src/main/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodVEmbeddedLayoutUI.kt

.../com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUIScreenshotTest.kt

.../test/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUITest.kt

.../src/main/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUI.kt

jaynewstrom-stripe · 2024-12-20T20:13:46Z

.../com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUIScreenshotTest.kt

@@ -47,7 +47,7 @@ class PaymentMethodEmbeddedLayoutUIScreenshotTest {
                onSelectSavedPaymentMethod = {},
                onManageOneSavedPaymentMethod = {},


I was actually thinking a bit about the reverse. I thought all of the fields outside of row style were the same. And row style was the only "difference".

How about both? Added TestPaymentMethodLayoutUi helper function

jaynewstrom-stripe · 2024-12-20T21:10:21Z

.../src/main/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUI.kt

+    if (rowStyle.hasSeparators()) {
+        val color = Color(rowStyle.separatorColor())
+        val thickness = rowStyle.separatorThickness()
+        val modifier = if (rowStyle is Embedded.RowStyle.FlatWithRadio) {


This feels like another one we should move into rowStyle.

...rc/test/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodLayoutUITestHelper.kt

jaynewstrom-stripe · 2024-12-20T21:15:07Z

...rc/test/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodLayoutUITestHelper.kt

+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [Build.VERSION_CODES.Q])
+@OptIn(ExperimentalEmbeddedPaymentElementApi::class)
+class PaymentMethodLayoutUITestHelper(


This approach might not be ideal.

It would be easy to add another scenario, but miss adding it for both variants. Maybe we should have a shared test for both, driven by parameterized tests. That would ensure we couldn't miss a test case for the common case.

Updated to use parameterized tests

jaynewstrom-stripe · 2024-12-23T21:38:05Z

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

@@ -960,6 +960,9 @@ class PaymentSheet internal constructor(
            @Parcelize
            sealed class RowStyle : Parcelable {

+                internal abstract fun hasSeparators(): Boolean


Should this be a sealed class instead? None, Separators(defaultInset: Boolean)

jaynewstrom-stripe · 2024-12-23T21:40:04Z

.../test/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodVerticalLayoutUITest.kt

@@ -33,7 +33,7 @@ import org.robolectric.annotation.Config
 @Config(sdk = [Build.VERSION_CODES.Q])
 @OptIn(ExperimentalEmbeddedPaymentElementApi::class)
 internal class PaymentMethodVerticalLayoutUITest(


Should we rename this class? Can we rename it so it's easy to know it tests both?

Updated to PaymentMethodLayoutUITest

graphite-app · 2024-12-23T22:26:54Z

.../src/main/java/com/stripe/android/paymentsheet/verticalmode/PaymentMethodEmbeddedLayoutUI.kt

+            )
+        }
+
+        OptionalEmbeddedDivider(rowStyle)


The OptionalEmbeddedDivider call should be moved inside the paymentMethods.forEachIndexed block to avoid rendering an extra divider when paymentMethods is empty. This would prevent visual artifacts in the empty state.

Spotted by Graphite Reviewer

Is this helpful? React 👍 or 👎 to let us know.

Add PaymentMethodEmbeddedLayoutUI

040dad3

tjclawson-stripe force-pushed the tyler/mobilesdk-2851 branch from 5b0276d to 040dad3 Compare December 19, 2024 20:54

tjclawson-stripe changed the title ~~Update PaymentMethodVerticalLayoutUI for Embedded~~ Add PaymentMethodEmbeddedLayoutUI Dec 19, 2024

tjclawson-stripe marked this pull request as ready for review December 19, 2024 20:58

tjclawson-stripe requested review from a team as code owners December 19, 2024 20:58

tjclawson-stripe requested review from toluo-stripe and jaynewstrom-stripe December 19, 2024 20:58

jaynewstrom-stripe reviewed Dec 19, 2024

View reviewed changes

tjclawson-stripe added 2 commits December 20, 2024 14:45

Refactor

af024b9

Merge branch 'master' into tyler/mobilesdk-2851

f40a71c

jaynewstrom-stripe reviewed Dec 20, 2024

View reviewed changes

tjclawson-stripe added 3 commits December 20, 2024 15:41

Refactor tests

7f78589

Add TestPaymentMethodLayoutUi helper function

3a7f610

Lint

596611a

tjclawson-stripe requested a review from jaynewstrom-stripe December 20, 2024 20:56

jaynewstrom-stripe reviewed Dec 20, 2024

View reviewed changes

tjclawson-stripe added 4 commits December 23, 2024 14:30

Revert PaymentMethodVerticalLayoutUITest refactor

344df74

Remove is check for start separator inset

ab7314a

Merge branch 'master' into tyler/mobilesdk-2851

8cf7e93

Add embedded parameter to PaymentMethodVerticalLayoutUITest

7622091

tjclawson-stripe requested a review from jaynewstrom-stripe December 23, 2024 21:29

jaynewstrom-stripe reviewed Dec 23, 2024

View reviewed changes

Rename PaymentMethodVerticalLayoutUITest to PaymentMethodLayoutUITest

52fe481

tjclawson-stripe requested a review from jaynewstrom-stripe December 23, 2024 22:26

graphite-app bot reviewed Dec 23, 2024

View reviewed changes

tjclawson-stripe added the embedded label Dec 24, 2024

Fix screenshot tests

0e0e4c4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PaymentMethodEmbeddedLayoutUI #9808

Add PaymentMethodEmbeddedLayoutUI #9808

tjclawson-stripe commented Dec 19, 2024 •

edited

Loading

github-actions bot commented Dec 19, 2024 •

edited

Loading

tjclawson-stripe commented Dec 19, 2024

jaynewstrom-stripe Dec 20, 2024

tjclawson-stripe Dec 20, 2024

jaynewstrom-stripe Dec 20, 2024

tjclawson-stripe Dec 23, 2024

jaynewstrom-stripe Dec 20, 2024

tjclawson-stripe Dec 23, 2024

jaynewstrom-stripe Dec 23, 2024

jaynewstrom-stripe Dec 23, 2024

tjclawson-stripe Dec 23, 2024

graphite-app bot Dec 23, 2024

		@@ -47,7 +47,7 @@ class PaymentMethodEmbeddedLayoutUIScreenshotTest {
		onSelectSavedPaymentMethod = {},
		onManageOneSavedPaymentMethod = {},

Add PaymentMethodEmbeddedLayoutUI #9808

Are you sure you want to change the base?

Add PaymentMethodEmbeddedLayoutUI #9808

Conversation

tjclawson-stripe commented Dec 19, 2024 • edited Loading

Summary

Motivation

Testing

Screenshots

Changelog

github-actions bot commented Dec 19, 2024 • edited Loading

tjclawson-stripe commented Dec 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

graphite-app bot Dec 23, 2024

Choose a reason for hiding this comment

tjclawson-stripe commented Dec 19, 2024 •

edited

Loading

github-actions bot commented Dec 19, 2024 •

edited

Loading