distok/apkfuckery
2
4
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changes of com.discord v1251

Browse source
This commit is contained in:
root 2020-09-02 04:07:20 +00:00
parent cef9fa9a2e
commit 4b481ae41b
9600 changed files with 408618 additions and 461559 deletions
Download patch file Download diff file Expand all files Collapse all files

2
com.discord/res/layout-v22/emoji_picker_header_item.xml
View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_width="fill_parent" android:textAllCaps="true" android:paddingHorizontal="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Bold"
<TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:id="@id/header_item_text" android:background="?colorBackgroundSecondary" android:paddingLeft="4.0dip" android:paddingTop="4.0dip" android:paddingRight="4.0dip" android:paddingBottom="4.0dip" android:layout_width="fill_parent" android:textAllCaps="true" android:paddingHorizontal="4.0dip" style="@style/UiKit.TextView.Bold"
xmlns:android="http://schemas.android.com/apk/res/android" />

18
com.discord/res/layout-v22/flex_input_widget.xml
View file

@ -6,19 +6,19 @@
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_attachment_clear_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_clear_24dp" android:contentDescription="@string/clear_attachments" android:elevation="4.0dip" style="@style/FlexInput.Input.Button" />
</LinearLayout>
<RelativeLayout android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup">
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<LinearLayout android:id="@id/flex_input_left_btns_container" android:layout_width="wrap_content" android:layout_marginLeft="5.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_expand_btn" android:padding="8.0dip" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_carot_right_24dp" android:contentDescription="@string/expand_buttons" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_camera_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginRight="8.0dip" android:src="@drawable/ic_camera_24dp" android:contentDescription="@string/camera" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
<androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_gallery_btn" android:background="@drawable/drawable_circle_black" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8.0dip" android:src="@drawable/ic_gallery_24dp" android:contentDescription="@string/attachment_photos" android:backgroundTint="?colorBackgroundSecondaryAlt" app:tint="?colorInteractiveNormal" style="@style/FlexInput.Input" />
</LinearLayout>
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
<LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
<androidx.appcompat.widget.AppCompatImageButton android:layout_gravity="center_vertical" android:id="@id/flex_input_emoji_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:drawablePadding="0.0dip" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
</LinearLayout>
<FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
<FrameLayout android:id="@id/flex_input_send_btn_container" android:background="@drawable/drawable_circle_black" android:clipToPadding="false" android:layout_width="40.0dip" android:layout_height="40.0dip" android:layout_marginLeft="8.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/send_message" android:animateLayoutChanges="true" android:backgroundTint="?chat_send_btn_bg">
<ImageView android:layout_gravity="center" android:id="@id/flex_input_send_btn_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_send_24dp" android:importantForAccessibility="no" app:tint="?chat_send_btn" />
</FrameLayout>
<TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="@dimen/uikit_spacing_xlarge" android:paddingRight="12.0dip" android:paddingBottom="@dimen/uikit_spacing_xlarge" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
<TextView android:gravity="center" android:id="@id/flex_input_cannot_send_text" android:background="?colorBackgroundSecondary" android:paddingLeft="12.0dip" android:paddingTop="24.0dip" android:paddingRight="12.0dip" android:paddingBottom="24.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_height="wrap_content" android:text="@string/no_send_messages_permission_placeholder" android:layout_alignParentStart="true" android:layout_alignParentEnd="true" style="@style/UiKit.TextView" />
</RelativeLayout>
<FrameLayout android:id="@id/flex_input_expression_tray_container" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="@dimen/default_keyboard_height" />
<FrameLayout android:id="@id/flex_input_default_window_insets_handler" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="wrap_content" />

2
com.discord/res/layout-v22/gif_search_empty_state_text_box_view.xml
View file

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_small" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="@dimen/uikit_spacing_small" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="@dimen/uikit_spacing_small" android:layout_marginVertical="@dimen/uikit_spacing_small" android:paddingHorizontal="@dimen/uikit_spacing_medium" android:paddingVertical="@dimen/uikit_spacing_small" style="@style/UiKit.TextView"
<androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="4.0dip" android:layout_marginVertical="4.0dip" android:paddingHorizontal="8.0dip" android:paddingVertical="4.0dip" style="@style/UiKit.TextView"
xmlns:android="http://schemas.android.com/apk/res/android" />

8
com.discord/res/layout-v22/overlay_bubble_menu.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
<LinearLayout android:theme="@style/AppTheme.Dark" android:gravity="left" android:clipChildren="false" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layoutDirection="ltr" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:gravity="center|right" android:orientation="horizontal" android:id="@id/overlay_header" android:layout_width="wrap_content" android:layout_height="wrap_content">
<View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" />
<View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" />
<androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="@dimen/uikit_spacing_small" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
<androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
</LinearLayout>
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
<com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
</LinearLayout>

6
com.discord/res/layout-v22/view_chat_upload.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout android:padding="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout android:padding="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<ImageView android:id="@id/file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/display_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/display_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginHorizontal="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:ellipsize="middle" android:id="@id/display_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/subtitle_text" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/file_image" app:layout_constraintRight_toLeftOf="@id/subtitle_text" app:layout_constraintStart_toEndOf="@id/file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/subtitle_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/display_name" app:layout_constraintEnd_toStartOf="@id/failed_alert_icon" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/display_name" app:layout_constraintRight_toLeftOf="@id/failed_alert_icon" app:layout_constraintStart_toEndOf="@id/display_name" />
<ImageView android:id="@id/failed_alert_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_alert_circle_16dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintBottom_toBottomOf="@id/display_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/display_name" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
com.discord/res/layout-v22/view_upload_progress.xml
View file

@ -2,7 +2,7 @@
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<ImageView android:id="@id/progress_file_image" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_uploads_generic_dark" android:scaleType="fitCenter" android:baselineAlignBottom="true" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@id/progress_text" app:layout_constraintEnd_toStartOf="@id/progress_text" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/progress_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/progress_text" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginHorizontal="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
<ProgressBar android:id="@id/progress_bar" 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:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:ellipsize="middle" android:id="@id/progress_text" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:singleLine="true" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/progress_bar" app:layout_constraintEnd_toStartOf="@id/progress_subtext" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_file_image" app:layout_constraintRight_toLeftOf="@id/progress_subtext" app:layout_constraintStart_toEndOf="@id/progress_file_image" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" app:layout_constraintWidth_default="wrap" style="@style/UiKit.TextView.Semibold" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_200" android:id="@id/progress_subtext" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/progress_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_default="wrap" app:layout_constraintLeft_toRightOf="@id/progress_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/progress_text" />
<ProgressBar android:id="@id/progress_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:maxHeight="1.0dip" android:max="100" android:minHeight="1.0dip" app:layout_constrainedHeight="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/progress_text" style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
com.discord/res/layout-v22/widget_call_fullscreen.xml
View file

@ -7,6 +7,12 @@
<TextView android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance.Semibold" />
<com.google.android.material.button.MaterialButton android:id="@id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
</LinearLayout>
<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/call_streaming_active" android:background="@color/black" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
<ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:src="@drawable/screen_share_illustration" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" android:text="@string/mobile_stream_active_header" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance.Bold" />
<TextView android:textColor="@color/primary_dark_300" android:id="@id/call_streaming_active_body" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_active_body" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance" />
<com.google.android.material.button.MaterialButton android:id="@id/call_stop_streaming_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mobile_stream_stop_sharing" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent">
<com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="?actionBarSize" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
@ -14,12 +20,12 @@
<androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16.0dip" android:layout_marginTop="32.0dip" app:cardCornerRadius="8.0dip" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout" app:layout_goneMarginTop="72.0dip">
<com.discord.views.video.VideoCallParticipantView android:id="@id/call_pip" android:visibility="gone" android:layout_width="140.0dip" android:layout_height="79.0dip" app:vcpv_is_overlay="true" app:vcpv_match_video_orientation="true" />
</androidx.cardview.widget.CardView>
<LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="@dimen/uikit_spacing_xxxlarge" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
<LinearLayout android:gravity="center_horizontal" android:orientation="vertical" android:id="@id/private_call_container" android:background="?ptrn_shapes" android:paddingTop="64.0dip" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/action_bar_toolbar_layout">
<androidx.recyclerview.widget.RecyclerView android:orientation="horizontal" android:id="@id/private_call_users_recycler" android:layout_width="wrap_content" android:layout_height="wrap_content" android:overScrollMode="never" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
<TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_400" android:id="@id/private_call_status_secondary" style="@style/UiKit.TextView" />
</LinearLayout>
<com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
<com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
<com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
com.discord/res/layout-v22/widget_chat_list_adapter_item_call.xml
View file

@ -2,8 +2,8 @@
<androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginTop="8.0dip" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="8.0dip" app:cardElevation="0.0dip" app:strokeWidth="0.0dip"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" android:paddingBottom="8.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingHorizontal="16.0dip" android:paddingVertical="8.0dip">
<ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginHorizontal="16.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
<ImageView android:id="@id/chat_list_adapter_item_call_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/chat_list_adapter_item_call_title" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:lineSpacingMultiplier="1.0" android:layout_marginHorizontal="16.0dip" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView" />
<TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_call_subtitle" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/sample_time_pm" android:layout_marginHorizontal="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/CallMessage.Subtitle" />
<LinearLayout android:id="@id/chat_list_adapter_item_call_unjoined_ongoing_subtitle" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginHorizontal="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_call_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_call_title" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
<TextView android:textSize="12.0dip" android:id="@id/chat_list_adapter_item_unjoined_call_duration" android:layout_width="wrap_content" style="@style/CallMessage.Subtitle" />

6
com.discord/res/layout-v22/widget_emoji_picker.xml
View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.appbar.AppBarLayout android:id="@id/emoji_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
<RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
<RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
<TextView android:gravity="center_vertical" android:id="@id/emoji_inline_search_button" android:background="?bg_pressed_highlight" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
<com.google.android.material.textfield.TextInputEditText android:id="@id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/emoji_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_emoji" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
@ -12,10 +12,10 @@
</com.google.android.material.appbar.AppBarLayout>
<com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="16.0dip" style="@style/UiKit.TextView" />
</com.discord.app.AppViewFlipper>
<View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">
<androidx.recyclerview.widget.RecyclerView android:id="@id/emoji_picker_category_recycler" android:layout_width="0.0dip" android:layout_height="fill_parent" app:layout_constraintEnd_toStartOf="@id/emoji_picker_category_barrier" app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Barrier android:id="@id/emoji_picker_category_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="emoji_picker_unicode_emoji_shortcut_button,emoji_picker_backspace_icon" />
<ImageView android:id="@id/emoji_picker_unicode_emoji_shortcut_button" android:visibility="gone" android:layout_width="wrap_content" android:src="@drawable/ic_emoji_picker_category_people" android:contentDescription="@string/unicode_emoji_category_shortcut_a11y_label" app:layout_constraintEnd_toStartOf="@id/emoji_picker_backspace_icon" app:layout_constraintStart_toEndOf="@id/emoji_picker_category_barrier" app:tint="?colorInteractiveNormal" style="@style/EmojiPickerButtonIcon" />

6
com.discord/res/layout-v22/widget_expression_tray.xml
View file

@ -13,9 +13,9 @@
<TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
<TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/expression_tray_search_icon" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
<com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
<TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="8.0dip" android:paddingBottom="8.0dip" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/expression_tray_search_icon" android:padding="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
</com.discord.utilities.view.rounded.RoundedRelativeLayout>
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>

2
com.discord/res/layout-v22/widget_gif_picker_search.xml
View file

@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<com.google.android.material.appbar.AppBarLayout android:id="@id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
<androidx.appcompat.widget.Toolbar android:id="@id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
<RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="12.0dip" android:layout_marginVertical="@dimen/uikit_spacing_large">
<RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="16.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="12.0dip" android:layout_marginVertical="16.0dip">
<com.google.android.material.textfield.TextInputEditText android:id="@id/gif_search_input" android:background="@null" android:visibility="visible" android:layout_height="wrap_content" android:hint="@string/search_tenor" style="@style/ExpressionSearchInput" />
<ImageView android:id="@id/gif_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/reset" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
</RelativeLayout>

36
com.discord/res/layout-v22/widget_guild_clone.xml
View file

@ -7,39 +7,39 @@
<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
<com.discord.app.AppViewFlipper android:id="@id/guild_create_flipper" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
<TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_resolving_title" style="@style/UiKit.TextView.H2" />
<ProgressBar android:id="@id/loading_button_progress" android:layout_width="30.0dip" android:layout_height="30.0dip" />
</LinearLayout>
<LinearLayout android:gravity="center_horizontal" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
<TextView android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
<TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_title" style="@style/UiKit.TextView.H2" />
<TextView android:layout_marginBottom="8.0dip" android:text="@string/guild_template_invalid_subtitle" style="@style/UiKit.TextView.Subtext" />
</LinearLayout>
<LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.TextView.Large.SingleLine" />
<include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" layout="@layout/layout_icon_uploader" />
<LinearLayout android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.Copy">
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
<TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
<TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
<include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" layout="@layout/layout_icon_uploader" />
<LinearLayout android:padding="16.0dip" style="@style/UiKit.Copy">
<TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/guild_create_name" android:hint="@string/form_placeholder_server_name" style="@style/UiKit.TextInputLayout">
<com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="@dimen/uikit_spacing_medium" android:importantForAutofill="no" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
<com.google.android.material.textfield.TextInputEditText android:layout_marginBottom="8.0dip" android:importantForAutofill="no" style="@style/UiKit.TextInputLayout.EditText.SingleLine" />
</com.google.android.material.textfield.TextInputLayout>
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext" />
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
<com.discord.utilities.view.text.LinkifiedTextView android:layout_gravity="start" android:id="@id/guild_create_guidelines" android:layout_marginLeft="0.0dip" android:layout_marginRight="0.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.TextView.Subtext" />
<com.discord.views.LoadingButton android:id="@id/guild_create_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="8.0dip" app:lb_background_color="@color/uikit_btn_bg_color_selector_green" app:lb_progress_color="@color/white" app:lb_text="@string/create" app:lb_text_color="@drawable/button_text_color_primary_100" />
<TextView android:textSize="12.0sp" android:textColor="?colorHeaderSecondary" android:id="@id/guild_create_protip" style="@style/UiKit.TextView" />
</LinearLayout>
<LinearLayout android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
<LinearLayout android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<View android:background="?colorBackgroundModifierAccent" android:layout_marginTop="16.0dip" android:layout_marginBottom="@dimen/uikit_textsize_xxlarge" style="@style/UiKit.Divider" />
<TextView android:text="@string/channels" style="@style/UiKit.TextView.H1.Bold" />
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_channels_descriptions" style="@style/UiKit.TextView.Subtext" />
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.widgets.guilds.create.GuildTemplateChannelsView android:id="@id/guild_template_preview_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:id="@id/guild_template_preview_roles_layout" android:layout_marginTop="16.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:text="@string/guild_template_modal_roles_header" style="@style/UiKit.TextView.H1.Bold" />
<TextView android:textColor="?colorTextNormal" android:text="@string/guild_template_modal_roles_description" style="@style/UiKit.TextView.Subtext" />
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_medium" />
<LinearLayout android:background="@drawable/drawable_rect_rounded_white_corner_radius_8dp" android:paddingBottom="8.0dip" android:layout_marginTop="8.0dip" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" android:backgroundTint="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.LinearLayout">
<com.discord.widgets.roles.RolesListView android:id="@id/guild_template_preview_roles" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="8.0dip" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

4
com.discord/res/layout-v22/widget_notice_popup.xml
View file

@ -2,8 +2,8 @@
<LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" android:focusedByDefault="false" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<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" app:roundAsCircle="true" style="@style/Avatar.Notification" />
<LinearLayout android:layout_gravity="center_vertical" 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.LinearLayout">
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" app:roundAsCircle="true" style="@style/Avatar.Notification" />
<LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
<com.discord.app.AppTextView android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/popup_body" android:maxLines="3" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
</LinearLayout>

10
com.discord/res/layout-v22/widget_notice_popup_channel.xml
View file

@ -2,12 +2,12 @@
<LinearLayout android:background="?notice_popup_bg" android:focusable="false" android:focusableInTouchMode="false" android:maxWidth="@dimen/popup_notif_max_width" android:focusedByDefault="false" style="@style/UiKit.ViewGroup.LinearLayout"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<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:textAppearance="@style/UiKit.TextAppearance.Semibold" 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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
<com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" style="@style/Avatar.Notification" />
<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
<TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" 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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="32.0dip" style="@style/UiKit.TextView.Subtext.SingleLine" />
<TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_subtitle" 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.SingleLine" />
<com.discord.utilities.view.text.SimpleDraweeSpanTextView 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: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.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="2.0dip" 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:visibility="gone" android:layout_width="64.0dip" android:layout_height="64.0dip" 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>

18
com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
View file

@ -1,15 +1,15 @@
<?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:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 app:navigationContentDescription="@string/close" 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:background="?selectableItemBackgroundBorderless" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" 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">
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_medium" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
<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" />
<LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
<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="16.0dip" android:layout_marginBottom="8.0dip" />
<com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="8.0dip" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
<TextView android:layout_marginTop="8.0dip" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" android:hint="@string/billing_address_name" android:autofillHints="name" style="@style/UiKit.TextInputLayout.Primary">
<com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit.TextInputLayout.EditText" />
</com.google.android.material.textfield.TextInputLayout>
@ -31,8 +31,8 @@
<com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_country" android:focusable="false" android:hint="@string/billing_address_country" app:endIconDrawable="@drawable/ic_lock_white_a60_16dp" app:endIconMode="custom" style="@style/UiKit.TextInputLayout.Primary">
<com.google.android.material.textfield.TextInputEditText android:enabled="false" android:textColor="?primary_400" android:inputType="none" style="@style/UiKit.TextInputLayout.EditText" />
</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" />
<com.google.android.material.button.MaterialButton 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.Material.Button.Red.Outline" />
<CheckBox android:id="@id/payment_source_edit_default" android:layout_marginTop="8.0dip" android:checked="true" android:text="@string/payment_source_make_default" app:buttonTint="@color/brand_500" style="@style/UiKit.Checkbox" />
<com.google.android.material.button.MaterialButton android:id="@id/dialog_delete" android:layout_marginTop="24.0dip" android:layout_marginBottom="24.0dip" android:text="@string/payment_source_delete" style="@style/UiKit.Material.Button.Red.Outline" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</LinearLayout>

2
com.discord/res/layout-v22/widget_settings_account_change_password.xml
View file

@ -5,7 +5,7 @@
<androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.ScrollView">
<LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
<LinearLayout android:paddingLeft="16.0dip" android:paddingTop="8.0dip" android:paddingRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
<com.google.android.material.textfield.TextInputLayout android:id="@id/change_password_current_password_input" android:hint="@string/form_label_current_password" style="@style/UiKit.TextInputLayout.Primary">
<com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Password">
<requestFocus />