Changes of com.discord v1197

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

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

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>

com.discord/res/layout/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">
+                <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" 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" 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" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
+</LinearLayout>

com.discord/res/layout/widget_gif_picker_sheet.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.fragment.app.FragmentContainerView android:name="com.discord.widgets.chat.input.gifpicker.WidgetGifPickerSearch" android:id="@id/gif_search_sheet_content" android:tag="WidgetGifPickerSearchTag" android:background="?colorBackgroundSecondary" android:layout_width="fill_parent" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/widget_guild_context_menu.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView android:id="@id/guild_context_menu_card" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundFloating" app:cardCornerRadius="4.0dip" app:cardElevation="4.0dip" app:cardUseCompatPadding="true"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="240.0dip">
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/guild_context_menu_header" android:paddingTop="14.0dip" android:paddingBottom="14.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/whitney_bold" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" />
+        <View android:id="@id/guild_context_menu_header_divider" android:background="?colorBackgroundModifierAccent" android:layout_width="fill_parent" android:layout_height="1.0dip" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/guild_context_menu_mark_as_read" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/mark_as_read" android:drawableStart="@drawable/ic_mail_24dp" style="@style/ContextMenuTextOption" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/guild_context_menu_notifications" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/notifications" android:drawableStart="@drawable/ic_guild_notifications_24dp" style="@style/ContextMenuTextOption" />
+        <androidx.appcompat.widget.AppCompatTextView android:textColor="@color/status_red_500" android:id="@id/guild_context_menu_leave_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/leave_server" android:drawableStart="@drawable/ic_exit_24dp" app:drawableTint="@color/status_red_500" style="@style/ContextMenuTextOption" />
+        <androidx.appcompat.widget.AppCompatTextView android:id="@id/guild_context_menu_more_options" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/more_options" android:drawableStart="@drawable/ic_settings_24dp" style="@style/ContextMenuTextOption" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>

com.discord/res/layout/widget_guild_invite_info.xml

@@ -11,7 +11,7 @@
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" 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/widget_prune_users.xml

@@ -7,7 +7,6 @@
         <TextView android:text="@string/form_label_last_seen" style="@style/UiKit.Settings.Item.Header" />
         <com.discord.views.CheckedSetting android:id="@id/prune_users_history_1_radio" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
         <com.discord.views.CheckedSetting android:id="@id/prune_users_history_2_radio" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
-        <com.discord.views.CheckedSetting android:id="@id/prune_users_history_3_radio" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
         <RelativeLayout android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.RelativeLayout">
             <ProgressBar android:id="@id/prune_users_loading_progressbar" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="fill_parent" android:indeterminate="true" android:layout_alignTop="@id/prune_users_estimate_text" android:layout_alignBottom="@id/prune_users_estimate_text" android:layout_centerInParent="true" />
             <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/prune_users_estimate_text" android:layout_centerInParent="true" style="@style/UiKit.TextView" />

com.discord/res/layout/widget_user_phone_add.xml

@@ -3,10 +3,11 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ScrollView android:layout_height="fill_parent" android:layout_above="@id/user_phone_add_anchor" style="@style/UiKit.ViewGroup.ScrollView">
         <LinearLayout style="@style/UiKit.Copy.Container">
-            <com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone.Frozen" />
+            <com.airbnb.lottie.LottieAnimationView android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.Anim.Verify.By.Phone.Frozen" />
             <LinearLayout style="@style/UiKit.Copy">
                 <TextView android:text="@string/enter_phone_title" style="@style/UiKit.TextView.H1" />
-                <TextView android:gravity="center" android:layout_marginTop="16.0dip" android:text="@string/enter_phone_description" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:id="@id/user_phone_add_description" android:layout_marginTop="16.0dip" android:text="@string/enter_phone_description" style="@style/UiKit.TextView" />
+                <TextView android:gravity="center" android:id="@id/user_phone_add_description_note" android:layout_marginTop="16.0dip" style="@style/UiKit.TextView" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
@@ -19,11 +20,10 @@
                 <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.SingleLine.Phone" />
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
-        <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@id/user_phone_add_next" android:text="@string/next" style="@style/UiKit.Material.Button" />
+        <com.google.android.material.button.MaterialButton android:enabled="false" android:id="@id/user_phone_add_next" android:text="@string/next" style="@style/UiKit.User.Phone.Add.Confirm" />
     </LinearLayout>
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat.Transparent">
         <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
     </com.google.android.material.appbar.AppBarLayout>
-    <ImageView android:id="@id/close" android:padding="@dimen/uikit_spacing_large" android:foreground="?selectableItemBackgroundBorderless" android:src="?ic_close_24dp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" android:contentDescription="@string/close" style="@style/UiKit.ImageView" />
     <com.discord.utilities.dimmer.DimmerView style="@style/UiKit.DimmerView" />
 </RelativeLayout>

com.discord/res/layout/widget_user_set_custom_status.xml

@@ -19,6 +19,7 @@
             <RadioGroup android:id="@id/set_custom_status_expiration" android:layout_width="fill_parent" android:layout_height="wrap_content">
                 <com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_never" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_dont_clear" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
                 <com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_30_minutes" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_minutes" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
+                <com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_1_hour" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_hours" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
                 <com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_4_hours" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_in_hours" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
                 <com.discord.views.CheckedSetting android:id="@id/set_custom_status_expiration_tomorrow" android:layout_width="fill_parent" android:layout_height="wrap_content" app:cs_text="@string/custom_status_clear_tomorrow" app:cs_view_type="radio" style="@style/UiKit.CheckedSetting.Themed" />
             </RadioGroup>

com.discord/res/values-bg/strings.xml

@@ -1340,7 +1340,6 @@
     <string name="dm">Директно съобщение</string>
     <string name="dm_search_placeholder">Намери или започни разговор</string>
     <string name="dm_verification_text_blocked">Не можеш да изпращаш съобщения до потребител, който си блокирал.</string>
-    <string name="domain_migration_message_2">Сега сме Discord.com!</string>
     <string name="done">Готово</string>
     <string name="dont_show_again">Не показвай пак.</string>
     <string name="download">Сваляне</string>

com.discord/res/values-cs/strings.xml

@@ -1321,7 +1321,6 @@ kliknutím na ten malinkaťoulinkatý text dole."</string>
     <string name="dm">Přímá zpráva</string>
     <string name="dm_search_placeholder">Najít nebo začít konverzaci</string>
     <string name="dm_verification_text_blocked">Nemůžeš posílat zprávy uživateli, kterého sis zablokoval.</string>
-    <string name="domain_migration_message_2">Teď jsme Discord.com!</string>
     <string name="done">Hotovo</string>
     <string name="dont_show_again">Příště nezobrazovat.</string>
     <string name="download">Stáhnout</string>

com.discord/res/values-da/strings.xml

@@ -1311,7 +1311,6 @@ på den lille bitte tekst nedenfor."</string>
     <string name="dm">Direkte besked</string>
     <string name="dm_search_placeholder">Find eller start en samtale</string>
     <string name="dm_verification_text_blocked">Du kan ikke sende beskeder til en bruger, du har blokeret.</string>
-    <string name="domain_migration_message_2">Vi er nu Discord.com!</string>
     <string name="done">Færdig</string>
     <string name="dont_show_again">Vis mig ikke dette igen.</string>
     <string name="download">Hent</string>

com.discord/res/values-de/strings.xml

@@ -1360,7 +1360,6 @@ indem du auf den winzig kleinen Text unten klickst."</string>
     <string name="dm">Direktnachricht</string>
     <string name="dm_search_placeholder">Finde oder starte ein Gespräch</string>
     <string name="dm_verification_text_blocked">Du kannst einem von dir geblockten Nutzer keine Nachrichten senden.</string>
-    <string name="domain_migration_message_2">Wir sind jetzt Discord.com!</string>
     <string name="done">Fertig</string>
     <string name="dont_show_again">Nicht erneut anzeigen.</string>
     <string name="download_app">App herunterladen</string>

com.discord/res/values-el/strings.xml

@@ -1339,7 +1339,6 @@ Avatar"</string>
     <string name="dm">Άμεσο μήνυμα</string>
     <string name="dm_search_placeholder">Βρες ή ξεκίνησε μια συνομιλία</string>
     <string name="dm_verification_text_blocked">Δεν μπορείς να στείλεις μηνύματα σε έναν χρήστη που έχεις αποκλείσει.</string>
-    <string name="domain_migration_message_2">Πλέον είσαι Discord.com!</string>
     <string name="done">Έγινε</string>
     <string name="dont_show_again">Να μην εμφανιστεί αυτό ξανά.</string>
     <string name="download">Λήψη</string>

com.discord/res/values-es-rES/strings.xml

@@ -1339,7 +1339,6 @@ pulsando el minúsculo texto que hay a continuación."</string>
     <string name="dm">Mensaje directo</string>
     <string name="dm_search_placeholder">Busca o inicia una conversación</string>
     <string name="dm_verification_text_blocked">No puedes enviar mensajes a un usuario al que tienes bloqueado.</string>
-    <string name="domain_migration_message_2">¡Ahora somos Discord.com!</string>
     <string name="done">Listo</string>
     <string name="dont_show_again">No volver a mostrar.</string>
     <string name="download">Descargar</string>

com.discord/res/values-fi/strings.xml

@@ -1334,7 +1334,6 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
     <string name="dm">Yksityisviesti</string>
     <string name="dm_search_placeholder">Etsi tai aloita keskustelu</string>
     <string name="dm_verification_text_blocked">Et voi lähettää viestejä käyttäjälle, jonka olet estänyt.</string>
-    <string name="domain_migration_message_2">Olemme nyt Discord.com!</string>
     <string name="done">Valmis</string>
     <string name="dont_show_again">Älä näytä tätä enää uudelleen.</string>
     <string name="download">Lataa</string>

com.discord/res/values-fr/strings.xml

@@ -1384,7 +1384,6 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."</string>
     <string name="dm">Message privé</string>
     <string name="dm_search_placeholder">Rechercher/lancer une conversation</string>
     <string name="dm_verification_text_blocked">Tu ne peux pas envoyer de message à un utilisateur que tu as bloqué.</string>
-    <string name="domain_migration_message_2">Nous sommes désormais Discord.com !</string>
     <string name="done">Terminé</string>
     <string name="dont_show_again">Ne plus afficher ce message.</string>
     <string name="download">Télécharger</string>

com.discord/res/values-hr/strings.xml

@@ -1291,7 +1291,6 @@ Personalizirani URL smije sadržavati samo slova, brojeve ili podvlake."</string
     <string name="dm">Izravna poruka</string>
     <string name="dm_search_placeholder">Pronađi ili započni razgovor</string>
     <string name="dm_verification_text_blocked">Ne možeš slati poruke korisniku kojeg si blokirao/la.</string>
-    <string name="domain_migration_message_2">Sada smo Discord.com!</string>
     <string name="done">Gotovo</string>
     <string name="dont_show_again">Ne prikazuj mi ovo više.</string>
     <string name="download">Preuzmi</string>

com.discord/res/values-hu/strings.xml

@@ -1329,7 +1329,6 @@ a lenti, egészen aprócska szövegre kattintva."</string>
     <string name="dm">Közvetlen üzenet</string>
     <string name="dm_search_placeholder">Keress, vagy indíts új beszélgetést</string>
     <string name="dm_verification_text_blocked">Nem tudsz üzenetet küldeni azoknak, akiket letiltottál.</string>
-    <string name="domain_migration_message_2">Mostantól a Discord.com címen érhetsz el minket!</string>
     <string name="done">Kész</string>
     <string name="dont_show_again">Ne mutasd többször.</string>
     <string name="download">Letöltés</string>

com.discord/res/values-it/strings.xml

@@ -1377,7 +1377,6 @@ sul piccolo testo in fondo."</string>
     <string name="dm">Messaggio diretto</string>
     <string name="dm_search_placeholder">Trova o avvia una conversazione</string>
     <string name="dm_verification_text_blocked">Non puoi inviare messaggi a qualcuno che hai bloccato.</string>
-    <string name="domain_migration_message_2">Ora siamo su Discord.com!</string>
     <string name="done">Fatto</string>
     <string name="dont_show_again">Non visualizzare più.</string>
     <string name="download">Scarica</string>

com.discord/res/values-ja/strings.xml

@@ -1407,7 +1407,6 @@ Discordをここまで成長させてくれた皆様のサポートに心から
     <string name="dm">ダイレクトメッセージ</string>
     <string name="dm_search_placeholder">会話に参加または作成する</string>
     <string name="dm_verification_text_blocked">ブロック済みのユーザーにはメッセージを送信できません。</string>
-    <string name="domain_migration_message_2">これからはDiscord.comです！</string>
     <string name="done">完了</string>
     <string name="dont_show_again">今後表示しない。</string>
     <string name="download">ダウンロード</string>

com.discord/res/values-ko/strings.xml

@@ -1400,7 +1400,6 @@ Discord가 이 자리까지 올 수 있도록 도와주신 모든 분에게 깊
     <string name="dm">개인 메시지</string>
     <string name="dm_search_placeholder">대화 찾기 또는 시작하기</string>
     <string name="dm_verification_text_blocked">차단한 사용자에게 메시지를 보낼 수 없어요.</string>
-    <string name="domain_migration_message_2">이제부터는 Discord.com에서 저희를 찾아주세요!</string>
     <string name="done">완료</string>
     <string name="dont_show_again">다시 보지 않기.</string>
     <string name="download">다운로드</string>

com.discord/res/values-land/styles.xml

@@ -28,6 +28,10 @@
     <style name="UiKit.ImageView.HideInLandscape" parent="@style/UiKit.ImageView">
         <item name="android:visibility">gone</item>
     </style>
+    <style name="UiKit.User.Phone.Add.Confirm" parent="@style/UiKit.Material.Button">
+        <item name="android:layout_width">160.0dip</item>
+        <item name="android:layout_marginStart">@dimen/uikit_spacing_large</item>
+    </style>
     <style name="UiKit.User.Phone.Add.Number" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_weight">1.0</item>

com.discord/res/values-lt/strings.xml

@@ -1333,7 +1333,6 @@ mažytį užrašą apačioje."</string>
     <string name="dm">Asmeninė žinutė</string>
     <string name="dm_search_placeholder">Rasti arba pradėti pokalbį</string>
     <string name="dm_verification_text_blocked">Tu negali siųsti pranešimų užblokuotam naudotojui.</string>
-    <string name="domain_migration_message_2">Dabar esame Discord.com!</string>
     <string name="done">Atlikta</string>
     <string name="dont_show_again">Daugiau nerodyti.</string>
     <string name="download">Atsisiųsti</string>

com.discord/res/values-nl/strings.xml

@@ -1361,7 +1361,6 @@ de pietepeuterige tekst hieronder."</string>
     <string name="dm">Direct bericht</string>
     <string name="dm_search_placeholder">Zoek of start een gesprek</string>
     <string name="dm_verification_text_blocked">Je kunt geen berichten verzenden naar een gebruiker die je hebt geblokkeerd.</string>
-    <string name="domain_migration_message_2">We zijn nu Discord.com!</string>
     <string name="done">Klaar</string>
     <string name="dont_show_again">Laat me dit niet meer zien.</string>
     <string name="download">Downloaden</string>

com.discord/res/values-no/strings.xml

@@ -1259,7 +1259,6 @@ bittelille teksten nedenfor."</string>
     <string name="dm">Direktemelding</string>
     <string name="dm_search_placeholder">Finn eller start en samtale</string>
     <string name="dm_verification_text_blocked">Du kan ikke sende meldinger til en bruker du har blokkert.</string>
-    <string name="domain_migration_message_2">Vi er nå Discord.com!</string>
     <string name="done">Ferdig</string>
     <string name="dont_show_again">Ikke vis meg dette igjen.</string>
     <string name="download">Last ned</string>

com.discord/res/values-pl/strings.xml

@@ -1389,7 +1389,6 @@ malutki tekst poniżej."</string>
     <string name="dm">Prywatna wiadomość</string>
     <string name="dm_search_placeholder">Znajdź lub rozpocznij rozmowę</string>
     <string name="dm_verification_text_blocked">Nie możesz wysyłać wiadomości do zablokowanych użytkowników.</string>
-    <string name="domain_migration_message_2">Teraz jesteśmy Discord.com!</string>
     <string name="done">Gotowe</string>
     <string name="dont_show_again">Nie pokazuj ponownie.</string>
     <string name="download">Pobierz</string>

com.discord/res/values-pt-rBR/strings.xml

@@ -1385,7 +1385,6 @@ Crie o seu e comece a interagir."</string>
     <string name="dm">Mensagem direta</string>
     <string name="dm_search_placeholder">Encontre ou comece uma conversa</string>
     <string name="dm_verification_text_blocked">Você não pode enviar mensagens a um usuário que bloqueou.</string>
-    <string name="domain_migration_message_2">Agora somos o Discord.com!</string>
     <string name="done">Pronto</string>
     <string name="dont_show_again">Não me mostre isso novamente.</string>
     <string name="download">Baixar</string>

com.discord/res/values-ro/strings.xml

@@ -1307,7 +1307,6 @@ textul extra-minuscul de mai jos."</string>
     <string name="dm">Mesaj direct</string>
     <string name="dm_search_placeholder">Găsește sau începe o conversație</string>
     <string name="dm_verification_text_blocked">Nu poți trimite mesaje unui utilizator pe care l-ai blocat.</string>
-    <string name="domain_migration_message_2">Acum suntem Discord.com!</string>
     <string name="done">Gata</string>
     <string name="dont_show_again">Nu mai afișa.</string>
     <string name="download">Descarcă</string>

com.discord/res/values-ru/strings.xml

@@ -1414,7 +1414,6 @@ Discord — это ваше место для общения
     <string name="dm">Личное сообщение</string>
     <string name="dm_search_placeholder">Найти или начать беседу</string>
     <string name="dm_verification_text_blocked">Вы не можете отправлять сообщения пользователю, которого вы заблокировали.</string>
-    <string name="domain_migration_message_2">Теперь мы Discord.com!</string>
     <string name="done">Готово</string>
     <string name="dont_show_again">Больше не показывать.</string>
     <string name="download">Загрузить</string>

com.discord/res/values-sv-rSE/strings.xml

@@ -1325,7 +1325,6 @@ den pyttelilla texten nederst."</string>
     <string name="dm">Direktmeddelande</string>
     <string name="dm_search_placeholder">Hitta eller starta en konversation</string>
     <string name="dm_verification_text_blocked">Du kan inte skicka meddelanden till en användare du har blockerat.</string>
-    <string name="domain_migration_message_2">Du hittar oss nu på Discord.com!</string>
     <string name="done">Klar</string>
     <string name="dont_show_again">Visa inte det här igen.</string>
     <string name="download">Ladda ned</string>

com.discord/res/values-th/strings.xml

@@ -1336,7 +1336,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
     <string name="dm">ข้อความส่วนตัว</string>
     <string name="dm_search_placeholder">ค้นหา หรือเริ่มการสนทนา</string>
     <string name="dm_verification_text_blocked">คุณไม่สามารถส่งข้อความไปยังผู้ใช้ที่คุณบล็อกได้</string>
-    <string name="domain_migration_message_2">ตอนนี้เราคือ Discord.com!</string>
     <string name="done">เสร็จสิ้น</string>
     <string name="dont_show_again">อย่าแสดงสิ่งนี้อีก</string>
     <string name="download">ดาวน์โหลด</string>

com.discord/res/values-tr/strings.xml

@@ -1331,7 +1331,6 @@ tıklayarak kırmızı alarmı kapatabilirsin."</string>
     <string name="dm">Direkt Mesaj</string>
     <string name="dm_search_placeholder">Sohbet bul ya da başlat</string>
     <string name="dm_verification_text_blocked">Engellediğin bir kullanıcıya mesaj gönderemezsin.</string>
-    <string name="domain_migration_message_2">"Artık Discord.com'uz!"</string>
     <string name="done">Bitti</string>
     <string name="dont_show_again">Bunu bana bir daha gösterme.</string>
     <string name="download">İndir</string>

com.discord/res/values-uk/strings.xml

@@ -1346,7 +1346,6 @@
     <string name="dm">Приватне повідомлення</string>
     <string name="dm_search_placeholder">Знайди або розпочни бесіду</string>
     <string name="dm_verification_text_blocked">Ти не можеш надсилати повідомлення користувачу, якого ти заблокував.</string>
-    <string name="domain_migration_message_2">Тепер ми Discord.com!</string>
     <string name="done">Готово</string>
     <string name="dont_show_again">Не показувати знову.</string>
     <string name="download">Завантажити</string>

com.discord/res/values-vi/strings.xml

@@ -1323,7 +1323,6 @@ dòng chữ bé ở dưới."</string>
     <string name="dm">Tin nhắn trực tiếp</string>
     <string name="dm_search_placeholder">Tìm hoặc bắt đầu cuộc trò chuyện</string>
     <string name="dm_verification_text_blocked">Bạn không thể gửi tin nhắn cho người dùng đã chặn.</string>
-    <string name="domain_migration_message_2">Giờ chúng tôi là Discord.com!</string>
     <string name="done">Xong</string>
     <string name="dont_show_again">Đừng hiển thị lại nội dung này.</string>
     <string name="download">Tải xuống</string>

com.discord/res/values-zh-rCN/strings.xml

@@ -1346,7 +1346,6 @@
     <string name="dm">私信</string>
     <string name="dm_search_placeholder">寻找或开始新的对话</string>
     <string name="dm_verification_text_blocked">您不能向被您屏蔽的用户发送信息。</string>
-    <string name="domain_migration_message_2">我们现在成为了 Discord.com！</string>
     <string name="done">完成</string>
     <string name="dont_show_again">不要再提醒我。</string>
     <string name="download">下载</string>

com.discord/res/values-zh-rTW/strings.xml

@@ -1346,7 +1346,6 @@
     <string name="dm">私人訊息</string>
     <string name="dm_search_placeholder">搜尋或開始一個對話</string>
     <string name="dm_verification_text_blocked">您無法傳送訊息給您已封鎖的使用者。</string>
-    <string name="domain_migration_message_2">我們現在是 Discord.com 了！</string>
     <string name="done">完成</string>
     <string name="dont_show_again">不要再提示我。</string>
     <string name="download">下載</string>

com.discord/res/values/attrs.xml

@@ -1783,8 +1783,8 @@
     <attr name="theme_emoji_icon_symbols" format="reference" />
     <attr name="theme_emoji_icon_travel" format="reference" />
     <attr name="theme_emoji_placeholder" format="reference" />
-    <attr name="theme_emoji_search_icon_empty" format="reference" />
     <attr name="theme_emoji_settings_empty" format="reference" />
+    <attr name="theme_expression_tray_search_icon_empty" format="reference" />
     <attr name="theme_friends_add_icon" format="reference" />
     <attr name="theme_friends_divider" format="reference|color" />
     <attr name="theme_friends_new_group_icon" format="reference" />

com.discord/res/values/colors.xml

@@ -157,6 +157,8 @@
     <color name="flexInputIconColorDisabled">@color/primary_500_alpha_30</color>
     <color name="foreground_material_dark">@android:color/white</color>
     <color name="foreground_material_light">@android:color/black</color>
+    <color name="github">#ff191717</color>
+    <color name="github_500">#ff191717</color>
     <color name="google">#ffcb2120</color>
     <color name="grey_1">#ff99aab5</color>
     <color name="grey_1_alpha_60">#9999aab5</color>

com.discord/res/values/ids.xml

@@ -883,7 +883,7 @@
     <item type="id" name="friends_list_recycler" />
     <item type="id" name="ghost_view" />
     <item type="id" name="ghost_view_holder" />
-    <item type="id" name="gif_category_back_button" />
+    <item type="id" name="gif_category_container" />
     <item type="id" name="gif_category_gif_recycler" />
     <item type="id" name="gif_category_item_icon" />
     <item type="id" name="gif_category_item_preview" />
@@ -894,6 +894,16 @@
     <item type="id" name="gif_picker_category_recycler" />
     <item type="id" name="gif_picker_container" />
     <item type="id" name="gif_picker_loading_view" />
+    <item type="id" name="gif_search_app_bar" />
+    <item type="id" name="gif_search_bar" />
+    <item type="id" name="gif_search_clear" />
+    <item type="id" name="gif_search_gif_recycler" />
+    <item type="id" name="gif_search_input" />
+    <item type="id" name="gif_search_sheet_content" />
+    <item type="id" name="gif_search_suggested_terms_container" />
+    <item type="id" name="gif_search_suggested_terms_flex_box" />
+    <item type="id" name="gif_search_suggested_terms_icon_text" />
+    <item type="id" name="gif_search_toolbar" />
     <item type="id" name="gift_entitlement_code" />
     <item type="id" name="gift_entitlement_code_container" />
     <item type="id" name="gift_entitlement_container" />
@@ -927,6 +937,13 @@
     <item type="id" name="guild_actions_add_join" />
     <item type="id" name="guild_actions_overview_header_tv" />
     <item type="id" name="guild_call_onboarding_connect" />
+    <item type="id" name="guild_context_menu_card" />
+    <item type="id" name="guild_context_menu_header" />
+    <item type="id" name="guild_context_menu_header_divider" />
+    <item type="id" name="guild_context_menu_leave_guild" />
+    <item type="id" name="guild_context_menu_mark_as_read" />
+    <item type="id" name="guild_context_menu_more_options" />
+    <item type="id" name="guild_context_menu_notifications" />
     <item type="id" name="guild_create_button" />
     <item type="id" name="guild_create_flipper" />
     <item type="id" name="guild_create_guidelines" />
@@ -1144,6 +1161,7 @@
     <item type="id" name="invite_actions_title" />
     <item type="id" name="invite_avatar" />
     <item type="id" name="invite_avatar_small" />
+    <item type="id" name="invite_avatar_small_card" />
     <item type="id" name="invite_avatar_small_wrap" />
     <item type="id" name="invite_avatar_wrap" />
     <item type="id" name="invite_channel" />
@@ -1643,7 +1661,6 @@
     <item type="id" name="prune_users_estimate_text" />
     <item type="id" name="prune_users_history_1_radio" />
     <item type="id" name="prune_users_history_2_radio" />
-    <item type="id" name="prune_users_history_3_radio" />
     <item type="id" name="prune_users_loading_progressbar" />
     <item type="id" name="qr_scanner" />
     <item type="id" name="qr_scanner_chip" />
@@ -1906,6 +1923,7 @@
     <item type="id" name="set_custom_status_emoji" />
     <item type="id" name="set_custom_status_emoji_button" />
     <item type="id" name="set_custom_status_expiration" />
+    <item type="id" name="set_custom_status_expiration_1_hour" />
     <item type="id" name="set_custom_status_expiration_30_minutes" />
     <item type="id" name="set_custom_status_expiration_4_hours" />
     <item type="id" name="set_custom_status_expiration_never" />
@@ -2104,6 +2122,7 @@
     <item type="id" name="snackbar_action" />
     <item type="id" name="snackbar_text" />
     <item type="id" name="spacer" />
+    <item type="id" name="sparkle_view_image" />
     <item type="id" name="spinner" />
     <item type="id" name="split_action_bar" />
     <item type="id" name="src_toggle" />
@@ -2249,6 +2268,8 @@
     <item type="id" name="user_mutual_guilds_recycler_view" />
     <item type="id" name="user_phone_add_anchor" />
     <item type="id" name="user_phone_add_country_code" />
+    <item type="id" name="user_phone_add_description" />
+    <item type="id" name="user_phone_add_description_note" />
     <item type="id" name="user_phone_add_next" />
     <item type="id" name="user_phone_add_number" />
     <item type="id" name="user_phone_digit_verification" />
@@ -2270,6 +2291,7 @@
     <item type="id" name="user_profile_admin_edit_member" />
     <item type="id" name="user_profile_admin_kick" />
     <item type="id" name="user_profile_admin_server_deafen" />
+    <item type="id" name="user_profile_admin_server_disconnect" />
     <item type="id" name="user_profile_admin_server_move" />
     <item type="id" name="user_profile_admin_server_mute" />
     <item type="id" name="user_profile_avatar_presence" />

com.discord/res/values/plurals.xml

@@ -250,6 +250,15 @@
         <item quantity="zero">0 members</item>
         <item quantity="one">1 member</item>
     </plurals>
+    <plurals name="form_help_last_seen_with_roles_days">
+        <item quantity="other">%s days</item>
+        <item quantity="one">1 day</item>
+    </plurals>
+    <plurals name="form_help_last_seen_with_roles_members">
+        <item quantity="other">%s members</item>
+        <item quantity="zero">0 members</item>
+        <item quantity="one">1 member</item>
+    </plurals>
     <plurals name="game_feed_user_played_days_ago_time">
         <item quantity="other">days</item>
         <item quantity="one">day</item>
@@ -1031,5 +1040,5 @@
         <item quantity="other">%s People</item>
         <item quantity="one">%s Person</item>
     </plurals>
-    <item type="plurals" name="APKTOOL_DUMMY_ed">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_ef">false</item>
 </resources>

com.discord/res/values/strings.xml

@@ -199,6 +199,7 @@
     <string name="age_gate_error_same_year">"Hmm, that's really young!"</string>
     <string name="age_gate_existing_header">Help us keep Discord safe</string>
     <string name="age_gate_failed_to_update_birthday">Failed to verify your birthday, please try again</string>
+    <string name="age_gate_go_back">Go back</string>
     <string name="age_gate_header">Enter your birthday</string>
     <string name="age_gate_invalid_birthday">Please enter a valid date of birth</string>
     <string name="age_gate_nsfw_body">Before you can view this NSFW channel, we need to verify your age. We will only ask you for this once. [Why do I need to provide my birthday?](%1$s)</string>
@@ -1132,7 +1133,7 @@ We’re here to make a good impression."</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="com.crashlytics.android.build_id">0b28f6295dc849dca22543b22297b638</string>
+    <string name="com.crashlytics.android.build_id">6e3a88d939cb4ca0975fae8ea10e1503</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_me_description">Displays text with emphasis.</string>
@@ -1477,9 +1478,10 @@ We’re here to make a good impression."</string>
     <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
     <string name="disconnect_account_title">Disconnect %1$s</string>
     <string name="disconnect_from_voice">Disconnect from Voice</string>
+    <string name="disconnect_user_success">User has been disconnected from voice.</string>
     <string name="discord">Discord</string>
-    <string name="discord_desc_long">Discord is an all-in-one communication app for your friends, communities, and gaming.</string>
-    <string name="discord_desc_short">Team voice &amp; text chat</string>
+    <string name="discord_desc_long">Join over 100 million people who use Discord to talk and hang out with communities and friends.</string>
+    <string name="discord_desc_short">Your place to talk</string>
     <string name="discord_gg">discord.gg/</string>
     <string name="discord_name">Discord</string>
     <string name="discord_rich_presence">Discord Rich Presence</string>
@@ -1504,7 +1506,6 @@ We’re here to make a good impression."</string>
     <string name="dm_search_placeholder">Find or start a conversation</string>
     <string name="dm_tooltip_a11y_label">%1$s %2$s</string>
     <string name="dm_verification_text_blocked">You cannot send messages to a user you have blocked.</string>
-    <string name="domain_migration_message_2">We are now Discord.com!</string>
     <string name="done">Done</string>
     <string name="dont_show_again">"Don't show me this again."</string>
     <string name="download">Download</string>
@@ -1639,7 +1640,8 @@ We’re here to make a good impression."</string>
     <string name="engagement_ratio">Engagement Ratio</string>
     <string name="enter_email_body">In order to verify your email address, you must first enter an email address.</string>
     <string name="enter_new_topic">Enter a new topic</string>
-    <string name="enter_phone_description">Please enter your phone number. You will receive a text message with your verification code.</string>
+    <string name="enter_phone_description">You will receive a text message with a verification code.</string>
+    <string name="enter_phone_description_note">Note: Your phone number can be used to verify **one Discord account** at a time and is only used for verification.</string>
     <string name="enter_phone_title">Enter a Phone Number</string>
     <string name="error">Error</string>
     <string name="error_copying_image">Unable to copy image preview.</string>
@@ -1798,7 +1800,8 @@ We’re here to make a good impression."</string>
     <string name="form_help_explicit_content_filter">Automatically scan and delete media sent in this server that contains explicit content. Please choose how broadly the filter will apply to members in your server. **We recommend setting a filter for a public Discord.**</string>
     <string name="form_help_hardware_h264">Hardware acceleration uses your GPU for efficient video encoding, if available.</string>
     <string name="form_help_instant_invite_channel">If a channel is selected then an invite link will be generated with the widget, otherwise only online members and voice channels will be provided.</string>
-    <string name="form_help_last_seen">Pruning will kick **%1$s** who have not been seen in **%2$s** and are not assigned to any roles. They can re-join the server using a new invite.</string>
+    <string name="form_help_last_seen">Pruning will kick **%1$s** who have not been seen in **%2$s** and are not assigned to any roles. They can rejoin the server using a new invite.</string>
+    <string name="form_help_last_seen_with_roles">"Pruning will kick **%1$s** who have not been seen in **%2$s** and assigned to just the roles you've selected. Members who are not assigned to any roles are still included. They can rejoin the server using a new invite."</string>
     <string name="form_help_news">Post messages that reach servers outside your own. Users can opt into Following this channel, so select posts you Publish from here will appear directly in their own servers. Announcement channels will not receive messages from other Announcement channels. [Learn more.](%1$s)</string>
     <string name="form_help_nsfw">Users will need to confirm they are of over legal age to view in the content in this channel. NSFW channels are exempt from the explicit content filter.</string>
     <string name="form_help_open_h264">Disabling OpenH264 also disables hardware accelerated video encoding, if available.</string>
@@ -3112,81 +3115,81 @@ Want to know more about Discord?"</string>
     <string name="hypesquad_perk_title_profile_badge">Hype Profile Badge</string>
     <string name="hypesquad_perk_title_squad_challenges">Squad Challenges</string>
     <string name="hypesquad_perks_heading">Perks of being hype</string>
-    <string name="hypesquad_question_0_prompt">Wumpus appears at the front door, you:</string>
-    <string name="hypesquad_question_0_response_a">Yell “LEROY JENKINS” and run directly at Wumpus</string>
-    <string name="hypesquad_question_0_response_b">Are baffled because Wumpus is a fictitious character and you’re on vacation</string>
-    <string name="hypesquad_question_0_response_c">Invite Wumpus into your home and offer him an icy cold beverage</string>
-    <string name="hypesquad_question_0_response_d">Faint, because you’re not very good with surprises</string>
-    <string name="hypesquad_question_10_prompt">Wumpus wants to go investigate a spoopy abandoned house in the middle of the night! Do you:</string>
-    <string name="hypesquad_question_10_response_a">Grab your flashlight and charge in head-first</string>
-    <string name="hypesquad_question_10_response_b">Stand guard outside the spoopy house and yell at Wumpus if monsters arrive</string>
-    <string name="hypesquad_question_10_response_c">Cautiously stick with Wumpus, defending them from anything EXTRA-spoopy</string>
-    <string name="hypesquad_question_10_response_d">Absolutely refuse - there might be some huge spiders!</string>
-    <string name="hypesquad_question_11_prompt">A new band is forming, and Wumpus is the lead guitarist! Problem is… he’s not very good. You go ahead and:</string>
-    <string name="hypesquad_question_11_response_a">Leave the band to start your solo EDM career</string>
-    <string name="hypesquad_question_11_response_b">Teach him the four essential chords to any pop track</string>
-    <string name="hypesquad_question_11_response_c">Join the band anyways, you bet he’ll improve over time.</string>
-    <string name="hypesquad_question_11_response_d">Suggest that Wumpus probably pick up the tambourine instead</string>
-    <string name="hypesquad_question_12_prompt">"You're ascended to the peak of the highest mountain and the only thing separating you from riches is the three-headed dragon of the spire that stands in your way. You:"</string>
-    <string name="hypesquad_question_12_response_a">Charge into combat</string>
-    <string name="hypesquad_question_12_response_b">Watch old Godzilla movies to learn from his fights against King Ghidorah</string>
-    <string name="hypesquad_question_12_response_c">Try and convince the dragon to split the riches</string>
-    <string name="hypesquad_question_12_response_d">Offer the dragon a Wumpus plushie, how could it not want one?</string>
-    <string name="hypesquad_question_13_prompt">What’s that sound?:</string>
-    <string name="hypesquad_question_13_response_a">A lurking sword-wielding skeleton</string>
-    <string name="hypesquad_question_13_response_b">My massive collection of Newton’s Cradles</string>
-    <string name="hypesquad_question_13_response_c">The soft humming of your daily meditation</string>
-    <string name="hypesquad_question_13_response_d">Wumpus repeatedly @everyone pinging his server</string>
-    <string name="hypesquad_question_14_prompt">The correct order of cereal is:</string>
-    <string name="hypesquad_question_14_response_a">Bowl, spoon, milk, cereal</string>
-    <string name="hypesquad_question_14_response_b">Bowl, cereal, milk, spoon</string>
-    <string name="hypesquad_question_14_response_c">Bowl, milk, cereal, spoon</string>
-    <string name="hypesquad_question_14_response_d">Cereal, milk, spoon, bowl</string>
-    <string name="hypesquad_question_1_prompt">Nelly wants to play games with you on Discord, but you’d rather hang out with Wumpus, you:</string>
-    <string name="hypesquad_question_1_response_a">Ditch the both of them and go eat birthday cake ice cream</string>
-    <string name="hypesquad_question_1_response_b">Turn your online status to “Invisible” and play with Wumpus</string>
-    <string name="hypesquad_question_1_response_c">Ask Nelly to play games with Clyde</string>
-    <string name="hypesquad_question_1_response_d">Nelly won’t mind, because Nelly is a robot</string>
-    <string name="hypesquad_question_2_prompt">Wumpus wants to order a pineapple pizza, but you’re just not feeling it, you:</string>
-    <string name="hypesquad_question_2_response_a">Order two pineapple pizzas because pineapples on pizza is :fire:</string>
-    <string name="hypesquad_question_2_response_b">Tell Wumpus that pineapple pizza is not okay</string>
-    <string name="hypesquad_question_2_response_c">Compromise and get ½ pineapple and ½ cheese</string>
-    <string name="hypesquad_question_2_response_d">Eat birthday cake ice cream instead</string>
-    <string name="hypesquad_question_3_prompt">You’re planning a vacation with Wumpus, but you seem to disagree on travel locations, you:</string>
-    <string name="hypesquad_question_3_response_a">Spin a globe and randomly choose a location</string>
-    <string name="hypesquad_question_3_response_b">Decide that you both enjoy spaghetti and go to Italy</string>
-    <string name="hypesquad_question_3_response_c">Stay at home and save up money to buy Discord Nitro</string>
-    <string name="hypesquad_question_3_response_d">You can’t agree on a location so you go on vacation by yourself</string>
-    <string name="hypesquad_question_4_prompt">Nelly is planning on building a sequel to the popular SNEK game, but is unsure of what genre it should be, you:</string>
-    <string name="hypesquad_question_4_response_a">Build a survival-horror game with Snek stranded in the woods</string>
-    <string name="hypesquad_question_4_response_b">Convince her it should be a puzzle game</string>
-    <string name="hypesquad_question_4_response_c">Say we need more platforming games!</string>
-    <string name="hypesquad_question_4_response_d">Tell Nelly it should be the next big Battle Royale game</string>
-    <string name="hypesquad_question_5_prompt">Wumpus tells you to listen to his hot new mixtape, you:</string>
-    <string name="hypesquad_question_5_response_a">Decide to make a music video and put it on YouTube and get millions of views</string>
-    <string name="hypesquad_question_5_response_b">Listen and analyze the mixtape in a dark secluded room</string>
-    <string name="hypesquad_question_5_response_c">Write a 10 page paper analyzing the deeper meanings for the lyrics</string>
-    <string name="hypesquad_question_5_response_d">Throw it on the ground</string>
-    <string name="hypesquad_question_6_prompt">What do you usually follow?</string>
-    <string name="hypesquad_question_6_response_a">Your gut</string>
-    <string name="hypesquad_question_6_response_b">Discord on Twitter</string>
-    <string name="hypesquad_question_6_response_c">Your heart</string>
-    <string name="hypesquad_question_6_response_d">I don’t understand this question</string>
-    <string name="hypesquad_question_7_prompt">Which superhero power would you rather have?</string>
-    <string name="hypesquad_question_7_response_a">Sick karate skills</string>
-    <string name="hypesquad_question_7_response_b">Superhuman reading speed</string>
-    <string name="hypesquad_question_7_response_c">Perfect aim</string>
-    <string name="hypesquad_question_7_response_d">Supersleep</string>
-    <string name="hypesquad_question_8_prompt">You start watching a lot of Aggretsuko, but Wumpus wants to watch We Bare Bears, you:</string>
-    <string name="hypesquad_question_8_response_a">Start singing death metal in hopes to change Wumpus’s mind.</string>
-    <string name="hypesquad_question_8_response_b">Watch We Bare Bears because that’s clearly the more superior show</string>
-    <string name="hypesquad_question_8_response_c">Compromise and watch Adventure Time</string>
-    <string name="hypesquad_question_8_response_d">Eat mint chip ice cream instead</string>
-    <string name="hypesquad_question_9_prompt">Your team just wiped in a dungeon because Wumpus aggroed the boss too early, you:</string>
-    <string name="hypesquad_question_9_response_a">Coach Wumpus on what they might be doing wrong</string>
-    <string name="hypesquad_question_9_response_b">Say nothing and resurrect the team</string>
-    <string name="hypesquad_question_9_response_c">Laugh it off and suggest trying again</string>
-    <string name="hypesquad_question_9_response_d">Kick Wumpus from the party and get Clyde as the new tank</string>
+    <string name="hypesquad_question_0_prompt">Which insult would hurt you the most?</string>
+    <string name="hypesquad_question_0_response_a">You overreact a lot.</string>
+    <string name="hypesquad_question_0_response_b">"You don't listen enough."</string>
+    <string name="hypesquad_question_0_response_c">You only care about yourself.</string>
+    <string name="hypesquad_question_0_response_d">"You're ordinary."</string>
+    <string name="hypesquad_question_10_prompt">You can only listen to one type of music for the rest of your life. Do you pick:</string>
+    <string name="hypesquad_question_10_response_a">Something catchy that gets you excited.</string>
+    <string name="hypesquad_question_10_response_b">Something unintrusive that helps you concentrate.</string>
+    <string name="hypesquad_question_10_response_c">Something relaxing that puts you at ease.</string>
+    <string name="hypesquad_question_10_response_d">Something nostalgic that you know well.</string>
+    <string name="hypesquad_question_11_prompt">Vacation time. Where are you going?</string>
+    <string name="hypesquad_question_11_response_a">Somewhere new and extremely different from where you live.</string>
+    <string name="hypesquad_question_11_response_b">"Somewhere quiet. It's not a vacation unless you get to relax and reset."</string>
+    <string name="hypesquad_question_11_response_c">"A place you've been before that you have grown to see as a second home."</string>
+    <string name="hypesquad_question_11_response_d">"Stay at home. You're not one for travelling."</string>
+    <string name="hypesquad_question_12_prompt">Your computer desk looks like:</string>
+    <string name="hypesquad_question_12_response_a">"A mess to anyone who isn't you. But you know where everything is…"</string>
+    <string name="hypesquad_question_12_response_b">"A mess. And you're not sure where everything is…"</string>
+    <string name="hypesquad_question_12_response_c">Kinda simple but you really like it.</string>
+    <string name="hypesquad_question_12_response_d">"Something out of a magazine. It's clean and decorative."</string>
+    <string name="hypesquad_question_13_prompt">The nightmare situation finally happens to you. You order food at a restaurant and what comes out is not what you ordered. You:</string>
+    <string name="hypesquad_question_13_response_a">"Don't complain. Just send it back because you were really craving that one thing."</string>
+    <string name="hypesquad_question_13_response_b">"Complain to the table that this isn't what you ordered but don't send it back."</string>
+    <string name="hypesquad_question_13_response_c">Eat it without saying anything to anyone.</string>
+    <string name="hypesquad_question_13_response_d">"Complain to the waiter that this isn't what you ordered and send it back."</string>
+    <string name="hypesquad_question_14_prompt">"You're on your way out the door to something important, but your neighbor says that they need help with something. You:"</string>
+    <string name="hypesquad_question_14_response_a">"Help them and don't worry about the other thing you were on your way to."</string>
+    <string name="hypesquad_question_14_response_b">Apologize to your neighbor but insist you have something you must get to.</string>
+    <string name="hypesquad_question_14_response_c">"Knock on your other neighbor's door and ask them if they can help out in your place."</string>
+    <string name="hypesquad_question_14_response_d">"Pretend you didn't hear them."</string>
+    <string name="hypesquad_question_1_prompt">What sounds like a perfect day to you?</string>
+    <string name="hypesquad_question_1_response_a">Sleeping in, having a giant, homemade lunch, and heading out to meet up with close friends late at night.</string>
+    <string name="hypesquad_question_1_response_b">"Waking up early, finishing something you've been putting off for a while, and working on a new hobby in the late afternoon."</string>
+    <string name="hypesquad_question_1_response_c">Waking up on time, walking to the garden store and buying a new plant, and sinking deep into a bath to end the day.</string>
+    <string name="hypesquad_question_1_response_d">Waking up with no plans, taking the day as it comes.</string>
+    <string name="hypesquad_question_2_prompt">"What's something positive about you that you would agree with?"</string>
+    <string name="hypesquad_question_2_response_a">Making decisions is easy for you.</string>
+    <string name="hypesquad_question_2_response_b">"It's easy for you to understand new things."</string>
+    <string name="hypesquad_question_2_response_c">"You're dependable."</string>
+    <string name="hypesquad_question_2_response_d">You tend to see the good in people.</string>
+    <string name="hypesquad_question_3_prompt">Which of these smells makes you happiest?</string>
+    <string name="hypesquad_question_3_response_a">"Air that's deep and smokey from a campfire, and sweet from toasted marshmallows."</string>
+    <string name="hypesquad_question_3_response_b">Crisp, cool air revitalized after a thunderstorm.</string>
+    <string name="hypesquad_question_3_response_c">Fresh flowers in bloom mixed with the clean smell of laundry drying on a line.</string>
+    <string name="hypesquad_question_3_response_d">Walking into a kitchen after something flavorful has been slow cooking for 8 hours as fresh bread cools on the counter.</string>
+    <string name="hypesquad_question_4_prompt">Your favorite out of these genres is:</string>
+    <string name="hypesquad_question_4_response_a">Fiction</string>
+    <string name="hypesquad_question_4_response_b">Biographies and memoirs</string>
+    <string name="hypesquad_question_4_response_c">Poetry</string>
+    <string name="hypesquad_question_4_response_d">Romance</string>
+    <string name="hypesquad_question_5_prompt">You and your best friend get into a fight. No one is clearly in the wrong. You:</string>
+    <string name="hypesquad_question_5_response_a">Wait to see if they apologize first, but eventually give in and reach out.</string>
+    <string name="hypesquad_question_5_response_b">Apologize first but secretly be upset you had to say something first.</string>
+    <string name="hypesquad_question_5_response_c">Apologize first and truly mean it.</string>
+    <string name="hypesquad_question_5_response_d">Never apologize. Whatever happens, happens.</string>
+    <string name="hypesquad_question_6_prompt">Your dream exotic animal companion would be:</string>
+    <string name="hypesquad_question_6_response_a">Something intimidating and protective like a bear.</string>
+    <string name="hypesquad_question_6_response_b">Something small and nimble like a fox.</string>
+    <string name="hypesquad_question_6_response_c">Something large and helpful like an elephant.</string>
+    <string name="hypesquad_question_6_response_d">Something different and eye catching like a komodo dragon.</string>
+    <string name="hypesquad_question_7_prompt">Your dream house would definitely have a:</string>
+    <string name="hypesquad_question_7_response_a">Perfectly sized bedroom with an extravagantly comfy bed.</string>
+    <string name="hypesquad_question_7_response_b">Giant, roaring fireplace with a cat sleeping calmly in front.</string>
+    <string name="hypesquad_question_7_response_c">Some seriously beautiful outdoor space.</string>
+    <string name="hypesquad_question_7_response_d">An expansive living room meant for hanging out in with tons of natural light.</string>
+    <string name="hypesquad_question_8_prompt">You would want a job that:</string>
+    <string name="hypesquad_question_8_response_a">"Challenges you in a way that makes you grow. You don't feel bored in your day to day."</string>
+    <string name="hypesquad_question_8_response_b">"You're really good at and are looked to for advice."</string>
+    <string name="hypesquad_question_8_response_c">"Lets you feel like you're making a difference in something."</string>
+    <string name="hypesquad_question_8_response_d">"You do what needs to be done, but you're not really too invested in it."</string>
+    <string name="hypesquad_question_9_prompt">How do you react to learning new things?</string>
+    <string name="hypesquad_question_9_response_a">"You tend to stay away from learning new things and focus on becoming better at things you're already good at."</string>
+    <string name="hypesquad_question_9_response_b">"Get really frustrated you aren't good at the start and become obsessive."</string>
+    <string name="hypesquad_question_9_response_c">Take things slowly and learn step-by-step to make sure you get things right.</string>
+    <string name="hypesquad_question_9_response_d">Give up early and often.</string>
     <string name="hypesquad_quiz_body_house_1">The House of Bravery thanks you for joining our efforts to preserve the sanctity of the land and maintain the legacy of Renwil. Your bravery is comparable to that of a thousand gallant warriors and without your leadership and prowess, we would be much closer to descending into chaos.</string>
     <string name="hypesquad_quiz_body_house_2">The House of Brilliance thanks you for joining our efforts to protect the land and maintain the legacy of Urdim. Your execution of strategies is that of a master tactician and without your calculated approach to any conflicts that comes your way, we would be much closer to descending into chaos.</string>
     <string name="hypesquad_quiz_body_house_3">The House of Balance thanks you for joining our efforts to protect the land and maintain the legacy of Arame. Your ability to stay stout and steadfast in times of uncertainty is admirable. Without your natural understanding of both your environment and your inner self, we would be much closer to descending into chaos.</string>
@@ -3422,6 +3425,8 @@ Want to know more about Discord?"</string>
     <string name="ios_profile_open_voice_channel">Open Voice Channel</string>
     <string name="ios_share_suggestions_hint">Allows Discord conversations to appear as suggestions for sharing and search in iOS. Disabling this will hide those suggestions and make iOS forget which friends and servers are your favorite.</string>
     <string name="ios_share_suggestions_toggle">iOS Conversation Suggestions</string>
+    <string name="ios_stream_participants_hidden">Participants without video are currently hidden. Would you like to show them?</string>
+    <string name="ios_stream_show_non_video">Show participants without video</string>
     <string name="ios_view_all">View all</string>
     <string name="ip_address_secured">IP Address Secured</string>
     <string name="ip_authorization_succeeded">IP Address Authorized</string>
@@ -3793,6 +3798,7 @@ Want to know more about Discord?"</string>
     <string name="modify_followed_news_header">Are you sure?</string>
     <string name="monthly">Monthly</string>
     <string name="more">More</string>
+    <string name="more_options">More Options</string>
     <string name="move_from_category_to">Move from %1$s to</string>
     <string name="move_members">Move Members</string>
     <string name="move_members_description">Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access.</string>
@@ -4727,6 +4733,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="promotion_card_body_redeemed_hidden">"You've redeemed this, but the code is hidden due to Streamer Mode."</string>
     <string name="prune">Prune</string>
     <string name="prune_members">Prune Members</string>
+    <string name="prune_with_roles">Also include members with these roles</string>
     <string name="pt_br">Portuguese, Brazilian</string>
     <string name="ptt_limited_body">Push to Talk (Limited) will only work when this browser tab has focus. Download the desktop application to get system-wide Push to Talk.</string>
     <string name="ptt_limited_title">Hey, Just a quick heads</string>
@@ -4914,6 +4921,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="ring">Ring</string>
     <string name="ro">Romanian, Romania</string>
     <string name="role_color">Role Color</string>
+    <string name="role_id_copied">Copied id for role: %1$s</string>
     <string name="role_order_updated">Role order updated.</string>
     <string name="roles">Roles</string>
     <string name="roles_list">%1$s</string>
@@ -5162,6 +5170,9 @@ Server Insights is an experimental feature and is subject to change or removal i
     <string name="server_status">Server Status</string>
     <string name="server_undeafen">Server Undeafen</string>
     <string name="server_unmute">Server Unmute</string>
+    <string name="server_video_invite">Invite</string>
+    <string name="server_video_invite_description">No one else is here yet. Invite people to join you!</string>
+    <string name="server_video_invite_description_alt">No one else is here yet. Tell your friends to come join you!</string>
     <string name="server_voice_mute">Server Mute</string>
     <string name="server_voice_unmute">Server Unmute</string>
     <string name="servers">Servers</string>
@@ -5324,6 +5335,7 @@ Server Insights is an experimental feature and is subject to change or removal i
 Would you like to show them?"</string>
     <string name="stream_playing">Playing %1$s</string>
     <string name="stream_premium_upsell_body">Stream source resolution at 60 frames per second with Discord Nitro, get access to chat perks and [more](onPressMore)!</string>
+    <string name="stream_premium_upsell_body_no_cta">Stream source resolution at 60 frames per second with Discord Nitro, get access to chat perks and more!</string>
     <string name="stream_premium_upsell_cta">Subscribe</string>
     <string name="stream_premium_upsell_header">Unlock HD Video streaming with Discord Nitro</string>
     <string name="stream_preview_loading">Generating preview…</string>
@@ -5557,6 +5569,8 @@ Would you like to show them?"</string>
     <string name="too_many_emoji">You are out of emoji slots.</string>
     <string name="too_many_reactions_alert_body">Your reaction was not added because there are too many reactions on this message.</string>
     <string name="too_many_reactions_alert_header">We appreciate the enthusiasm, but…</string>
+    <string name="too_many_user_guilds_description">You must leave a server first to join.</string>
+    <string name="too_many_user_guilds_title">You are at the 100 server limit.</string>
     <string name="tooltip_community_feature_disabled">This option is not available for Community servers.</string>
     <string name="tooltip_discoverable_guild_feature_disabled">This is required for discoverable servers. Disable Discovery first to do this.</string>
     <string name="tooltip_guild_privacy_type_admin">Only server administrators can change this.</string>
@@ -6144,6 +6158,6 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="youre_viewing_older_messages">"You're viewing older messages"</string>
     <string name="zh_cn">Chinese, China</string>
     <string name="zh_tw">Chinese, Taiwan</string>
-    <item type="string" name="APKTOOL_DUMMY_3c0">false</item>
-    <item type="string" name="APKTOOL_DUMMY_3c4">false</item>
+    <item type="string" name="APKTOOL_DUMMY_3c1">false</item>
+    <item type="string" name="APKTOOL_DUMMY_3c5">false</item>
 </resources>

com.discord/res/values/styles.xml

@@ -430,8 +430,8 @@
         <item name="theme_emoji_icon_symbols">@drawable/ic_emoji_symbols_dark</item>
         <item name="theme_emoji_icon_travel">@drawable/ic_emoji_travel_dark</item>
         <item name="theme_emoji_placeholder">@drawable/ic_emoji_placeholder_primary_500</item>
-        <item name="theme_emoji_search_icon_empty">@drawable/ic_emoji_search_empty_dark</item>
         <item name="theme_emoji_settings_empty">@drawable/img_empty_server_settings_emoji_dark</item>
+        <item name="theme_expression_tray_search_icon_empty">@drawable/ic_emoji_search_empty_dark</item>
         <item name="theme_friends_add_icon">@drawable/ic_header_members_add_white_24dp</item>
         <item name="theme_friends_divider">#ff303337</item>
         <item name="theme_friends_new_group_icon">@drawable/ic_group_add_white_24dp</item>
@@ -708,8 +708,8 @@
         <item name="theme_emoji_icon_symbols">@drawable/ic_emoji_symbols_light</item>
         <item name="theme_emoji_icon_travel">@drawable/ic_emoji_travel_light</item>
         <item name="theme_emoji_placeholder">@drawable/ic_emoji_placeholder_primary_100</item>
-        <item name="theme_emoji_search_icon_empty">@drawable/ic_emoji_search_empty_light</item>
         <item name="theme_emoji_settings_empty">@drawable/img_empty_server_settings_emoji_light</item>
+        <item name="theme_expression_tray_search_icon_empty">@drawable/ic_emoji_search_empty_light</item>
         <item name="theme_friends_add_icon">@drawable/ic_header_members_add_grey_24dp</item>
         <item name="theme_friends_divider">@color/white_6</item>
         <item name="theme_friends_new_group_icon">@drawable/ic_group_add_grey_24dp</item>
@@ -2620,6 +2620,19 @@
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
+    <style name="ContextMenuTextOption">
+        <item name="android:textSize">@dimen/uikit_textsize_large</item>
+        <item name="android:textColor">?colorInteractiveActive</item>
+        <item name="android:background">?selectableItemBackground</item>
+        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingTop">14.0dip</item>
+        <item name="android:paddingRight">@dimen/uikit_spacing_large</item>
+        <item name="android:paddingBottom">14.0dip</item>
+        <item name="android:text">@string/mark_as_read</item>
+        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+        <item name="android:fontFamily">@font/whitney_semibold</item>
+        <item name="drawableTint">?colorInteractiveNormal</item>
+    </style>
     <style name="DialogDatePicker" parent="@style/AppTheme">
         <item name="android:textColorPrimary">?colorHeaderPrimary</item>
     </style>
@@ -2692,7 +2705,7 @@
         <item name="android:paddingStart">@dimen/uikit_spacing_medium</item>
     </style>
     <style name="ExpressionTrayTab" parent="@style/UiKit.TextView">
-        <item name="android:textAppearance">@style/UiKit.TextAppearance.Bold</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance.Semibold</item>
         <item name="android:gravity">center</item>
         <item name="android:padding">@dimen/uikit_spacing_medium</item>
         <item name="android:layout_width">fill_parent</item>
@@ -2703,7 +2716,7 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:layout_weight">1.0</item>
         <item name="cardBackgroundColor">@color/transparent</item>
-        <item name="cardCornerRadius">8.0dip</item>
+        <item name="cardCornerRadius">4.0dip</item>
         <item name="cardElevation">0.0dip</item>
         <item name="strokeWidth">0.0dip</item>
     </style>
@@ -5136,6 +5149,7 @@
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">@font/whitney_medium</item>
     </style>
+    <style name="UiKit.User.Phone.Add.Confirm" parent="@style/UiKit.Material.Button" />
     <style name="UiKit.User.Phone.Add.Number" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
     <style name="UiKit.User.Phone.Verify.Digits" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
     <style name="UiKit.User.Verify.Char" parent="@style/UiKit.TextView">

com.discord/res/xml/shortcuts.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="com.discord.app.AppActivity$AppAction">
+        <data android:mimeType="*/*" />
+        <category android:name="com.discord.intent.category.DIRECT_SHARE_TARGET" />
+    </share-target>
+</shortcuts>