Changes of com.discord v868

This commit is contained in:
root 2019-03-30 09:05:33 +01:00
parent c73a90a9e0
commit e192d6acb6
4609 changed files with 73244 additions and 70107 deletions

View file

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.discord.views.EditPaymentMethodView android:id="@id/edit_payment_method_view" android:layout_width="fill_parent" android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android" />

View file

@ -17,6 +17,6 @@
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<Button android:textColor="@color/primary_100" android:id="@id/cancel_premium_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/premium_cancel_cancel_mobile" style="@style/UiKit.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/cancel_premium_confirm" android:background="@drawable/button_status_green_500" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_cancel_confirm_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/cancel_premium_confirm" android:background="@drawable/button_green" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/premium_cancel_confirm_mobile" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -10,5 +10,5 @@
<TextView android:id="@id/channels_list_item_private_desc" android:singleLine="true" style="@style/UiKit.TextView.Subtext" />
</LinearLayout>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_item_private_mentions" android:background="@drawable/drawable_overlay_mentions" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_xsmall" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_xsmall" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_large" android:minWidth="@dimen/uikit_spacing_large" android:singleLine="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" style="@style/UiKit.TextView.Bold" />
<View android:background="?primary_700_alpha_60" android:layout_alignLeft="@id/channels_list_item_private_avatar" android:layout_alignParentBottom="true" style="@style/UiKit.Divider" />
<View android:background="@color/primary_700_alpha_60" android:layout_alignLeft="@id/channels_list_item_private_avatar" android:layout_alignParentBottom="true" style="@style/UiKit.Divider" />
</RelativeLayout>

View file

@ -0,0 +1,24 @@
<?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">
<LinearLayout android:id="@id/notice_header_container" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:id="@id/disable_delete_header" android:padding="@dimen/uikit_spacing_large" android:text="@string/disable_account" style="@style/UiKit.TextView.H1.Bold" />
<View style="@style/UiKit.Divider" />
</LinearLayout>
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
<LinearLayout 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.LinearLayout">
<TextView android:id="@id/disable_delete_body" style="@style/UiKit.TextView" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/disable_delete_password_wrap" android:inputType="textPassword" app:hintEnabled="false" app:passwordToggleEnabled="true" app:passwordToggleTint="?primary_400" style="@style/UiKit.TextInputLayout">
<EditText android:id="@id/disable_delete_password" android:hint="@string/form_label_password" android:imeOptions="actionNext" style="@style/UiKit.Form.Field.EditText.Password" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout android:id="@id/disable_delete_code_wrap" app:hintEnabled="false" style="@style/UiKit.TextInputLayout">
<EditText android:id="@id/disable_delete_code" android:hint="@string/two_fa_auth_code" android:imeOptions="actionDone" style="@style/UiKit.Form.Field.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<View style="@style/UiKit.Settings.Divider" />
<LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
<Button android:textColor="?primary_100" android:id="@id/disable_delete_cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Button.Transparent" />
<com.discord.views.LoadingButton android:layout_gravity="center_vertical" android:id="@id/disable_delete_confirm" android:background="@drawable/button_red" android:paddingTop="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:lb_progress_color="@color/white" app:lb_text="@string/disable" app:lb_text_color="@drawable/button_text_color_primary_100" />
</LinearLayout>
</LinearLayout>

View file

@ -8,7 +8,7 @@
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<RelativeLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_username_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/edit_account_tag_layout_container" style="@style/UiKit.TextInputLayout">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_username" android:hint="@string/username" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_username" android:hint="@string/username" android:inputType="textPersonName" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText">
<requestFocus />
</androidx.appcompat.widget.AppCompatEditText>
</com.google.android.material.textfield.TextInputLayout>
@ -24,7 +24,7 @@
<com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_email_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.TextInputLayout">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_email" android:hint="@string/email" android:inputType="textEmailAddress" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_password_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.TextInputLayout">
<com.google.android.material.textfield.TextInputLayout android:id="@id/edit_account_password_wrap" android:layout_width="fill_parent" android:layout_height="wrap_content" app:passwordToggleEnabled="true" app:passwordToggleTint="?primary_400" style="@style/UiKit.TextInputLayout">
<androidx.appcompat.widget.AppCompatEditText android:id="@id/edit_account_password" android:hint="@string/user_settings_edit_account_password_label" android:inputType="textPassword" android:imeOptions="actionDone" style="@style/UiKit.TextInputLayout.EditText" />
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>

View file

@ -6,9 +6,9 @@
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/premium_settings_view_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior">
<androidx.core.widget.NestedScrollView android:id="@id/premium_settings_scrollview" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<FrameLayout style="@style/UiKit.ViewGroup">
<ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" />
<LinearLayout android:layout_marginTop="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.LinearLayout">
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<ImageView android:layout_gravity="top" android:background="@drawable/img_nitro_pattern" android:layout_width="fill_parent" android:layout_height="270.0sp" android:importantForAccessibility="no" app:layout_constraintTop_toTopOf="parent" />
<LinearLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="500.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/premium_settings_grandfathered" android:background="@drawable/bg_nitro_grandfathered" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" android:drawableLeft="@drawable/ic_nitro_badge_white" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_nitro_badge_white" style="@style/UiKit.TextView" />
<com.discord.views.ActiveSubscriptionView android:id="@id/premium_settings_active_subscription" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="@color/primary_630" />
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_400" android:id="@id/premium_settings_legalese" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView" />
@ -17,7 +17,7 @@
<include layout="@layout/view_premium_settings_tier_2" />
<include layout="@layout/view_premium_settings_games" />
</LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
<ProgressBar android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" />
<LinearLayout android:gravity="center" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">

View file

@ -5,7 +5,7 @@
<androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/guild_list_size" style="@style/UiKit.Guideline" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_strip_avatar_image" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/profile_strip_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/purple_brand_dark" style="@style/Avatar.Standard" />
<androidx.legacy.widget.Space android:id="@id/image_bottom_guideline" android:layout_width="@dimen/uikit_image_border_size_small" android:layout_height="@dimen/uikit_image_border_size_small" app:layout_constraintStart_toEndOf="@id/profile_strip_avatar_image" app:layout_constraintTop_toBottomOf="@id/profile_strip_avatar_image" />
<FrameLayout android:background="?primary_630_circle" android:padding="@dimen/uikit_image_border_size_small" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/image_bottom_guideline" app:layout_constraintEnd_toEndOf="@id/image_bottom_guideline" app:layout_constraintRight_toRightOf="@id/image_bottom_guideline">
<FrameLayout android:background="@drawable/drawable_uikit_primary_630_circle" android:padding="@dimen/uikit_image_border_size_small" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="@id/image_bottom_guideline" app:layout_constraintEnd_toEndOf="@id/image_bottom_guideline" app:layout_constraintRight_toRightOf="@id/image_bottom_guideline">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_strip_status" android:layout_width="10.0dip" android:layout_height="10.0dip" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
</FrameLayout>
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/primary_100" android:ellipsize="end" android:id="@id/profile_strip_name" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toTopOf="@id/profile_strip_discriminator" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Semibold" />