From d33e50c9e3df2b9ebd8c3da15adc4c9e19c8701a Mon Sep 17 00:00:00 2001 From: Levente Lorincz Date: Wed, 16 Oct 2024 16:58:52 +0300 Subject: [PATCH] fix(basis-sdk): Fixed custom localization setting --- .../paymentComponent/PaymentComponentView.kt | 16 +++++++++------- .../gps_payment_provider_selector_button.xml | 2 +- .../src/main/res/layout/gps_powered_by_gini.xml | 2 +- .../res/layout/gps_view_payment_component.xml | 2 +- .../gps_view_single_line_bank_selection.xml | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/internal-payment-sdk/sdk/src/main/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentView.kt b/internal-payment-sdk/sdk/src/main/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentView.kt index 3478b7822..93bb54546 100644 --- a/internal-payment-sdk/sdk/src/main/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentView.kt +++ b/internal-payment-sdk/sdk/src/main/java/net/gini/android/internal/payment/paymentComponent/PaymentComponentView.kt @@ -191,7 +191,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL private fun restoreBankPickerDefaultState() { LOG.debug("Restoring bank picker default state") - context?.wrappedWithGiniPaymentThemeAndLocale(GiniInternalPaymentModule.getSDKLanguage(context)?.languageLocale())?.let { context -> + context?.wrappedWithGiniPaymentThemeAndLocale(paymentComponent?.getGiniPaymentLanguage())?.let { context -> payInvoiceButton.visibility = View.GONE paymentProviderAppIconHolder.root.visibility = View.GONE selectBankButton.text = context.getString(R.string.gps_select_bank) @@ -206,7 +206,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL private fun customizeBankPicker(paymentProviderApp: PaymentProviderApp) { LOG.debug("Customizing bank picker for payment provider app: {}", paymentProviderApp.name) - context?.wrappedWithGiniPaymentThemeAndLocale(GiniInternalPaymentModule.getSDKLanguage(context)?.languageLocale())?.let { context -> + context?.wrappedWithGiniPaymentThemeAndLocale(paymentComponent?.getGiniPaymentLanguage())?.let { context -> selectBankButton.apply { text = if (paymentComponent?.bankPickerRows == BankPickerRows.SINGLE) "" else paymentProviderApp.name setCompoundDrawablesWithIntrinsicBounds( @@ -256,7 +256,7 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL private fun restorePayInvoiceButtonDefaultState() { LOG.debug("Restoring pay invoice button default state") - context?.wrappedWithGiniPaymentThemeAndLocale(GiniInternalPaymentModule.getSDKLanguage(context)?.languageLocale())?.let { context -> + context?.wrappedWithGiniPaymentThemeAndLocale(paymentComponent?.getGiniPaymentLanguage())?.let { context -> payInvoiceButton.apply { setBackgroundTint( ContextCompat.getColor( @@ -301,11 +301,13 @@ class PaymentComponentView(context: Context, attrs: AttributeSet?) : ConstraintL } private fun initViews() { - selectBankButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsSelectBankPicker.gpsSelectBankButton else binding.gpsSingleRowBankSelection.gpsSelectBankButton - payInvoiceButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsPayInvoiceButtonTwoRows else binding.gpsSingleRowBankSelection.gpsPayInvoiceButton - paymentProviderAppIconHolder = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsSelectBankPicker.gpsPaymentProviderAppIconHolder else binding.gpsSingleRowBankSelection.gpsPaymentProviderAppIconHolder + context?.wrappedWithGiniPaymentThemeAndLocale(paymentComponent?.getGiniPaymentLanguage())?.let { context -> + selectBankButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsSelectBankPicker.gpsSelectBankButton else binding.gpsSingleRowBankSelection.gpsSelectBankButton + payInvoiceButton = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsPayInvoiceButtonTwoRows else binding.gpsSingleRowBankSelection.gpsPayInvoiceButton + paymentProviderAppIconHolder = if (paymentComponent?.bankPickerRows == BankPickerRows.TWO) binding.gpsSelectBankPicker.gpsPaymentProviderAppIconHolder else binding.gpsSingleRowBankSelection.gpsPaymentProviderAppIconHolder - payInvoiceButton.text = if (reviewFragmentWillBeShown) resources.getString(R.string.gps_continue_to_overview) else resources.getString(R.string.gps_pay_button) + payInvoiceButton.text = if (reviewFragmentWillBeShown) context.getString(R.string.gps_continue_to_overview) else context.getString(R.string.gps_pay_button) + } } fun getMoreInformationLabel() = binding.gpsMoreInformation diff --git a/internal-payment-sdk/sdk/src/main/res/layout/gps_payment_provider_selector_button.xml b/internal-payment-sdk/sdk/src/main/res/layout/gps_payment_provider_selector_button.xml index a36d2e94c..49bd8d70a 100644 --- a/internal-payment-sdk/sdk/src/main/res/layout/gps_payment_provider_selector_button.xml +++ b/internal-payment-sdk/sdk/src/main/res/layout/gps_payment_provider_selector_button.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content"> -