feat(ad-hoc): Integrate nAPM v2 into Dynamic Checkout

ui-core/src/main/kotlin/com/processout/sdk/ui/core/component/POLabeledContent.kt

@@ -2,10 +2,12 @@ package com.processout.sdk.ui.core.component
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import com.processout.sdk.ui.core.annotation.ProcessOutInternalApi
+import com.processout.sdk.ui.core.style.POLabeledContentStyle
 import com.processout.sdk.ui.core.theme.ProcessOutTheme.colors
 import com.processout.sdk.ui.core.theme.ProcessOutTheme.spacing
 import com.processout.sdk.ui.core.theme.ProcessOutTheme.typography
@@ -50,3 +52,35 @@ fun POLabeledContent(
         }
     }
 }
+
+/** @suppress */
+@ProcessOutInternalApi
+object POLabeledContent {
+
+    @Immutable
+    data class Style(
+        val label: POText.Style,
+        val text: POText.Style,
+        val copyButton: POButton.Style
+    )
+
+    val default: Style
+        @Composable get() = Style(
+            label = POText.Style(
+                color = colors.text.placeholder,
+                textStyle = typography.s12(FontWeight.Medium)
+            ),
+            text = POText.Style(
+                color = colors.text.primary,
+                textStyle = typography.s15(FontWeight.Medium)
+            ),
+            copyButton = POCopyButton.default
+        )
+
+    @Composable
+    fun custom(style: POLabeledContentStyle) = Style(
+        label = POText.custom(style = style.label),
+        text = POText.custom(style = style.text),
+        copyButton = default.copyButton
+    )
+}

ui-core/src/main/kotlin/com/processout/sdk/ui/core/component/POTextWithIcon.kt

@@ -93,7 +93,7 @@ object POTextWithIcon {
             )
             return Style(
                 text = text,
-                iconResId = R.drawable.po_icon_info,
+                iconResId = R.drawable.po_icon_warning_diamond,
                 iconColorFilter = ColorFilter.tint(color = text.color)
             )
         }

ui-core/src/main/kotlin/com/processout/sdk/ui/core/component/field/radio/PORadioField.kt

@@ -256,7 +256,7 @@ object PORadioField {
         else if (isError) style.error
         else style.normal
 
-    internal fun Style.radioButtonStyle() = PORadioButton.Style(
+    fun Style.radioButtonStyle() = PORadioButton.Style(
         normalColor = normal.radioButtonColor,
         selectedColor = selected.radioButtonColor,
         errorColor = error.radioButtonColor,

ui/src/main/kotlin/com/processout/sdk/ui/checkout/DynamicCheckoutEvent.kt

@@ -1,11 +1,11 @@
 package com.processout.sdk.ui.checkout
 
-import androidx.compose.ui.text.input.TextFieldValue
 import com.processout.sdk.api.model.response.POAlternativePaymentMethodResponse
 import com.processout.sdk.api.model.response.POGooglePayCardTokenizationData
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.ui.card.scanner.recognition.POScannedCard
 import com.processout.sdk.ui.savedpaymentmethods.POSavedPaymentMethodsConfiguration
+import com.processout.sdk.ui.shared.state.FieldValue
 import org.json.JSONObject
 
 internal sealed interface DynamicCheckoutEvent {
@@ -16,7 +16,7 @@ internal sealed interface DynamicCheckoutEvent {
     data class FieldValueChanged(
         val paymentMethodId: String,
         val fieldId: String,
-        val value: TextFieldValue
+        val value: FieldValue
     ) : DynamicCheckoutEvent
 
     data class FieldFocusChanged(

ui/src/main/kotlin/com/processout/sdk/ui/checkout/DynamicCheckoutInteractor.kt

@@ -11,8 +11,10 @@ import coil.request.ImageRequest
 import coil.request.ImageResult
 import com.processout.sdk.R
 import com.processout.sdk.api.dispatcher.POEventDispatcher
-import com.processout.sdk.api.model.event.PONativeAlternativePaymentMethodEvent.WillSubmitParameters
-import com.processout.sdk.api.model.request.*
+import com.processout.sdk.api.model.request.POCardTokenizationProcessingRequest
+import com.processout.sdk.api.model.request.POCardTokenizationShouldContinueRequest
+import com.processout.sdk.api.model.request.POInvoiceAuthorizationRequest
+import com.processout.sdk.api.model.request.POInvoiceRequest
 import com.processout.sdk.api.model.request.POInvoiceRequest.ExpandedProperty.Companion.paymentMethods
 import com.processout.sdk.api.model.request.POInvoiceRequest.ExpandedProperty.Companion.transaction
 import com.processout.sdk.api.model.response.*
@@ -59,7 +61,9 @@ import com.processout.sdk.ui.checkout.delegate.PODynamicCheckoutEvent.*
 import com.processout.sdk.ui.napm.*
 import com.processout.sdk.ui.napm.PONativeAlternativePaymentConfiguration.*
 import com.processout.sdk.ui.napm.PONativeAlternativePaymentConfiguration.Flow
-import com.processout.sdk.ui.napm.delegate.PONativeAlternativePaymentEvent
+import com.processout.sdk.ui.napm.delegate.v2.NativeAlternativePaymentDefaultValuesRequest
+import com.processout.sdk.ui.napm.delegate.v2.PONativeAlternativePaymentEvent
+import com.processout.sdk.ui.napm.delegate.v2.PONativeAlternativePaymentEvent.WillSubmitParameters
 import com.processout.sdk.ui.savedpaymentmethods.POSavedPaymentMethodsConfiguration
 import com.processout.sdk.ui.shared.extension.orElse
 import com.processout.sdk.ui.shared.state.FieldValue
@@ -148,8 +152,8 @@ internal class DynamicCheckoutInteractor(
     }
 
     private fun cancelWebAuthorization() {
-        with(_state.value) {
-            if (selectedPaymentMethod != null || pendingSubmitPaymentMethod != null) {
+        _state.value.let {
+            if (it.selectedPaymentMethod != null || it.pendingSubmitPaymentMethod != null) {
                 interactorScope.launch {
                     _sideEffects.send(DynamicCheckoutSideEffect.CancelWebAuthorization)
                 }
@@ -432,8 +436,8 @@ internal class DynamicCheckoutInteractor(
         _state.value.paymentMethods.find { it.id == id }
 
     private fun activePaymentMethod(): PaymentMethod? =
-        with(_state.value) {
-            processingPaymentMethod ?: selectedPaymentMethod
+        _state.value.let {
+            it.processingPaymentMethod ?: it.selectedPaymentMethod
         }
 
     private fun onPaymentMethodSelected(event: PaymentMethodSelected) {
@@ -569,20 +573,24 @@ internal class DynamicCheckoutInteractor(
 
     private fun onFieldValueChanged(event: FieldValueChanged) {
         when (val paymentMethod = paymentMethod(event.paymentMethodId)) {
-            is Card -> cardTokenization.onEvent(
-                CardTokenizationEvent.FieldValueChanged(event.fieldId, event.value)
-            )
+            is Card -> if (event.value is FieldValue.Text) {
+                cardTokenization.onEvent(
+                    CardTokenizationEvent.FieldValueChanged(event.fieldId, event.value.value)
+                )
+            }
             is NativeAlternativePayment -> nativeAlternativePayment.onEvent(
-                NativeAlternativePaymentEvent.FieldValueChanged(event.fieldId, FieldValue.Text(event.value))
+                NativeAlternativePaymentEvent.FieldValueChanged(event.fieldId, event.value)
             )
-            else -> _state.update { state ->
-                state.copy(
-                    paymentMethods = state.paymentMethods.map {
-                        if (it.id == paymentMethod?.id) {
-                            updatedPaymentMethod(it, event.fieldId, event.value)
-                        } else it
-                    }
-                )
+            else -> if (event.value is FieldValue.Text) {
+                _state.update { state ->
+                    state.copy(
+                        paymentMethods = state.paymentMethods.map {
+                            if (it.id == paymentMethod?.id) {
+                                updatedPaymentMethod(it, event.fieldId, event.value.value)
+                            } else it
+                        }
+                    )
+                }
             }
         }
     }
@@ -593,9 +601,11 @@ internal class DynamicCheckoutInteractor(
         value: TextFieldValue
     ): PaymentMethod = when (paymentMethod) {
         is AlternativePayment -> when (fieldId) {
-            FieldId.SAVE_PAYMENT_METHOD -> with(paymentMethod) {
+            FieldId.SAVE_PAYMENT_METHOD -> {
                 POLogger.debug("Field is edited by the user: %s = %s", fieldId, value.text)
-                copy(savePaymentMethodField = savePaymentMethodField?.copy(value = value))
+                paymentMethod.copy(
+                    savePaymentMethodField = paymentMethod.savePaymentMethodField?.copy(value = value)
+                )
             }
             else -> paymentMethod
         }
@@ -840,16 +850,21 @@ internal class DynamicCheckoutInteractor(
             if (paymentMethod.id != paymentMethodId) {
                 return
             }
-            result.onSuccess { response ->
-                authorizeInvoice(
-                    paymentMethod = paymentMethod,
-                    source = response.gatewayToken,
-                    allowFallbackToSale = true
-                )
-            }.onFailure { failure ->
-                invalidateInvoice(
-                    reason = PODynamicCheckoutInvoiceInvalidationReason.Failure(failure)
+            when (paymentMethod) {
+                is NativeAlternativePayment -> nativeAlternativePayment.onEvent(
+                    NativeAlternativePaymentEvent.RedirectResult(result)
                 )
+                else -> result.onSuccess { response ->
+                    authorizeInvoice(
+                        paymentMethod = paymentMethod,
+                        source = response.gatewayToken,
+                        allowFallbackToSale = true
+                    )
+                }.onFailure { failure ->
+                    invalidateInvoice(
+                        reason = PODynamicCheckoutInvoiceInvalidationReason.Failure(failure)
+                    )
+                }
             }
         }
     }
@@ -1081,7 +1096,7 @@ internal class DynamicCheckoutInteractor(
                 eventDispatcher.send(request.toResponse(shouldContinue))
             }
         }
-        eventDispatcher.subscribeForRequest<PONativeAlternativePaymentMethodDefaultValuesRequest>(
+        eventDispatcher.subscribeForRequest<NativeAlternativePaymentDefaultValuesRequest>(
             coroutineScope = interactorScope
         ) { request ->
             activePaymentMethod()?.let { paymentMethod ->
@@ -1128,9 +1143,17 @@ internal class DynamicCheckoutInteractor(
                             _sideEffects.send(permissionRequest)
                             POLogger.info("System permission requested: %s", permissionRequest)
                         }
-                    is NativeAlternativePaymentSideEffect.Redirect -> {
-                        // TODO
-                    }
+                    is NativeAlternativePaymentSideEffect.Redirect ->
+                        activePaymentMethod()?.let { paymentMethod ->
+                            _state.update { it.copy(processingPaymentMethod = paymentMethod) }
+                            _sideEffects.send(
+                                DynamicCheckoutSideEffect.AlternativePayment(
+                                    paymentMethodId = paymentMethod.id,
+                                    redirectUrl = sideEffect.redirectUrl,
+                                    returnUrl = sideEffect.returnUrl
+                                )
+                            )
+                        }
                 }
             }
         }