Changes of com.discord v1019

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1018.apk
+apkFileName: com.discord-1019.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -184,5 +184,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '1018'
-  versionName: 10.1.8
+  versionCode: '1019'
+  versionName: 10.1.9

com.discord/assets/crashlytics-build.properties

@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Tue Jan 07 21:42:58 UTC 2020
-version_name=10.1.8
+#Fri Jan 10 01:12:32 UTC 2020
+version_name=10.1.9
 package_name=com.discord
-build_id=1850c70b-5f40-4142-8749-d514535f6355
-version_code=1018
+build_id=3901acd1-c80f-461c-93c8-a2caa305af42
+version_code=1019
 app_name=com.discord

com.discord/res/color/channel_list_item_text_color.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="false" android:color="@color/primary_400" />
-    <item android:state_selected="true" android:color="@color/primary_100" />
-</selector>

com.discord/res/color/channel_list_item_voice_text_color_dark.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="false" android:color="@color/primary_400" />
-    <item android:state_selected="true" android:color="@color/primary_100" />
-</selector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="20.0dip" android:width="20.0dip" android:viewportWidth="20.0" android:viewportHeight="20.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff72767d" android:pathData="M5.0049,17.5C4.6938,17.5 4.4583,17.2189 4.5126,16.9126L5,14.1667H2.2618C1.9512,14.1667 1.7157,13.8864 1.7693,13.5805L1.8859,12.9138C1.9278,12.6746 2.1356,12.5 2.3785,12.5H5.2917L6.175,7.5H3.4368C3.1262,7.5 2.8907,7.2198 2.9443,6.9138L3.0609,6.2471C3.1028,6.0079 3.3106,5.8333 3.5535,5.8333H6.4667L6.9851,2.9126C7.0275,2.6739 7.235,2.5 7.4774,2.5H8.1285C8.4396,2.5 8.6751,2.7811 8.6208,3.0874L8.1334,5.8333H13.1334L13.6518,2.9126C13.6942,2.6739 13.9017,2.5 14.1441,2.5H14.7951C15.1062,2.5 15.3418,2.7811 15.2874,3.0874L14.8,5.8333H17.5383C17.8489,5.8333 18.0843,6.1136 18.0308,6.4195L17.9141,7.0862C17.8722,7.3254 17.6645,7.5 17.4216,7.5H14.5084L13.625,12.5H16.3633C16.6739,12.5 16.9093,12.7802 16.8558,13.0862L16.7391,13.7529C16.6972,13.9921 16.4895,14.1667 16.2466,14.1667H13.3334L12.8149,17.0874C12.7726,17.3261 12.5651,17.5 12.3226,17.5H11.6716C11.3605,17.5 11.1249,17.2189 11.1793,16.9126L11.6667,14.1667H6.6667L6.1483,17.0874C6.1059,17.3261 5.8984,17.5 5.656,17.5H5.0049ZM7.8421,7.5L6.9587,12.5H11.9587L12.8421,7.5H7.8421Z" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,6 @@
+<?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="#ffb9bbbe" android:pathData="M14,8C14,7.4477 13.5523,7 13,7H9.76L10.3657,3.5874C10.4201,3.2811 10.1845,3 9.8734,3H8.8891C8.6466,3 8.4391,3.1739 8.3968,3.4126L7.76,7H4.1801C3.9372,7 3.7295,7.1746 3.6876,7.4138L3.5126,8.4138C3.459,8.7198 3.6945,9 4.0051,9H7.41L6.35,15H2.7701C2.5272,15 2.3195,15.1746 2.2776,15.4138L2.1026,16.4138C2.0491,16.7198 2.2845,17 2.5951,17H6L5.3943,20.4126C5.3399,20.7189 5.5755,21 5.8866,21H6.8709C7.1134,21 7.3209,20.8261 7.3632,20.5874L8,17H14L13.3943,20.4126C13.3399,20.7189 13.5755,21 13.8866,21H14.8709C15.1134,21 15.3209,20.8261 15.3632,20.5874L16,17H19.5799C19.8228,17 20.0306,16.8254 20.0724,16.5862L20.2474,15.5862C20.301,15.2802 20.0655,15 19.7549,15H16.35L16.6758,13.1558C16.7823,12.5529 16.3186,12 15.7063,12C15.2286,12 14.8199,12.3429 14.7368,12.8133L14.3504,15H8.3504L9.4104,9H13C13.5523,9 14,8.5523 14,8Z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M19.8914,3.802L22.2438,8.5565C22.5726,9.2212 22.0891,10 21.3475,10L16.6179,10C15.8745,10 15.391,9.2177 15.7235,8.5528L18.1007,3.7983C18.4701,3.0595 19.5251,3.0617 19.8914,3.802ZM18.4998,5H19.4999V7.5H18.4999L18.4998,5ZM18.4998,8.4989C18.4998,8.7759 18.7238,9 18.9998,9C19.2759,9 19.4999,8.7759 19.4999,8.4989C19.4999,8.2222 19.2759,7.9977 18.9998,7.9977C18.7238,7.9977 18.4998,8.2222 18.4998,8.4989Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable-anydpi-v24/ic_channel_voice.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="#ffb9bbbe" android:pathData="M11.383,3.079C11.009,2.925 10.579,3.01 10.293,3.296L6,8.002H3C2.45,8.002 2,8.453 2,9.002V15.002C2,15.552 2.45,16.002 3,16.002H6L10.293,20.71C10.579,20.996 11.009,21.082 11.383,20.927C11.757,20.772 12,20.407 12,20.002V4.002C12,3.599 11.757,3.232 11.383,3.079ZM14,5.0019V7.0019C16.757,7.0019 19,9.2459 19,12.002C19,14.759 16.757,17.002 14,17.002V19.002C17.86,19.002 21,15.863 21,12.002C21,8.143 17.86,5.0019 14,5.0019ZM14,9.002C15.654,9.002 17,10.349 17,12.002C17,13.657 15.654,15.002 14,15.002V13.002C14.551,13.002 15,12.553 15,12.002C15,11.451 14.551,11.002 14,11.002V9.002Z" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,6 @@
+<?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="#ffb9bbbe" android:pathData="M15,12C15,12.0007 15,12.0013 15,12.002C15,12.553 14.551,13.002 14,13.002V15.002C15.654,15.002 17,13.657 17,12.002C17,12.0013 17,12.0007 17,12H15ZM19,12C19,12.0007 19,12.0013 19,12.002C19,14.759 16.757,17.002 14,17.002V19.002C17.86,19.002 21,15.863 21,12.002C21,12.0013 21,12.0007 21,12H19ZM10.293,3.296C10.579,3.01 11.009,2.925 11.383,3.079C11.757,3.232 12,3.599 12,4.002V20.002C12,20.407 11.757,20.772 11.383,20.927C11.009,21.082 10.579,20.996 10.293,20.71L6,16.002H3C2.45,16.002 2,15.552 2,15.002V9.002C2,8.453 2.45,8.002 3,8.002H6L10.293,3.296Z" android:fillType="evenOdd" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M21.025,5V4C21.025,2.88 20.05,2 19,2C17.95,2 17,2.88 17,4V5C16.4477,5 16,5.4477 16,6V9C16,9.5523 16.4477,10 17,10H19H21C21.5523,10 22,9.5523 22,9V5.975C22,5.4365 21.5635,5 21.025,5ZM20,5H18V4C18,3.4286 18.4667,3 19,3C19.5333,3 20,3.4286 20,4V5Z" />
+</vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="12.0dip" android:width="8.0dip" android:viewportWidth="8.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff43b581" android:pathData="M0,1.5C0,0.6716 0.6716,0 1.5,0H6.5C7.3284,0 8,0.6716 8,1.5V10.5C8,11.3284 7.3284,12 6.5,12H1.5C0.6716,12 0,11.3284 0,10.5V1.5ZM5,10C5,10.5523 4.5523,11 4,11C3.4477,11 3,10.5523 3,10C3,9.4477 3.4477,9 4,9C4.5523,9 5,9.4477 5,10ZM7,2H1V8H7V2Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable-anydpi-v24/ic_settings_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="#ffb9bbbe" android:pathData="M19.738,10H22V14H19.739C19.498,14.931 19.1,15.798 18.565,16.564L20,18L18,20L16.565,18.564C15.797,19.099 14.932,19.498 14,19.738V22H10V19.738C9.069,19.498 8.203,19.099 7.436,18.564L6,20L4,18L5.436,16.564C4.901,15.799 4.502,14.932 4.262,14H2V10H4.262C4.502,9.068 4.9,8.202 5.436,7.436L4,6L6,4L7.436,5.436C8.202,4.9 9.068,4.502 10,4.262V2H14V4.261C14.932,4.502 15.797,4.9 16.565,5.435L18,3.999L20,5.999L18.564,7.436C19.099,8.202 19.498,9.069 19.738,10ZM12,16C14.2091,16 16,14.2091 16,12C16,9.7909 14.2091,8 12,8C9.7909,8 8,9.7909 8,12C8,14.2091 9.7909,16 12,16Z" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable/drawable_bottom_up_primary_630_gradient.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient android:startColor="#552f3136" android:endColor="@color/primary_630" android:angle="270.0" />
-</shape>

com.discord/res/drawable/drawable_button_theme_grey_channels.xml

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

com.discord/res/drawable/drawable_circle_black.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/grey_channels" />
+    <solid android:color="@color/black" />
 </shape>

com.discord/res/drawable/drawable_circle_guild_badge_active_dark.xml

@@ -2,7 +2,7 @@
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <shape android:shape="oval">
-        <stroke android:width="2.0dip" android:color="@color/grey_guilds" />
+        <stroke android:width="2.0dip" android:color="@color/primary_700" />
         <solid android:color="@color/status_green_500" />
     </shape>
 </inset>

com.discord/res/drawable/drawable_circle_guild_badge_active_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="oval">
+        <stroke android:width="2.0dip" android:color="@color/primary_light_200" />
+        <solid android:color="@color/status_green_500" />
+    </shape>
+</inset>

com.discord/res/drawable/drawable_circle_guild_badge_inactive_dark.xml

@@ -2,7 +2,7 @@
 <inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <shape android:shape="oval">
-        <stroke android:width="2.0dip" android:color="@color/grey_guilds" />
+        <stroke android:width="2.0dip" android:color="@color/primary_700" />
         <solid android:color="@color/primary_500" />
     </shape>
 </inset>

com.discord/res/drawable/drawable_circle_guild_badge_inactive_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset android:insetLeft="-2.0dip" android:insetRight="-2.0dip" android:insetTop="-2.0dip" android:insetBottom="-2.0dip"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape android:shape="oval">
+        <stroke android:width="2.0dip" android:color="@color/primary_light_200" />
+        <solid android:color="@color/primary_500" />
+    </shape>
+</inset>

com.discord/res/drawable/drawable_circle_speaking_dark.xml

@@ -2,5 +2,5 @@
 <shape android:shape="oval"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <stroke android:width="2.0dip" android:color="@color/status_green_500" />
-    <solid android:color="@color/grey_guilds" />
+    <solid android:color="@color/primary_700" />
 </shape>

com.discord/res/drawable/drawable_open_folder_light.xml

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

com.discord/res/drawable/drawable_overlay_category_dark.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed" />
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_category_pressed_dark" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_category_pressed_dark" />
     <item android:drawable="@color/transparent" />
 </selector>

com.discord/res/drawable/drawable_overlay_category_light.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_category_pressed_light" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_category_pressed_light" />
+    <item android:drawable="@color/transparent" />
+</selector>

com.discord/res/drawable/drawable_overlay_category_pressed_dark.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:left="2.0dip" android:top="8.0dip" android:right="2.0dip" android:bottom="8.0dip">
         <shape android:shape="rectangle">
-            <solid android:color="@color/primary_600" />
+            <solid android:color="@color/primary_500_alpha_32" />
             <corners android:radius="4.0dip" />
         </shape>
     </item>

com.discord/res/drawable/drawable_overlay_category_pressed_light.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:left="2.0dip" android:top="8.0dip" android:right="2.0dip" android:bottom="8.0dip">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/primary_light_500_alpha_24" />
+            <corners android:radius="4.0dip" />
+        </shape>
+    </item>
+</layer-list>

com.discord/res/drawable/drawable_overlay_channel_pressed_dark.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:left="8.0dip" android:right="8.0dip">
         <shape android:shape="rectangle">
-            <solid android:color="@color/primary_500_alpha_60" />
+            <solid android:color="@color/primary_500_alpha_32" />
             <corners android:radius="4.0dip" />
         </shape>
     </item>

com.discord/res/drawable/drawable_overlay_channel_pressed_light.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:left="8.0dip" android:right="8.0dip">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/primary_light_500_alpha_24" />
+            <corners android:radius="4.0dip" />
+        </shape>
+    </item>
+</layer-list>

com.discord/res/drawable/drawable_overlay_channels_active_dark.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:left="8.0dip" android:right="8.0dip">
         <shape android:shape="rectangle">
-            <solid android:color="@color/primary_600" />
+            <solid android:color="#ff42464d" />
             <corners android:radius="4.0dip" />
         </shape>
     </item>

com.discord/res/drawable/drawable_overlay_channels_active_light.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:left="8.0dip" android:right="8.0dip">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffd4d7dc" />
+            <corners android:radius="4.0dip" />
+        </shape>
+    </item>
+</layer-list>

com.discord/res/drawable/drawable_overlay_channels_dark.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_category_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_category_pressed" />
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed_dark" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed_dark" />
     <item android:drawable="@color/transparent" />
 </selector>

com.discord/res/drawable/drawable_overlay_channels_light.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed_light" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed_light" />
+    <item android:drawable="@color/transparent" />
+</selector>

com.discord/res/drawable/drawable_overlay_channels_selected_dark.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed" />
-    <item android:drawable="@drawable/drawable_overlay_channels_active" />
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed_dark" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed_dark" />
+    <item android:drawable="@drawable/drawable_overlay_channels_active_dark" />
 </selector>

com.discord/res/drawable/drawable_overlay_channels_selected_light.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/drawable_overlay_channel_pressed_light" />
+    <item android:state_focused="true" android:drawable="@drawable/drawable_overlay_channel_pressed_light" />
+    <item android:drawable="@drawable/drawable_overlay_channels_active_light" />
+</selector>

com.discord/res/drawable/drawable_overlay_guild_mentions_dark.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <shape android:shape="rectangle">
         <solid android:color="@color/status_red_500" />
-        <stroke android:width="2.0dip" android:color="@color/grey_guilds" />
+        <stroke android:width="2.0dip" android:color="@color/primary_700" />
         <corners android:radius="9999.0dip" />
     </shape>
 </inset>

com.discord/res/drawable/drawable_overlay_guild_mentions_light.xml

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

com.discord/res/drawable/drawable_overlay_mentions_primary_light_130.xml

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

com.discord/res/drawable/drawable_overlay_status_bar.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/grey_guilds" />
-        </shape>
-    </item>
-    <item android:left="72.5dip">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/grey_channels" />
-        </shape>
-    </item>
-</layer-list>

com.discord/res/drawable/drawable_reaction_text_color_light.xml

@@ -2,5 +2,5 @@
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/purple_brand" android:state_activated="true" />
-    <item android:color="@color/grey_6_alpha_30" android:state_activated="false" />
+    <item android:color="@color/primary_500_alpha_30" android:state_activated="false" />
 </selector>

com.discord/res/drawable/drawable_rect_rounded_dark.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/grey_guilds" />
+    <solid android:color="@color/primary_700" />
     <corners android:topLeftRadius="8.0dip" android:topRightRadius="8.0dip" android:bottomLeftRadius="8.0dip" android:bottomRightRadius="8.0dip" />
 </shape>

com.discord/res/drawable/drawable_squircle_primary_light_700_alpha_20.xml

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

com.discord/res/drawable/drawable_squircle_white.xml

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

com.discord/res/drawable/drawable_top_down_primary_630_gradient.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="@color/transparent" android:endColor="@color/primary_630" android:angle="90.0" />
+</shape>

com.discord/res/drawable/drawable_top_down_primary_light_130_gradient.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="@color/transparent" android:endColor="@color/primary_light_130" android:angle="90.0" />
+</shape>

com.discord/res/drawable/ic_add_grey_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7d8187" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-</vector>

com.discord/res/drawable/ic_channel_text.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7d8187" android:pathData="M3.527,14L4,11.333L1.333,11.333L1.567,10L4.233,10L4.94,6L2.273,6L2.507,4.667L5.173,4.667L5.647,2L6.98,2L6.507,4.667L10.507,4.667L10.98,2L12.313,2L11.84,4.667L14.507,4.667L14.273,6L11.607,6L10.9,10L13.567,10L13.333,11.333L10.667,11.333L10.193,14L8.86,14L9.333,11.333L5.333,11.333L4.86,14L3.527,14L3.527,14ZM6.273,6L5.567,10L9.567,10L10.273,6L6.273,6L6.273,6Z" />
-</vector>

com.discord/res/drawable/ic_channel_text_locked.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+<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="#ff7d8187" android:pathData="M8.92,4.667L6.507,4.667L6.98,2L5.647,2L5.173,4.667L2.507,4.667L2.273,6L4.94,6L4.233,10L1.567,10L1.333,11.333L4,11.333L3.527,14L4.86,14L5.333,11.333L9.333,11.333L8.86,14L10.193,14L10.667,11.333L13.333,11.333L13.567,10L10.9,10L11.077,9L9.743,9L9.567,10L5.567,10L6.273,6L8.92,6L8.92,4.667Z" android:fillAlpha="0.3" />
-    <path android:fillColor="#ff7d8187" android:pathData="M15.1,3.2L15.1,2C15.1,0.88 14.05,0 13,0C11.95,0 10.9,0.88 10.9,2L10.9,3.2C10.45,3.2 10,3.68 10,4.16L10,6.96C10,7.52 10.45,8 10.9,8L15.025,8C15.55,8 16,7.52 16,7.04L16,4.24C16,3.68 15.55,3.2 15.1,3.2ZM14,3L12,3L12,1.929C12,1.357 12.467,1 13,1C13.533,1 14,1.357 14,1.929L14,3Z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M14,8C14,7.4477 13.5523,7 13,7H9.76L10.3657,3.5874C10.4201,3.2811 10.1845,3 9.8734,3H8.8891C8.6466,3 8.4391,3.1739 8.3968,3.4126L7.76,7H4.1801C3.9372,7 3.7295,7.1746 3.6876,7.4138L3.5126,8.4138C3.459,8.7198 3.6945,9 4.0051,9H7.41L6.35,15H2.7701C2.5272,15 2.3195,15.1746 2.2776,15.4138L2.1026,16.4138C2.0491,16.7198 2.2845,17 2.5951,17H6L5.3943,20.4126C5.3399,20.7189 5.5755,21 5.8866,21H6.8709C7.1134,21 7.3209,20.8261 7.3632,20.5874L8,17H14L13.3943,20.4126C13.3399,20.7189 13.5755,21 13.8866,21H14.8709C15.1134,21 15.3209,20.8261 15.3632,20.5874L16,17H19.5799C19.8228,17 20.0306,16.8254 20.0724,16.5862L20.2474,15.5862C20.301,15.2802 20.0655,15 19.7549,15H16.35L16.6758,13.1558C16.7823,12.5529 16.3186,12 15.7063,12C15.2286,12 14.8199,12.3429 14.7368,12.8133L14.3504,15H8.3504L9.4104,9H13C13.5523,9 14,8.5523 14,8Z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M21.025,5V4C21.025,2.88 20.05,2 19,2C17.95,2 17,2.88 17,4V5C16.4477,5 16,5.4477 16,6V9C16,9.5523 16.4477,10 17,10H19H21C21.5523,10 22,9.5523 22,9V5.975C22,5.4365 21.5635,5 21.025,5ZM20,5H18V4C18,3.4286 18.4667,3 19,3C19.5333,3 20,3.4286 20,4V5Z" />
 </vector>

com.discord/res/drawable/ic_channel_text_muted.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#994f545c" android:pathData="M3.527,14L4,11.333L1.333,11.333L1.567,10L4.233,10L4.94,6L2.273,6L2.507,4.667L5.173,4.667L5.647,2L6.98,2L6.507,4.667L10.507,4.667L10.98,2L12.313,2L11.84,4.667L14.507,4.667L14.273,6L11.607,6L10.9,10L13.567,10L13.333,11.333L10.667,11.333L10.193,14L8.86,14L9.333,11.333L5.333,11.333L4.86,14L3.527,14L3.527,14ZM6.273,6L5.567,10L9.567,10L10.273,6L6.273,6L6.273,6Z" />
-</vector>

com.discord/res/drawable/ic_channel_text_nsfw.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7d8187" android:pathData="M8.644,4.667L6.507,4.667L6.98,2L5.647,2L5.173,4.667L2.507,4.667L2.273,6L4.94,6L4.233,10L1.567,10L1.333,11.333L4,11.333L3.527,14L4.86,14L5.333,11.333L9.333,11.333L8.86,14L10.193,14L10.667,11.333L13.333,11.333L13.567,10L10.9,10L11.077,9L9.743,9L9.567,10L5.567,10L6.273,6L8.138,6L8.644,4.667Z" android:fillAlpha="0.3" />
-    <path android:fillColor="#ff7d8187" android:pathData="M9.75,8L15.25,8L15.25,8C15.664,8 16,7.664 16,7.25L16,6.717L16,6.717C16,6.574 15.969,6.433 15.91,6.303L13.766,1.586L13.766,1.586C13.604,1.229 13.248,1 12.856,1L12.144,1L12.144,1C11.752,1 11.396,1.229 11.234,1.586L9.09,6.303L9.09,6.303C9.031,6.433 9,6.574 9,6.717L9,7.25L9,7.25C9,7.664 9.336,8 9.75,8ZM13,7L12,7L12,6L13,6L13,7ZM13,4.961L12,4.961L12,3L13,3L13,4.961Z" />
-</vector>

com.discord/res/drawable/ic_channel_voice.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7d8187" android:pathData="M9.333,2L9.333,3.373C11.26,3.947 12.667,5.733 12.667,7.847C12.667,9.96 11.26,11.74 9.333,12.313L9.333,13.693C12,13.087 14,10.7 14,7.847C14,4.993 12,2.607 9.333,2L9.333,2ZM11,7.847C11,6.667 10.333,5.653 9.333,5.16L9.333,10.513C10.333,10.04 11,9.02 11,7.847L11,7.847ZM2,5.847L2,9.847L4.667,9.847L8,13.18L8,2.513L4.667,5.847L2,5.847L2,5.847Z" />
-</vector>

com.discord/res/drawable/ic_channel_voice_locked.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7d8187" android:pathData="M13.601,10C12.889,11.844 11.291,13.248 9.333,13.693L9.333,12.313C10.551,11.951 11.561,11.106 12.14,10L13.601,10ZM10.774,8.995C10.498,9.661 9.987,10.204 9.333,10.513L9.333,8.995L10.774,8.995ZM2,5.847L4.667,5.847L8,2.513L8,13.18L4.667,9.847L2,9.847L2,5.847Z" android:fillAlpha="0.3" />
-    <path android:fillColor="#ff7d8187" android:pathData="M15.1,3.2L15.1,2C15.1,0.88 14.05,0 13,0C11.95,0 10.9,0.88 10.9,2L10.9,3.2C10.45,3.2 10,3.68 10,4.16L10,6.96C10,7.52 10.45,8 10.9,8L15.025,8C15.55,8 16,7.52 16,7.04L16,4.24C16,3.68 15.55,3.2 15.1,3.2ZM14,3L12,3L12,1.929C12,1.357 12.467,1 13,1C13.533,1 14,1.357 14,1.929L14,3Z" />
-</vector>

com.discord/res/drawable/ic_chevron_right_dark_grey_12dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="12.0" android:viewportHeight="12.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff4f545c" android:pathData="M4,8.295l2.29,-2.295l-2.29,-2.295l0.705,-0.705l3,3l-3,3z" />
-</vector>

com.discord/res/drawable/ic_guild_list_dms_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="#ffb9bbbe" android:pathData="M3.998,2C2.894,2 1.998,2.895 1.998,4V16C1.998,17.104 2.894,18 3.998,18H6.9981V22L10.998,18H19.998C21.103,18 21.998,17.104 21.998,16V4C21.998,2.895 21.103,2 19.998,2H3.998Z" />
+</vector>

com.discord/res/drawable/ic_help_outline_24dp.xml

@@ -1,5 +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="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
 </vector>

com.discord/res/drawable/ic_mentions_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="#ffb9bbbe" android:pathData="M12,2C6.486,2 2,6.486 2,12C2,17.515 6.486,22 12,22C14.039,22 15.993,21.398 17.652,20.259L16.521,18.611C15.195,19.519 13.633,20 12,20C7.589,20 4,16.411 4,12C4,7.589 7.589,4 12,4C16.411,4 20,7.589 20,12V12.782C20,14.17 19.402,15 18.4,15L18.398,15.018C18.338,15.005 18.273,15 18.209,15H18C17.437,15 16.6,14.182 16.6,13.631V12C16.6,9.464 14.537,7.4 12,7.4C9.463,7.4 7.4,9.463 7.4,12C7.4,14.537 9.463,16.6 12,16.6C13.234,16.6 14.35,16.106 15.177,15.313C15.826,16.269 16.93,17 18,17L18.002,16.981C18.064,16.994 18.129,17 18.195,17H18.4C20.552,17 22,15.306 22,12.782V12C22,6.486 17.514,2 12,2ZM12,14.599C10.566,14.599 9.4,13.433 9.4,11.999C9.4,10.565 10.566,9.399 12,9.399C13.434,9.399 14.6,10.565 14.6,11.999C14.6,13.433 13.434,14.599 12,14.599Z" />
+</vector>

com.discord/res/drawable/ic_mentions_white_a60_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#99ffffff" android:pathData="M12.3,9.3c-0.4,0 -0.7,0.1 -1,0.3s-0.5,0.5 -0.7,0.9c-0.2,0.3 -0.4,0.7 -0.5,1.1c-0.1,0.4 -0.2,0.8 -0.2,1.2c0,0.2 0,0.4 0.1,0.6c0,0.2 0.1,0.4 0.2,0.6c0.1,0.2 0.3,0.3 0.5,0.5c0.2,0.1 0.5,0.2 0.8,0.2c0.4,0 0.8,-0.1 1.1,-0.3c0.3,-0.2 0.6,-0.5 0.8,-0.8c0.2,-0.3 0.3,-0.7 0.4,-1.1c0.1,-0.4 0.1,-0.7 0.1,-1.1c0,-0.3 0,-0.5 -0.1,-0.8c0,-0.2 -0.1,-0.5 -0.3,-0.7c-0.1,-0.2 -0.3,-0.4 -0.5,-0.5C12.9,9.3 12.6,9.3 12.3,9.3L12.3,9.3zM19.4,17.5c0.3,0.3 0.3,0.9 0,1.1c-0.8,0.7 -1.8,1.3 -2.8,1.7c-1.3,0.5 -2.7,0.7 -4.2,0.7c-1.4,0 -2.7,-0.2 -3.8,-0.7c-1.1,-0.4 -2.1,-1.1 -2.9,-1.9c-0.8,-0.8 -1.4,-1.7 -1.9,-2.8C3.2,14.5 3,13.3 3,12c0,-1.3 0.2,-2.5 0.7,-3.6s1.2,-2 2,-2.9c0.8,-0.8 1.8,-1.4 3,-1.9C9.8,3.2 11.1,3 12.3,3c1.1,0 2.2,0.2 3.2,0.5c1,0.3 2,0.8 2.8,1.5c0.8,0.6 1.5,1.5 1.9,2.4c0.5,1 0.7,2.1 0.7,3.4c0,1 -0.1,1.8 -0.4,2.6c-0.3,0.7 -0.6,1.4 -1.1,1.9s-1,0.9 -1.5,1.1c-0.6,0.2 -1.2,0.4 -1.8,0.4c-0.7,0 -1.2,-0.2 -1.6,-0.5c-0.4,-0.3 -0.6,-0.7 -0.6,-1.2h-0.1c-0.2,0.4 -0.6,0.8 -1.1,1.1c-0.5,0.3 -1.1,0.5 -1.9,0.5c-1.1,0 -2,-0.4 -2.6,-1.1c-0.6,-0.7 -0.9,-1.7 -0.9,-2.8c0,-0.7 0.1,-1.3 0.3,-2s0.6,-1.2 1,-1.8c0.4,-0.5 0.9,-0.9 1.5,-1.2c0.6,-0.3 1.2,-0.5 2,-0.5c0.6,0 1.1,0.1 1.6,0.4c0.4,0.3 0.7,0.6 0.8,0.9h0l0,-0.2c0.1,-0.4 0.5,-0.8 1,-0.8h0.6c0.4,0 0.7,0.4 0.6,0.8l-0.8,3.8c0,0.2 -0.1,0.5 -0.1,0.8c-0.1,0.3 -0.1,0.5 -0.1,0.8c0,0.3 0.1,0.5 0.2,0.7c0.1,0.2 0.3,0.3 0.6,0.3c0.6,0 1.2,-0.3 1.6,-1c0.4,-0.7 0.6,-1.6 0.6,-2.7c0,-1 -0.2,-1.8 -0.5,-2.6C18,7.6 17.6,7 17,6.5c-0.6,-0.5 -1.3,-0.9 -2.1,-1.1C14.1,5.1 13.2,5 12.3,5c-1,0 -2,0.2 -2.8,0.5C8.6,5.9 7.9,6.4 7.3,7C6.7,7.6 6.2,8.4 5.9,9.3C5.5,10.1 5.4,11 5.4,12c0,1.1 0.2,2 0.5,2.9c0.3,0.9 0.8,1.6 1.5,2.2s1.4,1.1 2.3,1.4c0.9,0.3 1.9,0.5 2.9,0.5c1.3,0 2.5,-0.2 3.4,-0.6c0.7,-0.3 1.4,-0.7 2,-1.2c0.3,-0.3 0.9,-0.3 1.2,0.1L19.4,17.5L19.4,17.5z" />
-</vector>

com.discord/res/drawable/ic_quickswitcher_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">
+    <path android:fillColor="#ffb9bbbe" android:pathData="M16,9C17.488,9 18.865,9.4679 20,10.26V5.0019H0V16C0,17.103 0.896,18 2,18H9.294C9.106,17.367 9,16.695 9,16C9,12.134 12.134,9 16,9Z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M20,2C20,0.896 19.104,0 18,0H2C0.896,0 0,0.896 0,2V4.002H20V2ZM3,3C2.447,3 2,2.553 2,2C2,1.447 2.447,1 3,1C3.553,1 4,1.447 4,2C4,2.553 3.553,3 3,3ZM6,3C5.447,3 5,2.553 5,2C5,1.447 5.447,1 6,1C6.553,1 7,1.447 7,2C7,2.553 6.553,3 6,3Z" />
+    <path android:fillColor="#ffb9bbbe" android:pathData="M20.167,18.753C20.691,17.963 21,17.018 21,16C21,13.243 18.757,11 16,11C13.243,11 11,13.243 11,16C11,18.757 13.243,21 16,21C17.018,21 17.963,20.691 18.753,20.167L22,23.414L23.414,22L20.167,18.753ZM16,19C14.346,19 13,17.654 13,16C13,14.346 14.346,13 16,13C17.654,13 19,14.346 19,16C19,17.654 17.654,19 16,19Z" />
+</vector>

com.discord/res/drawable/ic_search_items_white_a60_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#99ffffff" android:pathData="M7,17H1.5v-2h3C5.2,15.8 6,16.5 7,17zM3.3,13H1.5v-2h1.1C2.8,11.7 3,12.4 3.3,13zM1.5,21v-2h12v2H1.5zM17,14l5,5l-1.5,1.5l-5,-5v-0.8l-0.3,-0.3c-1.1,1 -2.6,1.6 -4.2,1.6c-3.6,0 -6.5,-2.9 -6.5,-6.5S7.4,3 11,3s6.5,2.9 6.5,6.5c0,1.6 -0.6,3.1 -1.6,4.2l0.3,0.3H17zM11,14c2.5,0 4.5,-2 4.5,-4.5S13.5,5 11,5S6.5,7 6.5,9.5S8.5,14 11,14z" />
-</vector>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout android:background="?colorBackgroundSecondary" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.discord.views.CustomAppBarLayout android:id="@id/app_bar_layout" android:background="?colorBackgroundSecondary" style="@style/AppTheme.AppBarLayout">
+        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="?colorBackgroundSecondary" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:scrimVisibleHeightTrigger="0.0dip">
+            <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:maxHeight="150.0dip" app:actualImageScaleType="centerCrop" />
+                <FrameLayout android:id="@id/channels_list_banner_foreground" android:background="@drawable/drawable_top_down_primary_630_gradient" android:layout_width="fill_parent" android:layout_height="48.0dip" />
+            </FrameLayout>
+            <androidx.appcompat.widget.Toolbar android:id="@id/channels_toolbar" android:background="@null" style="@style/AppTheme.Toolbar">
+                <TextView android:textSize="15.0sp" android:textColor="?colorTextInteractiveActive" android:gravity="center_vertical" android:id="@id/channels_list_header" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="?actionBarSize" android:singleLine="true" android:shadowColor="?colorBackgroundSecondary" android:shadowDy="4.0" android:shadowRadius="2.0" android:drawableRight="?ic_overflow" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableEnd="?ic_overflow" style="@style/UiKit.TextView.Bold" />
+            </androidx.appcompat.widget.Toolbar>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+        <androidx.appcompat.widget.Toolbar android:id="@id/channels_list_search_toolbar" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content">
+            <com.google.android.material.button.MaterialButton android:textAppearance="@style/UiKit.TextView" android:textColor="?colorTextNormal" android:gravity="center_vertical" android:id="@id/channels_list_search" android:paddingLeft="@dimen/uikit_spacing_medium" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/dm_search_placeholder" android:drawableEnd="@drawable/ic_search" android:backgroundTint="?colorBackgroundTertiary" android:drawableTint="?colorTextNormal" />
+        </androidx.appcompat.widget.Toolbar>
+    </com.discord.views.CustomAppBarLayout>
+    <androidx.recyclerview.widget.RecyclerView android:id="@id/channels_list" android:paddingBottom="@dimen/uikit_spacing_medium" android:scrollbars="vertical" android:clipToPadding="false" android:layout_height="fill_parent" android:layout_below="@id/channels_list_search" android:overScrollMode="never" style="@style/UiKit.ViewGroup.RecyclerView.AppBarScrollingViewBehavior" />
+    <ViewStub android:id="@id/channels_list_unreads_stub" android:layout="@layout/widget_channels_list_unreads" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_anchor="@id/channels_list" />
+    <androidx.constraintlayout.widget.ConstraintLayout android:gravity="center" android:layout_gravity="end" android:id="@id/channels_list_premium_guild_hint" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="48.0dip" android:layout_marginRight="28.0dip" android:translationZ="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:id="@id/channels_list_tooltip_top_tail" android:background="@drawable/drawable_tooltip_top_tail" android:layout_width="24.0dip" android:layout_height="20.0dip" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
+        <View android:id="@id/channels_list_tooltip_background" android:background="@drawable/drawable_bg_tooltip" android:layout_width="fill_parent" android:layout_height="0.0dip" android:translationY="-8.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_tooltip_top_tail" />
+        <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_header" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/channels_list_tooltip_background" style="@style/UiKit.TextView.Semibold" />
+        <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/channels_list_premium_guild_hint_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_text" android:lineSpacingMultiplier="1.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_title" style="@style/UiKit.TextView" />
+        <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/brand_500" android:id="@id/channels_list_premium_guild_hint_button" android:layout_width="0.0dip" 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_xlarge" android:text="@string/premium_guild_subscription_header_subscribe_tooltip_close" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/channels_list_premium_guild_hint_subtitle" style="@style/UiKit.Material.Button.White" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/settings_channel_list_item.xml

@@ -2,7 +2,7 @@
 <RelativeLayout android:background="?selectableItemBackground" android:paddingTop="12.0dip" android:paddingBottom="12.0dip" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <View android:id="@id/settings_channel_list_item_selected_overlay" android:background="@color/grey_1_alpha_60" android:visibility="visible" android:layout_width="fill_parent" android:layout_height="fill_parent" />
-    <ImageView android:id="@id/settings_channel_list_item_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_channel_text" android:layout_centerVertical="true" android:contentDescription="@string/text_channel" android:layout_marginStart="28.0dip" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/settings_channel_list_item_hash" android:layout_width="16.0dip" android:layout_height="16.0dip" android:src="@drawable/ic_channel_text" android:tint="?colorTextNormal" android:layout_centerVertical="true" android:contentDescription="@string/text_channel" android:layout_marginStart="28.0dip" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/settings_channel_list_item_name" android:singleLine="true" android:layout_centerVertical="true" android:layout_marginStart="16.0dip" android:layout_toStartOf="@id/settings_channel_list_item_drag" android:layout_toEndOf="@id/settings_channel_list_item_hash" style="@style/UiKit.TextView" />
     <ImageView android:id="@id/settings_channel_list_item_drag" android:src="?ic_drag_handle" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="16.0dip" android:layout_alignParentEnd="true" style="@style/UiKit.ImageView" />
 </RelativeLayout>

com.discord/res/layout/user_profile_header_view.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" style="@style/UiKit.Sheet.Header"
+<androidx.constraintlayout.widget.ConstraintLayout android:id="@id/user_sheet_header" android:padding="@dimen/uikit_spacing_large" android:focusable="true" android:clickable="true" android:clipChildren="false" style="@style/UiKit.Sheet.Header"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <androidx.constraintlayout.widget.Guideline android:id="@id/uikit_sheet_header_guideline" style="@style/UiKit.Sheet.Guideline" />
-    <com.discord.widgets.user.profile.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/user_profile_header_name_wrap" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/uikit_sheet_header_guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:user_avatar_background_color="?primary_700" />
+    <com.discord.widgets.user.profile.UserAvatarPresenceView android:id="@id/user_profile_avatar_presence" android:clipChildren="false" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/user_profile_header_name_wrap" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/uikit_sheet_header_guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:user_avatar_background_color="?primary_700" />
     <LinearLayout android:id="@id/user_profile_header_name_wrap" android:layout_width="0.0dip" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/user_profile_header_badges_recycler" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/user_profile_avatar_presence" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/user_profile_header_primary_name" android:singleLine="false" style="@style/UiKit.TextView.Bold" />
         <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:id="@id/user_profile_header_secondary_name" android:singleLine="true" style="@style/UiKit.TextView.Semibold" />