Merge pull request #1614 from Adyen/refactor/non-transitive-r

Migrate to non-transitive R classes
Adyen · May 3, 2024 · 0700f86 · 0700f86
2 parents d571501 + dd776a3
commit 0700f86
Show file tree

Hide file tree

Showing 36 changed files with 181 additions and 45 deletions.
diff --git a/ach/src/main/java/com/adyen/checkout/ach/internal/ui/view/ACHDirectDebitView.kt b/ach/src/main/java/com/adyen/checkout/ach/internal/ui/view/ACHDirectDebitView.kt
@@ -29,6 +29,7 @@ import com.adyen.checkout.ui.core.internal.util.showError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class ACHDirectDebitView @JvmOverloads constructor(
@@ -49,7 +50,7 @@ internal class ACHDirectDebitView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/await/src/main/java/com/adyen/checkout/await/internal/ui/view/AwaitView.kt b/await/src/main/java/com/adyen/checkout/await/internal/ui/view/AwaitView.kt
@@ -27,6 +27,7 @@ import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class AwaitView @JvmOverloads constructor(
     context: Context,
@@ -48,7 +49,7 @@ internal class AwaitView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_double_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_double_margin).toInt()
         setPadding(padding, padding, padding, padding)
     }
 

diff --git a/...src/main/java/com/adyen/checkout/bacs/internal/ui/view/BacsDirectDebitConfirmationView.kt b/...src/main/java/com/adyen/checkout/bacs/internal/ui/view/BacsDirectDebitConfirmationView.kt
@@ -20,6 +20,7 @@ import com.adyen.checkout.components.core.internal.ui.ComponentDelegate
 import com.adyen.checkout.ui.core.internal.ui.ComponentView
 import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle
 import kotlinx.coroutines.CoroutineScope
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class BacsDirectDebitConfirmationView @JvmOverloads constructor(
     context: Context,
@@ -42,7 +43,7 @@ internal class BacsDirectDebitConfirmationView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/view/BacsDirectDebitInputView.kt b/bacs/src/main/java/com/adyen/checkout/bacs/internal/ui/view/BacsDirectDebitInputView.kt
@@ -35,6 +35,7 @@ import com.adyen.checkout.ui.core.internal.util.showError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class BacsDirectDebitInputView @JvmOverloads constructor(
@@ -58,7 +59,7 @@ internal class BacsDirectDebitInputView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/blik/src/main/java/com/adyen/checkout/blik/internal/ui/view/BlikView.kt b/blik/src/main/java/com/adyen/checkout/blik/internal/ui/view/BlikView.kt
@@ -26,6 +26,7 @@ import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle
 import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle
 import com.adyen.checkout.ui.core.internal.util.showError
 import kotlinx.coroutines.CoroutineScope
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class BlikView @JvmOverloads constructor(
     context: Context,
@@ -47,7 +48,7 @@ internal class BlikView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/view/BoletoView.kt b/boleto/src/main/java/com/adyen/checkout/boleto/internal/ui/view/BoletoView.kt
@@ -30,6 +30,7 @@ import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle
 import com.adyen.checkout.ui.core.internal.util.showError
 import com.adyen.checkout.ui.core.internal.util.showKeyboard
 import kotlinx.coroutines.CoroutineScope
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class BoletoView @JvmOverloads constructor(
@@ -47,7 +48,7 @@ internal class BoletoView @JvmOverloads constructor(
     init {
         orientation = VERTICAL
 
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/CardView.kt
@@ -53,6 +53,7 @@ import com.adyen.checkout.ui.core.internal.util.showError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 /**
  * CardView for [CardComponent].
@@ -82,7 +83,7 @@ class CardView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 
@@ -145,7 +146,7 @@ class CardView @JvmOverloads constructor(
             localizedContext,
         )
         binding.textInputLayoutPostalCode.setLocalizedHintFromStyle(
-            R.style.AdyenCheckout_PostalCodeInput,
+            UICoreR.style.AdyenCheckout_PostalCodeInput,
             localizedContext,
         )
         binding.textInputLayoutAddressLookup.setLocalizedHintFromStyle(
@@ -279,7 +280,7 @@ class CardView @JvmOverloads constructor(
             }
             if (binding.textInputLayoutAddressLookup.isVisible && !it.addressState.isValid) {
                 binding.textInputLayoutAddressLookup.showError(
-                    localizedContext.getString(R.string.checkout_address_lookup_validation_empty)
+                    localizedContext.getString(UICoreR.string.checkout_address_lookup_validation_empty),
                 )
             }
         }
@@ -727,9 +728,9 @@ class CardView @JvmOverloads constructor(
             AddressFormUIState.FULL_ADDRESS -> binding.addressFormInput.updateAddressHint(isOptional)
             AddressFormUIState.POSTAL_CODE -> {
                 val postalCodeStyleResId = if (isOptional) {
-                    R.style.AdyenCheckout_PostalCodeInput_Optional
+                    UICoreR.style.AdyenCheckout_PostalCodeInput_Optional
                 } else {
-                    R.style.AdyenCheckout_PostalCodeInput
+                    UICoreR.style.AdyenCheckout_PostalCodeInput
                 }
                 binding.textInputLayoutPostalCode.setLocalizedHintFromStyle(postalCodeStyleResId, localizedContext)
             }

diff --git a/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt b/card/src/main/java/com/adyen/checkout/card/internal/ui/view/StoredCardView.kt
@@ -35,6 +35,7 @@ import com.adyen.checkout.ui.core.internal.util.showError
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 /**
  * StoredCardView for [CardComponent].
@@ -61,7 +62,7 @@ internal class StoredCardView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/view/CashAppPayView.kt b/cashapppay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/view/CashAppPayView.kt
@@ -22,6 +22,7 @@ import com.adyen.checkout.components.core.internal.ui.ComponentDelegate
 import com.adyen.checkout.ui.core.internal.ui.ComponentView
 import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle
 import kotlinx.coroutines.CoroutineScope
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class CashAppPayView @JvmOverloads constructor(
     context: Context,
@@ -36,7 +37,7 @@ internal class CashAppPayView @JvmOverloads constructor(
     init {
         orientation = VERTICAL
 
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }
 

diff --git a/...pay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/view/CashAppPayWaitingView.kt b/...pay/src/main/java/com/adyen/checkout/cashapppay/internal/ui/view/CashAppPayWaitingView.kt
@@ -12,6 +12,7 @@ import com.adyen.checkout.components.core.internal.ui.ComponentDelegate
 import com.adyen.checkout.ui.core.internal.ui.ComponentView
 import com.adyen.checkout.ui.core.internal.util.setLocalizedTextFromStyle
 import kotlinx.coroutines.CoroutineScope
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class CashAppPayWaitingView @JvmOverloads constructor(
     context: Context,
@@ -25,7 +26,7 @@ internal class CashAppPayWaitingView @JvmOverloads constructor(
         orientation = HORIZONTAL
         gravity = Gravity.CENTER
 
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, padding)
     }
 

diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/ActionComponentDialogFragment.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/ActionComponentDialogFragment.kt
@@ -38,6 +38,7 @@ import com.adyen.checkout.dropin.internal.util.arguments
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @SuppressWarnings("TooManyFunctions")
 internal class ActionComponentDialogFragment :
@@ -83,7 +84,7 @@ internal class ActionComponentDialogFragment :
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?) = super.onCreateDialog(savedInstanceState).apply {
-        window?.setWindowAnimations(R.style.AdyenCheckout_BottomSheet_NoWindowEnterDialogAnimation)
+        window?.setWindowAnimations(UICoreR.style.AdyenCheckout_BottomSheet_NoWindowEnterDialogAnimation)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -134,7 +135,7 @@ internal class ActionComponentDialogFragment :
                 adyenLog(AdyenLogLevel.DEBUG) { "Permission $requiredPermission requested" }
                 requestPermissionLauncher.launch(arrayOf(requiredPermission))
             }
-            .setPositiveButton(R.string.error_dialog_button) { dialog, _ -> dialog.dismiss() }
+            .setPositiveButton(UICoreR.string.error_dialog_button) { dialog, _ -> dialog.dismiss() }
             .show()
     }
 

diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/BacsDirectDebitDialogFragment.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/BacsDirectDebitDialogFragment.kt
@@ -21,6 +21,7 @@ import com.adyen.checkout.core.internal.util.adyenLog
 import com.adyen.checkout.dropin.databinding.FragmentBacsDirectDebitComponentBinding
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.R as MaterialR
 
 internal class BacsDirectDebitDialogFragment : BaseComponentDialogFragment() {
 
@@ -68,7 +69,7 @@ internal class BacsDirectDebitDialogFragment : BaseComponentDialogFragment() {
         dialog.setOnShowListener {
             val bottomSheetDialog = dialog as BottomSheetDialog
             val bottomSheet =
-                bottomSheetDialog.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
+                bottomSheetDialog.findViewById<FrameLayout>(MaterialR.id.design_bottom_sheet)
             val layoutParams = bottomSheet?.layoutParams
             val behavior = bottomSheet?.let { BottomSheetBehavior.from(it) }
             behavior?.isDraggable = false

diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/BaseComponentDialogFragment.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/BaseComponentDialogFragment.kt
@@ -23,8 +23,8 @@ import com.adyen.checkout.components.core.paymentmethod.PaymentMethodDetails
 import com.adyen.checkout.core.AdyenLogLevel
 import com.adyen.checkout.core.exception.CheckoutException
 import com.adyen.checkout.core.internal.util.adyenLog
-import com.adyen.checkout.dropin.R
 import com.adyen.checkout.dropin.internal.provider.getComponentFor
+import com.adyen.checkout.ui.core.R as UICoreR
 
 private const val STORED_PAYMENT_METHOD = "STORED_PAYMENT_METHOD"
 private const val NAVIGATED_FROM_PRESELECTED = "NAVIGATED_FROM_PRESELECTED"
@@ -163,6 +163,6 @@ internal abstract class BaseComponentDialogFragment :
 
     fun handleError(componentError: ComponentError) {
         adyenLog(AdyenLogLevel.ERROR) { componentError.errorMessage }
-        protocol.showError(null, getString(R.string.component_error), componentError.errorMessage, true)
+        protocol.showError(null, getString(UICoreR.string.component_error), componentError.errorMessage, true)
     }
 }
diff --git a/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt b/drop-in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInActivity.kt
@@ -64,6 +64,7 @@ import com.adyen.checkout.sessions.core.CheckoutSession
 import com.adyen.checkout.sessions.core.SessionPaymentResult
 import com.adyen.checkout.wechatpay.WeChatPayUtils
 import kotlinx.coroutines.launch
+import com.adyen.checkout.ui.core.R as UICoreR
 
 /**
  * Activity that presents the available PaymentMethods to the Shopper.
@@ -273,7 +274,7 @@ internal class DropInActivity :
 
     override fun showError(dialogTitle: String?, errorMessage: String, reason: String, terminate: Boolean) {
         adyenLog(AdyenLogLevel.DEBUG) { "showError - message: $errorMessage" }
-        val title = dialogTitle ?: getString(R.string.error_dialog_title)
+        val title = dialogTitle ?: getString(UICoreR.string.error_dialog_title)
         showDialog(title, errorMessage) {
             errorDialogDismissed(reason, terminate)
         }
@@ -721,7 +722,7 @@ internal class DropInActivity :
             .setTitle(title)
             .setMessage(message)
             .setOnDismissListener { onDismiss() }
-            .setPositiveButton(R.string.error_dialog_button) { dialog, _ -> dialog.dismiss() }
+            .setPositiveButton(UICoreR.string.error_dialog_button) { dialog, _ -> dialog.dismiss() }
             .show()
     }
 

diff --git a/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInBottomSheetDialogFragment.kt b/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/DropInBottomSheetDialogFragment.kt
@@ -27,6 +27,7 @@ import com.adyen.checkout.giftcard.GiftCardComponentState
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.R as MaterialR
 
 internal abstract class DropInBottomSheetDialogFragment : BottomSheetDialogFragment() {
 
@@ -60,7 +61,7 @@ internal abstract class DropInBottomSheetDialogFragment : BottomSheetDialogFragm
 
         dialog.setOnShowListener {
             val bottomSheet = (dialog as BottomSheetDialog).findViewById<FrameLayout>(
-                com.google.android.material.R.id.design_bottom_sheet,
+                MaterialR.id.design_bottom_sheet,
             )
 
             if (bottomSheet != null) {

diff --git a/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/GiftCardComponentDialogFragment.kt b/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/GiftCardComponentDialogFragment.kt
@@ -20,14 +20,14 @@ import com.adyen.checkout.components.core.internal.PaymentComponent
 import com.adyen.checkout.core.AdyenLogLevel
 import com.adyen.checkout.core.exception.CheckoutException
 import com.adyen.checkout.core.internal.util.adyenLog
-import com.adyen.checkout.dropin.R
 import com.adyen.checkout.dropin.databinding.FragmentGiftcardComponentBinding
 import com.adyen.checkout.dropin.internal.provider.getComponentFor
 import com.adyen.checkout.giftcard.GiftCardComponent
 import com.adyen.checkout.giftcard.GiftCardComponentCallback
 import com.adyen.checkout.giftcard.GiftCardComponentState
 import com.adyen.checkout.ui.core.internal.ui.ViewableComponent
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class GiftCardComponentDialogFragment : DropInBottomSheetDialogFragment(), GiftCardComponentCallback {
@@ -125,7 +125,7 @@ internal class GiftCardComponentDialogFragment : DropInBottomSheetDialogFragment
 
     private fun handleError(componentError: ComponentError) {
         adyenLog(AdyenLogLevel.ERROR) { componentError.errorMessage }
-        protocol.showError(null, getString(R.string.component_error), componentError.errorMessage, true)
+        protocol.showError(null, getString(UICoreR.string.component_error), componentError.errorMessage, true)
     }
 
     override fun onBackPressed(): Boolean {

diff --git a/...n/java/com/adyen/checkout/dropin/internal/ui/GiftCardPaymentConfirmationDialogFragment.kt b/...n/java/com/adyen/checkout/dropin/internal/ui/GiftCardPaymentConfirmationDialogFragment.kt
@@ -20,6 +20,7 @@ import com.adyen.checkout.dropin.R
 import com.adyen.checkout.dropin.databinding.FragmentGiftCardPaymentConfirmationBinding
 import com.adyen.checkout.dropin.internal.ui.model.GiftCardPaymentConfirmationData
 import com.adyen.checkout.dropin.internal.ui.model.GiftCardPaymentMethodModel
+import com.adyen.checkout.ui.core.R as UICoreR
 
 internal class GiftCardPaymentConfirmationDialogFragment : DropInBottomSheetDialogFragment() {
 
@@ -52,7 +53,7 @@ internal class GiftCardPaymentConfirmationDialogFragment : DropInBottomSheetDial
             giftCardPaymentConfirmationData.amountPaid,
             giftCardPaymentConfirmationData.shopperLocale,
         )
-        binding.payButton.text = String.format(resources.getString(R.string.pay_button_with_value), amountToPay)
+        binding.payButton.text = String.format(resources.getString(UICoreR.string.pay_button_with_value), amountToPay)
 
         val remainingBalance = CurrencyUtils.formatAmount(
             giftCardPaymentConfirmationData.remainingBalance,

diff --git a/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodListDialogFragment.kt b/...in/src/main/java/com/adyen/checkout/dropin/internal/ui/PaymentMethodListDialogFragment.kt
@@ -37,6 +37,7 @@ import com.adyen.checkout.ui.core.internal.ui.view.AdyenSwipeToRevealLayout
 import com.adyen.checkout.ui.core.internal.util.PayButtonFormatter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class PaymentMethodListDialogFragment :
@@ -122,7 +123,7 @@ internal class PaymentMethodListDialogFragment :
                         adyenLog(AdyenLogLevel.ERROR) { event.componentError.errorMessage }
                         protocol.showError(
                             dialogTitle = null,
-                            errorMessage = getString(R.string.component_error),
+                            errorMessage = getString(UICoreR.string.component_error),
                             reason = event.componentError.errorMessage,
                             terminate = true,
                         )

diff --git a/...main/java/com/adyen/checkout/dropin/internal/ui/PreselectedStoredPaymentMethodFragment.kt b/...main/java/com/adyen/checkout/dropin/internal/ui/PreselectedStoredPaymentMethodFragment.kt
@@ -36,6 +36,7 @@ import com.adyen.checkout.ui.core.internal.ui.loadLogo
 import com.adyen.checkout.ui.core.internal.util.PayButtonFormatter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class PreselectedStoredPaymentMethodFragment : DropInBottomSheetDialogFragment() {
@@ -203,7 +204,7 @@ internal class PreselectedStoredPaymentMethodFragment : DropInBottomSheetDialogF
 
     private fun handleError(componentError: ComponentError) {
         adyenLog(AdyenLogLevel.ERROR) { componentError.errorMessage }
-        protocol.showError(null, getString(R.string.component_error), componentError.errorMessage, true)
+        protocol.showError(null, getString(UICoreR.string.component_error), componentError.errorMessage, true)
     }
 
     private fun showRemoveStoredPaymentDialog() {

diff --git a/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt b/econtext/src/main/java/com/adyen/checkout/econtext/internal/ui/view/EContextView.kt
@@ -28,6 +28,7 @@ import com.adyen.checkout.ui.core.internal.ui.view.AdyenTextInputEditText
 import com.adyen.checkout.ui.core.internal.util.setLocalizedHintFromStyle
 import kotlinx.coroutines.CoroutineScope
 import java.util.Locale
+import com.adyen.checkout.ui.core.R as UICoreR
 
 @Suppress("TooManyFunctions")
 internal class EContextView @JvmOverloads constructor(
@@ -46,7 +47,7 @@ internal class EContextView @JvmOverloads constructor(
 
     init {
         orientation = VERTICAL
-        val padding = resources.getDimension(R.dimen.standard_margin).toInt()
+        val padding = resources.getDimension(UICoreR.dimen.standard_margin).toInt()
         setPadding(padding, padding, padding, 0)
     }