Changes of com.discord v859
This commit is contained in:
parent
9ed2528f53
commit
08b27c380e
625 changed files with 14337 additions and 8732 deletions
|
@ -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>
|
Loading…
Add table
Add a link
Reference in a new issue