Changes of com.discord v846

com.discord/res/drawable-anydpi-v21/drawable_application_news_loading_dark.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="208.0dip" android:width="288.0dip" android:viewportWidth="288.0" android:viewportHeight="208.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff36393f" android:pathData="M0,4C0,1.791 1.791,0 4,0H284C286.209,0 288,1.791 288,4V116C288,118.209 286.209,120 284,120H4C1.791,120 0,118.209 0,116V4Z" />
-    <path android:fillColor="#ff36393f" android:pathData="M0,138C0,136.895 0.895,136 2,136H118C119.105,136 120,136.895 120,138V142C120,143.105 119.105,144 118,144H2C0.895,144 0,143.105 0,142V138Z" />
-    <path android:fillColor="#ff36393f" android:pathData="M0,154C0,152.895 0.895,152 2,152H286C287.105,152 288,152.895 288,154V158C288,159.105 287.105,160 286,160H2C0.895,160 0,159.105 0,158V154Z" />
-    <path android:fillColor="#ff36393f" android:pathData="M0,170C0,168.895 0.895,168 2,168H158C159.105,168 160,168.895 160,170V174C160,175.105 159.105,176 158,176H2C0.895,176 0,175.105 0,174V170Z" />
-    <path android:fillColor="#ff36393f" android:pathData="M0,194C0,192.895 0.895,192 2,192H118C119.105,192 120,192.895 120,194V198C120,199.105 119.105,200 118,200H2C0.895,200 0,199.105 0,198V194Z" />
-</vector>

com.discord/res/drawable-anydpi-v21/drawable_application_news_loading_light.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="208.0dip" android:width="288.0dip" android:viewportWidth="288.0" android:viewportHeight="208.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffe3e5e8" android:pathData="M0,4C0,1.791 1.791,0 4,0H284C286.209,0 288,1.791 288,4V116C288,118.209 286.209,120 284,120H4C1.791,120 0,118.209 0,116V4Z" />
-    <path android:fillColor="#ffe3e5e8" android:pathData="M0,138C0,136.895 0.895,136 2,136H118C119.105,136 120,136.895 120,138V142C120,143.105 119.105,144 118,144H2C0.895,144 0,143.105 0,142V138Z" />
-    <path android:fillColor="#ffe3e5e8" android:pathData="M0,154C0,152.895 0.895,152 2,152H286C287.105,152 288,152.895 288,154V158C288,159.105 287.105,160 286,160H2C0.895,160 0,159.105 0,158V154Z" />
-    <path android:fillColor="#ffe3e5e8" android:pathData="M0,170C0,168.895 0.895,168 2,168H158C159.105,168 160,168.895 160,170V174C160,175.105 159.105,176 158,176H2C0.895,176 0,175.105 0,174V170Z" />
-    <path android:fillColor="#ffe3e5e8" android:pathData="M0,194C0,192.895 0.895,192 2,192H118C119.105,192 120,192.895 120,194V198C120,199.105 119.105,200 118,200H2C0.895,200 0,199.105 0,198V194Z" />
-</vector>

com.discord/res/drawable-anydpi-v21/ic_check_brand_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff738bd7" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
-</vector>

com.discord/res/drawable-anydpi-v21/ic_delete_sweep_primary_100_a60_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#99ffffff" android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM14,5h-3l-1,-1L6,4L5,5L2,5v2h12z" />
-</vector>

com.discord/res/drawable-anydpi-v21/ic_delete_sweep_primary_500_a60_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#994f545c" android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM14,5h-3l-1,-1L6,4L5,5L2,5v2h12z" />
-</vector>

com.discord/res/drawable-anydpi-v21/ic_small_lock_green_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="18.0dip" android:width="18.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff43b581" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
-</vector>

com.discord/res/drawable-anydpi-v21/ic_upload_image_34dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="34.0dip" android:width="34.0dip" android:viewportWidth="40.0" android:viewportHeight="40.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff4f545c" android:pathData="M26.75,20.75L26.75,25.25C26.75,26.08 26.08,26.75 25.25,26.75L14.75,26.75C13.92,26.75 13.25,26.08 13.25,25.25L13.25,14.75C13.25,13.92 13.92,13.25 14.75,13.25L22.25,13.25L19.25,13.25L19.25,14.75L14.75,14.75L14.75,25.25L25.25,25.25L25.25,20.75L26.75,20.75ZM21.47,20.22L24.13,23.75L15.88,23.75L17.94,21.1L19.41,22.87L21.47,20.22ZM25.25,14.75L27.5,14.75L27.5,16.25L25.25,16.25L25.25,18.5L23.75,18.5L23.75,16.25L21.5,16.25L21.5,14.75L23.75,14.75L23.75,12.5L25.25,12.5L25.25,14.75Z" android:strokeColor="#00000000" android:strokeWidth="1.0" />
-</vector>

com.discord/res/drawable/drawable_bg_card_primary_700.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/primary_700" />
-    <corners android:radius="3.0dip" />
-</shape>

com.discord/res/drawable/drawable_bg_news_header.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/primary_800" />
-    <corners android:topLeftRadius="4.0dip" android:topRightRadius="4.0dip" />
-</shape>

com.discord/res/drawable/img_gifting_pattern_bg_dark.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
+<layer-list android:paddingBottom="@dimen/uikit_spacing_xxlarge"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_dark" />
     <item android:drawable="@color/primary_630_alpha_60" />

com.discord/res/drawable/img_gifting_pattern_bg_light.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list android:paddingBottom="@dimen/uikit_spacing_xxxlarge"
+<layer-list android:paddingBottom="@dimen/uikit_spacing_xxlarge"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:gravity="top" android:drawable="@drawable/img_gifting_pattern_light" />
     <item android:drawable="@color/primary_100_alpha_60" />

com.discord/res/layout-v17/view_application_news.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="?application_news_background" style="@style/UiKit.ViewGroup"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/application_news_loading" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" android:src="?application_news_loading" android:scaleType="fitXY" android:contentDescription="@string/loading" style="@style/UiKit.ImageView" />
-    <LinearLayout android:gravity="center" android:id="@id/application_news_error_container" android:padding="@dimen/uikit_spacing_xlarge" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
-        <ImageView android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?application_news_error" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?application_news_title_text_color" android:gravity="center" android:layout_width="fill_parent" android:text="@string/application_news_error_title" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?application_news_description_text_color" android:gravity="center" android:layout_width="fill_parent" android:text="@string/application_news_error_body" style="@style/UiKit.TextView" />
-        <Button android:id="@id/application_news_error_retry" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/try_again" style="@style/UiKit.Button.Theme" />
-    </LinearLayout>
-    <LinearLayout android:id="@id/application_news_content" android:visibility="visible" style="@style/UiKit.ViewGroup.LinearLayout">
-        <FrameLayout android:id="@id/application_news_header_container" android:background="?application_news_top_strip_color" android:layout_width="fill_parent" android:layout_height="@dimen/application_news_header_strip_height">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_news_splash" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="fitCenter" app:roundBottomLeft="false" app:roundBottomRight="false" app:roundedCornerRadius="4.0dip" />
-        </FrameLayout>
-        <TextView android:textColor="?application_news_title_text_color" android:id="@id/application_news_title" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Large" />
-        <TextView android:textColor="?application_news_description_text_color" android:id="@id/application_news_description" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
-        <View android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.Divider.Thick" />
-        <RelativeLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup">
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?application_news_footer_text_color" android:id="@id/application_news_footer_text" android:layout_toLeftOf="@id/application_news_icon" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_toStartOf="@id/application_news_icon" android:layout_alignParentStart="true" style="@style/UiKit.TextView.SingleLine" />
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/application_news_icon" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" app:placeholderImage="@color/primary_600" style="@style/Icon.Game.Small" />
-        </RelativeLayout>
-    </LinearLayout>
-</FrameLayout>

com.discord/res/layout-v17/view_global_search_item.xml

@@ -5,7 +5,7 @@
     <ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
+    <TextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:gravity="end" android:id="@id/item_group_tv" android:layout_marginRight="@dimen/uikit_spacing_medium" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
     <TextView android:id="@id/item_mentions_tv" android:visibility="gone" android:layout_marginRight="@dimen/uikit_spacing_medium" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
 </merge>

com.discord/res/layout-v17/widget_channel_group_dm_settings.xml

@@ -8,7 +8,7 @@
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
-                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
+                <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/edit" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
                 <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
                 <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="0.0dip" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">

com.discord/res/layout-v17/widget_chat_detached.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:background="@color/status_grey_500" android:visibility="gone" android:layout_height="@dimen/uikit_spacing_xlarge" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/chat_detached_icon" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_message_white_18dp" android:layout_centerVertical="true" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
     <TextView android:textColor="@color/white" android:text="@string/youre_viewing_older_messages" android:layout_toLeftOf="@id/chat_detached_arrow" android:layout_toRightOf="@id/chat_detached_icon" android:layout_centerVertical="true" android:layout_toStartOf="@id/chat_detached_arrow" android:layout_toEndOf="@id/chat_detached_icon" style="@style/UiKit.TextView.Subtext" />

com.discord/res/layout-v17/widget_chat_input_emoji_picker.xml

@@ -6,7 +6,7 @@
       xmlns:android="http://schemas.android.com/apk/res/android" />
     <RelativeLayout android:id="@id/emoji_picker_bottom_bar" android:background="?colorPrimary" android:layout_width="fill_parent" android:layout_height="48.0dip" android:layout_alignParentBottom="true">
         <ImageView android:id="@id/emoji_picker_search_icon" android:src="?theme_search_menu_icon" android:layout_alignParentLeft="true" android:contentDescription="@string/search" android:layout_alignParentStart="true" style="@style/EmojiPickerButtonIcon" />
-        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
+        <com.google.android.material.tabs.TabLayout android:id="@id/emoji_picker_tab_layout" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_toLeftOf="@id/emoji_picker_backspace_icon" android:layout_toRightOf="@id/emoji_picker_search_icon" android:layout_alignParentBottom="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/emoji_picker_backspace_icon" android:layout_toEndOf="@id/emoji_picker_search_icon" app:tabMaxWidth="@dimen/uikit_spacing_xxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />
         <ImageView android:id="@id/emoji_picker_backspace_icon" android:src="?theme_backspace_icon" android:layout_alignParentRight="true" android:contentDescription="@string/delete" android:layout_alignParentEnd="true" style="@style/EmojiPickerButtonIcon" />
     </RelativeLayout>
 </RelativeLayout>

com.discord/res/layout-v17/widget_chat_list_adapter_item_application_news.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.ApplicationNewsView android:id="@id/news_item_view" android:background="?chat_embed_bg" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_guideline_chat" android:layout_marginTop="@dimen/chat_cell_vertical_spacing_padding" android:layout_marginRight="@dimen/chat_cell_horizontal_spacing_total" android:layout_marginBottom="@dimen/chat_cell_vertical_spacing_padding" android:maxWidth="@dimen/chat_embed_width" android:minWidth="220.0dip" android:layout_marginStart="@dimen/uikit_guideline_chat" android:layout_marginEnd="@dimen/chat_cell_horizontal_spacing_total" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip"
-  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

com.discord/res/layout-v17/widget_chat_list_adapter_item_embed.xml

@@ -8,7 +8,7 @@
     <TextView android:textSize="9.5sp" android:textColor="@color/grey_1" android:id="@id/chat_list_item_embed_provider" android:background="?selectableItemBackground" android:visibility="gone" android:layout_width="0.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/uikit_chat_embed_guideline" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_item_embed_author_icon" android:visibility="gone" android:layout_width="@dimen/embed_tiny_icon_size" android:layout_height="@dimen/embed_tiny_icon_size" app:layout_constraintBottom_toBottomOf="@id/chat_list_item_embed_author_text" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_item_embed_author_text" app:placeholderImage="?theme_chat_divider_embed" app:roundedCornerRadius="2.0dip" />
     <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_item_embed_author_text" android:visibility="gone" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/embed_item_margin" android:layout_marginTop="@dimen/embed_item_margin" android:layout_toRightOf="@id/chat_list_item_embed_author_icon" android:layout_marginStart="@dimen/embed_item_margin" android:layout_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintEnd_toStartOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintLeft_toRightOf="@id/chat_list_item_embed_author_icon" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintStart_toEndOf="@id/chat_list_item_embed_author_icon" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_provider" app:layout_goneMarginLeft="0.0dip" app:layout_goneMarginStart="0.0dip" style="@style/UiKit.TextView.Semibold" />
-    <com.discord.utilities.view.text.LinkifiedTextView android:textColor="@color/link_500" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="@color/link_500" android:id="@id/chat_list_item_embed_title" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_author_text" style="@style/UiKit.TextView.Semibold" />
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_item_embed_description" android:background="?selectableItemBackground" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/sample_channel_message" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_title" style="@style/UiKit.TextView" />
     <LinearLayout android:id="@id/chat_list_item_embed_fields" android:layout_width="0.0dip" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_embed_guideline" app:layout_constraintRight_toLeftOf="@id/chat_list_item_embed_image_thumbnail" app:layout_constraintTop_toBottomOf="@id/chat_list_item_embed_description" style="@style/UiKit.ViewGroup.LinearLayout" />
     <androidx.constraintlayout.widget.Barrier android:id="@id/chat_list_item_embed_barrier" android:layout_width="0.0dip" android:layout_height="0.0dip" app:barrierDirection="bottom" app:constraint_referenced_ids="chat_list_item_embed_description,         chat_list_item_embed_title,         chat_list_item_embed_image_thumbnail,         chat_list_item_embed_fields,         chat_list_item_embed_author_text,         chat_list_item_embed_provider" />

com.discord/res/layout-v17/widget_edit_role.xml

@@ -13,9 +13,9 @@
             </FrameLayout>
             <View style="@style/UiKit.Settings.Divider" />
             <TextView android:text="@string/form_label_role_color" style="@style/UiKit.Settings.Item.Header" />
-            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge">
+            <RelativeLayout android:id="@id/role_settings_color_selector_container" android:background="?selectableItemBackground" android:focusable="true" android:clickable="true" android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge">
                 <TextView android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/form_label_role_color" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.TextView" />
-                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" />
+                <View android:id="@id/role_settings_current_color_display" android:background="@drawable/drawable_circle_purple_brand" android:layout_width="@dimen/uikit_spacing_xlarge" android:layout_height="@dimen/uikit_spacing_xlarge" android:layout_margin="@dimen/uikit_spacing_large" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" />
                 <View android:id="@id/role_settings_color_disabled_overlay" android:background="@color/white_alpha_30" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
             </RelativeLayout>
             <View style="@style/UiKit.Settings.Divider" />

com.discord/res/layout-v17/widget_friends_nearby.xml

@@ -10,7 +10,7 @@
             <TextView android:gravity="center" android:layout_gravity="center" android:id="@id/nearby_friends_error" android:layout_margin="@dimen/uikit_spacing_large" android:text="@string/add_friend_nearby_enable_settings_android" android:drawableTop="?img_addfriends_notconnected" android:drawablePadding="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
             <LinearLayout android:gravity="center" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                 <com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="220.0dip" android:layout_height="220.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
-                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:id="@id/nearby_friends_searching" android:layout_marginLeft="@dimen/uikit_spacing_xlarge" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:text="@string/add_friend_nearby_looking" style="@style/UiKit.TextView" />
             </LinearLayout>
             <androidx.recyclerview.widget.RecyclerView android:id="@id/nearby_friends_recycler" android:padding="@dimen/uikit_spacing_small" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
         </com.discord.app.AppViewFlipper>

com.discord/res/layout-v17/widget_global_search.xml

@@ -6,8 +6,8 @@
         <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_guild_list" style="@style/UiKit.GuildsList.Horiz" />
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/global_search_view_flipper" android:background="?colorPrimary" style="@style/AppTheme.AppBarScrollingViewBehavior">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H2" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/global_search_recycler" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <TextView android:textColor="?primary_400" android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/quickswitcher_tutorial_message_search" android:drawableTop="?img_empty_search_defaults" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView.H2" />
         <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
             <LinearLayout android:gravity="center_horizontal" 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">
                 <ImageView android:layout_width="80.0dip" android:layout_height="80.0dip" android:layout_margin="@dimen/uikit_spacing_large" android:src="?img_empty_search" android:contentDescription="@string/search_no_results" style="@style/UiKit.ImageView" />

com.discord/res/layout-v17/widget_guild_invite_share.xml

@@ -6,7 +6,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
         <com.discord.app.AppViewFlipper android:id="@id/guild_invite_suggestions_flipper" android:layout_width="fill_parent" android:layout_height="0.0dip" android:layout_weight="1.0">
-            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xxlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
+            <ImageView android:layout_gravity="center" android:layout_margin="@dimen/uikit_spacing_xlarge" android:src="?img_empty_server_invites" android:scaleType="centerInside" android:importantForAccessibility="no" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ImageView" />
             <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
                 <include layout="@layout/layout_search" />
                 <androidx.recyclerview.widget.RecyclerView android:id="@id/guild_invite_suggestion_list" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView" />

com.discord/res/layout-v17/widget_guild_invite_share_item.xml

@@ -3,6 +3,6 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
-    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
-    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
+    <TextView android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <TextView android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Button.Transparent.Fit" />
 </LinearLayout>

com.discord/res/layout-v17/widget_manage_reactions_result_user.xml

@@ -2,6 +2,5 @@
 <RelativeLayout android:paddingLeft="20.0dip" android:paddingTop="8.0dip" android:paddingRight="20.0dip" android:paddingBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/manage_reactions_result_user_avatar" android:layout_marginRight="16.0dip" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_marginEnd="16.0dip" android:layout_alignParentStart="true" style="@style/Avatar.Standard" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/manage_reactions_result_user_name" android:singleLine="true" android:layout_toLeftOf="@id/manage_reactions_result_remove_reaction" android:layout_toRightOf="@id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_toStartOf="@id/manage_reactions_result_remove_reaction" android:layout_toEndOf="@id/manage_reactions_result_user_avatar" style="@style/UiKit.TextView" />
-    <ImageView android:id="@id/manage_reactions_result_remove_reaction" android:background="?selectableItemBackgroundBorderless" android:focusable="true" android:clickable="true" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="?ic_close_24dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/remove_reaction" android:layout_alignParentEnd="true" />
+    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/manage_reactions_result_user_name" android:singleLine="true" android:layout_toRightOf="@id/manage_reactions_result_user_avatar" android:layout_centerVertical="true" android:layout_toEndOf="@id/manage_reactions_result_user_avatar" style="@style/UiKit.TextView" />
 </RelativeLayout>

com.discord/res/layout-v17/widget_notice_dialog.xml

@@ -7,7 +7,7 @@
     </LinearLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:gravity="center" android:id="@id/notice_body_container" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:gravity="start" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+            <TextView android:gravity="center" android:layout_gravity="start" android:id="@id/notice_body_text" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <View style="@style/UiKit.Settings.Divider" />

com.discord/res/layout-v17/widget_notice_popup_channel.xml

@@ -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>

com.discord/res/layout-v17/widget_server_settings_audit_log_listitem.xml

@@ -9,7 +9,7 @@
             </FrameLayout>
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/audit_log_listitem_avatar" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_toRightOf="@id/audit_log_listitem_action_container" android:layout_centerVertical="true" style="@style/Avatar.Standard" />
             <com.discord.app.AppTextView android:ellipsize="end" android:id="@id/audit_log_listitem_header_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toLeftOf="@id/audit_log_listitem_arrow" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?primary_400" android:ellipsize="end" android:id="@id/audit_log_listitem_date_text" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:maxLines="2" android:layout_toRightOf="@id/audit_log_listitem_avatar" android:layout_below="@id/audit_log_listitem_header_text" style="@style/UiKit.TextView" />
             <ImageView android:id="@id/audit_log_listitem_arrow" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:contentDescription="@string/more" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
         </RelativeLayout>
         <TextView android:textColor="?primary_400" android:id="@id/audit_log_listitem_change_text" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="fill_parent" style="@style/UiKit.TextView" />

com.discord/res/layout-v17/widget_server_settings_edit_integration.xml

@@ -40,7 +40,7 @@
                     <com.discord.views.CheckedSetting android:id="@id/edit_integration_custom_emotes_toggle" app:cs_text="@string/enable_twitch_emoji_sync" style="@style/UiKit.CheckedSetting.Themed" />
                 </LinearLayout>
             </LinearLayout>
-            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxxlarge" />
+            <Space android:layout_width="fill_parent" android:layout_height="@dimen/uikit_spacing_xxlarge" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
     <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/edit_integration_save" style="@style/Settings.FloatingActionButton.Save" />