Add FormActivityViewModel #9983

tjclawson-stripe · 2025-01-24T21:17:06Z

Summary

Setup FormActivityViewModel and FormActivityComponent and display VerticalModeFormUI

Motivation

https://jira.corp.stripe.com/browse/MOBILESDK-2941

Screen.Recording.2025-01-25.at.5.59.27.PM.mov

Testing

Added tests
Modified tests
Manually verified

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

tjclawson-stripe · 2025-01-24T21:20:55Z

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

+import com.stripe.android.model.PaymentMethodCode
+import javax.inject.Inject
+
+internal class FormActivityViewModel @Inject constructor(


Named FormActivityViewModel to not conflict with existing FormViewModel during refactors

github-actions · 2025-01-24T21:23:00Z

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 │ 302.6 KiB │ 302.6 KiB │  0 B │ 456.7 KiB │ 456.7 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.4 KiB │  90.4 KiB │ +1 B │ 170.7 KiB │ 170.7 KiB │  0 B 
──────────┼───────────┼───────────┼──────┼───────────┼───────────┼──────
    total │   9.6 MiB │   9.6 MiB │ +1 B │  21.5 MiB │  21.5 MiB │  0 B 

 DEX     │ old   │ new   │ diff      
─────────┼───────┼───────┼───────────
   files │     1 │     1 │ 0         
 strings │ 19975 │ 19975 │ 0 (+0 -0) 
   types │  6193 │  6193 │ 0 (+0 -0) 
 classes │  4985 │  4985 │ 0 (+0 -0) 
 methods │ 29820 │ 29820 │ 0 (+0 -0) 
  fields │ 17538 │ 17538 │ 0 (+0 -0) 

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

APK

   compressed    │   uncompressed   │                                           
──────────┬──────┼───────────┬──────┤                                           
 size     │ diff │ size      │ diff │ path                                      
──────────┼──────┼───────────┼──────┼───────────────────────────────────────────
    272 B │ +1 B │     120 B │  0 B │ ∆ META-INF/version-control-info.textproto 
 28.5 KiB │ +1 B │  63.1 KiB │  0 B │ ∆ META-INF/CERT.SF                        
 25.4 KiB │ -1 B │    63 KiB │  0 B │ ∆ META-INF/MANIFEST.MF                    
──────────┼──────┼───────────┼──────┼───────────────────────────────────────────
 54.2 KiB │ +1 B │ 126.2 KiB │  0 B │ (total)

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

tjclawson-stripe · 2025-01-25T22:57:23Z

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

+            hostedSurface = HOSTED_SURFACE_PAYMENT_ELEMENT,
+            instantDebits = instantDebits,
+            linkMode = paymentMethodMetadata.linkMode,
+            onBehalfOf = null,


Todo as part of confirmation implementation

tjclawson-stripe · 2025-01-25T22:58:43Z

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt

@@ -40,7 +47,10 @@ internal class FormActivity : AppCompatActivity() {
                        finish()
                    }
                ) {
-                    Text(localArgs.selectedPaymentMethodCode)
+                    VerticalModeFormUI(


This will be moved to a FormActivityUI composable in follow up PRs for headers/mandates

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

jaynewstrom-stripe · 2025-01-27T17:09:05Z

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

+    selectedPaymentMethodCode: PaymentMethodCode,
+    private val selectionHolder: EmbeddedSelectionHolder,
+    private val embeddedFormHelperFactory: EmbeddedFormHelperFactory,
+    val eventReporter: EventReporter


I've got an idea on how to remove the need for this. I'm going to attempt it in Manage first, and can follow up here if it's successful.

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

jaynewstrom-stripe · 2025-01-28T15:50:06Z

...t/src/test/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModelTest.kt

+internal class FormActivityViewModelTest {
+
+    @Test
+    fun `viewmodel initializes interactor correctly`() = runTest {


Honestly, it feels like we should remove this test, and have the test be in EmbeddedFormInteractorFactory. But even then, I don't think that test is very valuable. It seems like we should just remove this.

This is just wiring code that'll get tested with integration tests.

jaynewstrom-stripe · 2025-01-28T15:51:21Z

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt

+    val eventReporter: EventReporter
+) : ViewModel() {
+
+    val formInteractor = embeddedFormInteractorFactory.create(


I think we need to do one of 2 things:

Inject all these things, they should already be in the dependency injection graph.

Use this object somewhere else that can't inject these things. But even then, feels like this should live outside the view model.

Update to inject all dependencies and inject interactor directly into FormActivity

…ctivity

jaynewstrom-stripe · 2025-01-28T17:21:45Z

...c/main/java/com/stripe/android/paymentelement/embedded/form/EmbeddedFormInteractorFactory.kt

+            formElements = formHelper.formElementsForCode(paymentMethodCode),
+            onFormFieldValuesChanged = formHelper::onFormFieldValuesChanged,
+            usBankAccountArguments = usBankAccountFormArguments,
+            reportFieldInteraction = {


I think this just delegates to eventReporter, right? Any reason not to hook it up now?

It delegates to PaymentSheetAnalyticsListener, which requires a CurrentScreen. I'll implement in a follow up

tjclawson-stripe commented Jan 24, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt Show resolved Hide resolved

tjclawson-stripe commented Jan 24, 2025

View reviewed changes

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt Outdated Show resolved Hide resolved

tjclawson-stripe commented Jan 24, 2025

View reviewed changes

Add FormActivityViewModel

a997c6d

tjclawson-stripe force-pushed the tyler/form-viewmodel-setup branch from 32ee872 to a997c6d Compare January 24, 2025 22:13

tjclawson-stripe commented Jan 24, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt Outdated Show resolved Hide resolved

tjclawson-stripe changed the title ~~Add FormActivityViewModel~~ Add FormActivityViewModel Scaffolding Jan 24, 2025

tjclawson-stripe marked this pull request as ready for review January 24, 2025 22:34

tjclawson-stripe requested review from a team as code owners January 24, 2025 22:35

tjclawson-stripe requested review from toluo-stripe and jaynewstrom-stripe January 24, 2025 22:35

jaynewstrom-stripe reviewed Jan 24, 2025

View reviewed changes

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt Outdated Show resolved Hide resolved

Initialize DefaultVerticalModeFormInteractor

b0a1c79

tjclawson-stripe commented Jan 25, 2025

View reviewed changes

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt Outdated Show resolved Hide resolved

tjclawson-stripe commented Jan 25, 2025

View reviewed changes

tjclawson-stripe marked this pull request as draft January 25, 2025 22:59

tjclawson-stripe changed the title ~~Add FormActivityViewModel Scaffolding~~ Add FormActivityViewModel Jan 26, 2025

Add EventReporter

65c4a6b

tjclawson-stripe force-pushed the tyler/form-viewmodel-setup branch from 9fbebe5 to 65c4a6b Compare January 26, 2025 19:28

jaynewstrom-stripe reviewed Jan 27, 2025

View reviewed changes

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt Outdated Show resolved Hide resolved

tjclawson-stripe added 2 commits January 27, 2025 11:57

Merge branch 'master' into tyler/form-viewmodel-setup

40a2356

Refactor to use EmbeddedFormHelperFactory

96fcc00

jaynewstrom-stripe reviewed Jan 27, 2025

View reviewed changes

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivity.kt Outdated Show resolved Hide resolved

jaynewstrom-stripe reviewed Jan 27, 2025

View reviewed changes

...sheet/src/main/java/com/stripe/android/paymentelement/embedded/form/FormActivityViewModel.kt Outdated Show resolved Hide resolved

Add EmbeddedFormInteractorFactory

4f7bd74

tjclawson-stripe added 2 commits January 28, 2025 10:11

Merge branch 'master' into tyler/form-viewmodel-setup

622a144

Refactor to use EventReporterProvider

3d41985

jaynewstrom-stripe reviewed Jan 28, 2025

View reviewed changes

tjclawson-stripe added 5 commits January 28, 2025 11:50

Inject all need dependencies to EmbeddedFormInteractorFactory

dfca811

Remove FromActivityViewModelTest

2b0c07e

Clear coroutine scope in FormActivityViewModel

5f4a58c

Inject DefaultVerticalModeFormInteractor and EventReporter into FormA…

0235da8

…ctivity

Remove unneeded localArgs val

a9dca27

jaynewstrom-stripe approved these changes Jan 28, 2025

View reviewed changes

tjclawson-stripe marked this pull request as ready for review January 28, 2025 17:45

tjclawson-stripe enabled auto-merge (squash) January 28, 2025 17:45

tjclawson-stripe merged commit 14c5f1d into master Jan 28, 2025
13 checks passed

tjclawson-stripe deleted the tyler/form-viewmodel-setup branch January 28, 2025 17:56

jaynewstrom-stripe added the embedded label Jan 29, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add FormActivityViewModel #9983

Add FormActivityViewModel #9983

tjclawson-stripe commented Jan 24, 2025 •

edited

Loading

tjclawson-stripe Jan 24, 2025

github-actions bot commented Jan 24, 2025 •

edited

Loading

tjclawson-stripe Jan 25, 2025

tjclawson-stripe Jan 25, 2025

jaynewstrom-stripe Jan 27, 2025

jaynewstrom-stripe Jan 28, 2025

tjclawson-stripe Jan 28, 2025

jaynewstrom-stripe Jan 28, 2025

tjclawson-stripe Jan 28, 2025

jaynewstrom-stripe Jan 28, 2025

tjclawson-stripe Jan 28, 2025

Add FormActivityViewModel #9983

Add FormActivityViewModel #9983

Conversation

tjclawson-stripe commented Jan 24, 2025 • edited Loading

Summary

Motivation

Testing

Choose a reason for hiding this comment

github-actions bot commented Jan 24, 2025 • edited Loading

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

tjclawson-stripe commented Jan 24, 2025 •

edited

Loading

github-actions bot commented Jan 24, 2025 •

edited

Loading