Separate TextField from TextFieldSection

stripe · Nov 11, 2024 · 542cb7c · 542cb7c
1 parent eed35fc
commit 542cb7c
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 47 deletions.
diff --git a/.../android/financialconnections/features/networkinglinksignup/NetworkingLinkSignupScreen.kt b/.../android/financialconnections/features/networkinglinksignup/NetworkingLinkSignupScreen.kt
@@ -65,6 +65,7 @@ import com.stripe.android.financialconnections.ui.theme.Theme
 import com.stripe.android.model.ConsumerSessionLookup
 import com.stripe.android.uicore.elements.DropDown
 import com.stripe.android.uicore.elements.PhoneNumberCollectionSection
+import com.stripe.android.uicore.elements.TextField
 import com.stripe.android.uicore.elements.TextFieldController
 import com.stripe.android.uicore.elements.TextFieldSection
 import com.stripe.android.uicore.utils.collectAsState
@@ -319,13 +320,19 @@ internal fun EmailSection(
         ) {
             TextFieldSection(
                 modifier = Modifier
-                    .focusRequester(focusRequester)
-                    .onFocusChanged { focused = it.isFocused },
+                    .padding(vertical = 8.dp),
                 isSelected = focused,
                 textFieldController = emailController,
-                imeAction = if (showFullForm) ImeAction.Next else ImeAction.Done,
-                enabled = enabled
-            )
+            ) {
+                TextField(
+                    modifier = Modifier
+                        .focusRequester(focusRequester)
+                        .onFocusChanged { focused = it.isFocused },
+                    textFieldController = emailController,
+                    imeAction = if (showFullForm) ImeAction.Next else ImeAction.Done,
+                    enabled = enabled
+                )
+            }
             if (loading) {
                 CircularProgressIndicator(
                     modifier = Modifier

diff --git a/link/src/main/java/com/stripe/android/link/ui/signup/SignUpScreen.kt b/link/src/main/java/com/stripe/android/link/ui/signup/SignUpScreen.kt
@@ -42,6 +42,7 @@ import com.stripe.android.uicore.elements.EmailConfig
 import com.stripe.android.uicore.elements.NameConfig
 import com.stripe.android.uicore.elements.PhoneNumberCollectionSection
 import com.stripe.android.uicore.elements.PhoneNumberController
+import com.stripe.android.uicore.elements.TextField
 import com.stripe.android.uicore.elements.TextFieldController
 import com.stripe.android.uicore.elements.TextFieldSection
 import com.stripe.android.uicore.utils.collectAsState
@@ -144,15 +145,21 @@ private fun EmailCollectionSection(
     ) {
         TextFieldSection(
             textFieldController = emailController,
-            imeAction = if (signUpScreenState.signUpState == SignUpState.InputtingRemainingFields) {
-                ImeAction.Next
-            } else {
-                ImeAction.Done
-            },
-            enabled = enabled && signUpScreenState.signUpState != SignUpState.VerifyingEmail,
             modifier = Modifier
-                .focusRequester(focusRequester)
-        )
+                .padding(vertical = 8.dp),
+        ) {
+            TextField(
+                modifier = Modifier
+                    .focusRequester(focusRequester),
+                textFieldController = emailController,
+                imeAction = if (signUpScreenState.signUpState == SignUpState.InputtingRemainingFields) {
+                    ImeAction.Next
+                } else {
+                    ImeAction.Done
+                },
+                enabled = enabled && signUpScreenState.signUpState != SignUpState.VerifyingEmail,
+            )
+        }
         if (signUpScreenState.signUpState == SignUpState.VerifyingEmail) {
             CircularProgressIndicator(
                 modifier = Modifier
@@ -196,10 +203,15 @@ private fun SecondaryFields(
 
             if (signUpScreenState.requiresNameCollection) {
                 TextFieldSection(
+                    modifier = Modifier.padding(vertical = 8.dp),
                     textFieldController = nameController,
-                    imeAction = ImeAction.Done,
-                    enabled = true
-                )
+                ) {
+                    TextField(
+                        textFieldController = nameController,
+                        imeAction = ImeAction.Done,
+                        enabled = true,
+                    )
+                }
             }
 
             LinkTerms(

diff --git a/...tsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AutocompleteScreen.kt b/...tsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AutocompleteScreen.kt
@@ -41,6 +41,7 @@ import com.stripe.android.common.ui.LoadingIndicator
 import com.stripe.android.paymentsheet.injection.AutocompleteViewModelSubcomponent
 import com.stripe.android.paymentsheet.ui.AddressOptionsAppBar
 import com.stripe.android.ui.core.elements.autocomplete.PlacesClientProxy
+import com.stripe.android.uicore.elements.TextField
 import com.stripe.android.uicore.elements.TextFieldSection
 import com.stripe.android.uicore.shouldUseDarkDynamicColor
 import com.stripe.android.uicore.stripeColors
@@ -129,16 +130,20 @@ internal fun AutocompleteScreenUI(viewModel: AutocompleteViewModel) {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(horizontal = 16.dp)
+                        .padding(horizontal = 16.dp, vertical = 8.dp)
                 ) {
                     TextFieldSection(
                         textFieldController = viewModel.textFieldController,
-                        imeAction = ImeAction.Done,
-                        enabled = true,
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .focusRequester(focusRequester)
-                    )
+                    ) {
+                        TextField(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .focusRequester(focusRequester),
+                            textFieldController = viewModel.textFieldController,
+                            imeAction = ImeAction.Done,
+                            enabled = true,
+                        )
+                    }
                 }
                 if (loading) {
                     LoadingIndicator(

diff --git a/.../main/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountForm.kt b/.../main/java/com/stripe/android/paymentsheet/paymentdatacollection/ach/USBankAccountForm.kt
@@ -47,6 +47,7 @@ import com.stripe.android.uicore.elements.SameAsShippingElement
 import com.stripe.android.uicore.elements.SameAsShippingElementUI
 import com.stripe.android.uicore.elements.Section
 import com.stripe.android.uicore.elements.SectionCard
+import com.stripe.android.uicore.elements.TextField
 import com.stripe.android.uicore.elements.TextFieldController
 import com.stripe.android.uicore.elements.TextFieldSection
 import com.stripe.android.uicore.stripeColors
@@ -276,10 +277,15 @@ internal fun BillingDetailsForm(
                 contentAlignment = Alignment.CenterEnd
             ) {
                 TextFieldSection(
+                    modifier = Modifier.padding(vertical = 8.dp),
                     textFieldController = nameController,
-                    imeAction = ImeAction.Next,
-                    enabled = !isProcessing
-                )
+                ) {
+                    TextField(
+                        textFieldController = nameController,
+                        enabled = !isProcessing,
+                        imeAction = ImeAction.Next,
+                    )
+                }
             }
         }
         if (formArgs.billingDetailsCollectionConfiguration.email != CollectionMode.Never) {
@@ -290,14 +296,19 @@ internal fun BillingDetailsForm(
                 contentAlignment = Alignment.CenterEnd
             ) {
                 TextFieldSection(
+                    modifier = Modifier.padding(vertical = 8.dp),
                     textFieldController = emailController,
-                    imeAction = if (lastTextFieldIdentifier == IdentifierSpec.Email) {
-                        ImeAction.Done
-                    } else {
-                        ImeAction.Next
-                    },
-                    enabled = !isProcessing
-                )
+                ) {
+                    TextField(
+                        textFieldController = emailController,
+                        enabled = !isProcessing,
+                        imeAction = if (lastTextFieldIdentifier == IdentifierSpec.Email) {
+                            ImeAction.Done
+                        } else {
+                            ImeAction.Next
+                        },
+                    )
+                }
             }
         }
         if (formArgs.billingDetailsCollectionConfiguration.phone == CollectionMode.Always) {

diff --git a/stripe-ui-core/api/stripe-ui-core.api b/stripe-ui-core/api/stripe-ui-core.api
@@ -236,7 +236,7 @@ public final class com/stripe/android/uicore/elements/TextFieldStateConstants$Va
 public final class com/stripe/android/uicore/elements/TextFieldUIKt {
 	public static final fun AnimatedIcons (Ljava/util/List;ZLandroidx/compose/runtime/Composer;I)V
 	public static final fun TextField-qRf7idA (Lcom/stripe/android/uicore/elements/TextFieldController;ZILandroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;IILandroidx/compose/ui/focus/FocusRequester;Landroidx/compose/runtime/Composer;II)V
-	public static final fun TextFieldSection-vbMXUkU (Landroidx/compose/ui/Modifier;Lcom/stripe/android/uicore/elements/TextFieldController;IZZLjava/lang/Integer;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+	public static final fun TextFieldSection (Landroidx/compose/ui/Modifier;Lcom/stripe/android/uicore/elements/TextFieldController;ZLjava/lang/Integer;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
 }
 
 public final class com/stripe/android/uicore/elements/bottomsheet/ComposableSingletons$StripeBottomSheetLayoutKt {

diff --git a/stripe-ui-core/src/main/java/com/stripe/android/uicore/elements/TextFieldUI.kt b/stripe-ui-core/src/main/java/com/stripe/android/uicore/elements/TextFieldUI.kt
@@ -90,11 +90,9 @@ private fun defaultAutofillEventReporter(): (String) -> Unit {
 fun TextFieldSection(
     modifier: Modifier = Modifier,
     textFieldController: TextFieldController,
-    imeAction: ImeAction,
-    enabled: Boolean,
     isSelected: Boolean = false,
     @StringRes sectionTitle: Int? = null,
-    onTextStateChanged: (TextFieldState?) -> Unit = {}
+    content: @Composable () -> Unit,
 ) {
     val error by textFieldController.error.collectAsState()
 
@@ -108,19 +106,12 @@ fun TextFieldSection(
     }
 
     Section(
-        modifier = Modifier.padding(vertical = 8.dp),
+        modifier = modifier,
         title = sectionTitle,
         error = sectionErrorString,
         isSelected = isSelected,
-    ) {
-        TextField(
-            textFieldController = textFieldController,
-            enabled = enabled,
-            imeAction = imeAction,
-            modifier = modifier,
-            onTextStateChanged = onTextStateChanged
-        )
-    }
+        content = content,
+    )
 }
 
 /**