Changes of com.discord v889

com.discord/AndroidManifest.xml

@@ -18,10 +18,10 @@
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
+    <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
         <activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
         <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
             <intent-filter>
@@ -103,7 +103,7 @@
         <meta-data android:name="io.fabric.ApiKey" android:value="eaccfe98b3572a0a8721a8c3b10f9909018f5ec6"/>
         <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
         <activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-        <service android:exported="true" android:name="com.google.firebase.messaging.FirebaseMessagingService">
+        <service android:exported="false" android:name="com.google.firebase.messaging.FirebaseMessagingService">
             <intent-filter android:priority="-500">
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
@@ -122,14 +122,6 @@
             <meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.connector.internal.AnalyticsConnectorRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
         </service>
-        <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
-        <receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
-            <intent-filter>
-                <action android:name="com.android.vending.INSTALL_REFERRER"/>
-            </intent-filter>
-        </receiver>
-        <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
-        <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
         <receiver android:exported="true" android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver" android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
@@ -142,6 +134,14 @@
         </service>
         <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
         <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+        <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
+        <receiver android:enabled="true" android:exported="true" android:name="com.google.android.gms.measurement.AppMeasurementInstallReferrerReceiver" android:permission="android.permission.INSTALL_PACKAGES">
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER"/>
+            </intent-filter>
+        </receiver>
+        <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
+        <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
         <provider android:authorities="com.discord.workmanager-init" android:directBootAware="false" android:exported="false" android:multiprocess="true" android:name="androidx.work.impl.WorkManagerInitializer"/>
         <service android:directBootAware="false" android:enabled="@bool/enable_system_alarm_service_default" android:exported="false" android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"/>

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-888.apk
+apkFileName: com.discord-889.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -145,7 +145,6 @@ sharedLibrary: false
 sparseResources: false
 unknownFiles:
   androidsupportmultidexversion.txt: '8'
-  firebase-analytics-impl.properties: '8'
   firebase-analytics.properties: '8'
   firebase-common.properties: '8'
   firebase-core.properties: '8'
@@ -153,7 +152,6 @@ unknownFiles:
   firebase-iid-interop.properties: '8'
   firebase-iid.properties: '8'
   firebase-invites.properties: '8'
-  firebase-measurement-connector-impl.properties: '8'
   firebase-measurement-connector.properties: '8'
   firebase-messaging.properties: '8'
   play-services-ads-identifier.properties: '8'
@@ -164,6 +162,10 @@ unknownFiles:
   play-services-basement.properties: '8'
   play-services-measurement-api.properties: '8'
   play-services-measurement-base.properties: '8'
+  play-services-measurement-impl.properties: '8'
+  play-services-measurement-sdk-api.properties: '8'
+  play-services-measurement-sdk.properties: '8'
+  play-services-measurement.properties: '8'
   play-services-nearby.properties: '8'
   play-services-safetynet.properties: '8'
   play-services-stats.properties: '8'
@@ -470,5 +472,5 @@ usesFramework:
   tag: null
 version: 2.4.1-cc194d-SNAPSHOT
 versionInfo:
-  versionCode: '888'
-  versionName: 8.8.8
+  versionCode: '889'
+  versionName: 8.8.9

com.discord/assets/crashlytics-build.properties

@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Fri Apr 26 19:40:46 UTC 2019
-version_name=8.8.8
+#Fri May 03 18:04:29 UTC 2019
+version_name=8.8.9
 package_name=com.discord
-build_id=dcf04295-60f0-46ed-9d06-b0e2e173e2e2
-version_code=888
+build_id=039ee636-d458-4a49-82e1-e6ea791d6e71
+version_code=889
 app_name=com.discord

com.discord/res/anim/anim_slide_down.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set android:fillAfter="true" android:fillEnabled="true"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_decelerate_interpolator" android:fillAfter="true" android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="1.0" android:toYScale="0.0" />
-</set>

com.discord/res/anim/anim_slide_up.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set android:fillAfter="true" android:fillEnabled="true"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <scale android:interpolator="@android:anim/accelerate_decelerate_interpolator" android:fillAfter="true" android:fromXScale="1.0" android:toXScale="1.0" android:fromYScale="0.0" android:toYScale="1.0" />
-</set>

com.discord/res/drawable/drawable_asset_pattern_shapes_dark.xml

@@ -7,7 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/asset_pattern_shapes_white" android:tileMode="repeat"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
+        <bitmap android:src="@drawable/asset_pattern_shapes_white" android:tileMode="repeat" />
     </item>
 </layer-list>

com.discord/res/drawable/drawable_asset_pattern_shapes_light.xml

@@ -7,7 +7,6 @@
         </shape>
     </item>
     <item>
-        <bitmap android:src="@drawable/asset_pattern_shapes_grey" android:tileMode="repeat"
-          xmlns:android="http://schemas.android.com/apk/res/android" />
+        <bitmap android:src="@drawable/asset_pattern_shapes_grey" android:tileMode="repeat" />
     </item>
 </layer-list>

com.discord/res/drawable/drawable_bg_reaction_dark.xml

@@ -2,15 +2,13 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_activated="true">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/reaction_background_me_dark" />
             <corners android:radius="3.0dip" />
         </shape>
     </item>
     <item android:state_activated="false">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/white_alpha_05" />
             <corners android:radius="3.0dip" />
         </shape>

com.discord/res/drawable/drawable_bg_reaction_light.xml

@@ -2,15 +2,13 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_activated="true">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/reaction_background_me_light" />
             <corners android:radius="3.0dip" />
         </shape>
     </item>
     <item android:state_activated="false">
-        <shape android:shape="rectangle"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <shape android:shape="rectangle">
             <solid android:color="@color/grey_6_alpha_05" />
             <corners android:radius="3.0dip" />
         </shape>

com.discord/res/drawable/drawable_circle_ringing.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="oval"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="2.0dip" android:color="@color/status_red_500" />
-    <solid android:color="@color/grey_guilds" />
-</shape>

com.discord/res/drawable/drawable_nitro_classic_gradient_horizontal.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white_alpha_10" />
-    <corners android:radius="3.0dip" />
+    <gradient android:startColor="#ff738ef5" android:endColor="#ffb3aeff" />
 </shape>

com.discord/res/drawable/drawable_overlay_guild_mentions.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/grey_guilds" />
         <corners android:radius="9999.0dip" />

com.discord/res/drawable/drawable_overlay_mentions.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/status_red_500" />
-    <corners android:radius="2.0dip" />
-</shape>

com.discord/res/drawable/drawable_overlay_mentions_primary_100.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_100" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_600" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_overlay_mentions_primary_630.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle"
-      xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
         <stroke android:width="2.0dip" android:color="@color/primary_630" />
         <corners android:radius="12.0dip" />

com.discord/res/drawable/drawable_uikit_status_yellow_button_outline.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset android:insetLeft="@dimen/uikit_btn_inset_horizontal_material" android:insetRight="@dimen/uikit_btn_inset_horizontal_material" android:insetTop="@dimen/uikit_btn_inset_vertical_material" android:insetBottom="@dimen/uikit_btn_inset_vertical_material"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <shape android:shape="rectangle">
-        <corners android:radius="@dimen/uikit_btn_corner_radius" />
-        <solid android:color="@color/transparent" />
-        <stroke android:width="@dimen/uikit_btn_stroke_width" android:color="@color/status_yellow_500_alpha_60" />
-        <padding android:left="@dimen/uikit_btn_padding_horizontal" android:top="@dimen/uikit_btn_padding_vertical" android:right="@dimen/uikit_btn_padding_horizontal" android:bottom="@dimen/uikit_btn_padding_vertical" />
-    </shape>
-</inset>

com.discord/res/layout-land/widget_main_panel_center_content_unread.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ViewStub android:layout_width="wrap_content" android:layout_height="wrap_content"
+<ViewStub android:id="@id/main_toolbar_unread_count" android:layout_width="wrap_content" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" />

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
+<RelativeLayout android:paddingLeft="0.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size" android:paddingStart="0.0dip" android:paddingEnd="12.0dip"
   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/chip_image" android:padding="2.0dip" android:layout_width="@dimen/chipsview_image_size" android:layout_height="@dimen/chipsview_image_size" app:roundAsCircle="true" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:singleLine="true" android:layout_toRightOf="@id/chip_image" android:layout_centerVertical="true" android:layout_marginStart="5.0dip" android:layout_toEndOf="@id/chip_image" />

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

@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
-    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
+    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5dip" android:layout_height="10.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" 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">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
     <RelativeLayout android:id="@id/add_friend_user_item_presence_wrapper" android:layout_width="@dimen/avatar_status_size_standard" android:layout_height="@dimen/avatar_status_size_standard" android:translationX="@dimen/avatar_status_size_standard_margin" android:translationY="@dimen/avatar_status_size_standard_margin" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorPrimary" app:roundAsCircle="true" />
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_presence" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
     <TextView android:id="@id/add_friend_user_item_name" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Outline" />
-    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Outline" />
+    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
     <TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

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

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <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.discord/res/layout-v17/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <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.discord/res/layout-v17/widget_chat_input_verification.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/chat_input_verification" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_total" android:paddingRight="@dimen/chat_cell_horizontal_spacing_total" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/chat_cell_horizontal_spacing_total" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_total"
+<LinearLayout android:gravity="center" android:id="@id/chat_input_verification" android:background="?primary_700_bg" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/chat_cell_horizontal_spacing_padding" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <View android:background="?theme_chat_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" />
-    <TextView android:textSize="13.75sp" android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_horizontal_spacing_total" android:paddingBottom="@dimen/chat_cell_horizontal_spacing_total" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="13.75sp" android:textColor="@color/white" android:gravity="center" android:id="@id/chat_input_verification_action" android:background="@drawable/drawable_button_purple" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_marginBottom="15.0dip" android:text="@string/resend_verification_email" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:id="@id/chat_input_verification_action" android:text="@string/resend_verification_email" style="@style/UiKit.Button" />
 </LinearLayout>

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

@@ -13,7 +13,7 @@
         <View style="@style/UiKit.Settings.Divider" />
         <TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
         <LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:background="@color/transparent" android:clickable="false" android:layout_width="0.0dip" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
             <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
         </LinearLayout>
         <TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />

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

@@ -5,5 +5,5 @@
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
     <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
     <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" android:textAlignment="viewEnd" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
+    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" android:textAlignment="viewEnd" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingEnd="@dimen/chat_cell_horizontal_spacing_padding"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" android:layout_marginStart="8.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
         <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" android:layout_marginStart="6.0dip" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />

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

@@ -2,7 +2,7 @@
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   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:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" 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" />
 </LinearLayout>

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

@@ -1,7 +1,7 @@
 <?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">
-    <TextView android:id="@id/guild_transfer_ownership_header" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
+    <TextView android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/transfer_ownership" style="@style/UiKit.TextView.H1.Bold" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout android:id="@id/guild_transfer_ownership_mfa_wrap" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:text="@string/two_fa_enter_token_label" android:textAllCaps="true" style="@style/UiKit.Settings.Item.Label" />

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

@@ -14,8 +14,8 @@
         <TextView android:id="@id/rich_presence_time" style="@style/UiKit.TextView.Marquee" />
         <com.miguelgaeta.super_bar.SuperBar android:id="@id/rich_presence_superbar" android:focusable="false" android:clickable="false" android:layout_height="@dimen/uikit_spacing_large" app:sb_barBackgroundColor="?primary_700" app:sb_barColor="?primary_100" app:sb_barControlColor="@color/transparent" app:sb_barControlRadius="6.0dip" app:sb_barControlShadowRadius="0.0dip" app:sb_barHeight="6.0dip" app:sb_barTouchEnabled="false" app:sb_barValueMax="100.0" style="@style/UiKit.SuperBar" />
         <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
-            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_elapsed" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
+            <TextView android:id="@id/rich_presence_music_duration" android:layout_width="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent="50.0" style="@style/UiKit.TextView" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
     <FrameLayout android:id="@id/rich_presence_play_button" android:background="@color/rich_presence_spotify_play_button" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" 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_large" android:foreground="?selectableItemBackground" app:layout_constraintTop_toBottomOf="@id/rich_presence_container_data">

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

@@ -4,7 +4,7 @@
     <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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" 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: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/res/layout-v17/widget_payment_source_edit_dialog.xml

@@ -23,7 +23,7 @@
                 <androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:inputType="text" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
+                <androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:nextFocusRight="@id/dialog_save" android:hint="@string/billing_address_zip_code" android:inputType="text" android:imeOptions="actionDone" android:nextFocusForward="@id/dialog_save" style="@style/UiKit.TextInputLayout.EditText.Dense" />

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

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusable="true" android:focusableInTouchMode="true" android:descendantFocusability="beforeDescendants" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/nickname" style="@style/UiKit.Settings.Item.Header" />
-            <LinearLayout android:id="@id/edit_member_nickname_container" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <EditText android:id="@id/edit_member_nickname" android:layout_width="0.0dip" android:hint="@string/change_nickname" android:singleLine="true" android:maxLength="32" android:layout_weight="1.0" android:inputType="textNoSuggestions" style="@style/UiKit.EditText.Themed" />
                 <ImageView android:layout_gravity="center_vertical" android:id="@id/edit_member_nickname_lock" android:layout_marginRight="10.0dip" android:src="@drawable/ic_role_lock" android:layout_marginEnd="10.0dip" style="@style/UiKit.ImageView" />
             </LinearLayout>

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

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_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/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
@@ -37,6 +37,28 @@
             <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+            <LinearLayout android:id="@id/server_settings_overview_upload_splash_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_overview_upload_banner_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
             <View android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </ScrollView>

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

@@ -14,7 +14,7 @@
             <TextView android:text="@string/sync" style="@style/UiKit.Settings.Item.Header" />
             <com.discord.views.CheckedSetting android:id="@id/settings_appearance_sync_switch" app:cs_text="@string/settings_sync" app:cs_view_type="switchview" style="@style/UiKit.CheckedSetting.Themed" />
             <View style="@style/UiKit.Settings.Divider" />
-            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:id="@id/settings_appearance_font_scaling_container" style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:text="@string/accessibility_font_scaling_label" style="@style/UiKit.Settings.Item.Header" />
                 <TextView android:id="@id/settings_appearance_font_scale_platform" style="@style/UiKit.Settings.Item.SubText" />
                 <RelativeLayout style="@style/UiKit.Settings.Item">

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

@@ -6,8 +6,8 @@
         <ImageView android:id="@id/connected_account_img" android:layout_width="@dimen/connected_account_img_size" android:layout_height="@dimen/connected_account_img_size" android:layout_margin="@dimen/uikit_spacing_large" android:contentDescription="@string/connected_accounts" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
         <TextView android:textColor="@color/white" android:id="@id/connected_account_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintLeft_toRightOf="@id/connected_account_img" app:layout_constraintRight_toLeftOf="@id/connected_account_disconnect" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.TextView.Large.SingleLine" />
         <ImageView android:id="@id/connected_account_disconnect" android:padding="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
-        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
-        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
+        <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
             <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />

com.discord/res/layout-v21/widget_change_log.xml

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="0.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

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

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" android:elevation="@dimen/app_elevation" 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.discord/res/layout-v21/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <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" android:elevation="@dimen/uikit_spacing_medium">
         <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.discord/res/layout-v21/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_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/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
@@ -37,6 +37,28 @@
             <TextView android:text="@string/form_help_default_notification_settings_mobile" style="@style/UiKit.Settings.Item.SubText" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_all" app:cs_text="@string/form_label_all_messages" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             <com.discord.views.CheckedSetting android:id="@id/server_settings_overview_notification_only_mentions" app:cs_text="@string/form_label_only_mentions" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+            <LinearLayout android:id="@id/server_settings_overview_upload_splash_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_invite_background" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_splash_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_splash" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_overview_upload_banner_section" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/guild_settings_server_banner" style="@style/UiKit.Settings.Item.Header" />
+                <FrameLayout android:id="@id/server_settings_overview_upload_banner_container" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackground">
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_upload_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" app:placeholderImage="@drawable/drawable_nitro_classic_gradient_horizontal" app:roundedCornerRadius="3.0dip" app:viewAspectRatio="1.78" />
+                    <com.google.android.material.floatingactionbutton.FloatingActionButton android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
+                </FrameLayout>
+                <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
+                <TextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />
+            </LinearLayout>
             <View android:layout_width="fill_parent" android:layout_height="64.0dip" />
         </LinearLayout>
     </ScrollView>

com.discord/res/layout-v22/widget_chat_input_edit_text.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView"
+<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.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"
   xmlns:android="http://schemas.android.com/apk/res/android" />

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

@@ -4,7 +4,7 @@
     <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_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" 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: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/res/layout-v22/widget_payment_source_edit_dialog.xml

@@ -23,7 +23,7 @@
                 <androidx.appcompat.widget.AppCompatEditText android:hint="@string/billing_address_city" android:inputType="text" android:imeOptions="actionNext" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_state" style="@style/UiKit.Form.Field.EditText.Wrap">
-                <androidx.appcompat.widget.AppCompatEditText android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:editable="false" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
+                <androidx.appcompat.widget.AppCompatEditText android:enabled="false" android:focusableInTouchMode="false" android:hint="@string/billing_address_state" android:drawableRight="@drawable/ic_chevron_right_grey_24dp" android:inputType="none" android:imeOptions="actionGo" android:drawableEnd="@drawable/ic_chevron_right_grey_24dp" style="@style/UiKit.TextInputLayout.EditText.Dense" />
             </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_postal_code" style="@style/UiKit.Form.Field.EditText.Wrap">
                 <androidx.appcompat.widget.AppCompatEditText android:nextFocusRight="@id/dialog_save" android:hint="@string/billing_address_zip_code" android:inputType="text" android:imeOptions="actionDone" android:nextFocusForward="@id/dialog_save" android:autofillHints="postalCode" style="@style/UiKit.TextInputLayout.EditText.Dense" />

com.discord/res/layout/view_chip_default.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
+<RelativeLayout android:paddingLeft="0.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="@dimen/chipsview_image_size"
   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/chip_image" android:padding="2.0dip" android:layout_width="@dimen/chipsview_image_size" android:layout_height="@dimen/chipsview_image_size" app:roundAsCircle="true" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/chip_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5.0dip" android:singleLine="true" android:layout_toRightOf="@id/chip_image" android:layout_centerVertical="true" />

com.discord/res/layout/view_toolbar_title.xml

@@ -2,6 +2,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/toolbar_title" android:layout_width="wrap_content" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
-    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
+    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="10.5dip" android:layout_height="10.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:baselineAlignBottom="true" app:layout_constraintBaseline_toBaselineOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_add_friend_user_list_item.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" 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">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_avatar" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
     <RelativeLayout android:id="@id/add_friend_user_item_presence_wrapper" android:layout_width="@dimen/avatar_status_size_standard" android:layout_height="@dimen/avatar_status_size_standard" android:translationX="@dimen/avatar_status_size_standard_margin" android:translationY="@dimen/avatar_status_size_standard_margin" app:layout_constraintBottom_toBottomOf="@id/add_friend_user_item_avatar" app:layout_constraintRight_toRightOf="@id/add_friend_user_item_avatar">
         <com.facebook.drawee.view.SimpleDraweeView android:layout_width="fill_parent" android:layout_height="fill_parent" app:placeholderImage="?colorPrimary" app:roundAsCircle="true" />
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/add_friend_user_item_presence" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="@dimen/avatar_status_size_extra_margin" android:layout_centerInParent="true" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
     </RelativeLayout>
     <TextView android:id="@id/add_friend_user_item_name" android:layout_marginLeft="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/add_friend_user_item_name_secondary" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/add_friend_user_item_name" app:layout_constraintRight_toLeftOf="@id/add_friend_user_item_send" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Subtext.SingleLine" />
-    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Outline" />
-    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
+    <Button android:id="@id/add_friend_user_item_send" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/send" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Outline" />
+    <Button android:id="@id/add_friend_user_item_accept" android:visibility="gone" android:layout_width="wrap_content" android:minWidth="90.0dip" android:text="@string/friend_request_accept" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Button.Green.Fit.Outline" />
     <TextView android:textColor="?primary_500" android:gravity="center" android:id="@id/add_friend_user_item_sent" android:visibility="gone" android:minWidth="90.0dip" android:text="@string/invite_friend_modal_sent" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView.Semibold" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_change_log.xml

@@ -14,7 +14,7 @@
             <com.discord.app.AppTextView android:id="@id/change_log_body" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:text="@string/change_log_md_body" style="@style/UiKit.TextView" />
         </LinearLayout>
     </ScrollView>
-    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:background="?colorPrimaryDark" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_small" android:paddingRight="0.0dip" android:paddingBottom="@dimen/uikit_spacing_small" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_twitter" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_twitter_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_facebook" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_facebook_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />
         <androidx.appcompat.widget.AppCompatImageButton android:id="@id/change_log_instagram" android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_xsmall" android:src="@drawable/ic_instagram_white_18dp" android:scaleType="fitCenter" android:tint="?primary_100" style="@style/UiKit.ImageView.Clickable" />

com.discord/res/layout/widget_channel_group_dm_settings.xml

@@ -7,7 +7,7 @@
     <androidx.core.widget.NestedScrollView android:id="@id/group_dm_settings_scroll_view" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <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" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="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" />
                 <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" 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.discord/res/layout/widget_channel_notification_settings.xml

@@ -20,7 +20,7 @@
             <View style="@style/UiKit.Settings.Divider" />
             <LinearLayout android:gravity="center_vertical" android:id="@id/channel_notification_settings_system" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <ImageView android:padding="@dimen/uikit_textsize_large" android:src="?ic_notifications_a60" android:contentDescription="@string/form_label_mobile_notifications_system_label" style="@style/UiKit.ImageView" />
-                <LinearLayout android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
+                <LinearLayout android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
                     <TextView android:text="@string/form_label_mobile_user_notifications_label" style="@style/UiKit.Settings.Item.Label" />
                     <TextView android:text="@string/form_label_mobile_user_notifications_hint" style="@style/UiKit.Settings.Item.Addition" />
                 </LinearLayout>

com.discord/res/layout/widget_chat_input_edit_text.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
+<com.discord.widgets.chat.input.WidgetChatInputEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_input_text" android:textColorHint="?theme_chat_input_text_placeholder" android:layout_gravity="center_vertical" android:background="@color/transparent" android:paddingTop="@dimen/uikit_spacing_small" android:paddingBottom="@dimen/uikit_spacing_small" android:scrollbars="vertical" android:layout_width="fill_parent" android:minHeight="42.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/widget_chat_input_emoji_picker.xml

@@ -2,8 +2,7 @@
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <include android:id="@id/emoji_search_bar" layout="@layout/layout_search_actionbar" />
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" android:layout_above="@id/emoji_picker_bottom_bar" android:layout_below="@id/emoji_search_bar" style="@style/UiKit.ViewGroup.RecyclerView" />
     <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" 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" app:tabMaxWidth="@dimen/uikit_spacing_xxxlarge" app:tabMode="scrollable" app:tabPaddingEnd="@dimen/uikit_spacing_small" app:tabPaddingStart="@dimen/uikit_spacing_small" />

com.discord/res/layout/widget_chat_input_verification.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:gravity="center" android:orientation="vertical" android:id="@id/chat_input_verification" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_total" android:paddingRight="@dimen/chat_cell_horizontal_spacing_total" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content"
+<LinearLayout android:gravity="center" android:id="@id/chat_input_verification" android:background="?primary_700_bg" android:paddingLeft="@dimen/chat_cell_horizontal_spacing_padding" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <View android:background="?theme_chat_divider" android:layout_width="fill_parent" android:layout_height="0.25dip" />
-    <TextView android:textSize="13.75sp" android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_horizontal_spacing_total" android:paddingBottom="@dimen/chat_cell_horizontal_spacing_total" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
-    <TextView android:textSize="13.75sp" android:textColor="@color/white" android:gravity="center" android:id="@id/chat_input_verification_action" android:background="@drawable/drawable_button_purple" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_marginBottom="15.0dip" android:text="@string/resend_verification_email" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:textColor="?theme_chat_text" android:gravity="center" android:id="@id/chat_input_verification_text" android:paddingTop="@dimen/chat_cell_vertical_spacing_padding" android:paddingBottom="@dimen/chat_cell_vertical_spacing_padding" android:layout_width="fill_parent" style="@style/UiKit.TextView.Semibold" />
+    <TextView android:id="@id/chat_input_verification_action" android:text="@string/resend_verification_email" style="@style/UiKit.Button" />
 </LinearLayout>

com.discord/res/layout/widget_chat_list_actions.xml

@@ -13,7 +13,7 @@
         <View style="@style/UiKit.Settings.Divider" />
         <TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" android:drawableLeft="?ic_copy" android:drawableStart="?ic_copy" style="@style/UiKit.Settings.Item.Icon" />
         <LinearLayout android:gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction" android:background="?selectableItemBackground" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <TextView android:background="@color/transparent" android:clickable="false" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
+            <TextView android:background="@color/transparent" android:clickable="false" android:layout_width="0.0dip" android:text="@string/add_reaction" android:drawableLeft="?ic_add_reaction" android:layout_weight="1.0" android:drawableStart="?ic_add_reaction" style="@style/UiKit.Settings.Item.Icon" />
             <androidx.recyclerview.widget.RecyclerView android:layout_gravity="center_vertical" android:id="@id/dialog_chat_actions_add_reaction_emojis_list" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
         </LinearLayout>
         <TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" android:drawableLeft="?ic_reactions" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />

com.discord/res/layout/widget_chat_list_adapter_item_game_invite.xml

@@ -5,5 +5,5 @@
     <TextView android:id="@id/item_game_invite_header" style="@style/UiKit.Chat.Embed.Header" />
     <TextView android:textSize="18.0sp" android:textColor="?primary_100" android:id="@id/item_game_invite_status" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_header" app:layout_constraintStart_toStartOf="@id/item_game_invite_header" app:layout_constraintTop_toBottomOf="@id/item_game_invite_header" style="@style/UiKit.TextView" />
     <androidx.recyclerview.widget.RecyclerView android:id="@id/item_game_invite_recycler" android:layout_width="0.0dip" android:layout_height="@dimen/avatar_size_standard" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_game_invite_cover_image" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
+    <TextView android:gravity="end" android:id="@id/item_game_invite_application_name" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="2" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/item_game_invite_cover_image" app:layout_constraintStart_toStartOf="@id/item_game_invite_cover_image" style="@style/UiKit.Chat.Embed.Footer" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_chat_list_adapter_item_text.xml

@@ -2,10 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingRight="@dimen/chat_cell_horizontal_spacing_padding" 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">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_chat_guideline" style="@style/UiKit.Chat.Guideline" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" style="@style/Avatar.Chat" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_list_adapter_item_text_avatar" android:layout_marginLeft="8.0dip" android:importantForAccessibility="no" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/uikit_chat_guideline" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/uikit_chat_guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_header" style="@style/Avatar.Chat" />
     <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/chat_list_adapter_item_text_header" android:layout_width="wrap_content" android:layout_height="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_avatar">
         <TextView android:textColor="?theme_chat_name" android:id="@id/chat_list_adapter_item_text_name" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_bot" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintStart_toStartOf="parent" style="@style/UiKit.TextView.Large.SingleLine" />
-        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
+        <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/chat_list_adapter_item_text_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:text="BOT" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_timestamp" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_name" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?theme_chat_timestamp" android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_timestamp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="6.0dip" android:layout_marginBottom="1.0dip" android:maxWidth="150.0dip" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/chat_list_adapter_item_text_name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/chat_list_adapter_item_text_bot" style="@style/UiKit.TextView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/chat_list_adapter_item_text" android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:layout_marginRight="@dimen/uikit_spacing_small" android:layout_marginBottom="2.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/uikit_chat_guideline" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/uikit_chat_guideline" app:layout_constraintTop_toBottomOf="@id/chat_list_adapter_item_text_header" style="@style/UiKit.Chat.Text" />

com.discord/res/layout/widget_debugging_adapter_item.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="2" style="@style/UiKit.TextView"
-      xmlns:android="http://schemas.android.com/apk/res/android" />
+    <TextView android:ellipsize="end" android:id="@id/debugging_item_log_message" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="2" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
 </LinearLayout>

com.discord/res/layout/widget_fatal_crash.xml

@@ -3,8 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <LinearLayout android:orientation="vertical" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <ImageView android:layout_gravity="center_horizontal" android:layout_marginBottom="8.0dip" android:src="?img_wumpus_tophat" style="@style/UiKit.ImageView" />
-        <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+        <LinearLayout android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:layout_marginBottom="8.0dip" android:text="@string/crash_unexpected" style="@style/UiKit.TextView.H2" />
             <com.discord.utilities.view.text.LinkifiedTextView android:autoLink="web" android:id="@id/fatal_crash_testers_invite" android:layout_marginBottom="8.0dip" android:text="@string/crash_testers_invite" style="@style/UiKit.TextView" />
             <TextView android:text="@string/crash_disclaimer" style="@style/UiKit.TextView" />

com.discord/res/layout/widget_friends_list_adapter_item_empty.xml

@@ -4,7 +4,7 @@
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip">
         <ImageView android:id="@id/friends_list_item_empty_no_friends" android:layout_width="320.0dip" android:layout_height="0.0dip" android:src="?theme_friends_no_friends" android:scaleType="fitCenter" android:adjustViewBounds="true" android:layout_weight="1.0" android:contentDescription="@string/sample_empty_string" />
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?theme_chat_text" android:gravity="center" android:layout_width="320.0dip" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/friends_empty_state_all" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@id/friends_list_item_empty_invite" android:background="@drawable/drawable_button_purple" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/tip_instant_invite_title" android:singleLine="true" style="@style/UiKit.TextView" />
+        <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/white" android:gravity="center" android:id="@id/friends_list_item_empty_invite" android:background="@drawable/drawable_button_purple" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_height="36.0dip" android:text="@string/tip_instant_invite_title3" android:singleLine="true" style="@style/UiKit.TextView" />
     </LinearLayout>
     <LinearLayout android:gravity="center" android:layout_gravity="center" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="16.0dip">
         <ImageView android:id="@id/friends_list_item_empty_no_online" android:layout_width="320.0dip" android:layout_height="0.0dip" android:src="?theme_friends_no_online" android:scaleType="fitCenter" android:adjustViewBounds="true" android:layout_weight="1.0" android:contentDescription="@string/sample_empty_string" />

com.discord/res/layout/widget_guild_invite_share_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   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" 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:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" 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" />
 </LinearLayout>