feat(POM-369): Migrate native APM to Compose (part 3)

build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        androidGradlePluginVersion = '8.4.0'
+        androidGradlePluginVersion = '8.4.1'
         kotlinVersion = '1.9.24'
         kspVersion = '1.9.24-1.0.20'
         dokkaVersion = '1.9.20'
@@ -59,6 +59,7 @@ ext {
     okioVersion = '3.9.0'
     coilVersion = '2.6.0'
     commonMarkVersion = '0.22.0'
+    libphonenumberVersion = '8.13.37'
 
     checkout3dsSdkVersion = '3.2.2'
     adyen3dsSdkVersion = '2.2.15'

sdk/src/main/kotlin/com/processout/sdk/api/model/request/PONativeAlternativePaymentMethodDefaultValuesRequest.kt

@@ -1,6 +1,7 @@
 package com.processout.sdk.api.model.request
 
 import com.processout.sdk.api.model.response.PONativeAlternativePaymentMethodParameter
+import com.processout.sdk.core.annotation.ProcessOutInternalApi
 import java.util.UUID
 
 /**
@@ -11,7 +12,7 @@ import java.util.UUID
  * @param[parameters] Collection of parameters that can be inspected to decide if default values should be provided.
  * @param[uuid] Unique identifier of request.
  */
-data class PONativeAlternativePaymentMethodDefaultValuesRequest internal constructor(
+data class PONativeAlternativePaymentMethodDefaultValuesRequest @ProcessOutInternalApi constructor(
     val gatewayConfigurationId: String,
     val invoiceId: String,
     val parameters: List<PONativeAlternativePaymentMethodParameter>,

sdk/src/main/kotlin/com/processout/sdk/core/util/POMarkdownUtils.kt

@@ -0,0 +1,20 @@
+package com.processout.sdk.core.util
+
+import com.processout.sdk.core.annotation.ProcessOutInternalApi
+
+/** @suppress */
+@ProcessOutInternalApi
+object POMarkdownUtils {
+
+    private const val ESCAPE_CHAR = '\\'
+    private const val MARKDOWN_SPECIAL_CHARS = "\\`*_{}[]()#+-.!"
+
+    fun escapedMarkdown(text: String) = buildString {
+        text.forEach { char ->
+            if (MARKDOWN_SPECIAL_CHARS.contains(char)) {
+                append(ESCAPE_CHAR)
+            }
+            append(char)
+        }
+    }
+}

sdk/src/main/kotlin/com/processout/sdk/ui/nativeapm/NativeAlternativePaymentMethodViewModel.kt

@@ -35,7 +35,7 @@ import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.logger.POLogger
 import com.processout.sdk.core.retry.PORetryStrategy
 import com.processout.sdk.core.retry.PORetryStrategy.Exponential
-import com.processout.sdk.core.util.escapedMarkdown
+import com.processout.sdk.core.util.POMarkdownUtils.escapedMarkdown
 import com.processout.sdk.ui.nativeapm.NativeAlternativePaymentMethodUiState.*
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodConfiguration.*
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodConfiguration.Options.Companion.DEFAULT_PAYMENT_CONFIRMATION_TIMEOUT_SECONDS
@@ -603,7 +603,7 @@ internal class NativeAlternativePaymentMethodViewModel(
             inputParameters = parameters?.toInputParameters() ?: emptyList(),
             successMessage = options.successMessage
                 ?: app.getString(R.string.po_native_apm_success_message),
-            customerActionMessageMarkdown = escapedMarkdown(gateway.customerActionMessage),
+            customerActionMessageMarkdown = gateway.customerActionMessage?.let { escapedMarkdown(it) },
             customerActionImageUrl = gateway.customerActionImageUrl,
             primaryActionText = options.primaryActionText ?: invoice.formatPrimaryActionText(),
             secondaryAction = options.secondaryAction?.toUiModel(),
@@ -658,8 +658,8 @@ internal class NativeAlternativePaymentMethodViewModel(
 
     private fun getInputHint(type: ParameterType) =
         when (type) {
-            PHONE -> app.getString(R.string.po_native_apm_input_hint_phone)
-            EMAIL -> app.getString(R.string.po_native_apm_input_hint_email)
+            EMAIL -> app.getString(R.string.po_native_apm_email_placeholder)
+            PHONE -> app.getString(R.string.po_native_apm_phone_placeholder)
             else -> null
         }
 

sdk/src/main/res/values-pl/strings.xml

@@ -12,8 +12,8 @@
     <string name="po_native_apm_cancel_confirmation_confirm">Anuluj płatność</string>
     <string name="po_native_apm_cancel_confirmation_dismiss">Nie teraz</string>
     <string name="po_native_apm_success_message">Sukces!\nPłatność przyjęta.</string>
-    <string name="po_native_apm_input_hint_phone">Twój numer telefonu</string>
-    <string name="po_native_apm_input_hint_email">imię@przykład.pl</string>
+    <string name="po_native_apm_email_placeholder">imię@przykład.pl</string>
+    <string name="po_native_apm_phone_placeholder">Twój numer telefonu</string>
     <string name="po_native_apm_error_required_parameter">Parametr jest wmagany.</string>
     <string name="po_native_apm_error_invalid_number">Niepoprawny numer.</string>
     <string name="po_native_apm_error_invalid_text">Niepoprawna wartość.</string>

sdk/src/main/res/values-pt/strings.xml

@@ -12,8 +12,8 @@
     <string name="po_native_apm_cancel_confirmation_confirm">Cancelar pagamento</string>
     <string name="po_native_apm_cancel_confirmation_dismiss">Agora não</string>
     <string name="po_native_apm_success_message">Successo!\nPagamento aprovado.</string>
-    <string name="po_native_apm_input_hint_phone">Insira o seu número de telemóvel</string>
-    <string name="po_native_apm_input_hint_email">nome@exemplo.pt</string>
+    <string name="po_native_apm_email_placeholder">nome@exemplo.pt</string>
+    <string name="po_native_apm_phone_placeholder">Insira o seu número de telemóvel</string>
     <string name="po_native_apm_error_required_parameter">Campo obrigatório.</string>
     <string name="po_native_apm_error_invalid_number">Número inválido.</string>
     <string name="po_native_apm_error_invalid_text">Texto inválido.</string>

sdk/src/main/res/values/strings.xml

@@ -12,8 +12,8 @@
     <string name="po_native_apm_cancel_confirmation_confirm">Cancel payment</string>
     <string name="po_native_apm_cancel_confirmation_dismiss">Not now</string>
     <string name="po_native_apm_success_message">Success!\nPayment approved.</string>
-    <string name="po_native_apm_input_hint_phone">Enter phone number</string>
-    <string name="po_native_apm_input_hint_email">name@example.com</string>
+    <string name="po_native_apm_email_placeholder">name@example.com</string>
+    <string name="po_native_apm_phone_placeholder">Enter phone number</string>
     <string name="po_native_apm_error_required_parameter">Parameter is required.</string>
     <string name="po_native_apm_error_invalid_number">Number is not valid.</string>
     <string name="po_native_apm_error_invalid_text">Value is not valid.</string>

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

@@ -65,7 +65,7 @@ private fun titlePadding(
     if (withDragHandle) PaddingValues(
         start = spacing.extraLarge,
         end = spacing.extraLarge,
-        top = spacing.small,
+        top = spacing.medium,
         bottom = spacing.large
     ) else PaddingValues(
         horizontal = spacing.extraLarge,