PaymentMethod.PaymentInfo 데이터 모델 개선

.github/workflows/build-apk.yml

@@ -19,19 +19,11 @@ jobs:
         uses: ASzc/change-string-case-action@v5
         with:
           string: ${{inputs.build_flavor}}
-      - name: Restore gradle.properties
-        shell: bash
-        run: |
-          mkdir -p ~/.gradle/
-          echo "CUSTOMER_KEY=CUSTOMER_KEY" >> ~/.gradle/gradle.properties
-          echo "CLIENT_KEY=CLIENT_KEY" >> ~/.gradle/gradle.properties
-          echo "REDIRECT_URL=REDIRECT_URL" >> ~/.gradle/gradle.properties
-          echo "ORDER_ID=ORDER_ID" >> ~/.gradle/gradle.properties
       - name: Set Build Variables
         id: variables
         run: |
-          echo "TASK=assemble${{steps.string.outputs.capitalized}}Debug" >> $GITHUB_OUTPUT
-          echo "FILE_PATH=./app/build/outputs/apk/${{steps.string.outputs.lowercase}}/debug/app-${{steps.string.outputs.lowercase}}-debug.apk" >> $GITHUB_OUTPUT
+          echo "TASK=assemble${{steps.string.outputs.capitalized}}LocalDebug" >> $GITHUB_OUTPUT
+          echo "FILE_PATH=./app/build/outputs/apk/${{steps.string.outputs.lowercase}}Local/debug/app-${{steps.string.outputs.lowercase}}-local-debug.apk" >> $GITHUB_OUTPUT
       - name: Checkout Repository
         uses: actions/checkout@v3
         with:

.gitignore

@@ -3,3 +3,6 @@
 local.properties
 app/build
 paymentsdk/build
+build
+app/.DS_Store
+.DS_Store

CHANGELOG.md

@@ -1,4 +1,60 @@
-# 0.1.4 (2023.05.19)
+# 0.1.17 (2024.12.19)
+## Added
+### Payment SDK 다통화승인(외화결제) 지원
+
+# 0.1.16 (2024.07.03)
+## Fixed
+### 결제 취소 에러 문구 한글로 변경
+
+# 0.1.15 (2024.03.06)
+## Fixed
+### 삼성카드 일반결제 백신 앱 (vguard) 이슈 대응
+
+# 0.1.14 (2024.01.03)
+## Added
+### requestPayment의 PaymentInfo에 useInternationalCardOnly 파라미터 추가
+
+# 0.1.13 (2023.12.13)
+## Fixed
+### 카드사 결제 페이지에서 취소 시 에러 화면으로 이동하는 이슈 수정
+
+# 0.1.12 (2023.10.06)
+## Added
+### 고객이 선택한 결제수단 반환
+com.tosspayments.paymentsdk.PaymentWidget.getSelectedPaymentMethod(): SelectedPaymentMethod
+
+### 위젯 렌더링 status listener에 onFail 메서드 추가
+com.tosspayments.paymentsdk.model.PaymentWidgetStatusListener.onFail(fail: TossPaymentResult.Fail)
+
+| Parameter | Description |
+|-----------|-------------|
+| fail      | 에러 정보       |
+
+# 0.1.11 (2023.07.26)
+## Fixed
+### 결제 위젯에서 발생하는 Error Event 수신이 안되는 이슈 수정
+
+# 0.1.10 (2023.07.11)
+## Changed
+### 결제 카드사 추가
+
+# 0.1.9 (2023.07.04)
+## Added
+### 해외결제 지원 및 멀티위젯 옵션 추가
+com.tosspayments.paymentsdk.PaymentWidget.renderPaymentMethods(com.tosspayments.paymentsdk.view.PaymentMethod, com.tosspayments.paymentsdk.view.PaymentMethod.Rendering.Amount, com.tosspayments.paymentsdk.view.PaymentMethod.Rendering.Options, com.tosspayments.paymentsdk.model.PaymentWidgetStatusListener)
+
+
+# 0.1.8 (2023.06.26)
+
+## Added
+### 위젯 렌더링 status listener 추가
+com.tosspayments.paymentsdk.model.PaymentWidgetStatusListener
+
+## Changed
+### renderPaymentMethods, renderAgreement 메서드 paymentWidgetStatusListener parameter 추가
+
+
+# 0.1.4 (2023.05.30)
 
 ## Added
 ### 결제 수단 초기화 메서드
@@ -12,10 +68,10 @@ com.tosspayments.paymentsdk.PaymentWidget.renderPaymentMethods(method: PaymentMe
 ### 결제 요청
 com. tosspayments.paymentsdk.PaymentWidget.requestPayment(paymentInfo: PaymentMethod.PaymentInfo, paymentCallback: PaymentCallback)
 
-| Parameter   | Description       |
-|-------------|-------------------|
-| paymentInfo | 결제 정보             |
-| paymentInfo | 결제 결과 수신 Callback |
+| Parameter       | Description       |
+|-----------------|-------------------|
+| paymentInfo     | 결제 정보             |
+| paymentCallback | 결제 결과 수신 Callback |
 
 ### 결제 금액 갱신
 com. tosspayments.paymentsdk.PaymentWidget.updateAmount(amount: Number, description: String?)

README.md

@@ -15,14 +15,15 @@
 프로젝트의 Gradle 설정을 아래와 같이 설정하세요.
 
 ```gradle
-// build.gradle(Project)
-
-allprojects {
-     repositories {
-            ...
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-     }
+// settings.gradle
+
+dependencyResolutionManagement {
+  ...
+  repositories {
+    ...
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+  }
 }
 ```
 
@@ -43,24 +44,28 @@ dependencies {
 ```xml
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:background="@color/white">
 
     ...
 
-    <com.tosspayments.paymentsdk.view.PaymentMethodWidget
-        android:id="@+id/payment_widget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp" />
-
-        ...
+    <com.tosspayments.paymentsdk.view.PaymentMethod
+      android:id="@+id/payment_widget"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp" />
+
+    <com.tosspayments.paymentsdk.view.Agreement
+      android:id="@+id/agreement_widget"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content" />
+
+    ...
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
 ```
 
 ## 시작하기
@@ -79,6 +84,6 @@ git clone https://github.com/tosspayments/payment-sdk-android
 
 2. Android Studio에서 프로젝트를 여세요.
 
-3. [샘플 앱](https://github.com/tosspayments/payment-sdk-android/tree/main/app)을 빌드하세요. 앱을 실행하면 아래와 같이 다양한 결제수단 및 결제위젯을 테스트할 수 있습니다.
+3. 'Android Studio > Build > Select Build Variant' 메뉴에서 app / paymentsdk 모두 **liveDebug** 설정 후 [샘플 앱](https://github.com/tosspayments/payment-sdk-android/tree/main/app)을 빌드하세요. 
 
-![토스페이먼츠 Android SDK 샘플 프로젝터 화면](https://static.tosspayments.com/docs/github/android-sample.png)
+![토스페이먼츠 Android SDK 샘플 프로젝터 화면](https://static.tosspayments.com/docs/github/android-sample.png)

app/build.gradle

@@ -12,14 +12,14 @@ android {
     namespace 'com.tosspayments.paymentsdk.sample'
     compileSdk 33
 
-    flavorDimensions "server"
+    flavorDimensions "server", "source"
 
     defaultConfig {
         applicationId "com.tosspayments.paymentsdk.sample"
         minSdk 21
         targetSdk 33
         versionCode 1
-        versionName "0.1.0"
+        versionName project.property("versionName") as String
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -29,14 +29,24 @@ android {
             dimension "server"
             applicationIdSuffix ".dev"
         }
+
         staging {
             dimension "server"
             applicationIdSuffix ".staging"
         }
+
         live {
             dimension "server"
             applicationIdSuffix ".live"
         }
+
+        local {
+            dimension "source"
+        }
+
+        remote {
+            dimension "source"
+        }
     }
 
     buildTypes {
@@ -58,16 +68,17 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    viewBinding {
+        enabled = true
+    }
 }
 
 dependencies {
     def lifecycle_version = "2.5.1"
     def compose_version = "1.2.1"
 
-//    implementation 'com.github.tosspayments:payment-sdk-android:0.1.4'
-
-//    로컬 테스트시 해제
     implementation project(':paymentsdk')
+//    remoteImplementation 'com.github.tosspayments:payment-sdk-android:${project.property("versionName")}'
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.5.0'

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

@@ -3,6 +3,7 @@ package com.tosspayments.paymentsdk.sample.activity
 import androidx.activity.viewModels
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
+import com.tosspayments.paymentsdk.model.paymentinfo.Currency
 import com.tosspayments.paymentsdk.sample.viewmodel.CardPaymentViewModel
 import com.tosspayments.paymentsdk.model.paymentinfo.TossCardPaymentCompany
 import com.tosspayments.paymentsdk.model.paymentinfo.TossCardPaymentFlow
@@ -25,6 +26,7 @@ class CardPaymentActivity : PaymentActivity<TossCardPaymentInfo>() {
         FlowMode()
         EasyPay()
         DiscountCode()
+        Currency()
     }
 
     @Composable
@@ -188,4 +190,15 @@ class CardPaymentActivity : PaymentActivity<TossCardPaymentInfo>() {
             }
         }
     }
+
+    @Composable
+    private fun Currency() {
+        ItemSelectDialog("통화",
+            buttonText = viewModel.currency.collectAsState().value?.name ?: "통화 선택",
+            items = Currency.values().map { Pair(it.name, it) }) {
+            it?.let {
+                viewModel.setCurrency(it)
+            }
+        }
+    }
 }