From 936d9ee1d86072ae6876db112dd24cf2e38063e5 Mon Sep 17 00:00:00 2001
From: Michael Shafrir <mshafrir@stripe.com>
Date: Fri, 4 Oct 2019 10:38:06 -0400
Subject: [PATCH] Add namespace to Stripe resources

Fixes #1656
---
 .../res/layout/add_payment_method_footer.xml  |  2 +-
 .../res/drawable/simple_button_background.xml |  2 +-
 .../res/layout/activity_payment_methods.xml   |  4 +-
 .../activity_select_shipping_method.xml       |  2 +-
 stripe/res/layout/activity_stripe.xml         |  2 +-
 stripe/res/layout/add_address_widget.xml      | 14 ++---
 .../layout/add_payment_method_card_layout.xml |  2 +-
 .../layout/add_payment_method_card_row.xml    | 14 ++---
 .../layout/add_payment_method_fpx_layout.xml  |  2 +-
 .../res/layout/add_payment_method_fpx_row.xml | 14 ++---
 stripe/res/layout/card_input_widget.xml       | 10 ++--
 stripe/res/layout/card_multiline_widget.xml   | 12 ++--
 stripe/res/layout/fpx_bank.xml                |  6 +-
 stripe/res/layout/masked_card_row.xml         |  6 +-
 stripe/res/layout/masked_card_view.xml        |  6 +-
 .../layout/payment_auth_web_view_layout.xml   |  2 +-
 stripe/res/layout/shipping_method_view.xml    | 10 ++--
 stripe/res/values-night/colors.xml            | 14 ++---
 stripe/res/values/colors.xml                  | 28 +++++-----
 stripe/res/values/constants.xml               |  4 +-
 stripe/res/values/dimens.xml                  | 56 +++++++++----------
 stripe/res/values/ids.xml                     |  6 +-
 stripe/res/values/styles.xml                  | 14 ++---
 .../view/AddPaymentMethodCardRowView.kt       |  2 +-
 .../view/AddPaymentMethodFpxRowView.kt        |  2 +-
 .../android/view/AddPaymentMethodFpxView.kt   |  2 +-
 .../stripe/android/view/CardInputWidget.java  |  4 +-
 .../android/view/CardMultilineWidget.java     |  4 +-
 .../view/PaymentMethodSwipeCallback.kt        |  6 +-
 .../stripe/android/view/ShippingMethodView.kt |  6 +-
 .../com/stripe/android/view/StripeEditText.kt |  4 +-
 .../com/stripe/android/view/ThemeConfig.kt    | 10 ++--
 .../android/view/CardMultilineWidgetTest.kt   |  2 +-
 .../view/PaymentMethodSwipeCallbackTest.kt    |  4 +-
 .../view/PaymentMethodsActivityTest.kt        |  4 +-
 .../stripe/android/view/StripeEditTextTest.kt |  6 +-
 36 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/example/res/layout/add_payment_method_footer.xml b/example/res/layout/add_payment_method_footer.xml
index bf0c52839ef..b058a2bbb83 100644
--- a/example/res/layout/add_payment_method_footer.xml
+++ b/example/res/layout/add_payment_method_footer.xml
@@ -2,5 +2,5 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/add_card_total_margin"
+    android:layout_margin="@dimen/stripe_add_card_total_margin"
     android:text="@string/add_payment_method_footer" />
\ No newline at end of file
diff --git a/stripe/res/drawable/simple_button_background.xml b/stripe/res/drawable/simple_button_background.xml
index e261e50a822..5e7f5f2cfce 100644
--- a/stripe/res/drawable/simple_button_background.xml
+++ b/stripe/res/drawable/simple_button_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/slate_50"
+    <item android:drawable="@color/stripe_add_payment_method_pressed"
           android:state_pressed="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/stripe/res/layout/activity_payment_methods.xml b/stripe/res/layout/activity_payment_methods.xml
index c6a7e37e8be..dc18cce84b4 100644
--- a/stripe/res/layout/activity_payment_methods.xml
+++ b/stripe/res/layout/activity_payment_methods.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:elevation="@dimen/toolbar_elevation"
+            android:elevation="@dimen/stripe_toolbar_elevation"
             app:title="@string/title_payment_method"
             android:theme="@style/StripeToolBarStyle" />
 
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/payment_methods_toolbar"
-            android:layout_marginTop="@dimen/list_top_margin" />
+            android:layout_marginTop="@dimen/stripe_list_top_margin" />
     </RelativeLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/stripe/res/layout/activity_select_shipping_method.xml b/stripe/res/layout/activity_select_shipping_method.xml
index 79e4e63bf30..e71ee6d55c3 100644
--- a/stripe/res/layout/activity_select_shipping_method.xml
+++ b/stripe/res/layout/activity_select_shipping_method.xml
@@ -9,6 +9,6 @@
         android:id="@+id/select_shipping_method_widget"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/shipping_widget_outer_margin"
+        android:layout_margin="@dimen/stripe_shipping_widget_outer_margin"
         />
 </FrameLayout>
diff --git a/stripe/res/layout/activity_stripe.xml b/stripe/res/layout/activity_stripe.xml
index bc9badf33e8..bf4a3e0326b 100644
--- a/stripe/res/layout/activity_stripe.xml
+++ b/stripe/res/layout/activity_stripe.xml
@@ -12,7 +12,7 @@
         android:layout_height="?attr/actionBarSize"
         android:layout_alignParentTop="true"
         android:background="?attr/colorPrimary"
-        android:elevation="@dimen/toolbar_elevation"
+        android:elevation="@dimen/stripe_toolbar_elevation"
         android:theme="@style/StripeToolBarStyle"
         />
 
diff --git a/stripe/res/layout/add_address_widget.xml b/stripe/res/layout/add_address_widget.xml
index 912cd518625..79664eb6279 100644
--- a/stripe/res/layout/add_address_widget.xml
+++ b/stripe/res/layout/add_address_widget.xml
@@ -13,7 +13,7 @@
         android:id="@+id/tl_name_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -28,7 +28,7 @@
         android:id="@+id/tl_address_line1_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -43,7 +43,7 @@
         android:id="@+id/tl_address_line2_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -58,7 +58,7 @@
         android:id="@+id/tl_city_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -74,7 +74,7 @@
         android:id="@+id/tl_state_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -89,7 +89,7 @@
         android:id="@+id/tl_postal_code_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         >
 
         <com.stripe.android.view.StripeEditText
@@ -103,7 +103,7 @@
         android:id="@+id/tl_phone_number_aaw"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_address_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_address_vertical_margin"
         android:hint="@string/address_label_phone_number"
         >
 
diff --git a/stripe/res/layout/add_payment_method_card_layout.xml b/stripe/res/layout/add_payment_method_card_layout.xml
index f8fc7ab032b..c924d1c8f4b 100644
--- a/stripe/res/layout/add_payment_method_card_layout.xml
+++ b/stripe/res/layout/add_payment_method_card_layout.xml
@@ -5,5 +5,5 @@
     android:id="@+id/add_source_card_entry_widget"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/add_card_total_margin"
+    android:layout_margin="@dimen/stripe_add_card_total_margin"
     />
diff --git a/stripe/res/layout/add_payment_method_card_row.xml b/stripe/res/layout/add_payment_method_card_row.xml
index cc5b106b156..e734aff0411 100644
--- a/stripe/res/layout/add_payment_method_card_row.xml
+++ b/stripe/res/layout/add_payment_method_card_row.xml
@@ -4,18 +4,18 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/activity_total_margin"
+    android:layout_marginTop="@dimen/stripe_activity_total_margin"
     android:focusableInTouchMode="true"
-    android:paddingStart="@dimen/list_row_start_padding"
-    android:paddingEnd="@dimen/list_row_end_padding"
-    android:paddingTop="@dimen/add_payment_method_vertical_padding"
-    android:paddingBottom="@dimen/add_payment_method_vertical_padding"
+    android:paddingStart="@dimen/stripe_list_row_start_padding"
+    android:paddingEnd="@dimen/stripe_list_row_end_padding"
+    android:paddingTop="@dimen/stripe_add_payment_method_vertical_padding"
+    android:paddingBottom="@dimen/stripe_add_payment_method_vertical_padding"
     android:background="@drawable/simple_button_background"
     android:orientation="horizontal">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/masked_card_icon_width"
+        android:layout_height="@dimen/stripe_masked_card_icon_width"
         android:src="@drawable/ic_add_black_32dp"
         android:tint="?attr/colorAccent"
         android:focusableInTouchMode="false"
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/list_row_start_padding"
+        android:layout_marginStart="@dimen/stripe_list_row_start_padding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:text="@string/payment_method_add_new_card"
         android:textColor="?attr/colorAccent"
diff --git a/stripe/res/layout/add_payment_method_fpx_layout.xml b/stripe/res/layout/add_payment_method_fpx_layout.xml
index fecc806745d..5938c96120a 100644
--- a/stripe/res/layout/add_payment_method_fpx_layout.xml
+++ b/stripe/res/layout/add_payment_method_fpx_layout.xml
@@ -8,6 +8,6 @@
         android:id="@+id/fpx_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/list_top_margin" />
+        android:layout_marginTop="@dimen/stripe_list_top_margin" />
 
 </LinearLayout>
diff --git a/stripe/res/layout/add_payment_method_fpx_row.xml b/stripe/res/layout/add_payment_method_fpx_row.xml
index b825a384290..bfb5ab8ac5f 100644
--- a/stripe/res/layout/add_payment_method_fpx_row.xml
+++ b/stripe/res/layout/add_payment_method_fpx_row.xml
@@ -4,18 +4,18 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/activity_total_margin"
+    android:layout_marginTop="@dimen/stripe_activity_total_margin"
     android:focusableInTouchMode="true"
-    android:paddingStart="@dimen/list_row_start_padding"
-    android:paddingEnd="@dimen/list_row_end_padding"
-    android:paddingTop="@dimen/add_payment_method_vertical_padding"
-    android:paddingBottom="@dimen/add_payment_method_vertical_padding"
+    android:paddingStart="@dimen/stripe_list_row_start_padding"
+    android:paddingEnd="@dimen/stripe_list_row_end_padding"
+    android:paddingTop="@dimen/stripe_add_payment_method_vertical_padding"
+    android:paddingBottom="@dimen/stripe_add_payment_method_vertical_padding"
     android:background="@drawable/simple_button_background"
     android:orientation="horizontal">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/masked_card_icon_width"
+        android:layout_height="@dimen/stripe_masked_card_icon_width"
         android:src="@drawable/ic_add_black_32dp"
         android:tint="?attr/colorAccent"
         android:focusableInTouchMode="false"
@@ -27,7 +27,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/list_row_start_padding"
+        android:layout_marginStart="@dimen/stripe_list_row_start_padding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:text="@string/payment_method_add_new_fpx"
         android:textColor="?attr/colorAccent"
diff --git a/stripe/res/layout/card_input_widget.xml b/stripe/res/layout/card_input_widget.xml
index 74bdd20313a..0d3684932db 100644
--- a/stripe/res/layout/card_input_widget.xml
+++ b/stripe/res/layout/card_input_widget.xml
@@ -6,9 +6,9 @@
         android:id="@+id/iv_card_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/card_icon_padding"
-        android:layout_marginBottom="@dimen/card_icon_padding"
-        android:layout_marginEnd="@dimen/card_icon_padding"
+        android:layout_marginTop="@dimen/stripe_card_icon_padding"
+        android:layout_marginBottom="@dimen/stripe_card_icon_padding"
+        android:layout_marginEnd="@dimen/stripe_card_icon_padding"
         android:src="@drawable/ic_unknown"
         android:contentDescription="@null" />
 
@@ -95,7 +95,7 @@
             android:visibility="visible"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:layout_marginStart="@dimen/card_expiry_initial_margin"
+            android:layout_marginStart="@dimen/stripe_card_expiry_initial_margin"
             android:layout_gravity="start"
             />
 
@@ -115,7 +115,7 @@
             android:maxLength="4"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:layout_marginStart="@dimen/card_cvc_initial_margin"
+            android:layout_marginStart="@dimen/stripe_card_cvc_initial_margin"
             android:layout_gravity="start"
             />
 
diff --git a/stripe/res/layout/card_multiline_widget.xml b/stripe/res/layout/card_multiline_widget.xml
index d543e76f093..6d2569a65ed 100644
--- a/stripe/res/layout/card_multiline_widget.xml
+++ b/stripe/res/layout/card_multiline_widget.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/acc_label_card_number"
-        android:layout_marginTop="@dimen/add_card_element_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_card_element_vertical_margin"
         >
 
         <com.stripe.android.view.CardNumberEditText
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:digits="@string/valid_digits"
-            android:drawablePadding="@dimen/card_icon_multiline_padding"
+            android:drawablePadding="@dimen/stripe_card_icon_multiline_padding"
             android:drawableStart="@drawable/ic_unknown"
             android:imeOptions="actionNext"
             android:inputType="number"
@@ -30,7 +30,7 @@
         android:id="@+id/second_row_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/add_card_element_vertical_margin"
+        android:layout_marginTop="@dimen/stripe_add_card_element_vertical_margin"
         android:baselineAligned="false"
         android:orientation="horizontal"
         >
@@ -39,7 +39,7 @@
             android:id="@+id/tl_add_source_expiry_ml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/add_card_expiry_middle_margin"
+            android:layout_marginEnd="@dimen/stripe_add_card_expiry_middle_margin"
             android:layout_weight="1"
             android:hint="@string/acc_label_expiry_date"
             >
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:imeOptions="actionNext"
                 android:inputType="date"
-                android:maxLength="@integer/date_length"
+                android:maxLength="@integer/stripe_date_length"
                 android:nextFocusDown="@+id/et_add_source_cvc_ml"
                 android:nextFocusForward="@+id/et_add_source_cvc_ml"
                 />
@@ -61,7 +61,7 @@
             android:id="@+id/tl_add_source_cvc_ml"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/add_card_expiry_middle_margin"
+            android:layout_marginEnd="@dimen/stripe_add_card_expiry_middle_margin"
             android:layout_weight="1"
             >
 
diff --git a/stripe/res/layout/fpx_bank.xml b/stripe/res/layout/fpx_bank.xml
index b92f7ad6ec0..b45ac33bd5e 100644
--- a/stripe/res/layout/fpx_bank.xml
+++ b/stripe/res/layout/fpx_bank.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/list_row_height"
+    android:minHeight="@dimen/stripe_list_row_height"
     android:orientation="horizontal"
     android:paddingStart="16dp"
     android:paddingEnd="12dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
-        android:layout_width="@dimen/masked_card_icon_width"
+        android:layout_width="@dimen/stripe_masked_card_icon_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
         android:src="@drawable/ic_bank_generic" />
@@ -25,7 +25,7 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/check_icon"
-        android:layout_width="@dimen/masked_card_icon_width"
+        android:layout_width="@dimen/stripe_masked_card_icon_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:src="@drawable/ic_checkmark" />
diff --git a/stripe/res/layout/masked_card_row.xml b/stripe/res/layout/masked_card_row.xml
index 614d02353ed..4730dcebe66 100644
--- a/stripe/res/layout/masked_card_row.xml
+++ b/stripe/res/layout/masked_card_row.xml
@@ -3,13 +3,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/list_row_end_padding"
-    android:paddingStart="@dimen/list_row_start_padding"
+    android:paddingEnd="@dimen/stripe_list_row_end_padding"
+    android:paddingStart="@dimen/stripe_list_row_start_padding"
     >
 
     <com.stripe.android.view.MaskedCardView
         android:id="@+id/masked_card_item"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/list_row_height"/>
+        android:layout_height="@dimen/stripe_list_row_height"/>
 
 </FrameLayout>
diff --git a/stripe/res/layout/masked_card_view.xml b/stripe/res/layout/masked_card_view.xml
index e0f35fdd34f..9af6e22c2dc 100644
--- a/stripe/res/layout/masked_card_view.xml
+++ b/stripe/res/layout/masked_card_view.xml
@@ -4,7 +4,7 @@
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/masked_icon_view"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/masked_card_icon_width"
+        android:layout_height="@dimen/stripe_masked_card_icon_width"
         android:src="@drawable/ic_unknown"
         android:layout_gravity="center_vertical|start"
         />
@@ -14,14 +14,14 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginStart="@dimen/list_row_start_padding"
+        android:layout_marginStart="@dimen/stripe_list_row_start_padding"
         android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
         android:layout_gravity="center_vertical|start"
         />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/masked_check_icon"
-        android:layout_width="@dimen/masked_card_icon_width"
+        android:layout_width="@dimen/stripe_masked_card_icon_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         />
diff --git a/stripe/res/layout/payment_auth_web_view_layout.xml b/stripe/res/layout/payment_auth_web_view_layout.xml
index baa7718e6de..8b91219f6e5 100644
--- a/stripe/res/layout/payment_auth_web_view_layout.xml
+++ b/stripe/res/layout/payment_auth_web_view_layout.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        android:elevation="@dimen/toolbar_elevation"
+        android:elevation="@dimen/stripe_toolbar_elevation"
         android:theme="@style/StripeToolBarStyle"
         app:title="@string/secure_checkout" />
 
diff --git a/stripe/res/layout/shipping_method_view.xml b/stripe/res/layout/shipping_method_view.xml
index 11802c22dde..1f68f495be0 100644
--- a/stripe/res/layout/shipping_method_view.xml
+++ b/stripe/res/layout/shipping_method_view.xml
@@ -12,7 +12,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_toStartOf="@+id/shipping_method_price"
-            android:paddingTop="@dimen/shipping_widget_vertical_margin"
+            android:paddingTop="@dimen/stripe_shipping_widget_vertical_margin"
             android:textAppearance="@style/TextAppearance.AppCompat.Menu" />
 
         <TextView
@@ -21,9 +21,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_below="@+id/shipping_method_name"
-            android:layout_marginTop="@dimen/shipping_widget_vertical_margin"
+            android:layout_marginTop="@dimen/stripe_shipping_widget_vertical_margin"
             android:layout_toStartOf="@+id/shipping_method_price"
-            android:paddingBottom="@dimen/shipping_widget_vertical_margin"
+            android:paddingBottom="@dimen/stripe_shipping_widget_vertical_margin"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" />
 
         <TextView
@@ -31,13 +31,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="@dimen/shipping_widget_horizontal_margin"
+            android:layout_marginEnd="@dimen/stripe_shipping_widget_horizontal_margin"
             android:layout_toStartOf="@+id/selected_icon"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/selected_icon"
-            android:layout_width="@dimen/shipping_check_icon_width"
+            android:layout_width="@dimen/stripe_shipping_check_icon_width"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
diff --git a/stripe/res/values-night/colors.xml b/stripe/res/values-night/colors.xml
index 8055de94139..49ef977f9f8 100644
--- a/stripe/res/values-night/colors.xml
+++ b/stripe/res/values-night/colors.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="control_normal_color_default">#e1e1e1</color>
-    <color name="color_text_secondary_default">#e1e1e1</color>
-    <color name="color_text_unselected_secondary_default">#a5a5a5</color>
-    <color name="color_text_unselected_primary_default">#e1e1e1</color>
-    <color name="toolbar_color_default">#1f1f1f</color>
-    <color name="toolbar_color_default_dark">#000000</color>
+    <color name="stripe_control_normal_color_default">#e1e1e1</color>
+    <color name="stripe_color_text_secondary_default">#e1e1e1</color>
+    <color name="stripe_color_text_unselected_secondary_default">#a5a5a5</color>
+    <color name="stripe_color_text_unselected_primary_default">#e1e1e1</color>
+    <color name="stripe_toolbar_color_default">#1f1f1f</color>
+    <color name="stripe_toolbar_color_default_dark">#000000</color>
 
-    <color name="text_color_secondary">@android:color/secondary_text_dark</color>
+    <color name="stripe_text_color_secondary">@android:color/secondary_text_dark</color>
 </resources>
diff --git a/stripe/res/values/colors.xml b/stripe/res/values/colors.xml
index de1cb03e493..887353af478 100644
--- a/stripe/res/values/colors.xml
+++ b/stripe/res/values/colors.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="error_text_light_theme">#ffeb1c26</color>
-    <color name="error_text_dark_theme">#ffe85746</color>
-    <color name="accent_color_default">#ff2296f3</color>
-    <color name="control_normal_color_default">#ff90A4AE</color>
-    <color name="color_text_secondary_default">#ff32325d</color>
-    <color name="color_text_unselected_secondary_default">#80323232</color>
-    <color name="color_text_unselected_primary_default">#ff000000</color>
-    <color name="slate_50">#3332325d</color>
-    <color name="toolbar_color_default">#ff3f51b5</color>
-    <color name="toolbar_color_default_dark">#ff324090</color>
+    <color name="stripe_error_text_light_theme">#ffeb1c26</color>
+    <color name="stripe_error_text_dark_theme">#ffe85746</color>
+    <color name="stripe_accent_color_default">#ff2296f3</color>
+    <color name="stripe_control_normal_color_default">#ff90A4AE</color>
+    <color name="stripe_color_text_secondary_default">#ff32325d</color>
+    <color name="stripe_color_text_unselected_secondary_default">#80323232</color>
+    <color name="stripe_color_text_unselected_primary_default">#ff000000</color>
+    <color name="stripe_add_payment_method_pressed">#3332325d</color>
+    <color name="stripe_toolbar_color_default">#ff3f51b5</color>
+    <color name="stripe_toolbar_color_default_dark">#ff324090</color>
 
-    <color name="title_text_color">@android:color/white</color>
-    <color name="text_color_secondary">@android:color/secondary_text_light</color>
+    <color name="stripe_title_text_color">@android:color/white</color>
+    <color name="stripe_text_color_secondary">@android:color/secondary_text_light</color>
 
-    <color name="swipe_start_payment_method">#DFDEDF</color>
-    <color name="swipe_threshold_payment_method">#D5473F</color>
+    <color name="stripe_swipe_start_payment_method">#DFDEDF</color>
+    <color name="stripe_swipe_threshold_payment_method">#D5473F</color>
 </resources>
diff --git a/stripe/res/values/constants.xml b/stripe/res/values/constants.xml
index a271389f780..3f5b33454be 100644
--- a/stripe/res/values/constants.xml
+++ b/stripe/res/values/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="date_length">5</integer>
-    <integer name="light_text_alpha_hex">204</integer>
+    <integer name="stripe_date_length">5</integer>
+    <integer name="stripe_light_text_alpha_hex">204</integer>
 </resources>
diff --git a/stripe/res/values/dimens.xml b/stripe/res/values/dimens.xml
index da97d9b740f..fb573c9b453 100644
--- a/stripe/res/values/dimens.xml
+++ b/stripe/res/values/dimens.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="activity_total_margin">8dp</dimen>
-    <dimen name="add_address_vertical_margin">16dp</dimen>
-    <dimen name="add_card_element_vertical_margin">12dp</dimen>
-    <dimen name="add_card_expiry_middle_margin">8dp</dimen>
-    <dimen name="add_card_total_margin">16dp</dimen>
-    <dimen name="add_payment_method_vertical_padding">8dp</dimen>
-    <dimen name="card_icon_padding">12dp</dimen>
-    <dimen name="card_widget_min_width">360dp</dimen>
-    <dimen name="card_expiry_initial_margin">200dp</dimen>
-    <dimen name="card_cvc_initial_margin">1000dp</dimen>
-    <dimen name="android_pay_button_layout_margin">24dp</dimen>
-    <dimen name="android_pay_confirmation_margin">8dp</dimen>
-    <dimen name="android_pay_button_separation">8dp</dimen>
-    <dimen name="card_icon_multiline_width">24dp</dimen>
-    <dimen name="card_icon_multiline_padding">8dp</dimen>
-    <dimen name="card_icon_multiline_padding_bottom">1.52380955dp</dimen>
-    <dimen name="masked_card_icon_width">32dp</dimen>
-    <dimen name="list_top_margin">8dp</dimen>
-    <dimen name="shipping_check_icon_width">24dp</dimen>
-    <dimen name="masked_card_vertical_padding">4dp</dimen>
-    <dimen name="list_row_start_padding">20dp</dimen>
-    <dimen name="list_row_end_padding">8dp</dimen>
-    <dimen name="list_row_height">48dp</dimen>
-    <dimen name="notification_text_size">14sp</dimen>
-    <dimen name="toolbar_elevation">4dp</dimen>
-    <dimen name="shipping_widget_vertical_margin">4dp</dimen>
-    <dimen name="shipping_widget_horizontal_margin">16dp</dimen>
-    <dimen name="shipping_widget_outer_margin">12dp</dimen>
+    <dimen name="stripe_activity_total_margin">8dp</dimen>
+    <dimen name="stripe_add_address_vertical_margin">16dp</dimen>
+    <dimen name="stripe_add_card_element_vertical_margin">12dp</dimen>
+    <dimen name="stripe_add_card_expiry_middle_margin">8dp</dimen>
+    <dimen name="stripe_add_card_total_margin">16dp</dimen>
+    <dimen name="stripe_add_payment_method_vertical_padding">8dp</dimen>
+    <dimen name="stripe_card_icon_padding">12dp</dimen>
+    <dimen name="stripe_card_widget_min_width">360dp</dimen>
+    <dimen name="stripe_card_expiry_initial_margin">200dp</dimen>
+    <dimen name="stripe_card_cvc_initial_margin">1000dp</dimen>
+    <dimen name="stripe_android_pay_button_layout_margin">24dp</dimen>
+    <dimen name="stripe_android_pay_confirmation_margin">8dp</dimen>
+    <dimen name="stripe_android_pay_button_separation">8dp</dimen>
+    <dimen name="stripe_card_icon_multiline_width">24dp</dimen>
+    <dimen name="stripe_card_icon_multiline_padding">8dp</dimen>
+    <dimen name="stripe_card_icon_multiline_padding_bottom">1.52380955dp</dimen>
+    <dimen name="stripe_masked_card_icon_width">32dp</dimen>
+    <dimen name="stripe_list_top_margin">8dp</dimen>
+    <dimen name="stripe_shipping_check_icon_width">24dp</dimen>
+    <dimen name="stripe_masked_card_vertical_padding">4dp</dimen>
+    <dimen name="stripe_list_row_start_padding">20dp</dimen>
+    <dimen name="stripe_list_row_end_padding">8dp</dimen>
+    <dimen name="stripe_list_row_height">48dp</dimen>
+    <dimen name="stripe_notification_text_size">14sp</dimen>
+    <dimen name="stripe_toolbar_elevation">4dp</dimen>
+    <dimen name="stripe_shipping_widget_vertical_margin">4dp</dimen>
+    <dimen name="stripe_shipping_widget_horizontal_margin">16dp</dimen>
+    <dimen name="stripe_shipping_widget_outer_margin">12dp</dimen>
 </resources>
diff --git a/stripe/res/values/ids.xml b/stripe/res/values/ids.xml
index 6e51b2afd62..8a3cc5d25f2 100644
--- a/stripe/res/values/ids.xml
+++ b/stripe/res/values/ids.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <item type="id" name="default_reader_id" />
-    <item type="id" name="payment_methods_add_card" />
-    <item type="id" name="payment_methods_add_fpx" />
+    <item type="id" name="stripe_default_reader_id" />
+    <item type="id" name="stripe_payment_methods_add_card" />
+    <item type="id" name="stripe_payment_methods_add_fpx" />
 </resources>
diff --git a/stripe/res/values/styles.xml b/stripe/res/values/styles.xml
index d1aa4708203..a7ca7891ff7 100644
--- a/stripe/res/values/styles.xml
+++ b/stripe/res/values/styles.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="StripeDefaultTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
-        <item name="colorAccent">@color/accent_color_default</item>
-        <item name="colorControlNormal">@color/control_normal_color_default</item>
-        <item name="colorPrimary">@color/toolbar_color_default</item>
-        <item name="colorPrimaryDark">@color/toolbar_color_default_dark</item>
-        <item name="titleTextColor">@color/title_text_color</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary</item>
+        <item name="colorAccent">@color/stripe_accent_color_default</item>
+        <item name="colorControlNormal">@color/stripe_control_normal_color_default</item>
+        <item name="colorPrimary">@color/stripe_toolbar_color_default</item>
+        <item name="colorPrimaryDark">@color/stripe_toolbar_color_default_dark</item>
+        <item name="titleTextColor">@color/stripe_title_text_color</item>
+        <item name="android:textColorSecondary">@color/stripe_text_color_secondary</item>
     </style>
 
     <style name="StripeToolBarStyle" parent="@style/ThemeOverlay.AppCompat">
@@ -22,7 +22,7 @@
 
     <style name="StripeErrorTextStyle">
         <item name="android:textColor">#999999</item>
-        <item name="android:textSize">@dimen/notification_text_size</item>
+        <item name="android:textSize">@dimen/stripe_notification_text_size</item>
     </style>
 
     <style name="StripeDefault3DS2Theme" parent="BaseStripe3DS2Theme" />
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodCardRowView.kt b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodCardRowView.kt
index 0ebf930661c..0bad84a7080 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodCardRowView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodCardRowView.kt
@@ -12,7 +12,7 @@ internal class AddPaymentMethodCardRowView internal constructor(
 ) : AddPaymentMethodRowView(
     activity,
     R.layout.add_payment_method_card_row,
-    R.id.payment_methods_add_card,
+    R.id.stripe_payment_methods_add_card,
     AddPaymentMethodActivityStarter.Args.Builder()
         .setShouldAttachToCustomer(true)
         .setShouldRequirePostalCode(args.shouldRequirePostalCode)
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxRowView.kt b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxRowView.kt
index ab8a19c1fd2..fb54a8aac14 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxRowView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxRowView.kt
@@ -12,7 +12,7 @@ internal class AddPaymentMethodFpxRowView internal constructor(
 ) : AddPaymentMethodRowView(
     activity,
     R.layout.add_payment_method_fpx_row,
-    R.id.payment_methods_add_fpx,
+    R.id.stripe_payment_methods_add_fpx,
     AddPaymentMethodActivityStarter.Args.Builder()
         .setIsPaymentSessionActive(args.isPaymentSessionActive)
         .setPaymentMethodType(PaymentMethod.Type.Fpx)
diff --git a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
index 9f7f7138561..9c961671bbd 100644
--- a/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/AddPaymentMethodFpxView.kt
@@ -33,7 +33,7 @@ internal class AddPaymentMethodFpxView private constructor(
         View.inflate(getContext(), R.layout.add_payment_method_fpx_layout, this)
 
         // an id is required for state to be saved
-        id = R.id.payment_methods_add_fpx
+        id = R.id.stripe_payment_methods_add_fpx
 
         val recyclerView = findViewById<androidx.recyclerview.widget.RecyclerView>(R.id.fpx_list)
         recyclerView.adapter = adapter
diff --git a/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java b/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
index c79eb425b1b..714b52ca6c6 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardInputWidget.java
@@ -71,7 +71,7 @@ public class CardInputWidget extends LinearLayout implements CardWidget {
 
     // This value is used to ensure that onSaveInstanceState is called
     // in the event that the user doesn't give this control an ID.
-    private static final @IdRes int DEFAULT_READER_ID = R.id.default_reader_id;
+    @IdRes private static final int DEFAULT_READER_ID = R.id.stripe_default_reader_id;
 
     private static final long ANIMATION_LENGTH = 150L;
 
@@ -114,7 +114,7 @@ public CardInputWidget(@NonNull Context context, @Nullable AttributeSet attrs,
         }
 
         setOrientation(LinearLayout.HORIZONTAL);
-        setMinimumWidth(getResources().getDimensionPixelSize(R.dimen.card_widget_min_width));
+        setMinimumWidth(getResources().getDimensionPixelSize(R.dimen.stripe_card_widget_min_width));
 
         mPlacementParameters = new PlacementParameters();
         mCardIconImageView = findViewById(R.id.iv_card_icon);
diff --git a/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java b/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
index 28ab0f10b1c..c93f5d83b5f 100644
--- a/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
+++ b/stripe/src/main/java/com/stripe/android/view/CardMultilineWidget.java
@@ -492,7 +492,7 @@ void adjustViewForPostalCodeAttribute() {
                 EditorInfo.IME_ACTION_DONE : EditorInfo.IME_ACTION_NEXT);
 
         final int marginPixels = mShouldShowPostalCode
-                ? getResources().getDimensionPixelSize(R.dimen.add_card_expiry_middle_margin)
+                ? getResources().getDimensionPixelSize(R.dimen.stripe_add_card_expiry_middle_margin)
                 : 0;
         final LinearLayout.LayoutParams linearParams =
                 (LinearLayout.LayoutParams) mCvcTextInputLayout.getLayoutParams();
@@ -553,7 +553,7 @@ private int getCvcHelperText() {
 
     private int getDynamicBufferInPixels() {
         final float pixelsToAdjust = getResources()
-                .getDimension(R.dimen.card_icon_multiline_padding_bottom);
+                .getDimension(R.dimen.stripe_card_icon_multiline_padding_bottom);
         return new BigDecimal(pixelsToAdjust)
                 .setScale(0, RoundingMode.HALF_DOWN)
                 .intValue();
diff --git a/stripe/src/main/java/com/stripe/android/view/PaymentMethodSwipeCallback.kt b/stripe/src/main/java/com/stripe/android/view/PaymentMethodSwipeCallback.kt
index 88eea0e5bb2..439f955c338 100644
--- a/stripe/src/main/java/com/stripe/android/view/PaymentMethodSwipeCallback.kt
+++ b/stripe/src/main/java/com/stripe/android/view/PaymentMethodSwipeCallback.kt
@@ -26,12 +26,12 @@ internal class PaymentMethodSwipeCallback(
     private val trashIcon =
         ContextCompat.getDrawable(context, R.drawable.ic_trash)!!
     private val swipeStartColor =
-        ContextCompat.getColor(context, R.color.swipe_start_payment_method)
+        ContextCompat.getColor(context, R.color.stripe_swipe_start_payment_method)
     private val swipeThresholdColor =
-        ContextCompat.getColor(context, R.color.swipe_threshold_payment_method)
+        ContextCompat.getColor(context, R.color.stripe_swipe_threshold_payment_method)
     private val background = ColorDrawable(swipeStartColor)
     private val itemViewStartPadding = trashIcon.intrinsicWidth / 2
-    private val iconStartOffset = context.resources.getDimensionPixelSize(R.dimen.list_row_start_padding)
+    private val iconStartOffset = context.resources.getDimensionPixelSize(R.dimen.stripe_list_row_start_padding)
 
     override fun onMove(
         recyclerView: RecyclerView,
diff --git a/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt b/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
index 3630f744ee5..878df0c507d 100644
--- a/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ShippingMethodView.kt
@@ -36,21 +36,21 @@ internal class ShippingMethodView @JvmOverloads constructor(
 
         selectedColorInt =
             if (StripeColorUtils.isColorTransparent(rawSelectedColorInt)) {
-                ContextCompat.getColor(context, R.color.accent_color_default)
+                ContextCompat.getColor(context, R.color.stripe_accent_color_default)
             } else {
                 rawSelectedColorInt
             }
 
         unselectedTextColorPrimaryInt =
             if (StripeColorUtils.isColorTransparent(rawUnselectedTextColorPrimaryInt)) {
-                ContextCompat.getColor(context, R.color.color_text_unselected_primary_default)
+                ContextCompat.getColor(context, R.color.stripe_color_text_unselected_primary_default)
             } else {
                 rawUnselectedTextColorPrimaryInt
             }
 
         unselectedTextColorSecondaryInt =
             if (StripeColorUtils.isColorTransparent(rawUnselectedTextColorSecondaryInt)) {
-                ContextCompat.getColor(context, R.color.color_text_unselected_secondary_default)
+                ContextCompat.getColor(context, R.color.stripe_color_text_unselected_secondary_default)
             } else {
                 rawUnselectedTextColorSecondaryInt
             }
diff --git a/stripe/src/main/java/com/stripe/android/view/StripeEditText.kt b/stripe/src/main/java/com/stripe/android/view/StripeEditText.kt
index b117d2a8792..a5c4fd2204d 100644
--- a/stripe/src/main/java/com/stripe/android/view/StripeEditText.kt
+++ b/stripe/src/main/java/com/stripe/android/view/StripeEditText.kt
@@ -159,9 +159,9 @@ internal open class StripeEditText @JvmOverloads constructor(
             if (StripeColorUtils.isColorDark(textColors.defaultColor)) {
                 // Note: if the _text_ color is dark, then this is a
                 // light theme, and vice-versa.
-                R.color.error_text_light_theme
+                R.color.stripe_error_text_light_theme
             } else {
-                R.color.error_text_dark_theme
+                R.color.stripe_error_text_dark_theme
             }
         )
     }
diff --git a/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt b/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
index fa51c431145..c9d16cd4cdd 100644
--- a/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
+++ b/stripe/src/main/java/com/stripe/android/view/ThemeConfig.kt
@@ -14,33 +14,33 @@ internal class ThemeConfig(context: Context) {
     private val selectedColorInt = determineColor(
         context,
         colorUtils.getThemeAccentColor().data,
-        R.color.accent_color_default
+        R.color.stripe_accent_color_default
     )
 
     @ColorInt
     private val unselectedColorInt = determineColor(
         context,
         colorUtils.getThemeColorControlNormal().data,
-        R.color.control_normal_color_default
+        R.color.stripe_control_normal_color_default
     )
 
     @ColorInt
     private val unselectedTextColorInt = determineColor(
         context,
         colorUtils.getThemeTextColorSecondary().data,
-        R.color.color_text_secondary_default
+        R.color.stripe_color_text_secondary_default
     )
 
     @ColorInt
     private val selectedTextAlphaColorInt = ColorUtils.setAlphaComponent(
         selectedColorInt,
-        context.resources.getInteger(R.integer.light_text_alpha_hex)
+        context.resources.getInteger(R.integer.stripe_light_text_alpha_hex)
     )
 
     @ColorInt
     private val unselectedTextAlphaColorInt = ColorUtils.setAlphaComponent(
         unselectedTextColorInt,
-        context.resources.getInteger(R.integer.light_text_alpha_hex)
+        context.resources.getInteger(R.integer.stripe_light_text_alpha_hex)
     )
 
     val textColorValues = intArrayOf(
diff --git a/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.kt b/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.kt
index 7d85c3b3372..b848ced611f 100644
--- a/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.kt
+++ b/stripe/src/test/java/com/stripe/android/view/CardMultilineWidgetTest.kt
@@ -463,7 +463,7 @@ internal class CardMultilineWidgetTest : BaseViewTest<CardInputTestActivity>(
         assertEquals(View.VISIBLE, noZipGroup.postalCodeInputLayout.visibility)
 
         val expectedMargin = noZipCardMultilineWidget.resources
-            .getDimensionPixelSize(R.dimen.add_card_expiry_middle_margin)
+            .getDimensionPixelSize(R.dimen.stripe_add_card_expiry_middle_margin)
 
         val params = noZipGroup.cvcInputLayout.layoutParams as LinearLayout.LayoutParams
         assertEquals(expectedMargin, params.rightMargin)
diff --git a/stripe/src/test/java/com/stripe/android/view/PaymentMethodSwipeCallbackTest.kt b/stripe/src/test/java/com/stripe/android/view/PaymentMethodSwipeCallbackTest.kt
index 067ff824d62..94381ed2f1e 100644
--- a/stripe/src/test/java/com/stripe/android/view/PaymentMethodSwipeCallbackTest.kt
+++ b/stripe/src/test/java/com/stripe/android/view/PaymentMethodSwipeCallbackTest.kt
@@ -17,8 +17,8 @@ class PaymentMethodSwipeCallbackTest {
         val context: Context = ApplicationProvider.getApplicationContext()
         val calculatedColor = PaymentMethodSwipeCallback.calculateTransitionColor(
             0.25F,
-            ContextCompat.getColor(context, R.color.swipe_start_payment_method),
-            ContextCompat.getColor(context, R.color.swipe_threshold_payment_method)
+            ContextCompat.getColor(context, R.color.stripe_swipe_start_payment_method),
+            ContextCompat.getColor(context, R.color.stripe_swipe_threshold_payment_method)
         )
         assertEquals(-2312009, calculatedColor)
     }
diff --git a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.kt b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.kt
index c56698cdc40..072f2feeff9 100644
--- a/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.kt
+++ b/stripe/src/test/java/com/stripe/android/view/PaymentMethodsActivityTest.kt
@@ -71,7 +71,7 @@ class PaymentMethodsActivityTest : BaseViewTest<PaymentMethodsActivity>(PaymentM
         progressBar = paymentMethodsActivity.findViewById(R.id.payment_methods_progress_bar)
         recyclerView = paymentMethodsActivity.findViewById(R.id.payment_methods_recycler)
         addCardView = paymentMethodsActivity
-            .findViewById(R.id.payment_methods_add_card)
+            .findViewById(R.id.stripe_payment_methods_add_card)
     }
 
     @AfterTest
@@ -142,7 +142,7 @@ class PaymentMethodsActivityTest : BaseViewTest<PaymentMethodsActivity>(PaymentM
             .setIsPaymentSessionActive(true)
             .build())
         shadowActivity = Shadows.shadowOf(paymentMethodsActivity)
-        addCardView = paymentMethodsActivity.findViewById(R.id.payment_methods_add_card)
+        addCardView = paymentMethodsActivity.findViewById(R.id.stripe_payment_methods_add_card)
         addCardView.performClick()
         val intentForResult = shadowActivity.nextStartedActivityForResult
         val component = intentForResult.intent.component
diff --git a/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.kt b/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.kt
index 382c3d0a2dd..f4e780fa527 100644
--- a/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.kt
+++ b/stripe/src/test/java/com/stripe/android/view/StripeEditTextTest.kt
@@ -95,7 +95,7 @@ class StripeEditTextTest {
             .getColor(android.R.color.primary_text_dark))
         @ColorInt val colorInt = editText.defaultErrorColorInt
         @ColorInt val expectedErrorInt = ContextCompat.getColor(context,
-            R.color.error_text_dark_theme)
+            R.color.stripe_error_text_dark_theme)
         assertEquals(expectedErrorInt, colorInt)
     }
 
@@ -105,7 +105,7 @@ class StripeEditTextTest {
             .getColor(android.R.color.primary_text_light))
         @ColorInt val colorInt = editText.defaultErrorColorInt
         @ColorInt val expectedErrorInt = ContextCompat.getColor(context,
-            R.color.error_text_light_theme)
+            R.color.stripe_error_text_light_theme)
         assertEquals(expectedErrorInt, colorInt)
     }
 
@@ -127,7 +127,7 @@ class StripeEditTextTest {
     @Test
     fun setShouldShowError_whenErrorColorNotSet_shouldUseDefaultErrorColor() {
         editText.shouldShowError = true
-        assertEquals(ContextCompat.getColor(context, R.color.error_text_light_theme),
+        assertEquals(ContextCompat.getColor(context, R.color.stripe_error_text_light_theme),
             editText.textColors.defaultColor)
     }
 }