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

example/src/main/kotlin/com/processout/example/ui/screen/nativeapm/NativeApmFragment.kt

@@ -13,6 +13,9 @@ import com.processout.example.R
 import com.processout.example.databinding.FragmentNativeApmBinding
 import com.processout.example.shared.toMessage
 import com.processout.example.ui.screen.base.BaseFragment
+import com.processout.sdk.core.ProcessOutActivityResult
+import com.processout.sdk.ui.napm.PONativeAlternativePaymentConfiguration
+import com.processout.sdk.ui.napm.PONativeAlternativePaymentLauncher
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodConfiguration
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodLauncher
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodResult
@@ -29,21 +32,31 @@ class NativeApmFragment : BaseFragment<FragmentNativeApmBinding>(
     }
 
     private lateinit var launcher: PONativeAlternativePaymentMethodLauncher
+    private lateinit var launcherCompose: PONativeAlternativePaymentLauncher
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         launcher = PONativeAlternativePaymentMethodLauncher.create(
-            this, ::onNativeAlternativePaymentMethodResult
-        )
-    }
-
-    private fun onNativeAlternativePaymentMethodResult(result: PONativeAlternativePaymentMethodResult) {
-        viewModel.reset()
-        when (result) {
-            PONativeAlternativePaymentMethodResult.Success ->
-                showAlert(getString(R.string.success))
-            is PONativeAlternativePaymentMethodResult.Failure ->
-                showAlert(result.toMessage())
+            from = this
+        ) { result ->
+            viewModel.reset()
+            when (result) {
+                PONativeAlternativePaymentMethodResult.Success ->
+                    showAlert(getString(R.string.success))
+                is PONativeAlternativePaymentMethodResult.Failure ->
+                    showAlert(result.toMessage())
+            }
+        }
+        launcherCompose = PONativeAlternativePaymentLauncher.create(
+            from = this
+        ) { result ->
+            viewModel.reset()
+            when (result) {
+                is ProcessOutActivityResult.Success ->
+                    showAlert(getString(R.string.success))
+                is ProcessOutActivityResult.Failure ->
+                    showAlert(result.toMessage())
+            }
         }
     }
 
@@ -58,21 +71,22 @@ class NativeApmFragment : BaseFragment<FragmentNativeApmBinding>(
     }
 
     private fun setOnClickListeners() {
-        binding.createInvoiceButton.setOnClickListener { onSubmitClick() }
+        binding.launchNativeApmButton.setOnClickListener { onSubmitClick(launchCompose = false) }
+        binding.launchNativeApmComposeButton.setOnClickListener { onSubmitClick(launchCompose = true) }
         binding.currencyInput.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
-                onSubmitClick()
+                onSubmitClick(launchCompose = false)
                 return@setOnEditorActionListener true
             } else {
                 return@setOnEditorActionListener false
             }
         }
     }
 
-    private fun onSubmitClick() {
+    private fun onSubmitClick(launchCompose: Boolean) {
         val amount = binding.amountInput.text.toString()
         val currency = binding.currencyInput.text.toString()
-        viewModel.createInvoice(amount, currency)
+        viewModel.createInvoice(amount, currency, launchCompose)
     }
 
     private fun handle(uiState: NativeApmUiState) {
@@ -85,12 +99,21 @@ class NativeApmFragment : BaseFragment<FragmentNativeApmBinding>(
     }
 
     private fun launch(uiModel: NativeApmUiModel) {
-        launcher.launch(
-            PONativeAlternativePaymentMethodConfiguration(
-                gatewayConfigurationId = uiModel.gatewayConfigurationId,
-                invoiceId = uiModel.invoiceId
+        if (uiModel.launchCompose) {
+            launcherCompose.launch(
+                PONativeAlternativePaymentConfiguration(
+                    gatewayConfigurationId = uiModel.gatewayConfigurationId,
+                    invoiceId = uiModel.invoiceId
+                )
+            )
+        } else {
+            launcher.launch(
+                PONativeAlternativePaymentMethodConfiguration(
+                    gatewayConfigurationId = uiModel.gatewayConfigurationId,
+                    invoiceId = uiModel.invoiceId
+                )
             )
-        )
+        }
         viewModel.onLaunched()
     }
 
@@ -105,7 +128,8 @@ class NativeApmFragment : BaseFragment<FragmentNativeApmBinding>(
         with(binding) {
             amountInput.isEnabled = isEnabled
             currencyInput.isEnabled = isEnabled
-            createInvoiceButton.isClickable = isEnabled
+            launchNativeApmButton.isClickable = isEnabled
+            launchNativeApmComposeButton.isClickable = isEnabled
             amountInput.clearFocus()
             currencyInput.clearFocus()
         }

example/src/main/kotlin/com/processout/example/ui/screen/nativeapm/NativeApmUiState.kt

@@ -12,5 +12,6 @@ sealed class NativeApmUiState {
 
 data class NativeApmUiModel(
     val gatewayConfigurationId: String,
-    val invoiceId: String
+    val invoiceId: String,
+    val launchCompose: Boolean
 )

example/src/main/kotlin/com/processout/example/ui/screen/nativeapm/NativeApmViewModel.kt

@@ -41,7 +41,11 @@ class NativeApmViewModel(
     private val _uiState = MutableStateFlow<NativeApmUiState>(Initial)
     val uiState = _uiState.asStateFlow()
 
-    fun createInvoice(amount: String, currency: String) {
+    fun createInvoice(
+        amount: String,
+        currency: String,
+        launchCompose: Boolean
+    ) {
         _uiState.value = Submitting
         viewModelScope.launch {
             val request = POCreateInvoiceRequest(
@@ -51,8 +55,14 @@ class NativeApmViewModel(
                 customerId = createCustomer()?.id
             )
             invoices.createInvoice(request)
-                .onSuccess {
-                    _uiState.value = Submitted(NativeApmUiModel(gatewayConfigurationId, it.id))
+                .onSuccess { invoice ->
+                    _uiState.value = Submitted(
+                        NativeApmUiModel(
+                            gatewayConfigurationId,
+                            invoice.id,
+                            launchCompose
+                        )
+                    )
                 }
                 .onFailure { _uiState.value = Failure(it) }
         }

example/src/main/res/layout/fragment_native_apm.xml

@@ -82,18 +82,30 @@
         android:layout_height="@dimen/po_borderWidth"
         android:layout_marginBottom="@dimen/button_marginVertical"
         android:background="@color/po_border_subtle"
-        app:layout_constraintBottom_toTopOf="@+id/create_invoice_button"
+        app:layout_constraintBottom_toTopOf="@id/launch_native_apm_button"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
     <Button
-        android:id="@+id/create_invoice_button"
+        android:id="@+id/launch_native_apm_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/content_padding"
+        android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginBottom="@dimen/button_space_vertical"
+        android:text="@string/launch_native_apm"
+        app:layout_constraintBottom_toTopOf="@id/launch_native_apm_compose_button"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <Button
+        android:id="@+id/launch_native_apm_compose_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/content_padding"
         android:layout_marginEnd="@dimen/content_padding"
         android:layout_marginBottom="@dimen/button_marginVertical"
-        android:text="@string/create_invoice"
+        android:text="@string/launch_native_apm_compose"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />

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

@@ -3,7 +3,8 @@
     <string name="app_name" translatable="false">ProcessOut SDK Example</string>
 
     <string name="native_apm" translatable="false">Native Alternative Payment</string>
-    <string name="create_invoice" translatable="false">Create Invoice</string>
+    <string name="launch_native_apm" translatable="false">Launch Native APM</string>
+    <string name="launch_native_apm_compose" translatable="false">Launch Native APM (Compose WIP)</string>
     <string name="authorize_invoice" translatable="false">Authorize Invoice</string>
     <string name="invoice_details" translatable="false">Invoice Details</string>
     <string name="amount" translatable="false">Amount</string>

sdk/src/main/kotlin/com/processout/sdk/api/ProcessOut.kt

@@ -7,7 +7,7 @@ import com.processout.sdk.BuildConfig
 import com.processout.sdk.api.dispatcher.DefaultEventDispatchers
 import com.processout.sdk.api.dispatcher.POEventDispatchers
 import com.processout.sdk.api.dispatcher.PONativeAlternativePaymentMethodEventDispatcher
-import com.processout.sdk.api.dispatcher.nativeapm.DefaultNativeAlternativePaymentMethodEventDispatcher
+import com.processout.sdk.api.dispatcher.napm.PODefaultNativeAlternativePaymentMethodEventDispatcher
 import com.processout.sdk.api.network.ApiConstants
 import com.processout.sdk.api.repository.POCardsRepository
 import com.processout.sdk.api.repository.POGatewayConfigurationsRepository
@@ -64,7 +64,7 @@ class ProcessOut private constructor(
         replaceWith = ReplaceWith("dispatchers.nativeAlternativePaymentMethod")
     )
     val nativeAlternativePaymentMethodEventDispatcher: PONativeAlternativePaymentMethodEventDispatcher by lazy {
-        DefaultNativeAlternativePaymentMethodEventDispatcher
+        PODefaultNativeAlternativePaymentMethodEventDispatcher
     }
 
     /** Dispatchers that allows to handle events during various payment flows. */

sdk/src/main/kotlin/com/processout/sdk/api/dispatcher/DefaultEventDispatchers.kt

@@ -4,19 +4,19 @@ import com.processout.sdk.api.dispatcher.card.tokenization.POCardTokenizationEve
 import com.processout.sdk.api.dispatcher.card.tokenization.PODefaultCardTokenizationEventDispatcher
 import com.processout.sdk.api.dispatcher.card.update.POCardUpdateEventDispatcher
 import com.processout.sdk.api.dispatcher.card.update.PODefaultCardUpdateEventDispatcher
-import com.processout.sdk.api.dispatcher.nativeapm.DefaultNativeAlternativePaymentMethodEventDispatcher
+import com.processout.sdk.api.dispatcher.napm.PODefaultNativeAlternativePaymentMethodEventDispatcher
 
 internal object DefaultEventDispatchers : POEventDispatchers {
 
-    override val cardUpdate: POCardUpdateEventDispatcher by lazy {
-        PODefaultCardUpdateEventDispatcher
+    override val nativeAlternativePaymentMethod: PONativeAlternativePaymentMethodEventDispatcher by lazy {
+        PODefaultNativeAlternativePaymentMethodEventDispatcher
     }
 
     override val cardTokenization: POCardTokenizationEventDispatcher by lazy {
         PODefaultCardTokenizationEventDispatcher
     }
 
-    override val nativeAlternativePaymentMethod: PONativeAlternativePaymentMethodEventDispatcher by lazy {
-        DefaultNativeAlternativePaymentMethodEventDispatcher
+    override val cardUpdate: POCardUpdateEventDispatcher by lazy {
+        PODefaultCardUpdateEventDispatcher
     }
 }

sdk/src/main/kotlin/com/processout/sdk/api/dispatcher/POEventDispatchers.kt

@@ -8,12 +8,12 @@ import com.processout.sdk.api.dispatcher.card.update.POCardUpdateEventDispatcher
  */
 interface POEventDispatchers {
 
-    /** Dispatcher that allows to handle events during card updates. */
-    val cardUpdate: POCardUpdateEventDispatcher
+    /** Dispatcher that allows to handle events during native alternative payments. */
+    val nativeAlternativePaymentMethod: PONativeAlternativePaymentMethodEventDispatcher
 
     /** Dispatcher that allows to handle events during card tokenization. */
     val cardTokenization: POCardTokenizationEventDispatcher
 
-    /** Dispatcher that allows to handle events during native alternative payments. */
-    val nativeAlternativePaymentMethod: PONativeAlternativePaymentMethodEventDispatcher
+    /** Dispatcher that allows to handle events during card updates. */
+    val cardUpdate: POCardUpdateEventDispatcher
 }

sdk/src/main/kotlin/com/processout/sdk/api/dispatcher/PONativeAlternativePaymentMethodEventDispatcher.kt

@@ -5,7 +5,7 @@ import com.processout.sdk.api.model.request.PONativeAlternativePaymentMethodDefa
 import com.processout.sdk.api.model.response.PONativeAlternativePaymentMethodDefaultValuesResponse
 import kotlinx.coroutines.flow.SharedFlow
 
-// TODO: Move it to '.dispatcher.nativeapm' package before next major release.
+// TODO: Move it to '.dispatcher.napm' package before next major release.
 
 /**
  * Dispatcher that allows to handle events during native alternative payments.

sdk/src/main/kotlin/com/processout/sdk/api/dispatcher/nativeapm/DefaultNativeAlternativePaymentMethodEventDispatcher.kt → sdk/src/main/kotlin/com/processout/sdk/api/dispatcher/napm/PODefaultNativeAlternativePaymentMethodEventDispatcher.kt

@@ -1,14 +1,16 @@
-package com.processout.sdk.api.dispatcher.nativeapm
+package com.processout.sdk.api.dispatcher.napm
 
 import com.processout.sdk.api.dispatcher.PONativeAlternativePaymentMethodEventDispatcher
 import com.processout.sdk.api.model.event.PONativeAlternativePaymentMethodEvent
 import com.processout.sdk.api.model.request.PONativeAlternativePaymentMethodDefaultValuesRequest
 import com.processout.sdk.api.model.response.PONativeAlternativePaymentMethodDefaultValuesResponse
+import com.processout.sdk.core.annotation.ProcessOutInternalApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 
-internal object DefaultNativeAlternativePaymentMethodEventDispatcher
-    : PONativeAlternativePaymentMethodEventDispatcher {
+/** @suppress */
+@ProcessOutInternalApi
+object PODefaultNativeAlternativePaymentMethodEventDispatcher : PONativeAlternativePaymentMethodEventDispatcher {
 
     private val _events = MutableSharedFlow<PONativeAlternativePaymentMethodEvent>()
     override val events = _events.asSharedFlow()

sdk/src/main/kotlin/com/processout/sdk/api/repository/BaseRepository.kt

@@ -7,16 +7,16 @@ import com.processout.sdk.core.ProcessOutCallback
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.logger.POLogger
 import com.processout.sdk.core.map
-import com.processout.sdk.core.retry.RetryStrategy
-import com.processout.sdk.core.retry.RetryStrategy.Exponential
+import com.processout.sdk.core.retry.PORetryStrategy
+import com.processout.sdk.core.retry.PORetryStrategy.Exponential
 import kotlinx.coroutines.*
 import retrofit2.Response
 import java.io.IOException
 import java.net.SocketTimeoutException
 
 internal abstract class BaseRepository(
     private val failureMapper: ApiFailureMapper,
-    private val retryStrategy: RetryStrategy = Exponential(
+    private val retryStrategy: PORetryStrategy = Exponential(
         maxRetries = 4,
         initialDelay = 100,
         maxDelay = 1000,
@@ -63,7 +63,7 @@ internal abstract class BaseRepository(
 
     private suspend fun <T : Any> retry(
         apiMethod: suspend () -> Response<T>,
-        strategy: RetryStrategy
+        strategy: PORetryStrategy
     ): Response<T> {
         val iterator = strategy.iterator
         repeat(strategy.maxRetries - 1) {

sdk/src/main/kotlin/com/processout/sdk/core/POUnit.kt

@@ -0,0 +1,11 @@
+package com.processout.sdk.core
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * Parcelable unit object.
+ * Represents the absence of meaningful value.
+ */
+@Parcelize
+object POUnit : Parcelable

sdk/src/main/kotlin/com/processout/sdk/core/retry/RetryStrategy.kt → sdk/src/main/kotlin/com/processout/sdk/core/retry/PORetryStrategy.kt

@@ -1,8 +1,11 @@
 package com.processout.sdk.core.retry
 
+import com.processout.sdk.core.annotation.ProcessOutInternalApi
 import kotlin.math.roundToLong
 
-internal sealed class RetryStrategy(
+/** @suppress */
+@ProcessOutInternalApi
+sealed class PORetryStrategy(
     val maxRetries: Int,
     private val initialDelay: Long,
     private val minDelay: Long,
@@ -13,7 +16,7 @@ internal sealed class RetryStrategy(
     class Linear(
         maxRetries: Int,
         delay: Long
-    ) : RetryStrategy(
+    ) : PORetryStrategy(
         maxRetries = maxRetries,
         initialDelay = delay,
         minDelay = delay,
@@ -27,7 +30,7 @@ internal sealed class RetryStrategy(
         minDelay: Long = initialDelay,
         maxDelay: Long,
         factor: Double
-    ) : RetryStrategy(
+    ) : PORetryStrategy(
         maxRetries = maxRetries,
         initialDelay = initialDelay,
         minDelay = minDelay,

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

@@ -19,7 +19,7 @@ import coil.request.ImageRequest
 import coil.request.ImageResult
 import com.processout.sdk.R
 import com.processout.sdk.api.ProcessOut
-import com.processout.sdk.api.dispatcher.nativeapm.DefaultNativeAlternativePaymentMethodEventDispatcher
+import com.processout.sdk.api.dispatcher.napm.PODefaultNativeAlternativePaymentMethodEventDispatcher
 import com.processout.sdk.api.model.event.PONativeAlternativePaymentMethodEvent
 import com.processout.sdk.api.model.event.PONativeAlternativePaymentMethodEvent.*
 import com.processout.sdk.api.model.request.PONativeAlternativePaymentMethodDefaultValuesRequest
@@ -33,8 +33,8 @@ import com.processout.sdk.core.POFailure
 import com.processout.sdk.core.POFailure.Code.*
 import com.processout.sdk.core.ProcessOutResult
 import com.processout.sdk.core.logger.POLogger
-import com.processout.sdk.core.retry.RetryStrategy
-import com.processout.sdk.core.retry.RetryStrategy.Exponential
+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.ui.nativeapm.NativeAlternativePaymentMethodUiState.*
 import com.processout.sdk.ui.nativeapm.PONativeAlternativePaymentMethodConfiguration.Options
@@ -57,8 +57,8 @@ internal class NativeAlternativePaymentMethodViewModel(
     private val gatewayConfigurationId: String,
     private val invoiceId: String,
     private val invoicesService: POInvoicesService,
-    private val eventDispatcher: DefaultNativeAlternativePaymentMethodEventDispatcher,
-    private val captureRetryStrategy: RetryStrategy,
+    private val eventDispatcher: PODefaultNativeAlternativePaymentMethodEventDispatcher,
+    private val captureRetryStrategy: PORetryStrategy,
     val options: Options,
     val logAttributes: Map<String, String>
 ) : AndroidViewModel(app) {
@@ -77,7 +77,7 @@ internal class NativeAlternativePaymentMethodViewModel(
                     gatewayConfigurationId = gatewayConfigurationId,
                     invoiceId = invoiceId,
                     invoicesService = invoices,
-                    eventDispatcher = DefaultNativeAlternativePaymentMethodEventDispatcher,
+                    eventDispatcher = PODefaultNativeAlternativePaymentMethodEventDispatcher,
                     captureRetryStrategy = Exponential(
                         maxRetries = Int.MAX_VALUE,
                         initialDelay = 150,