[Financial Connections] Adds Mavericks to handle state-based UIs. #4986
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,75 @@ | ||
| package com.stripe.android.financialconnections | ||
|
|
||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import android.os.Bundle | ||
| import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import com.airbnb.mvrx.MavericksView | ||
| import com.airbnb.mvrx.viewModel | ||
| import com.airbnb.mvrx.withState | ||
| import com.stripe.android.financialconnections.FinancialConnectionsSheetViewEffect.FinishWithResult | ||
| import com.stripe.android.financialconnections.FinancialConnectionsSheetViewEffect.OpenAuthFlowWithUrl | ||
| import com.stripe.android.financialconnections.launcher.FinancialConnectionsSheetActivityResult | ||
| import com.stripe.android.financialconnections.presentation.CreateBrowserIntentForUrl | ||
|
|
||
| internal class FinancialConnectionsSheetActivity : | ||
| AppCompatActivity(R.layout.activity_financialconnections_sheet), MavericksView { | ||
|
|
||
| val viewModel: FinancialConnectionsSheetViewModel by viewModel() | ||
|
|
||
| private val startForResult = registerForActivityResult(StartActivityForResult()) { | ||
| viewModel.onActivityResult() | ||
| } | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| viewModel.onEach { postInvalidate() } | ||
| if (savedInstanceState != null) viewModel.onActivityRecreated() | ||
| } | ||
|
|
||
| override fun onResume() { | ||
| super.onResume() | ||
| viewModel.onResume() | ||
| } | ||
|
|
||
| override fun onBackPressed() { | ||
| super.onBackPressed() | ||
| finishWithResult(FinancialConnectionsSheetActivityResult.Canceled) | ||
| } | ||
|
|
||
| /** | ||
| * Handles new intents in the form of the redirect from the custom tab hosted auth flow | ||
| */ | ||
| override fun onNewIntent(intent: Intent?) { | ||
| super.onNewIntent(intent) | ||
| viewModel.handleOnNewIntent(intent) | ||
| } | ||
|
|
||
| /** | ||
| * handle state changes here. | ||
| */ | ||
| override fun invalidate() { | ||
| withState(viewModel) { state -> | ||
| state.viewEffect?.let { viewEffect -> | ||
| when (viewEffect) { | ||
| is OpenAuthFlowWithUrl -> startForResult.launch( | ||
| CreateBrowserIntentForUrl( | ||
| context = this, | ||
| uri = Uri.parse(viewEffect.url), | ||
| ) | ||
| ) | ||
| is FinishWithResult -> finishWithResult( | ||
| viewEffect.result | ||
| ) | ||
| } | ||
| viewModel.onViewEffectLaunched() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun finishWithResult(result: FinancialConnectionsSheetActivityResult) { | ||
| setResult(RESULT_OK, Intent().putExtras(result.toBundle())) | ||
| finish() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| package com.stripe.android.financialconnections | ||
|
|
||
| import com.airbnb.mvrx.MavericksState | ||
| import com.airbnb.mvrx.PersistState | ||
| import com.stripe.android.financialconnections.launcher.FinancialConnectionsSheetActivityArgs | ||
| import com.stripe.android.financialconnections.launcher.FinancialConnectionsSheetActivityResult | ||
| import com.stripe.android.financialconnections.launcher.FinancialConnectionsSheetForDataContract | ||
| import com.stripe.android.financialconnections.model.FinancialConnectionsSessionManifest | ||
|
|
@@ -9,38 +11,22 @@ import com.stripe.android.financialconnections.model.FinancialConnectionsSession | |
| * Class containing all of the data needed to represent the screen. | ||
| */ | ||
| internal data class FinancialConnectionsSheetState( | ||
| val initialArgs: FinancialConnectionsSheetActivityArgs, | ||
| val activityRecreated: Boolean = false, | ||
| @PersistState val manifest: FinancialConnectionsSessionManifest? = null, | ||
| @PersistState val authFlowActive: Boolean = false, | ||
| val viewEffect: FinancialConnectionsSheetViewEffect? = null | ||
| ) : MavericksState { | ||
|
|
||
|
Comment on lines
-17
to
-25
There was a problem hiding this comment. There's no need to handle savedStateHandle with the @PersistState annotation. |
||
| val sessionSecret: String | ||
| get() = initialArgs.configuration.financialConnectionsSessionClientSecret | ||
|
|
||
| /** | ||
| * Constructor used by Mavericks to build the initial state. | ||
| */ | ||
| constructor(args: FinancialConnectionsSheetActivityArgs) : this( | ||
| initialArgs = args | ||
| ) | ||
|
Comment on lines
+27
to
+29
There was a problem hiding this comment. instead of having to handle fragment args manually, Mavericks calls this constructor passing down the args so state can be used as the only source of truth. |
||
| } | ||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now viewEffects are part of the state, ensuring we commit to an Unidirectional Data Flow.