From 213dbf16e866220792438b812f743b1c744881c9 Mon Sep 17 00:00:00 2001 From: Aman tonk Date: Wed, 25 Sep 2024 13:43:12 +0900 Subject: [PATCH] Removed Linepay implementation as Linepay doesn't exist anymore. (#13) --- .../screens/payment/KomojuPaymentScreenModel.kt | 1 - .../ui/screens/payment/composables/AppPayForm.kt | 9 +++------ .../payment/composables/PaymentMethodForm.kt | 1 - .../payment/composables/PaymentMethodsRow.kt | 1 - .../src/main/res/drawable/komoju_ic_linepay.xml | 15 --------------- .../komoju/mobile/sdk/entities/PaymentMethod.kt | 10 ---------- .../degica/komoju/mobile/sdk/i18n/I18nTexts.kt | 2 -- .../mobile/sdk/remote/mappers/SessionMapper.kt | 10 ---------- 8 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 android/src/main/res/drawable/komoju_ic_linepay.xml diff --git a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt index 8e6b1db..299302a 100644 --- a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt +++ b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt @@ -165,7 +165,6 @@ internal class KomojuPaymentScreenModel(private val config: KomojuSDK.Configurat email = state.value.commonDisplayData.email, ) - is PaymentMethod.LinePay -> TODO() is PaymentMethod.MerPay -> TODO() is PaymentMethod.NetCash -> TODO() is PaymentMethod.Other -> TODO() diff --git a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/AppPayForm.kt b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/AppPayForm.kt index 48e2b84..31576fe 100644 --- a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/AppPayForm.kt +++ b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/AppPayForm.kt @@ -36,7 +36,6 @@ internal fun AppPayForm(paymentMethod: PaymentMethod, onPayButtonClicked: () -> when (paymentMethod) { is PaymentMethod.AliPay -> "PAYMENT_VIA_ALI_PAY" is PaymentMethod.AuPay -> "PAYMENT_VIA_AU_PAY" - is PaymentMethod.LinePay -> "PAYMENT_VIA_LINE_PAY" is PaymentMethod.MerPay -> "PAYMENT_VIA_MER_PAY" is PaymentMethod.PayPay -> "PAYMENT_VIA_PAY_PAY" is PaymentMethod.RakutenPay -> "PAYMENT_VIA_RAKUTEN" @@ -48,7 +47,6 @@ internal fun AppPayForm(paymentMethod: PaymentMethod, onPayButtonClicked: () -> when (paymentMethod) { is PaymentMethod.AliPay -> "ALI_PAY_REDIRECT_MESSAGE" is PaymentMethod.AuPay -> "AU_PAY_REDIRECT_MESSAGE" - is PaymentMethod.LinePay -> "LINE_PAY_REDIRECT_MESSAGE" is PaymentMethod.MerPay -> "MER_PAY_REDIRECT_MESSAGE" is PaymentMethod.PayPay -> "PAY_PAY_REDIRECT_MESSAGE" is PaymentMethod.RakutenPay -> "RAKUTEN_REDIRECT_MESSAGE" @@ -60,7 +58,6 @@ internal fun AppPayForm(paymentMethod: PaymentMethod, onPayButtonClicked: () -> when (paymentMethod) { is PaymentMethod.AliPay -> "CONTINUE_TO_ALI_PAY" is PaymentMethod.AuPay -> "CONTINUE_TO_AU_PAY" - is PaymentMethod.LinePay -> "CONTINUE_TO_LINE_PAY" is PaymentMethod.MerPay -> "CONTINUE_TO_MER_PAY" is PaymentMethod.PayPay -> "CONTINUE_TO_PAY_PAY" is PaymentMethod.RakutenPay -> "CONTINUE_TO_RAKUTEN" @@ -99,9 +96,9 @@ internal fun AppPayForm(paymentMethod: PaymentMethod, onPayButtonClicked: () -> private fun AppPayFormPreview() { KomojuMobileSdkTheme(Language.ENGLISH) { AppPayForm( - PaymentMethod.LinePay( - displayName = "LINE Pay", - hashedGateway = "LINE", + PaymentMethod.PayPay( + displayName = "PayPay", + hashedGateway = "paypay", exchangeRate = 1.0, currency = "JPY", amount = 100.0, diff --git a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodForm.kt b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodForm.kt index 058b1c6..16bd30d 100644 --- a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodForm.kt +++ b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodForm.kt @@ -49,7 +49,6 @@ internal fun PaymentMethodForm( is PaymentMethod.AliPay, is PaymentMethod.AuPay, - is PaymentMethod.LinePay, is PaymentMethod.MerPay, is PaymentMethod.PayPay, is PaymentMethod.RakutenPay, diff --git a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt index 22b4d3c..9ecb301 100644 --- a/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt +++ b/android/src/main/java/com/degica/komoju/android/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt @@ -64,7 +64,6 @@ private val PaymentMethod.displayIcon is PaymentMethod.BitCash -> R.drawable.komoju_ic_bitcash is PaymentMethod.CreditCard -> R.drawable.komoju_ic_credit_card is PaymentMethod.Konbini -> R.drawable.komoju_ic_konbini - is PaymentMethod.LinePay -> R.drawable.komoju_ic_linepay is PaymentMethod.MerPay -> R.drawable.komoju_ic_merpay is PaymentMethod.NetCash -> R.drawable.komoju_ic_credit_card is PaymentMethod.Paidy -> R.drawable.komoju_ic_paidy diff --git a/android/src/main/res/drawable/komoju_ic_linepay.xml b/android/src/main/res/drawable/komoju_ic_linepay.xml deleted file mode 100644 index 9beacfb..0000000 --- a/android/src/main/res/drawable/komoju_ic_linepay.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/entities/PaymentMethod.kt b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/entities/PaymentMethod.kt index 723e690..bbedb1d 100644 --- a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/entities/PaymentMethod.kt +++ b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/entities/PaymentMethod.kt @@ -28,16 +28,6 @@ sealed interface PaymentMethod { val isOffsite: Boolean, ) : PaymentMethod - data class LinePay( - override val displayName: String, - override val hashedGateway: String, - override val exchangeRate: Double, - override val currency: String, - override val amount: Double, - override val additionalFields: List, - val isOffsite: Boolean, - ) : PaymentMethod - data class MerPay( override val displayName: String, override val hashedGateway: String, diff --git a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/i18n/I18nTexts.kt b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/i18n/I18nTexts.kt index 10b35fd..e3ad9e7 100644 --- a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/i18n/I18nTexts.kt +++ b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/i18n/I18nTexts.kt @@ -11,7 +11,6 @@ private val englishTexts = """ { "credit_card": "Credit Card", "paypay": "PayPay", -"linepay": "LINE Pay", "merpay": "Merpay", "rakutenpay": "Rakuten Pay", "paidy": "Paidy", @@ -107,7 +106,6 @@ private val japaneseTexts = """ { "credit_card": "カード", "paypay": "PayPay", -"linepay": "LINE Pay", "merpay": "メルペイ", "rakutenpay": "楽天ペイ", "paidy": "ペイディ", diff --git a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/remote/mappers/SessionMapper.kt b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/remote/mappers/SessionMapper.kt index e35236c..f83e33b 100644 --- a/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/remote/mappers/SessionMapper.kt +++ b/shared/src/commonMain/kotlin/com/degica/komoju/mobile/sdk/remote/mappers/SessionMapper.kt @@ -57,16 +57,6 @@ internal object SessionMapper { displayName = i18nTexts[paymentMethodType], ) - "linepay" -> PaymentMethod.LinePay( - hashedGateway = paymentMethod.hashedGateway.orEmpty(), - exchangeRate = paymentMethod.exchangeRate ?: 1.0, - currency = paymentMethod.currency.orEmpty(), - amount = paymentMethod.amount ?: 0.0, - additionalFields = paymentMethod.additionalFields?.filterNotNull().orEmpty(), - isOffsite = paymentMethod.offsite ?: false, - displayName = i18nTexts[paymentMethodType], - ) - "merpay" -> PaymentMethod.MerPay( hashedGateway = paymentMethod.hashedGateway.orEmpty(), exchangeRate = paymentMethod.exchangeRate ?: 1.0,