feature/cp-376 : 로깅 시점 변경 및 샘플 앱 redirectUrl 이슈 수정 (#19)

* 샘플 앱 redirectUrl 반영 안 되는 문제 수정

* selectedPaymentMethod 로깅 시점 변경

Author: JooYang

app/src/main/java/com/tosspayments/paymentsdk/sample/activity/PaymentWidgetActivity.kt

@@ -216,6 +216,7 @@ class PaymentWidgetActivity : AppCompatActivity() {
                     }
                 }
             )
+            Log.d("selectedPaymentMethod", paymentWidget.getSelectedPaymentMethod().toString())
         }
 
         binding.changeAmountCta.setOnClickListener {

app/src/main/java/com/tosspayments/paymentsdk/sample/extension/Flows.kt

@@ -0,0 +1,25 @@
+package com.tosspayments.paymentsdk.sample.extension
+
+import kotlinx.coroutines.flow.Flow
+
+fun <T1, T2, T3, T4, T5, T6, R> combine(
+    flow: Flow<T1>,
+    flow2: Flow<T2>,
+    flow3: Flow<T3>,
+    flow4: Flow<T4>,
+    flow5: Flow<T5>,
+    flow6: Flow<T6>,
+    transform6: suspend (T1, T2, T3, T4, T5, T6) -> R,
+): Flow<R> =
+    kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> ->
+        @Suppress("UNCHECKED_CAST")
+        transform6(
+            args[0] as T1,
+            args[1] as T2,
+            args[2] as T3,
+            args[3] as T4,
+            args[4] as T5,
+            args[5] as T6,
+        )
+
+    }

app/src/main/java/com/tosspayments/paymentsdk/sample/viewmodel/PaymentWidgetInfoViewModel.kt

@@ -6,8 +6,12 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
+import com.tosspayments.paymentsdk.sample.extension.combine
 import com.tosspayments.paymentsdk.view.PaymentMethod
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
 
 @SuppressLint("ApplySharedPref")
 class PaymentWidgetInfoViewModel(application: Application) : AndroidViewModel(application) {
@@ -30,8 +34,9 @@ class PaymentWidgetInfoViewModel(application: Application) : AndroidViewModel(ap
             _clientKey,
             _customerKey,
             _orderId,
-            _orderName
-        ) { amount, clientKey, customerKey, orderId, orderName ->
+            _orderName,
+            _redirectUrl,
+        ) { amount, clientKey, customerKey, orderId, orderName, redirectUrl ->
             val isValid = amount.toDouble() > 0 && arrayOf(
                 clientKey,
                 customerKey,
@@ -48,7 +53,7 @@ class PaymentWidgetInfoViewModel(application: Application) : AndroidViewModel(ap
                     customerKey = customerKey,
                     orderId = orderId,
                     orderName = orderName,
-                    redirectUrl = _redirectUrl.value
+                    redirectUrl = redirectUrl,
                 )
             }
         }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), UiState.Invalid)

paymentsdk/src/main/java/com/tosspayments/paymentsdk/PaymentWidget.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.util.Log
 import android.webkit.JavascriptInterface
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -78,7 +77,6 @@ class PaymentWidget(
             PaymentMethod.EVENT_NAME_CHANGE_PAYMENT_METHOD -> {
                 kotlin.runCatching { SelectedPaymentMethod.fromJson(params) }.getOrNull()?.let {
                     selectedPaymentMethod = it
-                    Log.d("selectedPaymentMethod", it.toString())
                 }
             }
             Agreement.EVENT_NAME_UPDATE_AGREEMENT_STATUS -> {