From f4b14a40c0c18dca7d3e6ad85cb2875c8e296e8a Mon Sep 17 00:00:00 2001 From: amnix Date: Mon, 11 Nov 2024 17:40:57 +0900 Subject: [PATCH] Use default Res Package directory --- gradle/libs.versions.toml | 2 + shared/build.gradle.kts | 12 ++-- .../awating/KonbiniAwaitingPaymentScreen.kt | 44 ++++++------- .../ui/screens/failed/PaymentFailedScreen.kt | 14 ++--- .../ui/screens/payment/KomojuPaymentScreen.kt | 6 +- .../payment/KomojuPaymentScreenModel.kt | 46 +++++++------- .../screens/payment/composables/BankForm.kt | 20 +++--- .../payment/composables/BitCashForm.kt | 8 +-- .../payment/composables/CreditCardForm.kt | 18 +++--- .../composables/CreditCardSchemeIcons.kt | 12 ++-- .../payment/composables/KonbiniBrandsRow.kt | 26 ++++---- .../payment/composables/KonbiniForm.kt | 12 ++-- .../payment/composables/NetCashForm.kt | 8 +-- .../payment/composables/OffSitePayForm.kt | 42 ++++++------- .../screens/payment/composables/PaidyForm.kt | 12 ++-- .../payment/composables/PayEasyForm.kt | 20 +++--- .../payment/composables/PaymentMethodsRow.kt | 62 +++++++++---------- .../payment/composables/WebMoneyForm.kt | 8 +-- .../screens/success/PaymentSuccessScreen.kt | 10 +-- .../sdk/ui/screens/webview/WebViewScreen.kt | 10 +-- .../komoju/mobile/sdk/ui/theme/Typography.kt | 12 ++-- 21 files changed, 205 insertions(+), 199 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92c3330..af5602f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -30,12 +30,14 @@ mavenPublish = "0.30.0" dokka = "1.9.20" compose-multiplatform = "1.7.0" jetbrainsComposeLifecycle = "2.8.3" +androidx-ui-tooling = "1.7.5" [libraries] androidx-browser = { module = "androidx.browser:browser", version.ref = "browser" } human-readable = { module = "nl.jacobras:Human-Readable", version.ref = "humanReadable" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-ui-tooling" } core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" } junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 9983ab4..fb9acd1 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -28,7 +28,6 @@ kotlin { iosSimulatorArm64(), ).forEach { it.binaries.framework { - linkerOpts("-make_mergeable") xcf.add(this) baseName = "komojuShared" isStatic = true @@ -70,6 +69,7 @@ kotlin { implementation(libs.ktor.client.okhttp) implementation(libs.kotlinx.coroutines.android) implementation(libs.androidx.browser) + implementation(libs.androidx.compose.ui.tooling.preview) } iosMain.dependencies { implementation(libs.ktor.client.darwin) @@ -96,11 +96,15 @@ android { resourcePrefix = "komoju_" } +dependencies { + debugImplementation(libs.androidx.ui.tooling) +} + compose { resources { - publicResClass = false - packageOfResClass = "com.komoju.mobile.sdk.shared.generated.resources" - generateResClass = auto + publicResClass = true + //packageOfResClass = "com.komoju.mobile.sdk.shared.generated.resources" + generateResClass = always } } diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/awating/KonbiniAwaitingPaymentScreen.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/awating/KonbiniAwaitingPaymentScreen.kt index 4462443..9a33383 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/awating/KonbiniAwaitingPaymentScreen.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/awating/KonbiniAwaitingPaymentScreen.kt @@ -32,28 +32,6 @@ import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import com.komoju.mobile.sdk.entities.Payment import com.komoju.mobile.sdk.entities.PaymentStatus -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_awaiting_payment -import com.komoju.mobile.sdk.shared.generated.resources.komoju_awaiting_payment_instruction -import com.komoju.mobile.sdk.shared.generated.resources.komoju_confirmation_code -import com.komoju.mobile.sdk.shared.generated.resources.komoju_done -import com.komoju.mobile.sdk.shared.generated.resources.komoju_error -import com.komoju.mobile.sdk.shared.generated.resources.komoju_have_a_question_contact_us -import com.komoju.mobile.sdk.shared.generated.resources.komoju_i_will_do_it_later -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_completed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_failed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_konbini_pending -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_prenidng -import com.komoju.mobile.sdk.shared.generated.resources.komoju_okay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_failed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_successful -import com.komoju.mobile.sdk.shared.generated.resources.komoju_receipt_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_total_payment -import com.komoju.mobile.sdk.shared.generated.resources.komoju_update_payment_method -import com.komoju.mobile.sdk.shared.generated.resources.komoju_view_instructions -import com.komoju.mobile.sdk.shared.generated.resources.komoju_your_payment_has_been_processed_successfully -import com.komoju.mobile.sdk.shared.generated.resources.komoju_your_payment_has_failed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_your_payment_is_awaiting_processing import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.composables.TextButton import com.komoju.mobile.sdk.ui.composables.ThemedCircularProgressIndicator @@ -63,6 +41,28 @@ import com.komoju.mobile.sdk.ui.theme.Gray200 import com.komoju.mobile.sdk.ui.theme.Gray50 import com.komoju.mobile.sdk.ui.theme.Gray700 import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_awaiting_payment +import komoju_mobile_sdk.shared.generated.resources.komoju_awaiting_payment_instruction +import komoju_mobile_sdk.shared.generated.resources.komoju_confirmation_code +import komoju_mobile_sdk.shared.generated.resources.komoju_done +import komoju_mobile_sdk.shared.generated.resources.komoju_error +import komoju_mobile_sdk.shared.generated.resources.komoju_have_a_question_contact_us +import komoju_mobile_sdk.shared.generated.resources.komoju_i_will_do_it_later +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_completed +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_failed +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_konbini_pending +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_prenidng +import komoju_mobile_sdk.shared.generated.resources.komoju_okay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_failed +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_successful +import komoju_mobile_sdk.shared.generated.resources.komoju_receipt_number +import komoju_mobile_sdk.shared.generated.resources.komoju_total_payment +import komoju_mobile_sdk.shared.generated.resources.komoju_update_payment_method +import komoju_mobile_sdk.shared.generated.resources.komoju_view_instructions +import komoju_mobile_sdk.shared.generated.resources.komoju_your_payment_has_been_processed_successfully +import komoju_mobile_sdk.shared.generated.resources.komoju_your_payment_has_failed +import komoju_mobile_sdk.shared.generated.resources.komoju_your_payment_is_awaiting_processing import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/failed/PaymentFailedScreen.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/failed/PaymentFailedScreen.kt index 2bbc34b..b0a08a7 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/failed/PaymentFailedScreen.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/failed/PaymentFailedScreen.kt @@ -22,16 +22,16 @@ import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_back_to_store -import com.komoju.mobile.sdk.shared.generated.resources.komoju_credit_card_error -import com.komoju.mobile.sdk.shared.generated.resources.komoju_error_other -import com.komoju.mobile.sdk.shared.generated.resources.komoju_error_user_cancel -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_failed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_failed import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.KomojuPaymentRoute import com.komoju.mobile.sdk.ui.screens.RouterEffect +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_back_to_store +import komoju_mobile_sdk.shared.generated.resources.komoju_credit_card_error +import komoju_mobile_sdk.shared.generated.resources.komoju_error_other +import komoju_mobile_sdk.shared.generated.resources.komoju_error_user_cancel +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_failed +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_failed import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreen.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreen.kt index bcffcc8..f0c5818 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreen.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreen.kt @@ -31,9 +31,6 @@ import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import com.komoju.mobile.sdk.KomojuMobileSDKConfiguration import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_img_payment_footer -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_options import com.komoju.mobile.sdk.ui.composables.InlinedWebView import com.komoju.mobile.sdk.ui.composables.ThemedCircularProgressIndicator import com.komoju.mobile.sdk.ui.composables.launchCustomTab @@ -41,6 +38,9 @@ import com.komoju.mobile.sdk.ui.screens.RouterEffect import com.komoju.mobile.sdk.ui.screens.payment.composables.PaymentMethodForm import com.komoju.mobile.sdk.ui.screens.payment.composables.PaymentMethodsRow import com.komoju.mobile.sdk.ui.screens.payment.composables.PaymentSheetHandle +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_img_payment_footer +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_options import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt index 791eb98..bae9824 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/KomojuPaymentScreenModel.kt @@ -16,29 +16,6 @@ import com.komoju.mobile.sdk.entities.SecureTokenResponse.Status.SKIPPED import com.komoju.mobile.sdk.entities.SecureTokenResponse.Status.UNKNOWN import com.komoju.mobile.sdk.navigation.RouterStateScreenModel import com.komoju.mobile.sdk.remote.apis.KomojuRemoteApi -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_cadrholder_name_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_please_select_a_konbini_brand -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_bit_cash_id_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_bit_cash_id_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_card_number_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_cardholder_name_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_cvv_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_email_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_expiry_date_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_first_name_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_first_name_phonetic_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_first_name_phonetic_must_be_a_kana -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_last_name_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_last_name_phonetic_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_last_name_phonetic_must_be_a_kana -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_name_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_net_cash_id_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_net_cash_id_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_phone_number_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_phone_number_is_not_valid -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_prepaid_number_cannot_be_empty -import com.komoju.mobile.sdk.shared.generated.resources.komoju_the_entered_prepaid_number_is_not_valid import com.komoju.mobile.sdk.ui.composables.InlinedPaymentPrimaryButtonState import com.komoju.mobile.sdk.ui.screens.KomojuPaymentRoute import com.komoju.mobile.sdk.ui.screens.Router @@ -55,6 +32,29 @@ import com.komoju.mobile.sdk.utils.isDigitsOnly import com.komoju.mobile.sdk.utils.isKanaOnly import com.komoju.mobile.sdk.utils.isValidEmail import com.komoju.mobile.sdk.utils.verifyTokenAndProcessPayment +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_cadrholder_name_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_please_select_a_konbini_brand +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_bit_cash_id_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_bit_cash_id_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_card_number_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_cardholder_name_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_cvv_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_email_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_expiry_date_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_first_name_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_first_name_phonetic_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_first_name_phonetic_must_be_a_kana +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_last_name_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_last_name_phonetic_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_last_name_phonetic_must_be_a_kana +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_name_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_net_cash_id_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_net_cash_id_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_phone_number_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_phone_number_is_not_valid +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_prepaid_number_cannot_be_empty +import komoju_mobile_sdk.shared.generated.resources.komoju_the_entered_prepaid_number_is_not_valid import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BankForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BankForm.kt index 933a768..fa60137 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BankForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BankForm.kt @@ -17,20 +17,20 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_email -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_email_address -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_phone_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_first_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_first_name_phonetic -import com.komoju.mobile.sdk.shared.generated.resources.komoju_last_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_last_name_phonetic -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_phone_number import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.CommonDisplayData import com.komoju.mobile.sdk.ui.theme.KomojuMobileSdkTheme import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_email +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_email_address +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_phone_number +import komoju_mobile_sdk.shared.generated.resources.komoju_first_name +import komoju_mobile_sdk.shared.generated.resources.komoju_first_name_phonetic +import komoju_mobile_sdk.shared.generated.resources.komoju_last_name +import komoju_mobile_sdk.shared.generated.resources.komoju_last_name_phonetic +import komoju_mobile_sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_phone_number import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BitCashForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BitCashForm.kt index 231da31..acfa521 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BitCashForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/BitCashForm.kt @@ -12,13 +12,13 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_bitcash_information -import com.komoju.mobile.sdk.shared.generated.resources.komoju_hiragana_id -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.BitCashDisplayData import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_bitcash_information +import komoju_mobile_sdk.shared.generated.resources.komoju_hiragana_id +import komoju_mobile_sdk.shared.generated.resources.komoju_pay import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardForm.kt index e7a14b3..3de36ac 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardForm.kt @@ -37,15 +37,7 @@ import androidx.compose.ui.text.toUpperCase import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_card_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_cardholder_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_cvv -import com.komoju.mobile.sdk.shared.generated.resources.komoju_full_name_on_card -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_cvv -import com.komoju.mobile.sdk.shared.generated.resources.komoju_mm_yy -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_save_this_card_for_future_payments +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.InlinedPaymentPrimaryButton import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.CreditCardDisplayData @@ -61,6 +53,14 @@ import com.komoju.mobile.sdk.utils.CreditCardUtils.formatOtherCardNumbers import com.komoju.mobile.sdk.utils.CreditCardUtils.identifyCardScheme import com.komoju.mobile.sdk.utils.CreditCardUtils.makeExpirationFilter import com.komoju.mobile.sdk.utils.testID +import komoju_mobile_sdk.shared.generated.resources.komoju_card_number +import komoju_mobile_sdk.shared.generated.resources.komoju_cardholder_name +import komoju_mobile_sdk.shared.generated.resources.komoju_cvv +import komoju_mobile_sdk.shared.generated.resources.komoju_full_name_on_card +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_cvv +import komoju_mobile_sdk.shared.generated.resources.komoju_mm_yy +import komoju_mobile_sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_save_this_card_for_future_payments import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardSchemeIcons.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardSchemeIcons.kt index eac74f0..d8917a8 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardSchemeIcons.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/CreditCardSchemeIcons.kt @@ -8,13 +8,13 @@ import androidx.compose.foundation.layout.width import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_amex -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_diners -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_jcb -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_master -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_visa +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.utils.CardScheme +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_amex +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_diners +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_jcb +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_master +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_visa import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniBrandsRow.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniBrandsRow.kt index 2f5f2a2..5803485 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniBrandsRow.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniBrandsRow.kt @@ -20,22 +20,22 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.komoju.mobile.sdk.entities.PaymentMethod.Konbini.KonbiniBrand -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju__7_eleven -import com.komoju.mobile.sdk.shared.generated.resources.komoju_daily_yamazaki -import com.komoju.mobile.sdk.shared.generated.resources.komoju_family_mart -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_daily_yamazaki -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_family_mart -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_lawson -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_ministop -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_seico_mart -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_seven_eleven -import com.komoju.mobile.sdk.shared.generated.resources.komoju_lawson -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ministop -import com.komoju.mobile.sdk.shared.generated.resources.komoju_seicomart +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.theme.Gray200 import com.komoju.mobile.sdk.ui.theme.KomojuDarkGreen import com.komoju.mobile.sdk.ui.theme.KomojuMobileSdkTheme +import komoju_mobile_sdk.shared.generated.resources.komoju__7_eleven +import komoju_mobile_sdk.shared.generated.resources.komoju_daily_yamazaki +import komoju_mobile_sdk.shared.generated.resources.komoju_family_mart +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_daily_yamazaki +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_family_mart +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_lawson +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_ministop +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_seico_mart +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_seven_eleven +import komoju_mobile_sdk.shared.generated.resources.komoju_lawson +import komoju_mobile_sdk.shared.generated.resources.komoju_ministop +import komoju_mobile_sdk.shared.generated.resources.komoju_seicomart import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniForm.kt index 4809f60..136f161 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/KonbiniForm.kt @@ -19,18 +19,18 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.komoju.mobile.sdk.entities.PaymentMethod import com.komoju.mobile.sdk.entities.PaymentMethod.Konbini.KonbiniBrand -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_email -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_email_address -import com.komoju.mobile.sdk.shared.generated.resources.komoju_full_name_on_receipt -import com.komoju.mobile.sdk.shared.generated.resources.komoju_name_shown_on_receipt -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.CommonDisplayData import com.komoju.mobile.sdk.ui.screens.payment.KonbiniDisplayData import com.komoju.mobile.sdk.ui.theme.KomojuMobileSdkTheme import com.komoju.mobile.sdk.ui.theme.Red600 import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.komoju_email +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_email_address +import komoju_mobile_sdk.shared.generated.resources.komoju_full_name_on_receipt +import komoju_mobile_sdk.shared.generated.resources.komoju_name_shown_on_receipt +import komoju_mobile_sdk.shared.generated.resources.komoju_pay import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/NetCashForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/NetCashForm.kt index 442adc3..7ce6a32 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/NetCashForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/NetCashForm.kt @@ -12,13 +12,13 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_net_cash_id -import com.komoju.mobile.sdk.shared.generated.resources.komoju_net_cash_information -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.NetCashDisplayData import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.komoju_net_cash_id +import komoju_mobile_sdk.shared.generated.resources.komoju_net_cash_information +import komoju_mobile_sdk.shared.generated.resources.komoju_pay import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/OffSitePayForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/OffSitePayForm.kt index d3067cd..51da283 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/OffSitePayForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/OffSitePayForm.kt @@ -22,30 +22,30 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_alipay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_aupay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_linepay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_merpay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_paypay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_continue_to_rakuten -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_app_opens_info -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_alipay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_au_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_line_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_mer_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_paypay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_via_rakuten_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_webview_open_info -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_alipay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_au_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_line_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_mer_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_paypay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_you_will_be_redirected_to_rakuten +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.types.OffSitePaymentType import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.theme.KomojuMobileSdkTheme +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_alipay +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_aupay +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_linepay +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_merpay +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_paypay +import komoju_mobile_sdk.shared.generated.resources.komoju_continue_to_rakuten +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_app_opens_info +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_alipay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_au_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_line_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_mer_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_paypay +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_via_rakuten_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_webview_open_info +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_alipay +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_au_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_line_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_mer_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_paypay +import komoju_mobile_sdk.shared.generated.resources.komoju_you_will_be_redirected_to_rakuten import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaidyForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaidyForm.kt index 3e2fa78..59fab46 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaidyForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaidyForm.kt @@ -13,16 +13,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_phone_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_full_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_phone_number +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.PaidyDisplayData import com.komoju.mobile.sdk.ui.theme.KomojuMobileSdkTheme import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_name +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_phone_number +import komoju_mobile_sdk.shared.generated.resources.komoju_full_name +import komoju_mobile_sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_phone_number import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PayEasyForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PayEasyForm.kt index f406b48..04338ff 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PayEasyForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PayEasyForm.kt @@ -14,19 +14,19 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_email -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_email_address -import com.komoju.mobile.sdk.shared.generated.resources.komoju_enter_your_phone_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_first_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_first_name_phonetic -import com.komoju.mobile.sdk.shared.generated.resources.komoju_last_name -import com.komoju.mobile.sdk.shared.generated.resources.komoju_last_name_phonetic -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_phone_number +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.CommonDisplayData import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.komoju_email +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_email_address +import komoju_mobile_sdk.shared.generated.resources.komoju_enter_your_phone_number +import komoju_mobile_sdk.shared.generated.resources.komoju_first_name +import komoju_mobile_sdk.shared.generated.resources.komoju_first_name_phonetic +import komoju_mobile_sdk.shared.generated.resources.komoju_last_name +import komoju_mobile_sdk.shared.generated.resources.komoju_last_name_phonetic +import komoju_mobile_sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_phone_number import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt index 14fb1fb..a0b5423 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/PaymentMethodsRow.kt @@ -21,40 +21,40 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_alipay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_aupay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_bank_transfer -import com.komoju.mobile.sdk.shared.generated.resources.komoju_bitcash -import com.komoju.mobile.sdk.shared.generated.resources.komoju_credit_card -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_alipay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_au_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_bank_transfer -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_bitcash -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_credit_card -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_konbini -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_linepay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_merpay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_net_cash -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_paidy -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_pay_easy -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_paypay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_rakuten_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_web_money -import com.komoju.mobile.sdk.shared.generated.resources.komoju_konbini -import com.komoju.mobile.sdk.shared.generated.resources.komoju_line_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_merpay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_netcash -import com.komoju.mobile.sdk.shared.generated.resources.komoju_other -import com.komoju.mobile.sdk.shared.generated.resources.komoju_paidy -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payeasy -import com.komoju.mobile.sdk.shared.generated.resources.komoju_paypay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_rakuten_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_unknown -import com.komoju.mobile.sdk.shared.generated.resources.komoju_webmoney +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.types.OffSitePaymentType import com.komoju.mobile.sdk.ui.theme.Gray200 import com.komoju.mobile.sdk.ui.theme.KomojuDarkGreen +import komoju_mobile_sdk.shared.generated.resources.komoju_alipay +import komoju_mobile_sdk.shared.generated.resources.komoju_aupay +import komoju_mobile_sdk.shared.generated.resources.komoju_bank_transfer +import komoju_mobile_sdk.shared.generated.resources.komoju_bitcash +import komoju_mobile_sdk.shared.generated.resources.komoju_credit_card +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_alipay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_au_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_bank_transfer +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_bitcash +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_credit_card +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_konbini +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_linepay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_merpay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_net_cash +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_paidy +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_pay_easy +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_paypay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_rakuten_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_web_money +import komoju_mobile_sdk.shared.generated.resources.komoju_konbini +import komoju_mobile_sdk.shared.generated.resources.komoju_line_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_merpay +import komoju_mobile_sdk.shared.generated.resources.komoju_netcash +import komoju_mobile_sdk.shared.generated.resources.komoju_other +import komoju_mobile_sdk.shared.generated.resources.komoju_paidy +import komoju_mobile_sdk.shared.generated.resources.komoju_payeasy +import komoju_mobile_sdk.shared.generated.resources.komoju_paypay +import komoju_mobile_sdk.shared.generated.resources.komoju_rakuten_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_unknown +import komoju_mobile_sdk.shared.generated.resources.komoju_webmoney import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.ui.tooling.preview.Preview diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/WebMoneyForm.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/WebMoneyForm.kt index fd3c44b..ddd3aa7 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/WebMoneyForm.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/payment/composables/WebMoneyForm.kt @@ -12,13 +12,13 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.komoju.mobile.sdk.entities.PaymentMethod -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_pay -import com.komoju.mobile.sdk.shared.generated.resources.komoju_prepaid_number -import com.komoju.mobile.sdk.shared.generated.resources.komoju_webmoney_information +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.payment.WebMoneyDisplayData import com.komoju.mobile.sdk.utils.AmountUtils +import komoju_mobile_sdk.shared.generated.resources.komoju_pay +import komoju_mobile_sdk.shared.generated.resources.komoju_prepaid_number +import komoju_mobile_sdk.shared.generated.resources.komoju_webmoney_information import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/success/PaymentSuccessScreen.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/success/PaymentSuccessScreen.kt index 13ad771..85f6c03 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/success/PaymentSuccessScreen.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/success/PaymentSuccessScreen.kt @@ -26,13 +26,13 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import com.komoju.mobile.sdk.KomojuMobileSDKPaymentResult import com.komoju.mobile.sdk.navigation.paymentResultScreenModel -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_back_to_store -import com.komoju.mobile.sdk.shared.generated.resources.komoju_ic_payment_status_completed -import com.komoju.mobile.sdk.shared.generated.resources.komoju_payment_success -import com.komoju.mobile.sdk.shared.generated.resources.komoju_thank_you_for_your_order +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.composables.PrimaryButton import com.komoju.mobile.sdk.ui.screens.RouterEffect +import komoju_mobile_sdk.shared.generated.resources.komoju_back_to_store +import komoju_mobile_sdk.shared.generated.resources.komoju_ic_payment_status_completed +import komoju_mobile_sdk.shared.generated.resources.komoju_payment_success +import komoju_mobile_sdk.shared.generated.resources.komoju_thank_you_for_your_order import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/webview/WebViewScreen.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/webview/WebViewScreen.kt index 1636524..18b57ee 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/webview/WebViewScreen.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/screens/webview/WebViewScreen.kt @@ -30,11 +30,7 @@ import cafe.adriel.voyager.core.annotation.InternalVoyagerApi import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.internal.BackHandler -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_are_you_sure_you_want_to_cancel_the_payment -import com.komoju.mobile.sdk.shared.generated.resources.komoju_cancel_payment -import com.komoju.mobile.sdk.shared.generated.resources.komoju_no -import com.komoju.mobile.sdk.shared.generated.resources.komoju_yes +import komoju_mobile_sdk.shared.generated.resources.Res import com.komoju.mobile.sdk.ui.screens.KomojuPaymentRoute import com.komoju.mobile.sdk.ui.screens.RouterEffect import com.komoju.mobile.sdk.ui.theme.LocalConfigurableTheme @@ -43,6 +39,10 @@ import com.multiplatform.webview.web.LoadingState import com.multiplatform.webview.web.WebView import com.multiplatform.webview.web.rememberWebViewNavigator import com.multiplatform.webview.web.rememberWebViewState +import komoju_mobile_sdk.shared.generated.resources.komoju_are_you_sure_you_want_to_cancel_the_payment +import komoju_mobile_sdk.shared.generated.resources.komoju_cancel_payment +import komoju_mobile_sdk.shared.generated.resources.komoju_no +import komoju_mobile_sdk.shared.generated.resources.komoju_yes import org.jetbrains.compose.resources.stringResource internal data class WebViewScreen(val route: KomojuPaymentRoute.WebView) : Screen { diff --git a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/theme/Typography.kt b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/theme/Typography.kt index e86b962..1aa84f5 100644 --- a/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/theme/Typography.kt +++ b/shared/src/commonMain/kotlin/com/komoju/mobile/sdk/ui/theme/Typography.kt @@ -4,12 +4,12 @@ import androidx.compose.material3.Typography import androidx.compose.runtime.Composable import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight -import com.komoju.mobile.sdk.shared.generated.resources.Res -import com.komoju.mobile.sdk.shared.generated.resources.komoju_font_inter_bold -import com.komoju.mobile.sdk.shared.generated.resources.komoju_font_inter_light -import com.komoju.mobile.sdk.shared.generated.resources.komoju_font_inter_medium -import com.komoju.mobile.sdk.shared.generated.resources.komoju_font_inter_regular -import com.komoju.mobile.sdk.shared.generated.resources.komoju_font_inter_semibold +import komoju_mobile_sdk.shared.generated.resources.Res +import komoju_mobile_sdk.shared.generated.resources.komoju_font_inter_bold +import komoju_mobile_sdk.shared.generated.resources.komoju_font_inter_light +import komoju_mobile_sdk.shared.generated.resources.komoju_font_inter_medium +import komoju_mobile_sdk.shared.generated.resources.komoju_font_inter_regular +import komoju_mobile_sdk.shared.generated.resources.komoju_font_inter_semibold import org.jetbrains.compose.resources.Font @Composable