Changes of com.discord v846
This commit is contained in:
root
parent
66d052f838
commit
704dabdd33
6363 changed files with 152303 additions and 196491 deletions
|
|
@ -4,10 +4,10 @@
|
|||
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
|
||||
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
|
||||
<TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintWidth_min="@dimen/uikit_spacing_xlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<TextView android:id="@id/popup_subtitle" android:layout_marginLeft="4.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
|
||||
<com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:background="?primary_600_bg" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
<ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -10,42 +10,38 @@
|
|||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" style="@style/UiKit.TextView.Semibold" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/settings_account_verification_resend" android:background="@drawable/drawable_button_white" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/verify_account" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:gravity="center_vertical" android:id="@id/settings_account_avatar_wrap" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<FrameLayout android:id="@id/settings_account_avatar_container" android:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Large.ExtraAccount" />
|
||||
<ImageView android:layout_gravity="center|right|top" android:id="@id/settings_account_avatar_edit" android:background="@drawable/drawable_circle_white_1" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_upload_image_34dp" android:scaleType="center" />
|
||||
</FrameLayout>
|
||||
<LinearLayout android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:id="@id/settings_account_tag" style="@style/UiKit.TextView.Large.SingleLine" />
|
||||
<TextView android:textColor="?primary_400" android:id="@id/settings_account_email" style="@style/UiKit.TextView" />
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/remove_icon" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:weightSum="2.0" android:layout_below="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
|
||||
<Button android:id="@id/settings_account_edit" android:layout_width="0.0dip" android:text="@string/user_settings_edit_account" android:layout_weight="1.0" style="@style/UiKit.Button" />
|
||||
<Button android:id="@id/settings_account_change_password" android:layout_width="0.0dip" android:text="@string/change_password" android:layout_weight="1.0" style="@style/UiKit.Button.Grey" />
|
||||
<RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
|
||||
<LinearLayout android:gravity="center_horizontal" android:id="@id/settings_account_avatar_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<RelativeLayout android:background="@drawable/drawable_circle_white_5" android:layout_width="wrap_content" android:layout_height="wrap_content">
|
||||
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_account_avatar" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
|
||||
</RelativeLayout>
|
||||
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/purple_brand" android:id="@id/settings_account_remove_avatar" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/remove" style="@style/UiKit.TextView.Semibold" />
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
<View style="@style/UiKit.Divider" />
|
||||
<com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_username" android:hint="@string/username" android:inputType="textPersonName" android:importantForAutofill="no" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:textColor="@color/status_orange_500" android:id="@id/settings_account_claim_btn" android:visibility="gone" android:text="@string/claim_account" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" android:drawableTint="@color/status_orange_500" style="@style/UiKit.Settings.Item.Header" />
|
||||
<View style="@style/UiKit.Divider" />
|
||||
<LinearLayout android:id="@id/settings_account_mfa_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<FrameLayout style="@style/UiKit.ViewGroup">
|
||||
<TextView android:text="@string/two_fa" style="@style/UiKit.Settings.Item.Header" />
|
||||
<TextView android:textColor="@color/status_green_500" android:layout_gravity="end|center" android:id="@id/settings_account_mfa_enabled_header" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/user_settings_mfa_enabled" android:drawableLeft="@drawable/ic_small_lock_green_24dp" android:textAllCaps="true" android:drawableStart="@drawable/ic_small_lock_green_24dp" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Semibold" />
|
||||
</FrameLayout>
|
||||
<TextView android:id="@id/settings_account_view_backup_codes" android:text="@string/two_fa_view_backup_codes" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:id="@id/settings_account_remove_two_fa" android:text="@string/two_fa_remove" style="@style/UiKit.Settings.Item" />
|
||||
<LinearLayout android:id="@id/settings_account_credentials_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<com.google.android.material.textfield.TextInputLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_email" android:hint="@string/form_label_email" android:inputType="textEmailAddress" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<com.google.android.material.textfield.TextInputLayout android:id="@id/settings_account_password_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.Form.Field.EditText.Wrap">
|
||||
<androidx.appcompat.widget.AppCompatEditText android:id="@id/settings_account_password" android:hint="@string/form_label_current_password" android:inputType="textPassword" style="@style/UiKit.Form.Field.EditText.SingleLine" />
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
<View style="@style/UiKit.Settings.Divider" />
|
||||
<TextView android:id="@id/settings_account_change_password" android:text="@string/change_password" android:drawableRight="@drawable/ic_chevron_right_grey_12dp" android:drawableEnd="@drawable/ic_chevron_right_grey_12dp" style="@style/UiKit.Settings.Item.Header" />
|
||||
</LinearLayout>
|
||||
<View style="@style/UiKit.Divider" />
|
||||
<TextView android:text="@string/account_management" style="@style/UiKit.Settings.Item.Header" />
|
||||
<LinearLayout android:id="@id/settings_account_private_data_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textColor="?primary_100" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:id="@id/settings_account_private_data_header" android:focusable="true" android:focusableInTouchMode="false" android:clickable="true" android:text="@string/account_management" android:drawableRight="?ic_plus_a60" android:drawableEnd="?ic_plus_a60" style="@style/UiKit.Settings.Item.Header" />
|
||||
<LinearLayout android:id="@id/settings_account_private_data_wrap" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
|
||||
<TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_disable" android:text="@string/disable_account" style="@style/UiKit.Settings.Item" />
|
||||
<TextView android:textColor="@color/status_red_500" android:id="@id/settings_account_private_data_delete" android:text="@string/delete_account" style="@style/UiKit.Settings.Item" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
<com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/settings_account_save" style="@style/Settings.FloatingActionButton.Save" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
Loading…
Add table
Add a link
Reference in a new issue