Changes of com.discord v1197

com.discord/AndroidManifest.xml

@@ -84,6 +84,16 @@
                 <data android:host="discord.new" android:pathPattern="/.*" android:scheme="https"/>
                 <data android:host="discord.new" android:pathPattern="/.*" android:scheme="http"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:host="action" android:pathPattern="/oauth2/authorize" android:scheme="discord"/>
+                <data android:host="action" android:pathPattern="/connect/authorize" android:scheme="discord"/>
+                <data android:host="discord.com" android:pathPattern="/connect/authorize" android:scheme="https"/>
+                <data android:host="*.discord.com" android:pathPattern="/connect/authorize" android:scheme="https"/>
+            </intent-filter>
+            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity>
         <activity android:excludeFromRecents="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Call"/>
         <activity android:excludeFromRecents="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$IncomingCall" android:screenOrientation="sensorPortrait" android:showOnLockScreen="true" android:showWhenLocked="true" android:turnScreenOn="true"/>
@@ -101,15 +111,7 @@
                 <category android:name="android.intent.category.OPENABLE"/>
                 <data android:mimeType="*/*"/>
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:host="action" android:pathPattern="/oauth2/authorize" android:scheme="discord"/>
-                <data android:host="action" android:pathPattern="/connect/authorize" android:scheme="discord"/>
-                <data android:host="discord.com" android:pathPattern="/connect/authorize" android:scheme="https"/>
-                <data android:host="*.discord.com" android:pathPattern="/connect/authorize" android:scheme="https"/>
-            </intent-filter>
+            <meta-data android:name="android.service.chooser.chooser_target_service" android:value="androidx.sharetarget.ChooserTargetServiceCompat"/>
         </activity>
         <activity android:exported="true" android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"/>
         <service android:name="com.discord.utilities.fcm.NotificationClient$FCMMessagingService">
@@ -187,6 +189,11 @@
         <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"/>
+        <service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.chooser.ChooserTargetService"/>
+            </intent-filter>
+        </service>
         <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"/>
         <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1196.apk
+apkFileName: com.discord-1197.apk
 compressionType: false
 doNotCompress:
 - resources.arsc
@@ -3224,5 +3224,5 @@ usesFramework:
   tag: null
 version: 2.4.2-83a459-SNAPSHOT
 versionInfo:
-  versionCode: '1194'
-  versionName: '30.3'
+  versionCode: '1197'
+  versionName: '31.0'

com.discord/res/drawable-anydpi-v24/ic_account_github.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="255.0" android:viewportHeight="255.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M127.5,127.5m-96.5,0a96.5,96.5 0,1 1,193 0a96.5,96.5 0,1 1,-193 0" />
+    <path android:fillColor="#ff191717" android:pathData="M127.254,47C82.942,47 47,82.79 47,126.914C47,162.213 70.141,192.119 101.651,202.905C105.59,203.396 107.067,200.944 107.067,198.983C107.067,197.022 107.067,192.119 107.067,185.256C84.911,190.158 79.988,174.47 79.988,174.47C76.541,165.155 71.125,162.703 71.125,162.703C63.74,157.801 71.618,157.801 71.618,157.801C79.495,158.291 83.927,166.135 83.927,166.135C91.312,178.392 102.636,174.96 107.067,172.999C107.56,167.606 110.021,164.174 111.991,162.213C94.266,160.252 75.557,153.388 75.557,122.501C75.557,113.676 78.511,106.813 83.927,100.93C83.434,99.459 80.48,91.124 84.911,80.338C84.911,80.338 91.804,78.377 107.067,88.673C113.468,86.712 120.361,86.221 127.254,86.221C134.147,86.221 141.04,87.202 147.44,88.673C162.703,78.377 169.596,80.338 169.596,80.338C174.028,91.124 171.073,99.459 170.581,101.42C175.505,106.813 178.951,114.167 178.951,122.992C178.951,153.878 160.242,160.252 142.517,162.213C145.471,164.664 147.933,169.567 147.933,176.921C147.933,187.707 147.933,196.042 147.933,198.983C147.933,200.944 149.41,203.396 153.349,202.905C185.352,192.119 208,162.213 208,126.914C207.508,82.79 171.566,47 127.254,47Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable-anydpi-v24/ic_call_disconnect_24dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group android:scaleY="-1.0" android:rotation="0.0" android:translateY="24.0">
+        <path android:fillColor="#ff000000" android:pathData="M21.1169,1.116L22.8839,2.884L19.7679,6L22.8839,9.116L21.1169,10.884L17.9999,7.768L14.8839,10.884L13.1169,9.116L16.2329,6L13.1169,2.884L14.8839,1.116L17.9999,4.232L21.1169,1.116ZM18,22H13C6.925,22 2,17.075 2,11V6C2,5.447 2.448,5 3,5H7C7.553,5 8,5.447 8,6V10C8,10.553 7.553,11 7,11H6C6.063,14.938 9,18 13,18V17C13,16.447 13.447,16 14,16H18C18.553,16 19,16.447 19,17V21C19,21.553 18.553,22 18,22Z" android:fillType="evenOdd" />
+    </group>
+</vector>

com.discord/res/drawable-anydpi-v24/ic_github_white.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="255.0" android:viewportHeight="255.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M127.205,31C74.086,31 31,73.903 31,126.797C31,169.113 58.74,204.963 96.514,217.893C101.235,218.48 103.006,215.542 103.006,213.191C103.006,210.84 103.006,204.963 103.006,196.735C76.447,202.612 70.544,183.805 70.544,183.805C66.413,172.639 59.921,169.7 59.921,169.7C51.067,163.823 60.511,163.823 60.511,163.823C69.954,164.411 75.266,173.814 75.266,173.814C84.119,188.507 97.694,184.393 103.006,182.042C103.596,175.577 106.547,171.463 108.908,169.113C87.661,166.762 65.232,158.534 65.232,121.508C65.232,110.929 68.774,102.701 75.266,95.648C74.676,93.885 71.135,83.894 76.447,70.965C76.447,70.965 84.71,68.614 103.006,80.956C110.679,78.605 118.942,78.017 127.205,78.017C135.468,78.017 143.731,79.192 151.404,80.956C169.7,68.614 177.963,70.965 177.963,70.965C183.275,83.894 179.734,93.885 179.144,96.236C185.046,102.701 189.177,111.517 189.177,122.096C189.177,159.121 166.749,166.762 145.502,169.113C149.043,172.051 151.994,177.928 151.994,186.744C151.994,199.674 151.994,209.665 151.994,213.191C151.994,215.542 153.765,218.48 158.486,217.893C196.85,204.963 224,169.113 224,126.797C223.41,73.903 180.324,31 127.205,31Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable/$sparkle_animated_vector__0.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:name="vector" android:height="48.0dip" android:width="48.0dip" android:viewportWidth="48.0" android:viewportHeight="48.0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <group android:name="wrapper" android:translateX="6.0" android:translateY="4.0">
+        <group android:name="sparkle_group">
+            <group android:name="yellow_sparkle_group" android:pivotX="34.0" android:pivotY="4.0">
+                <path android:name="yellow_sparkle" android:fillColor="#ffffcb00" android:pathData="M 34.592 1.696 L 31.32 0.061 C 31.144 -0.004 30.954 -0.017 30.77 0.023 C 30.587 0.063 30.419 0.154 30.287 0.287 C 30.154 0.419 30.063 0.587 30.023 0.77 C 29.983 0.954 29.996 1.144 30.061 1.32 L 31.696 4.592 C 31.788 4.835 31.788 5.104 31.696 5.347 L 30.122 8.683 C 30.038 8.85 30.008 9.04 30.038 9.225 C 30.067 9.41 30.154 9.581 30.287 9.713 C 30.419 9.846 30.59 9.933 30.775 9.962 C 30.96 9.992 31.15 9.962 31.317 9.878 L 34.653 8.304 C 34.896 8.212 35.165 8.212 35.408 8.304 L 38.68 9.939 C 38.856 10.004 39.046 10.018 39.23 9.977 C 39.413 9.937 39.581 9.846 39.713 9.713 C 39.846 9.581 39.937 9.413 39.977 9.23 C 40.017 9.046 40.004 8.856 39.939 8.68 L 38.304 5.408 C 38.242 5.292 38.209 5.162 38.209 5.031 C 38.209 4.899 38.242 4.769 38.304 4.653 L 39.878 1.317 C 39.962 1.15 39.992 0.96 39.962 0.775 C 39.933 0.59 39.846 0.419 39.713 0.287 C 39.581 0.154 39.41 0.067 39.225 0.038 C 39.039 0.008 38.85 0.038 38.682 0.122 L 35.347 1.696 C 35.231 1.758 35.101 1.791 34.969 1.791 C 34.838 1.791 34.708 1.758 34.592 1.696 Z" android:strokeWidth="1.0" />
+            </group>
+            <group android:name="blue_sparkle_group" android:pivotX="4.0" android:pivotY="34.0" android:translateY="-2.0">
+                <path android:name="blue_sparkle" android:fillColor="#ff7289da" android:pathData="M 7.002 29.084 C 7.002 28.485 6.516 28 5.918 28 C 5.319 28 4.834 28.485 4.834 29.084 L 4.834 30.186 C 4.834 30.784 5.319 31.27 5.918 31.27 C 6.516 31.27 7.002 30.784 7.002 30.186 L 7.002 29.084 Z M 7.002 37.814 C 7.002 37.216 6.516 36.73 5.918 36.73 C 5.319 36.73 4.834 37.216 4.834 37.814 L 4.834 38.916 C 4.834 39.515 5.319 40 5.918 40 C 6.516 40 7.002 39.515 7.002 38.916 L 7.002 37.814 Z M 10.916 35.106 C 11.515 35.106 12 34.62 12 34.022 C 12 33.423 11.515 32.938 10.916 32.938 L 9.814 32.938 C 9.216 32.938 8.731 33.423 8.731 34.022 C 8.731 34.62 9.216 35.106 9.814 35.106 L 10.916 35.106 Z M 2.186 35.045 C 2.784 35.045 3.27 34.56 3.27 33.962 C 3.27 33.363 2.784 32.878 2.186 32.878 L 1.084 32.878 C 0.485 32.878 0 33.363 0 33.962 C 0 34.56 0.485 35.045 1.084 35.045 L 2.186 35.045 Z" android:strokeWidth="1.0" />
+            </group>
+        </group>
+    </group>
+</vector>

com.discord/res/drawable/$sparkle_animated_vector__1.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:valueFrom="0" android:valueTo="90" android:valueType="floatType" android:propertyName="rotation" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleX" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleY" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="90" android:valueTo="180" android:valueType="floatType" android:propertyName="rotation" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleX" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleY" />
+</set>

com.discord/res/drawable/$sparkle_animated_vector__2.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="0" android:valueTo="90" android:valueType="floatType" android:propertyName="rotation" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleX" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="500" android:valueFrom="0" android:valueTo="1" android:valueType="floatType" android:propertyName="scaleY" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="1000" android:valueFrom="90" android:valueTo="180" android:valueType="floatType" android:propertyName="rotation" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="1000" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleX" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:startOffset="1000" android:valueFrom="1" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleY" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:valueFrom="0" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleX" />
+    <objectAnimator android:interpolator="@android:interpolator/fast_out_slow_in" android:duration="500" android:valueFrom="0" android:valueTo="0" android:valueType="floatType" android:propertyName="scaleY" />
+</set>

com.discord/res/drawable/drawable_bg_corners_8dp.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/white" />
-    <corners android:radius="8.0dip" />
-</shape>

com.discord/res/drawable/ic_exit_24dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M10.418,13L12.708,15.294L11.292,16.706L6.586,11.991L11.294,7.292L12.707,8.708L10.41,11H21.949C21.446,5.955 17.177,2 12,2C6.486,2 2,6.487 2,12C2,17.513 6.486,22 12,22C17.177,22 21.446,18.046 21.949,13H10.418Z" />
+</vector>

com.discord/res/drawable/ic_mail_24dp.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path android:fillColor="#ffffffff" android:pathData="M12,10.823L20.965,5.26C20.677,5.1 20.352,5 20,5H4C3.648,5 3.322,5.1 3.035,5.26L12,10.823Z" />
+        <path android:fillColor="#ffffffff" android:pathData="M12.527,12.849C12.366,12.949 12.183,13 12,13C11.817,13 11.634,12.949 11.473,12.85L2.003,6.973C2.003,6.982 2,6.991 2,6.999V15.999C2,17.101 2.897,17.999 4,17.999H20C21.103,17.999 22,17.101 22,15.999V6.999C22,6.99 21.997,6.981 21.997,6.972L12.527,12.849Z" />
+    </group>
+</vector>

com.discord/res/drawable/rounded_rectangle_8dp_radius.xml

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

com.discord/res/drawable/sparkle_animated_vector.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector android:drawable="@drawable/$sparkle_animated_vector__0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="yellow_sparkle_group" android:animation="@drawable/$sparkle_animated_vector__1" />
+    <target android:name="blue_sparkle_group" android:animation="@drawable/$sparkle_animated_vector__2" />
+</animated-vector>

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

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

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

@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/emoji_picker_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/emoji_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
-        <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
+        <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
             <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
                 <TextView android:gravity="center_vertical" android:id="@id/emoji_inline_search_button" android:background="?bg_pressed_highlight" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
@@ -12,7 +12,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_marginHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_emoji_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
     </com.discord.app.AppViewFlipper>
     <View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout android:id="@id/expression_tray_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@id/expression_tray_landing_page" style="@style/UiKit.ViewGroup.Page">
+        <com.google.android.material.appbar.AppBarLayout android:id="@id/expression_tray_toolbar_layout" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
+            <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/expression_tray_toolbar" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_scrollFlags="enterAlways|scroll">
+                <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+                    <LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_4dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                        <androidx.cardview.widget.CardView android:id="@id/expression_tray_emoji_card" style="@style/ExpressionTrayTabCard">
+                            <TextView android:id="@id/expression_tray_emoji_button" android:text="@string/emoji" style="@style/ExpressionTrayTab" />
+                        </androidx.cardview.widget.CardView>
+                        <androidx.cardview.widget.CardView android:id="@id/expression_tray_gif_card" style="@style/ExpressionTrayTabCard">
+                            <TextView android:id="@id/expression_tray_gif_button" android:text="@string/gif" style="@style/ExpressionTrayTab" />
+                        </androidx.cardview.widget.CardView>
+                    </LinearLayout>
+                    <com.discord.utilities.view.rounded.RoundedRelativeLayout android:id="@id/expression_tray_search_bar" android:background="?colorBackgroundTertiary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:foreground="?bg_pressed_highlight" android:animateLayoutChanges="true" android:layout_marginHorizontal="12.0dip" app:bottomLeftRadius="4.0dip" app:bottomRightRadius="4.0dip" app:topLeftRadius="4.0dip" app:topRightRadius="4.0dip">
+                        <TextView android:gravity="center_vertical" android:id="@id/expression_tray_search_button" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
+                        <ImageView android:id="@id/expression_tray_search_icon" android:padding="@dimen/uikit_spacing_medium" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_search_white_24dp" android:layout_centerVertical="true" android:contentDescription="@string/search_emojis" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" />
+                    </com.discord.utilities.view.rounded.RoundedRelativeLayout>
+                </LinearLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+        <FrameLayout android:id="@id/expression_tray_content_container" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/expression_tray_toolbar" app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            <androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_emoji_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+            <androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_gif_picker_content" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        </FrameLayout>
+    </com.discord.utilities.views.ContentResizingCoordinatorLayout>
+    <androidx.fragment.app.FragmentContainerView android:id="@id/expression_tray_detail_page" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+</FrameLayout>

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

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.views.ContentResizingCoordinatorLayout android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@id/gif_category_container" android:background="?colorBackgroundSecondary" 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">
-    <com.google.android.material.appbar.AppBarLayout android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
+    <com.google.android.material.appbar.AppBarLayout android:background="?colorBackgroundSecondary" style="@style/AppTheme.AppBarLayout.Flat">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_scrollFlags="enterAlways|scroll">
-            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <ImageView android:id="@id/gif_category_back_button" android:background="?bg_pressed_highlight" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/ic_chevron_left_24dp" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveActive" style="@style/UiKit.ImageView" />
-                <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/gif_category_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintStart_toEndOf="@id/gif_category_back_button" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-            </LinearLayout>
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@id/gif_category_title" android:background="?bg_pressed_highlight" android:padding="12.0dip" android:layout_width="fill_parent" android:minHeight="56.0dip" android:drawableStart="@drawable/ic_chevron_left_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.TextView" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_category_gif_recycler" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:visibility="gone" android:layout_height="fill_parent" android:paddingHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:background="?colorBackgroundSecondary" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.appbar.AppBarLayout android:id="@id/gif_search_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar android:id="@id/gif_search_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
+            <RelativeLayout android:id="@id/gif_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="12.0dip" android:layout_marginVertical="@dimen/uikit_spacing_large">
+                <com.google.android.material.textfield.TextInputEditText android:id="@id/gif_search_input" android:background="@null" android:visibility="visible" android:layout_height="wrap_content" android:hint="@string/search_tenor" style="@style/ExpressionSearchInput" />
+                <ImageView android:id="@id/gif_search_clear" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/reset" android:layout_alignParentEnd="true" android:layout_marginHorizontal="@dimen/uikit_spacing_medium" app:tint="?colorTextMuted" />
+            </RelativeLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
+    <LinearLayout android:gravity="center" android:id="@id/gif_search_suggested_terms_container" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_height="fill_parent" android:paddingHorizontal="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView" />
+        <com.google.android.flexbox.FlexboxLayout android:id="@id/gif_search_suggested_terms_flex_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" app:alignContent="center" app:alignItems="center" app:flexWrap="wrap" app:justifyContent="center" app:layout_minHeight="24.0dip" app:layout_minWidth="48.0dip" />
+    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_search_gif_recycler" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_height="fill_parent" android:paddingHorizontal="12.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
+</LinearLayout>

com.discord/res/layout-w600dp/widget_guild_invite_info.xml

@@ -11,7 +11,7 @@
         </RelativeLayout>
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small_card" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="23.0dip">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
             </androidx.cardview.widget.CardView>
             <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />

com.discord/res/layout/gif_search_empty_state_text_box_view.xml

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

com.discord/res/layout/gif_suggested_term_view.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:gravity="center" android:id="@id/gif_search_suggested_terms_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:id="@id/gif_search_suggested_terms_icon_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_gif_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <com.google.android.flexbox.FlexboxLayout android:id="@id/gif_search_suggested_terms_flex_box" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" app:alignItems="center" app:flexWrap="wrap" app:justifyContent="center" app:layout_minHeight="24.0dip" app:layout_minWidth="48.0dip" />
+</LinearLayout>

com.discord/res/layout/sparkle_view.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageView android:id="@id/sparkle_view_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scaleType="fitCenter" android:elevation="16.0dip" />
+</merge>

com.discord/res/layout/user_profile_admin_view.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <TextView android:id="@id/user_profile_admin_edit_member" android:visibility="gone" android:text="@string/manage_user" android:drawableStart="?ic_settings" style="@style/UiKit.ListItem.Icon" />
     <TextView android:id="@id/user_profile_admin_server_mute" android:visibility="gone" android:text="@string/server_voice_mute" android:drawableStart="?ic_mic_grey" style="@style/UiKit.ListItem.Icon" />
     <TextView android:id="@id/user_profile_admin_server_deafen" android:visibility="gone" android:text="@string/server_deafen" android:drawableStart="?ic_headset_grey" style="@style/UiKit.ListItem.Icon" />
     <TextView android:id="@id/user_profile_admin_server_move" android:visibility="gone" android:text="@string/move_to" android:drawableStart="@drawable/ic_transfer_red_24dp" style="@style/UiKit.ListItem.Icon" />
+    <TextView android:id="@id/user_profile_admin_server_disconnect" android:visibility="gone" android:text="@string/disconnect" android:drawableStart="@drawable/ic_call_disconnect_24dp" app:drawableTint="@color/status_red" style="@style/UiKit.ListItem.Icon" />
     <TextView android:id="@id/user_profile_admin_kick" android:visibility="gone" android:text="@string/kick" android:drawableStart="@drawable/ic_remove_friend_red_24dp" style="@style/UiKit.ListItem.Icon" />
     <TextView android:id="@id/user_profile_admin_ban" android:visibility="gone" android:text="@string/ban" android:drawableStart="@drawable/ic_ban_red_24dp" style="@style/UiKit.ListItem.Icon" />
 </LinearLayout>

com.discord/res/layout/widget_channels_list_item_voice_user.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:orientation="horizontal" android:layout_height="24.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:orientation="horizontal" android:background="?bg_pressed_highlight" android:layout_height="24.0dip" android:layout_marginBottom="8.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   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/channels_item_voice_user_avatar" android:layout_centerVertical="true" android:layout_marginStart="36.0dip" android:layout_marginEnd="8.0dip" style="@style/Avatar.Small" />
     <TextView android:textColor="?colorChannelDefault" android:id="@id/channels_item_voice_user_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginEnd="4.0dip" android:layout_toStartOf="@id/indicators_container" android:layout_toEndOf="@id/channels_item_voice_user_avatar" style="@style/UiKit.TextView" />

com.discord/res/layout/widget_emoji_picker_v2.xml

@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/emoji_picker_container" android:background="?colorBackgroundSecondary" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/emoji_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
-        <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
+        <androidx.appcompat.widget.Toolbar android:id="@id/emoji_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
             <RelativeLayout android:id="@id/emoji_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
                 <TextView android:gravity="center_vertical" android:id="@id/emoji_inline_search_button" android:background="?bg_pressed_highlight" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
                 <com.google.android.material.textfield.TextInputEditText android:id="@id/emoji_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_emoji" style="@style/ExpressionSearchInput" />
@@ -12,7 +12,7 @@
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_emoji_picker_view_flipper" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
         <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_emoji_picker_recycler" android:clipToPadding="false" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
-        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_emoji_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderSecondary" android:layout_gravity="center" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_emoji_search_results" android:drawableTop="?theme_expression_tray_search_icon_empty" android:drawablePadding="@dimen/uikit_spacing_large" style="@style/UiKit.TextView" />
     </com.discord.app.AppViewFlipper>
     <View android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar_divider" android:background="?colorBackgroundTertiary" android:layout_marginBottom="@dimen/emoji_picker_category_bar_height" android:layout_above="@id/emoji_picker_bottom_bar" style="@style/UiKit.Divider" />
     <androidx.constraintlayout.widget.ConstraintLayout android:layout_gravity="bottom" android:id="@id/emoji_picker_bottom_bar" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_picker_category_bar_height" android:paddingStart="@dimen/uikit_spacing_medium" android:paddingEnd="@dimen/uikit_spacing_medium" android:elevation="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.ConstraintLayout">

com.discord/res/layout/widget_expression_tray.xml

@@ -5,7 +5,7 @@
         <com.google.android.material.appbar.AppBarLayout android:id="@id/expression_tray_toolbar_layout" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
             <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/expression_tray_toolbar" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_scrollFlags="enterAlways|scroll">
                 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
-                    <LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_8dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                    <LinearLayout android:id="@id/expression_tray_segmented_control" android:background="@drawable/drawable_bg_corners_4dp" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                         <androidx.cardview.widget.CardView android:id="@id/expression_tray_emoji_card" style="@style/ExpressionTrayTabCard">
                             <TextView android:id="@id/expression_tray_emoji_button" android:text="@string/emoji" style="@style/ExpressionTrayTab" />
                         </androidx.cardview.widget.CardView>

com.discord/res/layout/widget_friends_nearby.xml

@@ -2,7 +2,7 @@
 <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:gravity="center" android:background="?colorBackgroundPrimary" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.airbnb.lottie.LottieAnimationView android:id="@id/nearby_friends_searching_lottie" android:layout_width="wrap_content" android:layout_height="wrap_content" app:lottie_autoPlay="false" app:lottie_fileName="animations/anim_friends_add_nearby_looking.json" app:lottie_loop="true" />
+        <com.discord.rlottie.RLottieImageView android:id="@id/nearby_friends_searching_lottie" android:layout_width="wrap_content" android:layout_height="wrap_content" />
         <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:id="@id/nearby_friends_searching_title" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/add_friend_nearby_title" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderSecondary" android:gravity="center" android:id="@id/nearby_friends_searching_body" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/add_friend_nearby_body" style="@style/UiKit.TextView" />
         <TextView android:textSize="@dimen/uikit_settings_item_header_size" android:layout_gravity="center" android:id="@id/nearby_friends_learn_more" android:padding="@dimen/uikit_spacing_small" android:layout_marginTop="@dimen/uikit_spacing_small" android:text="@string/learn_more" app:fontFamily="@font/whitney_semibold" style="@style/UiKit.TextView.Link" />

com.discord/res/layout/widget_gif_category.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.utilities.views.ContentResizingCoordinatorLayout android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<com.discord.utilities.views.ContentResizingCoordinatorLayout android:id="@id/gif_category_container" android:background="?colorBackgroundSecondary" 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">
-    <com.google.android.material.appbar.AppBarLayout android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
+    <com.google.android.material.appbar.AppBarLayout android:background="?colorBackgroundSecondary" style="@style/AppTheme.AppBarLayout.Flat">
         <com.google.android.material.appbar.CollapsingToolbarLayout android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_scrollFlags="enterAlways|scroll">
-            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-                <ImageView android:id="@id/gif_category_back_button" android:background="?bg_pressed_highlight" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="@drawable/ic_chevron_left_24dp" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveActive" style="@style/UiKit.ImageView" />
-                <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/gif_category_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintStart_toEndOf="@id/gif_category_back_button" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
-            </LinearLayout>
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:gravity="center_vertical" android:id="@id/gif_category_title" android:background="?bg_pressed_highlight" android:padding="12.0dip" android:layout_width="fill_parent" android:minHeight="56.0dip" android:drawableStart="@drawable/ic_chevron_left_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.TextView" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_category_gif_recycler" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:visibility="gone" android:layout_height="fill_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />

com.discord/res/layout/widget_gif_picker.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:id="@id/gif_picker_container" android:background="?colorBackgroundSecondary" android:paddingStart="12.0dip" android:paddingEnd="12.0dip" style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_picker_category_recycler" android:paddingTop="12.0dip" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/gif_picker_category_recycler" android:paddingTop="@dimen/uikit_spacing_small" android:visibility="gone" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
     <com.discord.widgets.chat.input.gifpicker.GifLoadingView android:id="@id/gif_picker_loading_view" android:paddingTop="12.0dip" android:layout_height="fill_parent" app:glv_is_staggered="false" style="@style/UiKit.ViewGroup.RecyclerView" />
 </FrameLayout>