[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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:id="@+id/nav_host_fragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="vertical" | ||
| tools:context=".FinancialConnectionsSheetActivity" /> |
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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent"> | ||
|
|
||
| <com.google.android.material.progressindicator.CircularProgressIndicator | ||
| android:id="@+id/spinner" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" | ||
| android:indeterminate="true" | ||
| app:indicatorColor="@color/stripe_toolbar_color_default" | ||
| app:indicatorSize="@dimen/stripe_connectionssheet_loading_indicator_size" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:trackThickness="@dimen/stripe_connectionssheet_loading_indicator_stroke_width" /> | ||
|
|
||
| </FrameLayout> |
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 |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package com.stripe.android.financialconnections | ||
|
|
||
| import android.app.Activity | ||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import android.os.Bundle | ||
| import androidx.activity.addCallback | ||
| import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult | ||
| import androidx.fragment.app.Fragment | ||
| import com.airbnb.mvrx.MavericksView | ||
| import com.airbnb.mvrx.activityViewModel | ||
| 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 FinancialConnectionsSheetFragment : | ||
| Fragment(R.layout.fragment_financial_connections_sheet), MavericksView { | ||
|
|
||
| private val startForResult = registerForActivityResult(StartActivityForResult()) { | ||
| viewModel.onActivityResult() | ||
| } | ||
|
|
||
| private val viewModel: FinancialConnectionsSheetViewModel by activityViewModel() | ||
|
There was a problem hiding this comment. would a There was a problem hiding this comment. we need an activityViewModel to receive the |
||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| requireActivity().onBackPressedDispatcher.addCallback(this) { | ||
| finishWithResult(FinancialConnectionsSheetActivityResult.Canceled) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * handle state changes here. | ||
| */ | ||
| override fun invalidate() { | ||
| withState(viewModel) { state -> | ||
| if (state.viewEffect != null) { | ||
|
There was a problem hiding this comment. nit: use |
||
| when (state.viewEffect) { | ||
| is OpenAuthFlowWithUrl -> state.viewEffect.launch() | ||
|
There was a problem hiding this comment. I think you can directly define the launch() function inside There was a problem hiding this comment. you mean by adding a each viewEffect uses different dependencies hosted by the fragment, so we can't have a unified |
||
| is FinishWithResult -> finishWithResult(state.viewEffect.result) | ||
| } | ||
| viewModel.onViewEffectLaunched() | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. When state changes, |
||
|
|
||
| private fun OpenAuthFlowWithUrl.launch() { | ||
| val uri = Uri.parse(this.url) | ||
| startForResult.launch( | ||
| CreateBrowserIntentForUrl( | ||
| context = requireContext(), | ||
| uri = uri, | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun onResume() { | ||
| super.onResume() | ||
| viewModel.onResume() | ||
| } | ||
|
|
||
| private fun finishWithResult(result: FinancialConnectionsSheetActivityResult) { | ||
| requireActivity().setResult( | ||
| Activity.RESULT_OK, | ||
| Intent().putExtras(result.toBundle()) | ||
| ) | ||
| requireActivity().finish() | ||
| } | ||
| } | ||
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.
since there's only one fragment, is it possible to declare it deirectly in xml?
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.
Also why do we change the Activity to Fragment? Is it required by Mavericks?
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.
It is supported, but they recommend using fragments, as "Putting UI directly inside of an Activity is no longer recommended in general for Android." (airbnb/mavericks#616 (comment))
However if Compose will be used to build the UI, the activity is still a recommended approach - https://github.com/airbnb/mavericks/blob/main/sample-compose/src/main/java/com/airbnb/mvrx/compose/sample/ComposeSampleActivity.kt so the fragment would be removed in that case.
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.
Actually, rethinking about it, the fragment doesn't bring any value on this case as there's no UI currently. Moved things back to the activity - aaa6b24