Compose credit element

payments-core/src/main/java/com/stripe/android/CardUtils.kt

@@ -1,5 +1,6 @@
 package com.stripe.android
 
+import androidx.annotation.RestrictTo
 import com.stripe.android.cards.CardNumber
 import com.stripe.android.model.CardBrand
 
@@ -29,7 +30,8 @@ object CardUtils {
      * @param cardNumber a String that may or may not represent a valid Luhn number
      * @return `true` if and only if the input value is a valid Luhn number
      */
-    internal fun isValidLuhnNumber(cardNumber: String?): Boolean {
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    fun isValidLuhnNumber(cardNumber: String?): Boolean {
         if (cardNumber == null) {
             return false
         }

payments-core/src/main/java/com/stripe/android/model/CardBrand.kt

@@ -1,6 +1,7 @@
 package com.stripe.android.model
 
 import androidx.annotation.DrawableRes
+import androidx.annotation.RestrictTo
 import com.stripe.android.R
 import com.stripe.android.cards.CardNumber
 import java.util.regex.Pattern
@@ -174,7 +175,8 @@ enum class CardBrand(
      *
      * Note: currently only [CardBrand.DinersClub] has variants
      */
-    internal fun getMaxLengthForCardNumber(cardNumber: String): Int {
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    fun getMaxLengthForCardNumber(cardNumber: String): Int {
         val normalizedCardNumber = CardNumber.Unvalidated(cardNumber).normalized
         return variantMaxLength.entries.firstOrNull { (pattern, _) ->
             pattern.matcher(normalizedCardNumber).matches()
@@ -191,7 +193,8 @@ enum class CardBrand(
          * @return the [CardBrand] that matches the [cardNumber]'s prefix, if one is found;
          * otherwise, [CardBrand.Unknown]
          */
-        internal fun fromCardNumber(cardNumber: String?): CardBrand {
+        @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+        fun fromCardNumber(cardNumber: String?): CardBrand {
             if (cardNumber.isNullOrBlank()) {
                 return Unknown
             }
@@ -205,7 +208,8 @@ enum class CardBrand(
                 ).first()
         }
 
-        internal fun getCardBrands(cardNumber: String?): List<CardBrand> {
+        @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+        fun getCardBrands(cardNumber: String?): List<CardBrand> {
             if (cardNumber.isNullOrBlank()) {
                 return listOf(Unknown)
             }

payments-core/src/main/java/com/stripe/android/view/CardNumberEditText.kt

@@ -23,7 +23,6 @@ import com.stripe.android.networking.PaymentAnalyticsRequestFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext

payments-core/src/test/java/com/stripe/android/utils/TestUtils.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import org.robolectric.shadows.ShadowLooper.idleMainLooper
 
-internal object TestUtils {
+object TestUtils {
     @JvmStatic
     fun idleLooper() = idleMainLooper()
 

payments-ui-core/api/payments-ui-core.api

@@ -185,6 +185,11 @@ public final class com/stripe/android/ui/core/forms/BancontactSpecKt {
 	public static final fun getBancontactParamKey ()Ljava/util/Map;
 }
 
+public final class com/stripe/android/ui/core/forms/CardSpecKt {
+	public static final fun getCardForm ()Lcom/stripe/android/ui/core/elements/LayoutSpec;
+	public static final fun getCardParamKey ()Ljava/util/Map;
+}
+
 public final class com/stripe/android/ui/core/forms/EpsSpecKt {
 	public static final fun getEpsForm ()Lcom/stripe/android/ui/core/elements/LayoutSpec;
 	public static final fun getEpsParamKey ()Ljava/util/Map;

paymentsheet/res/values/totranslate.xml → payments-ui-core/res/values/totranslate.xml

@@ -3,4 +3,5 @@
     <!--
     Items here need to be entered in our translation tool
     -->
+    <string name="card_number_longer_than_expected" tools:ignore="ExtraTranslation">The card number is longer than expected, but you can still submit it.</string>
 </resources>

payments-ui-core/src/main/java/com/stripe/android/ui/core/address/TransformAddressToElement.kt

@@ -201,7 +201,7 @@ private fun isCityOrPostal(identifierSpec: IdentifierSpec) =
         identifierSpec == IdentifierSpec.City
 
 private fun getKeyboard(fieldSchema: FieldSchema?) = if (fieldSchema?.isNumeric == true) {
-    KeyboardType.Number
+    KeyboardType.NumberPassword
 } else {
     KeyboardType.Text
 }

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/AddressElement.kt

@@ -10,7 +10,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-class AddressElement constructor(
+open class AddressElement constructor(
     _identifier: IdentifierSpec,
     private val addressFieldRepository: AddressFieldElementRepository,
     private var rawValuesMap: Map<IdentifierSpec, String?> = emptyMap(),

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/AddressElementUI.kt

@@ -12,14 +12,17 @@ import androidx.compose.ui.Modifier
 @Composable
 internal fun AddressElementUI(
     enabled: Boolean,
-    controller: AddressController
+    controller: AddressController,
+    hiddenIdentifiers: List<IdentifierSpec>?
 ) {
     val fields by controller.fieldsFlowable.collectAsState(null)
     fields?.let { fieldList ->
         Column {
             fieldList.forEachIndexed { index, field ->
-                SectionFieldElementUI(enabled, field)
-                if (index != fieldList.size - 1) {
+                SectionFieldElementUI(enabled, field, hiddenIdentifiers = hiddenIdentifiers)
+                if ((hiddenIdentifiers?.contains(field.identifier) == false) &&
+                    (index != fieldList.size - 1)
+                ) {
                     val cardStyle = CardStyle(isSystemInDarkTheme())
                     Divider(
                         color = cardStyle.cardBorderColor,

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardBillingAddressElement.kt

@@ -0,0 +1,45 @@
+package com.stripe.android.ui.core.elements
+
+import androidx.annotation.RestrictTo
+import com.stripe.android.ui.core.address.AddressFieldElementRepository
+import com.stripe.android.ui.core.address.FieldType
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+/**
+ * This is a special type of AddressElement that
+ * removes fields from the address based on the country.  It
+ * is only intended to be used with the card payment method.
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class CardBillingAddressElement(
+    identifier: IdentifierSpec,
+    addressFieldRepository: AddressFieldElementRepository,
+    countryCodes: Set<String> = emptySet(),
+    countryDropdownFieldController: DropdownFieldController = DropdownFieldController(
+        CountryConfig(countryCodes)
+    ),
+    rawValuesMap: Map<IdentifierSpec, String?> = emptyMap(),
+) : AddressElement(
+    identifier,
+    addressFieldRepository,
+    rawValuesMap,
+    countryCodes,
+    countryDropdownFieldController
+) {
+    // Save for future use puts this in the controller rather than element
+    val hiddenIdentifiers: Flow<List<IdentifierSpec>> =
+        countryDropdownFieldController.rawFieldValue.map { countryCode ->
+            when (countryCode) {
+                "US", "GB", "CA" -> {
+                    FieldType.values()
+                        .filterNot { it == FieldType.PostalCode }
+                        .map { it.identifierSpec }
+                }
+                else -> {
+                    FieldType.values()
+                        .map { it.identifierSpec }
+                }
+            }
+        }
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardBillingSpec.kt

@@ -0,0 +1,14 @@
+package com.stripe.android.ui.core.elements
+
+import com.stripe.android.ui.core.address.AddressFieldElementRepository
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+internal object CardBillingSpec : SectionFieldSpec(IdentifierSpec.Generic("card_billing")) {
+    fun transform(
+        addressRepository: AddressFieldElementRepository
+    ) = CardBillingAddressElement(
+        IdentifierSpec.Generic("credit_billing"),
+        addressRepository
+    )
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsController.kt

@@ -0,0 +1,43 @@
+package com.stripe.android.ui.core.elements
+
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.combine
+import java.util.UUID
+
+internal class CardDetailsController : SectionFieldErrorController {
+
+    val label: Int? = null
+    val numberElement = CardNumberElement(
+        IdentifierSpec.Generic("number"),
+        CardNumberController(CardNumberConfig())
+    )
+
+    val cvcElement = CvcElement(
+        IdentifierSpec.Generic("cvc"),
+        CvcController(CvcConfig(), numberElement.controller.cardBrandFlow)
+    )
+
+    val expirationDateElement = SimpleTextElement(
+        IdentifierSpec.Generic("date"),
+        SimpleTextFieldController(DateConfig())
+    )
+
+    private val rowFields = listOf(expirationDateElement, cvcElement)
+    val fields = listOf(
+        numberElement,
+        RowElement(
+            IdentifierSpec.Generic("row_" + UUID.randomUUID().leastSignificantBits),
+            rowFields,
+            RowController(rowFields)
+        )
+    )
+
+    @ExperimentalCoroutinesApi
+    override val error = combine(
+        listOf(numberElement, expirationDateElement, cvcElement)
+            .map { it.controller }
+            .map { it.error }
+    ) {
+        it.filterNotNull().firstOrNull()
+    }
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsElement.kt

@@ -0,0 +1,46 @@
+package com.stripe.android.ui.core.elements
+
+import kotlinx.coroutines.flow.combine
+
+/**
+ * This is the element that represent the collection of all the card details:
+ * card number, expiration date, and CVC.
+ */
+internal class CardDetailsElement(
+    identifier: IdentifierSpec,
+    val controller: CardDetailsController = CardDetailsController(),
+) : SectionMultiFieldElement(identifier) {
+    override fun sectionFieldErrorController(): SectionFieldErrorController =
+        controller
+
+    override fun setRawValue(rawValuesMap: Map<IdentifierSpec, String?>) {
+        // Nothing from formFragmentArguments to populate
+    }
+
+    override fun getFormFieldValueFlow() = combine(
+        controller.numberElement.controller.formFieldValue,
+        controller.cvcElement.controller.formFieldValue,
+        controller.expirationDateElement.controller.formFieldValue
+    ) { number, cvc, expirationDate ->
+        var month = -1
+        var year = -1
+        expirationDate.value?.let { date ->
+            val newString = convertTo4DigitDate(date)
+            if (newString.length == 4) {
+                month = requireNotNull(newString.take(2).toIntOrNull())
+                year = requireNotNull(newString.takeLast(2).toIntOrNull())
+            }
+        }
+
+        listOf(
+            controller.numberElement.identifier to number,
+            controller.cvcElement.identifier to cvc,
+            IdentifierSpec.Generic("exp_month") to expirationDate.copy(
+                value = month.toString()
+            ),
+            IdentifierSpec.Generic("exp_year") to expirationDate.copy(
+                value = year.toString()
+            )
+        )
+    }
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsElementUI.kt

@@ -0,0 +1,28 @@
+package com.stripe.android.ui.core.elements
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Divider
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+@Composable
+internal fun CardDetailsElementUI(
+    enabled: Boolean,
+    controller: CardDetailsController,
+    hiddenIdentifiers: List<IdentifierSpec>?
+) {
+    controller.fields.forEachIndexed { index, field ->
+        SectionFieldElementUI(enabled, field, hiddenIdentifiers = hiddenIdentifiers)
+        if (index != controller.fields.size - 1) {
+            val cardStyle = CardStyle(isSystemInDarkTheme())
+            Divider(
+                color = cardStyle.cardBorderColor,
+                thickness = cardStyle.cardBorderWidth,
+                modifier = Modifier.padding(
+                    horizontal = cardStyle.cardBorderWidth
+                )
+            )
+        }
+    }
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsSpec.kt

@@ -0,0 +1,10 @@
+package com.stripe.android.ui.core.elements
+
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+internal object CardDetailsSpec : SectionFieldSpec(IdentifierSpec.Generic("card_details")) {
+    fun transform(): SectionFieldElement = CardDetailsElement(
+        IdentifierSpec.Generic("credit_detail")
+    )
+}

payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/CardDetailsTextFieldConfig.kt

@@ -0,0 +1,22 @@
+package com.stripe.android.ui.core.elements
+
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.input.VisualTransformation
+import com.stripe.android.model.CardBrand
+
+/**
+ * This is similar to the [TextFieldConfig], but in order to determine
+ * the state the card brand is required.
+ */
+internal interface CardDetailsTextFieldConfig {
+    val capitalization: KeyboardCapitalization
+    val debugLabel: String
+    val label: Int
+    val keyboard: KeyboardType
+    val visualTransformation: VisualTransformation
+    fun determineState(brand: CardBrand, number: String): TextFieldState
+    fun filter(userTyped: String): String
+    fun convertToRaw(displayName: String): String
+    fun convertFromRaw(rawValue: String): String
+}