Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'stripe' namespace to Stripe resources #1658

Merged
merged 1 commit into from
Oct 4, 2019
Merged

Add 'stripe' namespace to Stripe resources #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/res/layout/add_payment_method_footer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
2 changes: 1 addition & 1 deletion stripe/res/drawable/simple_button_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions stripe/res/layout/activity_payment_methods.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand All @@ -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>
2 changes: 1 addition & 1 deletion stripe/res/layout/activity_select_shipping_method.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion stripe/res/layout/activity_stripe.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>

Expand Down
14 changes: 7 additions & 7 deletions stripe/res/layout/add_address_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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"
>

Expand Down
2 changes: 1 addition & 1 deletion stripe/res/layout/add_payment_method_card_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
14 changes: 7 additions & 7 deletions stripe/res/layout/add_payment_method_card_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion stripe/res/layout/add_payment_method_fpx_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 7 additions & 7 deletions stripe/res/layout/add_payment_method_fpx_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions stripe/res/layout/card_input_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down Expand Up @@ -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"
/>

Expand All @@ -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"
/>

Expand Down
12 changes: 6 additions & 6 deletions stripe/res/layout/card_multiline_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
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
android:id="@+id/et_add_source_card_number_ml"
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"
Expand All @@ -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"
>
Expand All @@ -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"
>
Expand All @@ -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"
/>
Expand All @@ -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"
>

Expand Down
6 changes: 3 additions & 3 deletions stripe/res/layout/fpx_bank.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions stripe/res/layout/masked_card_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 deletions stripe/res/layout/masked_card_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>
Expand All @@ -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"
/>
Expand Down
2 changes: 1 addition & 1 deletion stripe/res/layout/payment_auth_web_view_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
10 changes: 5 additions & 5 deletions stripe/res/layout/shipping_method_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,23 +21,23 @@
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
android:id="@+id/shipping_method_price"
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"
Expand Down
Loading