Changes of com.discord v859
This commit is contained in:
root
parent
9ed2528f53
commit
08b27c380e
625 changed files with 14337 additions and 8732 deletions
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#99ffffff" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
|
||||
</vector>
|
||||
BIN
com.discord/res/drawable-hdpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-hdpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 239 B |
BIN
com.discord/res/drawable-ldpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-ldpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 151 B |
BIN
com.discord/res/drawable-mdpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-mdpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 223 B |
BIN
com.discord/res/drawable-xhdpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-xhdpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 352 B |
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 101 KiB |
BIN
com.discord/res/drawable-xxhdpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-xxhdpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 440 B |
BIN
com.discord/res/drawable-xxxhdpi/ic_lock_white_a60_16dp.png
Normal file
BIN
com.discord/res/drawable-xxxhdpi/ic_lock_white_a60_16dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 607 B |
|
|
@ -1,10 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/payment_method_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/payment_method_title" app:layout_constraintTop_toTopOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_method_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toLeftOf="@id/payment_method_invalid" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_method_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/payment_source_invalid" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/payment_method_title" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintLeft_toRightOf="@id/payment_method_title" app:layout_constraintRight_toLeftOf="@id/payment_method_premium" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageView android:id="@id/payment_method_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_method_invalid" app:layout_constraintLeft_toRightOf="@id/payment_method_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_method_invalid" app:layout_constraintVertical_bias="1.0" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_400" android:id="@id/payment_method_subtext" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
|
||||
<View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_subtext" style="@style/UiKit.Divider.Thick" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<Button android:theme="@style/UiKit.Button.Theme.Grey" android:id="@id/payment_method_edit" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" style="@style/UiKit.Button.Compact" />
|
||||
<com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_method_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/payment_method_edit" android:layout_alignParentLeft="true" android:layout_toStartOf="@id/payment_method_edit" android:layout_alignParentStart="true" />
|
||||
<View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.Divider.Thick" />
|
||||
</RelativeLayout>
|
||||
11
com.discord/res/layout-v17/payment_source_view.xml
Normal file
11
com.discord/res/layout-v17/payment_source_view.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.cardview.widget.CardView android:id="@id/payment_source_view_icon_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardCornerRadius="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/payment_source_view_title" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0">
|
||||
<ImageView android:id="@id/payment_source_view_icon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_source_view_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1.0" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageView android:id="@id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/payment_source_view_subtext" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
|
||||
</merge>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
|
||||
<com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:padding="@dimen/uikit_spacing_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
<androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
|
||||
<com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:text="@string/sample_user_name" android:hint="@string/billing_address_name" android:inputType="textPersonName" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address1" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address" android:inputType="textPostalAddress" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address2" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address2" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_city" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_zip_code" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:enabled="false" android:id="@id/payment_source_edit_country" android:focusable="false" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:textColor="?primary_400" android:paddingRight="@dimen/uikit_spacing_medium" android:hint="@string/billing_address_country" android:drawableRight="@drawable/ic_lock_white_a60_16dp" android:inputType="none" android:drawableEnd="@drawable/ic_lock_white_a60_16dp" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="@dimen/uikit_spacing_medium" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
|
||||
<Button android:id="@id/dialog_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/payment_source_delete" style="@style/UiKit.Button.Red.Outline" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</LinearLayout>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
|
||||
<com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:padding="@dimen/uikit_spacing_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
<androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
|
||||
<com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" android:autofillHints="name" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:text="@string/sample_user_name" android:hint="@string/billing_address_name" android:inputType="textPersonName" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address1" android:autofillHints="postalAddress" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address" android:inputType="textPostalAddress" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address2" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address2" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_city" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_zip_code" android:imeOptions="actionNext" android:autofillHints="postalCode" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:enabled="false" android:id="@id/payment_source_edit_country" android:focusable="false" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:textColor="?primary_400" android:paddingRight="@dimen/uikit_spacing_medium" android:hint="@string/billing_address_country" android:drawableRight="@drawable/ic_lock_white_a60_16dp" android:inputType="none" android:drawableEnd="@drawable/ic_lock_white_a60_16dp" android:paddingEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="@dimen/uikit_spacing_medium" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
|
||||
<Button android:id="@id/dialog_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/payment_source_delete" style="@style/UiKit.Button.Red.Outline" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</LinearLayout>
|
||||
|
|
@ -1,10 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<ImageView android:id="@id/payment_method_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/payment_method_title" app:layout_constraintTop_toTopOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_method_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toLeftOf="@id/payment_method_invalid" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_method_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/payment_source_invalid" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/payment_method_title" app:layout_constraintBottom_toTopOf="@id/payment_method_subtext" app:layout_constraintLeft_toRightOf="@id/payment_method_title" app:layout_constraintRight_toLeftOf="@id/payment_method_premium" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageView android:id="@id/payment_method_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_method_invalid" app:layout_constraintLeft_toRightOf="@id/payment_method_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_method_invalid" app:layout_constraintVertical_bias="1.0" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_400" android:id="@id/payment_method_subtext" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_method_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
|
||||
<View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_method_subtext" style="@style/UiKit.Divider.Thick" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<Button android:theme="@style/UiKit.Button.Theme.Grey" android:id="@id/payment_method_edit" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/edit" android:layout_alignParentTop="true" android:layout_alignParentRight="true" style="@style/UiKit.Button.Compact" />
|
||||
<com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_method_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/payment_method_edit" android:layout_alignParentLeft="true" />
|
||||
<View android:background="@color/primary_630" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" style="@style/UiKit.Divider.Thick" />
|
||||
</RelativeLayout>
|
||||
11
com.discord/res/layout/payment_source_view.xml
Normal file
11
com.discord/res/layout/payment_source_view.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merge android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.cardview.widget.CardView android:id="@id/payment_source_view_icon_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardCornerRadius="4.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/payment_source_view_title" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0">
|
||||
<ImageView android:id="@id/payment_source_view_icon" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
|
||||
</androidx.cardview.widget.CardView>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/payment_source_view_title" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/payment_source_view_subtext" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toLeftOf="@id/payment_source_view_invalid" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
|
||||
<TextView android:textSize="12.0sp" android:textColor="@color/primary_100" android:id="@id/payment_source_view_invalid" android:background="@drawable/drawable_bg_payment_invalid_indicator" android:paddingLeft="4.0dip" android:paddingRight="4.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:text="@string/payment_source_invalid" android:lineSpacingMultiplier="1.0" android:textAllCaps="true" android:fontFamily="@font/whitney_semibold" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_title" app:layout_constraintRight_toLeftOf="@id/payment_source_view_premium" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" style="@style/UiKit.TextView.SingleLine" />
|
||||
<ImageView android:id="@id/payment_source_view_premium" android:background="@drawable/drawable_bg_payment_premium_indicator" android:paddingRight="2.0dip" android:layout_width="24.0dip" android:layout_height="18.0dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_nitro_badge_white" android:contentDescription="@string/billing_payment_premium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/payment_source_view_title" app:layout_constraintLeft_toRightOf="@id/payment_source_view_invalid" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/payment_source_view_title" app:layout_goneMarginLeft="@dimen/uikit_spacing_medium" app:layout_goneMarginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/payment_source_view_subtext" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:lineSpacingMultiplier="1.0" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/payment_source_view_icon_wrapper" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/payment_source_view_title" app:layout_constraintVertical_bias="0.0" style="@style/UiKit.TextView" />
|
||||
</merge>
|
||||
37
com.discord/res/layout/widget_payment_source_edit_dialog.xml
Normal file
37
com.discord/res/layout/widget_payment_source_edit_dialog.xml
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_close" app:title="@string/payment_source_edit_title" style="@style/AppTheme.Toolbar">
|
||||
<com.discord.views.LoadingButton android:layout_gravity="end|center" android:id="@id/dialog_save" android:padding="@dimen/uikit_spacing_small" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" app:lb_progress_color="?primary_100_alpha_60" app:lb_text="@string/save" app:lb_text_color="?primary_100" />
|
||||
</androidx.appcompat.widget.Toolbar>
|
||||
<androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
|
||||
<LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" />
|
||||
<com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
|
||||
<TextView android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:text="@string/sample_user_name" android:hint="@string/billing_address_name" android:inputType="textPersonName" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address1" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address" android:inputType="textPostalAddress" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_address2" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_address2" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_city" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_zip_code" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:enabled="false" android:id="@id/payment_source_edit_country" android:focusable="false" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:textColor="?primary_400" android:paddingRight="@dimen/uikit_spacing_medium" android:hint="@string/billing_address_country" android:drawableRight="@drawable/ic_lock_white_a60_16dp" android:inputType="none" android:drawableEnd="@drawable/ic_lock_white_a60_16dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="@dimen/uikit_spacing_medium" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
|
||||
<Button android:id="@id/dialog_delete" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/payment_source_delete" style="@style/UiKit.Button.Red.Outline" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</LinearLayout>
|
||||
|
|
@ -473,6 +473,8 @@
|
|||
<item type="id" name="dialog_chat_actions_share" />
|
||||
<item type="id" name="dialog_chat_actions_subtitle" />
|
||||
<item type="id" name="dialog_chat_actions_title" />
|
||||
<item type="id" name="dialog_delete" />
|
||||
<item type="id" name="dialog_save" />
|
||||
<item type="id" name="dialog_selections" />
|
||||
<item type="id" name="dialog_title" />
|
||||
<item type="id" name="dimmer_view" />
|
||||
|
|
@ -979,17 +981,30 @@
|
|||
<item type="id" name="payment_info_save" />
|
||||
<item type="id" name="payment_info_zip_edittext" />
|
||||
<item type="id" name="payment_info_zip_textinputlayout" />
|
||||
<item type="id" name="payment_method_edit" />
|
||||
<item type="id" name="payment_method_header" />
|
||||
<item type="id" name="payment_method_icon" />
|
||||
<item type="id" name="payment_method_invalid" />
|
||||
<item type="id" name="payment_method_premium" />
|
||||
<item type="id" name="payment_method_subtext" />
|
||||
<item type="id" name="payment_method_title" />
|
||||
<item type="id" name="payment_method_summary" />
|
||||
<item type="id" name="payment_methods_empty_add" />
|
||||
<item type="id" name="payment_methods_loading" />
|
||||
<item type="id" name="payment_methods_recycler" />
|
||||
<item type="id" name="payment_methods_retry" />
|
||||
<item type="id" name="payment_methods_view_flipper" />
|
||||
<item type="id" name="payment_source_edit_address1" />
|
||||
<item type="id" name="payment_source_edit_address2" />
|
||||
<item type="id" name="payment_source_edit_city" />
|
||||
<item type="id" name="payment_source_edit_country" />
|
||||
<item type="id" name="payment_source_edit_default" />
|
||||
<item type="id" name="payment_source_edit_help" />
|
||||
<item type="id" name="payment_source_edit_name" />
|
||||
<item type="id" name="payment_source_edit_postal_code" />
|
||||
<item type="id" name="payment_source_edit_state" />
|
||||
<item type="id" name="payment_source_summary" />
|
||||
<item type="id" name="payment_source_view_icon" />
|
||||
<item type="id" name="payment_source_view_icon_wrapper" />
|
||||
<item type="id" name="payment_source_view_invalid" />
|
||||
<item type="id" name="payment_source_view_premium" />
|
||||
<item type="id" name="payment_source_view_subtext" />
|
||||
<item type="id" name="payment_source_view_title" />
|
||||
<item type="id" name="perm_req_text" />
|
||||
<item type="id" name="permissions_container" />
|
||||
<item type="id" name="permissions_req_btn" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -964,7 +964,7 @@ HERE ARE MORE THINGS {progress}
|
|||
<string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
|
||||
<string name="cloud_sync_modal_or">OR</string>
|
||||
<string name="collapse_category">Collapse Category</string>
|
||||
<string name="com.crashlytics.android.build_id">31546bf8-5bcb-4cbc-be0c-1beeea698141</string>
|
||||
<string name="com.crashlytics.android.build_id">7dc6f21a-b718-4669-a77e-d9e1a83e5415</string>
|
||||
<string name="coming_soon">Coming Soon</string>
|
||||
<string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
|
||||
<string name="coming_soon_title">COMING SOON!</string>
|
||||
|
|
@ -3009,8 +3009,12 @@ Want to know more about Discord?"</string>
|
|||
<string name="payment_source_credit_card">Credit Card</string>
|
||||
<string name="payment_source_delete">Delete Payment Method</string>
|
||||
<string name="payment_source_delete_disabled_tooltip">Cannot delete this payment source while you have an active Nitro subscription.</string>
|
||||
<string name="payment_source_deleted">Payment Method deleted</string>
|
||||
<string name="payment_source_edit_help_card">"To edit a card expiration date or other card information, please use the 'Add New Payment' button."</string>
|
||||
<string name="payment_source_edit_help_paypal">To edit your PayPal payment information, visit [PayPal.com](%1$s).</string>
|
||||
<string name="payment_source_edit_saved">Payment information saved</string>
|
||||
<string name="payment_source_edit_select_state">Select State</string>
|
||||
<string name="payment_source_edit_title">Edit Payment Method</string>
|
||||
<string name="payment_source_expiration_date">Expiration Date</string>
|
||||
<string name="payment_source_expiration_date_placeholder">MM/YY</string>
|
||||
<string name="payment_source_information">Payment Information</string>
|
||||
|
|
|
|||
|
|
@ -3238,6 +3238,10 @@
|
|||
<item name="android:paddingRight">20.0dip</item>
|
||||
<item name="android:paddingBottom">20.0dip</item>
|
||||
</style>
|
||||
<style name="UiKit.Dialog.Animation" parent="@style/UiKit">
|
||||
<item name="android:windowEnterAnimation">@anim/activity_slide_horizontal_open_in</item>
|
||||
<item name="android:windowExitAnimation">@anim/activity_slide_horizontal_close_out</item>
|
||||
</style>
|
||||
<style name="UiKit.Dialog.Body" parent="@style/UiKit.TextView">
|
||||
<item name="android:paddingLeft">@dimen/dialog_padding_horiz</item>
|
||||
<item name="android:paddingTop">@dimen/uikit_spacing_large</item>
|
||||
|
|
@ -3348,20 +3352,15 @@
|
|||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
|
||||
<item name="counterTextAppearance">@style/UiKit.Form.Field.EditText.Wrap.TextAppearance</item>
|
||||
<item name="counterTextAppearance">@style/UiKit.TextInputLayout.TextAppearance</item>
|
||||
<item name="errorTextAppearance">@style/TextAppearance.Error</item>
|
||||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
<item name="hintTextAppearance">@style/UiKit.Form.Field.EditText.Wrap.TextAppearance</item>
|
||||
<item name="hintTextAppearance">@style/UiKit.TextInputLayout.TextAppearance</item>
|
||||
</style>
|
||||
<style name="UiKit.Form.Field.EditText.Wrap.Password" parent="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<item name="passwordToggleEnabled">true</item>
|
||||
<item name="passwordToggleTint">?primary_400</item>
|
||||
</style>
|
||||
<style name="UiKit.Form.Field.EditText.Wrap.TextAppearance" parent="@style/TextAppearance.AppCompat">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_small</item>
|
||||
<item name="android:textColor">?primary_400</item>
|
||||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
</style>
|
||||
<style name="UiKit.Form.Label" parent="@style/UiKit.TextView">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_medium</item>
|
||||
<item name="android:textColor">?primary_200</item>
|
||||
|
|
@ -3720,6 +3719,34 @@
|
|||
<item name="android:textAllCaps">true</item>
|
||||
<item name="fontFamily">@font/whitney_semibold</item>
|
||||
</style>
|
||||
<style name="UiKit.TextInputLayout" parent="@style/UiKit">
|
||||
<item name="android:textColorHint">?primary_400</item>
|
||||
<item name="android:focusable">false</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="counterTextAppearance">@style/UiKit.TextInputLayout.TextAppearance</item>
|
||||
<item name="errorTextAppearance">@style/TextAppearance.Error</item>
|
||||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
<item name="hintTextAppearance">@style/UiKit.TextInputLayout.TextAppearance</item>
|
||||
</style>
|
||||
<style name="UiKit.TextInputLayout.EditText" parent="@style/Widget.AppCompat.EditText">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_medium</item>
|
||||
<item name="android:textColor">?primary_100</item>
|
||||
<item name="android:textColorHint">?primary_400</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:imeOptions">flagNoExtractUi</item>
|
||||
<item name="backgroundTint">?primary_400</item>
|
||||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
</style>
|
||||
<style name="UiKit.TextInputLayout.EditText.Dense" parent="@style/UiKit.TextInputLayout.EditText">
|
||||
<item name="android:paddingTop">@dimen/uikit_spacing_small</item>
|
||||
</style>
|
||||
<style name="UiKit.TextInputLayout.TextAppearance" parent="@style/TextAppearance.AppCompat">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_small</item>
|
||||
<item name="android:textColor">?primary_400</item>
|
||||
<item name="fontFamily">@font/whitney_medium</item>
|
||||
</style>
|
||||
<style name="UiKit.TextView" parent="">
|
||||
<item name="android:textSize">@dimen/uikit_textsize_medium</item>
|
||||
<item name="android:textColor">?primary_300</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue