Changes of com.discord v1255

com.discord/res/color-night/material_timepicker_button_stroke.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" android:alpha="0.38" />
+</selector>

com.discord/res/color-night/material_timepicker_clockface.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" android:alpha="0.12" />
+</selector>

com.discord/res/color-night/material_timepicker_modebutton_tint.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" />
+</selector>

com.discord/res/color/material_timepicker_button_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="?colorPrimary" android:alpha="0.24" />
+    <item android:color="@android:color/transparent" />
+</selector>

com.discord/res/color/material_timepicker_button_stroke.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" android:alpha="0.33" />
+</selector>

com.discord/res/color/material_timepicker_clockface.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" android:alpha="0.1" />
+</selector>

com.discord/res/color/material_timepicker_modebutton_tint.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorOnSurface" android:alpha="0.6" />
+</selector>

com.discord/res/color/mtrl_fab_ripple_color.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:color="?colorOnSecondary" android:alpha="0.32" />
-    <item android:state_focused="true" android:color="?colorOnSecondary" android:alpha="0.24" android:state_hovered="true" />
-    <item android:state_focused="true" android:color="?colorOnSecondary" android:alpha="0.24" />
-    <item android:color="?colorOnSecondary" android:alpha="0.08" android:state_hovered="true" />
-    <item android:color="?colorOnSecondary" android:alpha="0.0" />
+    <item android:state_pressed="true" android:color="?colorOnSecondary" android:alpha="@dimen/mtrl_high_ripple_pressed_alpha" />
+    <item android:state_focused="true" android:color="?colorOnSecondary" android:alpha="@dimen/mtrl_high_ripple_focused_alpha" android:state_hovered="true" />
+    <item android:state_focused="true" android:color="?colorOnSecondary" android:alpha="@dimen/mtrl_high_ripple_focused_alpha" />
+    <item android:color="?colorOnSecondary" android:alpha="@dimen/mtrl_high_ripple_hovered_alpha" android:state_hovered="true" />
+    <item android:color="?colorOnSecondary" android:alpha="@dimen/mtrl_high_ripple_default_alpha" />
 </selector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="12.0dip" android:width="12.0dip" android:viewportWidth="11.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff36393f" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ff36393f" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#fff04747" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="12.0dip" android:width="12.0dip" android:viewportWidth="11.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffc7ccd1" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ffc7ccd1" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#fff04747" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+</vector>

com.discord/res/drawable-anydpi-v24/ic_sound_quiet_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="#ff000000" android:pathData="M10.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.296ZM14,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/$ic_network_connecting_animated_vector__0.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="12.0dip" android:width="12.0dip" android:viewportWidth="11.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <path android:fillColor="#ff36393f" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ff36393f" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ff36393f" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:name="three" android:fillColor="#fffaa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:name="two" android:fillColor="#fffaa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+    <path android:name="one" android:fillColor="#fffaa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,6 @@
+<?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:duration="300" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="300" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,6 @@
+<?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:duration="400" android:startOffset="100" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="400" android:startOffset="150" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,6 @@
+<?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:duration="500" android:startOffset="200" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="500" android:startOffset="250" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,5 @@
+<?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:duration="600" android:startOffset="750" android:valueFrom="0" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="12.0dip" android:width="12.0dip" android:viewportWidth="11.0" android:viewportHeight="12.0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <path android:fillColor="#ffc7ccd1" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ffc7ccd1" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:fillColor="#ffc7ccd1" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:name="three" android:fillColor="#fffaa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:strokeAlpha="0.2" android:fillType="evenOdd" />
+    <path android:name="two" android:fillColor="#fffaa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+    <path android:name="one" android:fillColor="#fffaa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1.0" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,6 @@
+<?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:duration="300" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="300" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,6 @@
+<?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:duration="400" android:startOffset="100" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="400" android:startOffset="150" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,6 @@
+<?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:duration="500" android:startOffset="200" android:valueFrom="0" android:valueTo="1" android:propertyName="fillAlpha" />
+    <objectAnimator android:duration="500" android:startOffset="250" android:valueFrom="1" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

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

@@ -0,0 +1,5 @@
+<?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:duration="600" android:startOffset="750" android:valueFrom="0" android:valueTo="0" android:propertyName="fillAlpha" />
+</set>

com.discord/res/drawable/drawable_overlay_mentions_primary_800.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/primary_100" />
+        <stroke android:width="2.0dip" android:color="@color/primary_800" />
         <corners android:radius="12.0dip" />
     </shape>
 </inset>

com.discord/res/drawable/drawable_overlay_mentions_white.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/primary_600" />
+        <stroke android:width="2.0dip" android:color="@color/white" />
         <corners android:radius="12.0dip" />
     </shape>
 </inset>

com.discord/res/drawable/ic_call_indicator_video_16dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffffff" android:pathData="M17,10.5L17,7C17,6.45 16.55,6 16,6L4,6C3.45,6 3,6.45 3,7L3,17C3,17.55 3.45,18 4,18L16,18C16.55,18 17,17.55 17,17L17,13.5L21,17.5L21,6.5L17,10.5Z" />
-</vector>

com.discord/res/drawable/ic_clock_black_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="#ff000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8s8,3.58 8,8S16.42,20 12,20zM17.23,14.94l-1.26,1.55L11,13V6h2v6L17.23,14.94z" />
+</vector>

com.discord/res/drawable/ic_keyboard_black_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="#ff000000" android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z" />
+</vector>

com.discord/res/drawable/ic_network_airplane_mode.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffb9bbbe" android:pathData="M5.3334,14.6667H6.6667L10,9H13.6667C14.22,9 14.6667,8.5533 14.6667,8C14.6667,7.4467 14.22,7 13.6667,7L10,7L6.6667,1.3333L5.3334,1.3333L7,7H3.3333L2.3333,5.3333H1.3333L2,8L1.3333,10.6667H2.3333L3.3333,9H7L5.3334,14.6667Z" />
+</vector>

com.discord/res/drawable/ic_network_airplane_mode_light.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff4f5660" android:pathData="M5.3334,14.6667H6.6667L10,9H13.6667C14.22,9 14.6667,8.5533 14.6667,8C14.6667,7.4467 14.22,7 13.6667,7L10,7L6.6667,1.3333L5.3334,1.3333L7,7H3.3333L2.3333,5.3333H1.3333L2,8L1.3333,10.6667H2.3333L3.3333,9H7L5.3334,14.6667Z" />
+</vector>

com.discord/res/drawable/ic_network_connecting_animated_vector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector android:drawable="@drawable/$ic_network_connecting_animated_vector__0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="one" android:animation="@drawable/$ic_network_connecting_animated_vector__1" />
+    <target android:name="two" android:animation="@drawable/$ic_network_connecting_animated_vector__2" />
+    <target android:name="three" android:animation="@drawable/$ic_network_connecting_animated_vector__3" />
+    <target android:name="three" android:animation="@drawable/$ic_network_connecting_animated_vector__4" />
+</animated-vector>

com.discord/res/drawable/ic_network_connecting_animated_vector_light.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animated-vector android:drawable="@drawable/$ic_network_connecting_animated_vector_light__0"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt">
+    <target android:name="one" android:animation="@drawable/$ic_network_connecting_animated_vector_light__1" />
+    <target android:name="two" android:animation="@drawable/$ic_network_connecting_animated_vector_light__2" />
+    <target android:name="three" android:animation="@drawable/$ic_network_connecting_animated_vector_light__3" />
+    <target android:name="three" android:animation="@drawable/$ic_network_connecting_animated_vector_light__4" />
+</animated-vector>

com.discord/res/drawable/ic_videocam_white_16dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M21.526,8.149C21.231,7.966 20.862,7.951 20.553,8.105L18,9.382V7C18,5.897 17.103,5 16,5H4C2.897,5 2,5.897 2,7V17C2,18.104 2.897,19 4,19H16C17.103,19 18,18.104 18,17V14.618L20.553,15.894C20.694,15.965 20.847,16 21,16C21.183,16 21.365,15.949 21.526,15.851C21.82,15.668 22,15.347 22,15V9C22,8.653 21.82,8.332 21.526,8.149Z" />
+</vector>

com.discord/res/drawable/rounded_rectangle_8dp_radius_top.xml

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.button.MaterialButtonToggleGroup android:orientation="horizontal" android:id="@id/material_clock_period_toggle" android:background="?colorSurface" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" app:checkedButton="@id/material_clock_period_am_button" app:selectionRequired="true" app:singleSelection="true"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <Button android:id="@id/material_clock_period_am_button" android:layout_width="0.0dip" android:text="@string/material_timepicker_am" android:layout_weight="1.0" style="@style/Widget.MaterialComponents.TimePicker.Button" />
+    <Button android:id="@id/material_clock_period_pm_button" android:layout_width="0.0dip" android:text="@string/material_timepicker_pm" android:layout_weight="1.0" style="@style/Widget.MaterialComponents.TimePicker.Button" />
+</com.google.android.material.button.MaterialButtonToggleGroup>

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge android:id="@id/material_timepicker_container" android:layout_width="wrap_content" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <androidx.constraintlayout.widget.Guideline android:orientation="horizontal" android:id="@id/guideline" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintGuide_begin="16.0dip" />
+    <include android:id="@id/material_clock_display" android:layout_width="wrap_content" android:layout_height="wrap_content" app:layout_constraintBottom_toTopOf="@id/material_clock_period_toggle" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@id/guideline" app:layout_constraintVertical_chainStyle="packed" layout="@layout/material_clock_display" />
+    <include android:id="@id/material_clock_period_toggle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/material_clock_display" app:layout_constraintRight_toRightOf="@id/material_clock_display" app:layout_constraintTop_toBottomOf="@id/material_clock_display" app:layout_constraintVertical_chainStyle="packed" layout="@layout/material_clock_period_toggle_land" />
+    <com.google.android.material.timepicker.ClockFaceView android:id="@id/material_clock_face" android:layout_width="@dimen/material_clock_size" android:layout_height="@dimen/material_clock_size" android:layout_marginStart="@dimen/clock_face_margin_start" app:layout_constraintStart_toEndOf="@id/material_clock_display" app:layout_constraintTop_toTopOf="parent" app:valueTextColor="?colorOnSurface" />
+</merge>

com.discord/res/layout-ldrtl/material_textinput_timepicker.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="horizontal" android:background="?colorSurface" android:layout_width="wrap_content" android:layout_height="wrap_content" android:baselineAligned="false" android:layoutDirection="ltr" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <include android:id="@id/material_clock_period_toggle" android:layout_width="@dimen/material_clock_period_toggle_width" android:layout_height="@dimen/material_clock_period_toggle_height" android:layout_marginStart="0.0dip" android:layout_marginEnd="@dimen/material_clock_period_toggle_margin_left" layout="@layout/material_clock_period_toggle" />
+    <include layout="@layout/material_timepicker_textinput_display" />
+</LinearLayout>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:id="@id/floating_voice_controls_container" android:background="@drawable/rounded_rectangle_8dp_radius_top" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="@color/primary_700_alpha_60" android:paddingHorizontal="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout android:id="@id/floating_voice_controls_peek_container" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:layout_gravity="center" android:id="@id/floating_voice_controls_handle" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="40.0dip" android:layout_height="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginBottom="8.0dip" android:alpha="0.8" />
+        <LinearLayout android:gravity="center" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <ImageView android:id="@id/floating_voice_controls_video" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12.0dip" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_screenshare" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" android:layout_marginHorizontal="12.0dip" style="@style/UiKit.Calls.ButtonCircle" />
+            <FrameLayout android:id="@id/floating_voice_controls_controls_audio_output_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginHorizontal="12.0dip">
+                <ImageView android:id="@id/floating_voice_controls_audio_output" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+                <ImageView android:layout_gravity="end|center" android:id="@id/floating_voice_controls_audio_output_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_down_14dp" android:layout_marginEnd="6.0dip" app:tint="@color/white" />
+            </FrameLayout>
+            <ImageView android:id="@id/floating_voice_controls_mute" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" android:layout_marginHorizontal="12.0dip" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_stop_watching" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" android:layout_marginHorizontal="12.0dip" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_disconnect" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect" android:layout_marginHorizontal="12.0dip" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+        </LinearLayout>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/floating_voice_controls_push_to_talk" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginBottom="16.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_600" style="@style/UiKit.Material.Button" />
+    </LinearLayout>
+    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="8.0dip">
+        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:id="@id/floating_voice_controls_audio_output_sheet" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+            <TextView android:id="@id/floating_voice_controls_invite_sheet" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+            <TextView android:id="@id/floating_voice_controls_screenshare_sheet" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</LinearLayout>

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

@@ -1,3 +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="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="4.0dip" android:layout_marginVertical="4.0dip" android:paddingHorizontal="8.0dip" android:paddingVertical="4.0dip" style="@style/UiKit.TextView"
+<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" android:layout_marginHorizontal="4.0dip" android:layout_marginVertical="4.0dip" android:paddingHorizontal="8.0dip" android:paddingVertical="4.0dip" style="@style/UiKit.TextView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="2.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:accessibilityPaneTitle="@string/material_timepicker_select_time"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView android:textStyle="bold" android:id="@id/header_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/material_timepicker_select_time" android:importantForAccessibility="no" android:layout_marginStart="24.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="?textAppearanceCaption" />
+    <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="material_textinput_timepicker, material_timepicker_view" />
+    <com.google.android.material.timepicker.TimePickerView android:id="@id/material_timepicker_view" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24.0dip" android:layout_marginTop="@dimen/material_clock_face_margin_top" android:layout_marginRight="24.0dip" android:layout_marginBottom="24.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <include android:id="@id/material_textinput_timepicker" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24.0dip" android:layout_marginTop="52.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="24.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" layout="@layout/material_textinput_timepicker" />
+    <Button android:id="@id/material_timepicker_cancel_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@android:string/cancel" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toStartOf="@id/material_timepicker_ok_button" app:layout_constraintTop_toTopOf="@id/material_timepicker_ok_button" style="?borderlessButtonStyle" />
+    <Button android:id="@id/material_timepicker_ok_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/material_timepicker_dialog_buttons_margin_top" android:minWidth="64.0dip" android:text="@android:string/ok" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="?borderlessButtonStyle" />
+    <com.google.android.material.button.MaterialButton android:id="@id/material_timepicker_mode_button" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="48.0dip" android:checkable="true" android:layout_marginStart="8.0dip" app:iconPadding="0.0dip" app:iconTint="@color/material_timepicker_modebutton_tint" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/material_timepicker_ok_button" style="?borderlessButtonStyle" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,7 +5,7 @@
         <View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
         <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" android:autoSizeTextType="uniform" android:autoSizeMaxTextSize="@dimen/uikit_textsize_xlarge" style="@style/UiKit.TextView.H1.Bold" />
     </LinearLayout>
     <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
 </LinearLayout>

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

@@ -25,6 +25,9 @@
             <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?primary_100" android:id="@id/private_call_status_primary" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.TextView" />
             <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_400" android:id="@id/private_call_status_secondary" style="@style/UiKit.TextView" />
         </LinearLayout>
+        <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/widget_call_coordinator_layout" android:layout_width="fill_parent" android:layout_height="fill_parent">
+            <com.discord.widgets.voice.controls.FloatingVoiceControlsView2 android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating_new" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
         <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_700" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -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_expression_tray_search_icon_empty" android:drawablePadding="16.0dip" 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:drawablePadding="16.0dip" app:drawableTopCompat="?theme_expression_tray_search_icon_empty" 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="8.0dip" android:paddingEnd="8.0dip" android:elevation="8.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout">

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

@@ -3,7 +3,7 @@
   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" 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">
-            <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" />
+            <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" app:drawableStartCompat="@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_guild_clone.xml

@@ -16,7 +16,7 @@
             </LinearLayout>
             <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_width="fill_parent" android:layout_marginBottom="8.0dip" android:text="@string/guild_template_modal_title" style="@style/UiKit.TextView.Bold" />
-                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_template_32dp" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" style="@style/UiKit.TextView.Large.SingleLine" />
+                <TextView android:textSize="@dimen/uikit_textsize_xlarge" android:textColor="?colorHeaderSecondary" android:gravity="center" android:layout_gravity="center_horizontal" android:id="@id/guild_template_name" android:layout_width="wrap_content" android:text="@string/sample_server_name" android:drawablePadding="8.0dip" android:layout_marginStart="16.0dip" android:layout_marginEnd="16.0dip" app:drawableStartCompat="@drawable/ic_template_32dp" style="@style/UiKit.TextView.Large.SingleLine" />
                 <include android:layout_gravity="center" android:id="@id/guild_create_icon_uploader" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24.0dip" layout="@layout/layout_icon_uploader" />
                 <LinearLayout android:padding="16.0dip" style="@style/UiKit.Copy">
                     <TextView android:textSize="12.0sp" android:paddingLeft="0.0dip" android:paddingRight="0.0dip" android:layout_marginBottom="8.0dip" android:text="@string/form_label_server_name" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" style="@style/UiKit.Form.Label" />

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.Page"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout style="@style/UiKit.ViewGroup.Page.LinearLayout">
+        <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
+            <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar" />
+        </com.google.android.material.appbar.AppBarLayout>
+        <com.google.android.material.textfield.TextInputLayout android:id="@id/issue_details_input" android:layout_margin="16.0dip" android:hint="@string/feedback_describe_issue" style="@style/UiKit.TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText android:maxLength="1024" style="@style/UiKit.TextInputLayout.EditText.MultiLine" />
+        </com.google.android.material.textfield.TextInputLayout>
+        <com.discord.utilities.view.text.LinkifiedTextView android:textAppearance="@style/UiKit.TextAppearance" android:textColor="?colorTextMuted" android:id="@id/issue_details_cx_prompt" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:layout_marginHorizontal="16.0dip" style="@style/UiKit.TextView" />
+        <com.google.android.material.button.MaterialButton android:id="@id/issue_details_submit_button" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" android:layout_marginBottom="16.0dip" android:text="@string/submit" android:layout_marginHorizontal="16.0dip" style="@style/UiKit.Material.Button" />
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>

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

@@ -5,7 +5,7 @@
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="8.0dip" app:roundAsCircle="true" style="@style/Avatar.Notification" />
         <LinearLayout android:layout_gravity="center_vertical" android:layout_width="0.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <com.discord.app.AppTextView android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/popup_body" android:maxLines="3" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/popup_body" android:maxLines="3" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
         </LinearLayout>
         <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_close_24dp" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />
     </LinearLayout>

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

@@ -6,9 +6,9 @@
     </androidx.appcompat.widget.Toolbar>
     <androidx.core.widget.NestedScrollView android:layout_weight="1.0" style="@style/UiKit.ViewGroup.NestedScrollView">
         <LinearLayout android:paddingBottom="@dimen/list_bottom_padding" android:layout_marginLeft="16.0dip" android:layout_marginRight="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
-            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
+            <TextView android:textColor="@color/primary_100" android:gravity="center_vertical" android:id="@id/payment_source_edit_error" android:background="@drawable/drawable_button_red" android:padding="8.0dip" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="8.0dip" app:drawableStartCompat="@drawable/ic_info_outline_white_24dp" style="@style/UiKit.TextView" />
             <com.discord.widgets.settings.billing.PaymentSourceView android:id="@id/payment_source_summary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:layout_marginBottom="8.0dip" />
-            <com.discord.app.AppTextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="8.0dip" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
+            <TextView android:id="@id/payment_source_edit_help" android:layout_marginBottom="8.0dip" android:text="@string/payment_source_edit_help_card" style="@style/UiKit.TextView.Subtext" />
             <TextView android:layout_marginTop="8.0dip" android:text="@string/billing_address" style="@style/UiKit.TextView.H2" />
             <com.google.android.material.textfield.TextInputLayout android:id="@id/payment_source_edit_name" android:hint="@string/billing_address_name" android:autofillHints="name" style="@style/UiKit.TextInputLayout.Primary">
                 <com.google.android.material.textfield.TextInputEditText android:inputType="textPersonName" style="@style/UiKit.TextInputLayout.EditText" />

com.discord/res/layout/allow_accessibility_detection_dialog.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:id="@id/view_dialog_confirmation_header" android:padding="16.0dip" android:text="@string/accessibility_detection_modal_header" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Divider" />
-    <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/accessibility_detection_body_text" android:padding="16.0dip" android:text="@string/accessibility_detection_modal_body" style="@style/UiKit.TextView" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance" android:id="@id/accessibility_detection_body_text" android:padding="16.0dip" android:text="@string/accessibility_detection_modal_body" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <View style="@style/UiKit.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">

com.discord/res/layout/anchored_voice_controls_view.xml

@@ -1,13 +1,13 @@
 <?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">
     <LinearLayout android:id="@id/voice_fullscreen_controls_controls_wrap" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:id="@id/voice_fullscreen_controls_camera" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_videocam_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/camera" />
-        <ImageView android:id="@id/voice_fullscreen_controls_screenshare" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_mobile_screenshare_24dp" android:tint="?colorInteractiveNormal" android:layout_weight="1.0" android:contentDescription="@string/deafen" />
+        <ImageView android:id="@id/voice_fullscreen_controls_screenshare" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:visibility="gone" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_mobile_screenshare_24dp" android:layout_weight="1.0" android:contentDescription="@string/deafen" app:tint="?colorInteractiveNormal" />
         <ImageView android:id="@id/voice_fullscreen_controls_deafen" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_deafen_state" android:layout_weight="1.0" android:contentDescription="@string/deafen" />
         <ImageView android:id="@id/voice_fullscreen_controls_mute_state" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="?ic_mic_state" android:layout_weight="1.0" android:contentDescription="@string/mute" />
-        <ImageView android:id="@id/voice_fullscreen_controls_speaker" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_audio_output_white_24dp" android:tint="?colorInteractiveNormal" android:layout_weight="1.0" android:contentDescription="@string/switch_audio_output" />
-        <ImageView android:id="@id/voice_fullscreen_controls_disconnect" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/ic_call_disconnect_24dp" android:tint="@color/status_red_500" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" />
+        <ImageView android:id="@id/voice_fullscreen_controls_speaker" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="wrap_content" android:src="@drawable/ic_audio_output_white_24dp" android:layout_weight="1.0" android:contentDescription="@string/switch_audio_output" app:tint="?colorInteractiveNormal" />
+        <ImageView android:id="@id/voice_fullscreen_controls_disconnect" android:background="?selectableItemBackground" android:paddingTop="16.0dip" android:paddingBottom="16.0dip" android:focusable="true" android:clickable="true" android:layout_width="0.0dip" android:layout_height="fill_parent" android:src="@drawable/ic_call_disconnect_24dp" android:layout_weight="1.0" android:contentDescription="@string/disconnect_from_voice" app:tint="@color/status_red_500" />
     </LinearLayout>
     <com.google.android.material.button.MaterialButton android:id="@id/voice_fullscreen_controls_ptt" android:visibility="gone" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/input_mode_ptt" style="@style/UiKit.Material.Button" />
 </LinearLayout>

com.discord/res/layout/call_user_item.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.views.VoiceUserView android:id="@id/call_user_item_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:vuv_avatar_size="@dimen/call_participant_avatar_size"
+<com.discord.views.VoiceUserView android:id="@id/call_user_item_avatar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8.0dip" app:vuv_animate_avatar_when_ringing="true" app:vuv_avatar_size="@dimen/call_participant_avatar_size" app:vuv_fade_when_disconnected="true"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

com.discord/res/layout/default_tooltip_view_bottom.xml

@@ -2,5 +2,5 @@
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/TooltipDefaultContainer"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:src="@drawable/ic_tooltip_bottom_tail" android:rotation="180.0" app:layout_constraintBottom_toTopOf="@id/default_tooltip_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:tint="@color/brand" style="@style/UiKit.ImageView" />
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/default_tooltip_text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" style="@style/TooltipDefaultText" />
+    <TextView android:id="@id/default_tooltip_text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" style="@style/TooltipDefaultText" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/default_tooltip_view_top.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/TooltipDefaultContainer"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/default_tooltip_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/TooltipDefaultText" />
+    <TextView android:id="@id/default_tooltip_text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/TooltipDefaultText" />
     <ImageView android:src="@drawable/ic_tooltip_bottom_tail" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/default_tooltip_text" app:tint="@color/brand" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/dialog_add_content_pager_with_fab.xml

@@ -7,6 +7,6 @@
             <com.google.android.material.tabs.TabItem android:icon="@drawable/ic_keyboard_24dp" android:id="@id/add_content_keyboard_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/show_keyboard" />
         </com.google.android.material.tabs.TabLayout>
     </FrameLayout>
-    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/action_btn" android:visibility="gone" app:layout_anchor="@id/content_pager" style="@style/FlexInput.AddContent.Button.Send" />
-    <ImageView android:id="@id/launch_btn" app:layout_anchor="@id/content_pager" style="@style/FlexInput.AddContent.Button.Launcher" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/action_btn" android:visibility="gone" android:contentDescription="@string/send_message" app:layout_anchor="@id/content_pager" style="@style/FlexInput.AddContent.Button.Send" />
+    <ImageView android:id="@id/launch_btn" android:contentDescription="@string/select_from_application_a11y_label" app:layout_anchor="@id/content_pager" style="@style/FlexInput.AddContent.Button.Launcher" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/floating_voice_controls_view_v2.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:id="@id/floating_voice_controls_container" android:background="@drawable/rounded_rectangle_8dp_radius_top" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:paddingBottom="16.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:backgroundTint="@color/primary_700_alpha_60" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout android:id="@id/floating_voice_controls_peek_container" style="@style/UiKit.ViewGroup.LinearLayout">
+        <View android:layout_gravity="center" android:id="@id/floating_voice_controls_handle" android:background="@drawable/rounded_rectangle_8dp_radius" android:layout_width="40.0dip" android:layout_height="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginBottom="8.0dip" android:alpha="0.8" />
+        <LinearLayout android:gravity="center" android:layout_marginBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <ImageView android:id="@id/floating_voice_controls_video" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_videocam_white_24dp" android:contentDescription="@string/video" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_screenshare" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_mobile_screenshare_24dp" android:contentDescription="@string/video" style="@style/UiKit.Calls.ButtonCircle" />
+            <FrameLayout android:id="@id/floating_voice_controls_controls_audio_output_container" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip">
+                <ImageView android:id="@id/floating_voice_controls_audio_output" android:background="@drawable/drawable_circle_primary_900_alpha_60" android:src="@drawable/ic_sound_24dp" android:contentDescription="@string/switch_audio_output" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+                <ImageView android:layout_gravity="end|center" android:id="@id/floating_voice_controls_audio_output_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_arrow_down_14dp" android:layout_marginEnd="6.0dip" app:tint="@color/white" />
+            </FrameLayout>
+            <ImageView android:id="@id/floating_voice_controls_mute" android:background="@drawable/drawable_circle_black" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_mic_white_24dp" android:contentDescription="@string/mute" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_stop_watching" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_stop_stream" android:contentDescription="@string/stop_watching" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+            <ImageView android:id="@id/floating_voice_controls_disconnect" android:background="@drawable/drawable_circle_red" android:layout_marginLeft="12.0dip" android:layout_marginRight="12.0dip" android:src="@drawable/ic_call_disconnect_24dp" android:contentDescription="@string/disconnect" app:tint="@color/white" style="@style/UiKit.Calls.ButtonCircle" />
+        </LinearLayout>
+        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/floating_voice_controls_push_to_talk" android:visibility="gone" android:layout_width="fill_parent" android:layout_marginBottom="16.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_600" style="@style/UiKit.Material.Button" />
+    </LinearLayout>
+    <androidx.cardview.widget.CardView android:layout_width="fill_parent" android:layout_height="wrap_content" app:cardBackgroundColor="?colorBackgroundPrimary" app:cardCornerRadius="8.0dip">
+        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:id="@id/floating_voice_controls_audio_output_sheet" android:text="@string/audio_devices_change_output" app:drawableStartCompat="@drawable/ic_sound_bluetooth_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+            <TextView android:id="@id/floating_voice_controls_invite_sheet" android:text="@string/instant_invite" app:drawableStartCompat="@drawable/ic_guild_invite_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+            <TextView android:id="@id/floating_voice_controls_screenshare_sheet" android:text="@string/mobile_stream_screen_share" app:drawableStartCompat="@drawable/ic_mobile_screenshare_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.ListItem.Icon" />
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</LinearLayout>

com.discord/res/layout/gif_search_empty_state_text_box_view.xml

@@ -1,3 +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="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" android:backgroundTint="?colorBackgroundTertiary" style="@style/UiKit.TextView"
+<TextView android:textAppearance="@style/UiKit.TextAppearance" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorTextNormal" android:background="@drawable/rounded_rectangle_8dp_radius" android:paddingLeft="8.0dip" android:paddingTop="4.0dip" android:paddingRight="8.0dip" android:paddingBottom="4.0dip" android:layout_marginLeft="4.0dip" android:layout_marginTop="4.0dip" android:layout_marginRight="4.0dip" android:layout_marginBottom="4.0dip" 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

@@ -1,6 +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="16.0dip" android:textAlignment="center" style="@style/UiKit.TextView" />
+    <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:drawablePadding="16.0dip" android:textAlignment="center" app:drawableTopCompat="?theme_expression_tray_search_icon_empty" 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="16.0dip" app:alignItems="center" app:flexWrap="wrap" app:justifyContent="center" app:layout_minHeight="24.0dip" app:layout_minWidth="48.0dip" />
 </LinearLayout>

com.discord/res/layout/guild_role_item.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:layout_marginEnd="4.0dip" app:cardBackgroundColor="?primary_700" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/guild_role_item_text" android:padding="8.0dip" android:maxLines="1" android:drawablePadding="8.0dip" style="@style/UiKit.TextView.Subtext" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="?primary_100" android:ellipsize="end" android:id="@id/guild_role_item_text" android:padding="8.0dip" android:maxLines="1" android:drawablePadding="8.0dip" style="@style/UiKit.TextView.Subtext" />
 </androidx.cardview.widget.CardView>

com.discord/res/layout/layout_age_verify.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawableTop="@drawable/img_age_gate_safety" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/age_verify_title" android:text="@string/age_gate_existing_header" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:drawableTopCompat="@drawable/img_age_gate_safety" app:layout_constraintBottom_toTopOf="@id/age_verify_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
     <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="8.0dip" android:text="@string/age_gate_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_input_wrapper" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_title" style="@style/UiKit.TextView.Large" />
     <com.google.android.material.textfield.TextInputLayout android:id="@id/age_verify_input_wrapper" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:hint="@string/age_gate_date_of_birth" app:layout_constraintBottom_toTopOf="@id/age_verify_next_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_description" style="@style/UiKit.TextInputLayout">
         <com.google.android.material.textfield.TextInputEditText style="@style/UiKit.TextInputLayout.EditText.NoFocus" />

com.discord/res/layout/layout_age_verify_underage.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawableTop="@drawable/img_age_gate_failure" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
+    <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/age_verify_underage_title" android:text="@string/age_gate_underage_existing_header" android:drawablePadding="16.0dip" android:fontFamily="@font/whitney_bold" app:drawableTopCompat="@drawable/img_age_gate_failure" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_description" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.H1" />
     <com.discord.utilities.view.text.LinkifiedTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_description" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="8.0dip" android:text="@string/age_gate_underage_body" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_underage_warning" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_title" style="@style/UiKit.TextView.Large" />
-    <com.discord.app.AppTextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_warning" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="16.0dip" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_description" style="@style/UiKit.TextView.Large" />
+    <TextView android:gravity="center_horizontal" android:id="@id/age_verify_underage_warning" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_marginTop="16.0dip" android:text="@string/age_gate_underage_existing_body_deletion_with_days" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toTopOf="@id/age_verify_return_to_login_button" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_description" style="@style/UiKit.TextView.Large" />
     <com.google.android.material.button.MaterialButton android:id="@id/age_verify_return_to_login_button" android:layout_width="fill_parent" android:layout_marginLeft="16.0dip" android:layout_marginTop="16.0dip" android:layout_marginRight="16.0dip" android:text="@string/return_to_login" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/age_verify_underage_warning" style="@style/UiKit.Material.Button" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/layout_icon_uploader.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <ImageView android:id="@id/icon_uploader_placeholder_border" android:layout_width="0.0dip" android:layout_height="0.0dip" android:src="@drawable/drawable_circle_dashed" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:tint="?colorInteractiveNormal" />
     <ImageView android:id="@id/icon_uploader_placeholder_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_camera_24dp" android:importantForAccessibility="no" app:layout_constraintBottom_toTopOf="@id/icon_uploader_placeholder_text" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" app:layout_constraintVertical_chainStyle="packed" app:tint="?colorInteractiveNormal" />
-    <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
+    <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:gravity="center_horizontal" android:id="@id/icon_uploader_placeholder_text" android:layout_width="0.0dip" android:layout_height="24.0dip" android:text="@string/upload" android:textAllCaps="true" android:fontFamily="@font/whitney_bold" android:paddingStart="8.0dip" android:paddingEnd="8.0dip" app:autoSizeMaxTextSize="@dimen/uikit_textsize_small" app:autoSizeMinTextSize="8.0sp" app:autoSizeStepGranularity="1.0sp" app:autoSizeTextType="uniform" app:layout_constraintBottom_toBottomOf="@id/icon_uploader_image" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintStart_toStartOf="@id/icon_uploader_image" app:layout_constraintTop_toBottomOf="@id/icon_uploader_placeholder_icon" style="@style/UiKit.TextView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/icon_uploader_image" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@null" style="@style/Avatar.Hero" />
     <ImageView android:id="@id/icon_uploader_plus" android:background="@drawable/drawable_circle_brand_500" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_upload_plus_32dp" android:contentDescription="@string/sample_empty_string" android:translationX="6.0dip" android:translationY="-6.0dip" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/icon_uploader_image" app:layout_constraintTop_toTopOf="@id/icon_uploader_image" style="@style/UiKit.ImageView" />
     <androidx.constraintlayout.widget.Group android:id="@id/icon_uploader_placeholder_group" android:layout_width="wrap_content" android:layout_height="wrap_content" app:constraint_referenced_ids="icon_uploader_placeholder_border,icon_uploader_placeholder_icon,icon_uploader_placeholder_text,icon_uploader_plus" />

com.discord/res/layout/layout_premium_guild_status_features_user.xml

@@ -1,8 +1,8 @@
 <?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:textColor="?colorHeaderPrimary" android:gravity="center" android:layout_gravity="center_horizontal" android:layout_marginBottom="16.0dip" android:text="@string/premium_guild_perks_modal_subscriber_perks_header" style="@style/UiKit.TextView.H1" />
-    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" android:drawableStart="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" android:drawableStart="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
-    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" android:drawableStart="@drawable/ic_role_pink_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_member_badge" app:drawableStartCompat="@drawable/ic_boosted_badge_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_profile_badge" app:drawableStartCompat="@drawable/ic_booster_profile_badge_24dp" style="@style/UiKit.TextView.Perk" />
+    <TextView android:textColor="?colorTextNormal" android:text="@string/premium_guild_subscriber_feature_role" app:drawableStartCompat="@drawable/ic_role_pink_24dp" style="@style/UiKit.TextView.Perk" />
 </LinearLayout>

com.discord/res/layout/layout_unhandled_uri.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:orientation="vertical" android:background="@color/white" android:layout_width="fill_parent" android:layout_height="fill_parent"
-  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:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/purple_brand" android:background="@drawable/drawable_bg_settings_header" android:paddingLeft="@dimen/settings_option_padding" android:paddingTop="@dimen/settings_option_padding_header_top" android:paddingRight="@dimen/settings_option_padding" android:paddingBottom="@dimen/settings_option_padding" android:layout_width="fill_parent" android:text="@string/unhandled_link_title" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
     <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="16.0dip">
         <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="@color/grey_2" android:text="@string/unhandled_link_body" style="@style/UiKit.TextView" />
-        <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/unhandled_uri_display" android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:drawablePadding="10.0dip" android:drawableStart="@drawable/icon_menu_copy" style="@style/UiKit.TextView.Bold" />
+        <TextView android:textSize="@dimen/uikit_textsize_medium" android:gravity="center_vertical" android:id="@id/unhandled_uri_display" android:background="?selectableItemBackground" android:paddingTop="10.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:drawablePadding="10.0dip" app:drawableStartCompat="@drawable/icon_menu_copy" style="@style/UiKit.TextView.Bold" />
     </LinearLayout>
     <View android:background="@color/white_3" android:layout_width="fill_parent" android:layout_height="0.25dip" />
     <com.google.android.material.button.MaterialButton android:id="@id/unhandled_uri_okay" android:paddingLeft="32.0dip" android:paddingRight="32.0dip" android:layout_width="fill_parent" android:layout_marginLeft="15.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="15.0dip" android:layout_marginBottom="8.0dip" android:text="@string/okay" style="@style/UiKit.Material.Button" />

com.discord/res/layout/layout_voice_bottom_sheet_header.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:orientation="horizontal" android:background="?colorBackgroundTertiary" android:paddingLeft="16.0dip" android:paddingTop="10.0dip" android:paddingRight="16.0dip" android:paddingBottom="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:id="@id/voice_bottom_sheet_header_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_channel_voice" android:tint="?colorInteractiveNormal" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <ImageView android:id="@id/voice_bottom_sheet_header_icon" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_channel_voice" android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:ellipsize="end" android:id="@id/voice_bottom_sheet_header_title" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginLeft="16.0dip" android:maxLines="1" android:includeFontPadding="false" android:fontFamily="@font/whitney_semibold" app:layout_constraintBottom_toTopOf="@id/voice_bottom_sheet_header_subtitle" app:layout_constraintLeft_toRightOf="@id/voice_bottom_sheet_header_icon" app:layout_constraintRight_toLeftOf="@id/title_text_barrier" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" />
     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:ellipsize="end" android:id="@id/voice_bottom_sheet_header_subtitle" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxLines="1" android:includeFontPadding="false" android:fontFamily="@font/whitney_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/voice_bottom_sheet_header_title" app:layout_constraintRight_toLeftOf="@id/title_text_barrier" app:layout_constraintTop_toBottomOf="@id/voice_bottom_sheet_header_title" />
     <androidx.constraintlayout.widget.Barrier android:id="@id/title_text_barrier" android:layout_width="0.0dip" android:layout_height="fill_parent" app:barrierDirection="start" app:constraint_referenced_ids="voice_bottom_sheet_header_invite,voice_bottom_sheet_header_noise_cancellation, voice_bottom_sheet_header_settings" />
-    <ImageView android:id="@id/voice_bottom_sheet_header_invite" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_guild_invite_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/invite_friends" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_noise_cancellation" app:layout_constraintTop_toTopOf="parent" />
-    <ImageView android:id="@id/voice_bottom_sheet_header_noise_cancellation" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_noise_cancellation_active_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/user_settings_noise_cancellation" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_settings" app:layout_constraintTop_toTopOf="parent" />
-    <ImageView android:id="@id/voice_bottom_sheet_header_settings" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_settings_24dp" android:tint="?colorInteractiveNormal" android:contentDescription="@string/voice_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <ImageView android:id="@id/voice_bottom_sheet_header_invite" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_guild_invite_24dp" android:contentDescription="@string/invite_friends" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_noise_cancellation" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
+    <ImageView android:id="@id/voice_bottom_sheet_header_noise_cancellation" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:layout_marginRight="16.0dip" android:src="@drawable/ic_noise_cancellation_active_24dp" android:contentDescription="@string/user_settings_noise_cancellation" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/voice_bottom_sheet_header_settings" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
+    <ImageView android:id="@id/voice_bottom_sheet_header_settings" android:background="?selectableItemBackgroundBorderless" android:padding="4.0dip" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_settings_24dp" android:contentDescription="@string/voice_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:tint="?colorInteractiveNormal" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/leave_guild_dialog.xml

@@ -5,7 +5,7 @@
         <TextView android:id="@id/leave_guild_dialog_header" android:padding="16.0dip" android:text="@string/leave_server_title" style="@style/UiKit.TextView.H1.Bold" />
         <View style="@style/UiKit.Divider" />
     </LinearLayout>
-    <com.discord.app.AppTextView android:textColor="@color/primary_200" android:id="@id/leave_guild_dialog_body" android:paddingTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/leave_server_body" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView" />
+    <TextView android:textColor="@color/primary_200" android:id="@id/leave_guild_dialog_body" android:paddingTop="8.0dip" android:layout_marginBottom="8.0dip" android:text="@string/leave_server_body" android:paddingStart="16.0dip" android:paddingEnd="16.0dip" style="@style/UiKit.TextView" />
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout style="@style/UiKit.Dialog.ButtonContainer">
         <com.google.android.material.button.MaterialButton android:textColor="?primary_200" android:id="@id/leave_guild_cancel_btn" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />

com.discord/res/layout/material_chip_input_combo.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.timepicker.ChipTextInputComboView android:layout_width="wrap_content" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/material_clock_display.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="horizontal" android:id="@id/material_clock_display" android:background="?colorSurface" android:layout_width="wrap_content" android:layout_height="wrap_content" android:baselineAligned="false" android:layoutDirection="ltr" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.chip.Chip android:id="@id/material_hour_tv" style="@style/Widget.MaterialComponents.TimePicker.Display" />
+    <include layout="@layout/material_clock_display_divider" />
+    <com.google.android.material.chip.Chip android:id="@id/material_minute_tv" style="@style/Widget.MaterialComponents.TimePicker.Display" />
+</LinearLayout>

com.discord/res/layout/material_clock_display_divider.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:textAppearance="?textAppearanceHeadline3" android:textSize="56.0dip" android:textColor="?colorOnSurface" android:gravity="center" android:layout_width="@dimen/material_clock_display_padding" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:text="@string/material_clock_display_divider" android:maxEms="1" android:includeFontPadding="false" android:lineSpacingExtra="0.0dip" android:importantForAccessibility="no"
+  xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/material_clock_period_toggle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.button.MaterialButtonToggleGroup android:orientation="vertical" android:id="@id/material_clock_period_toggle" android:background="?colorSurface" android:visibility="gone" android:layout_width="@dimen/material_clock_period_toggle_width" android:layout_height="@dimen/material_clock_period_toggle_height" android:contentDescription="@string/material_clock_toggle_content_description" android:layout_marginStart="@dimen/material_clock_period_toggle_margin_left" app:checkedButton="@id/material_clock_period_am_button" app:layout_constraintStart_toEndOf="@id/material_clock_display" app:layout_constraintTop_toTopOf="parent" app:selectionRequired="true" app:singleSelection="true"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.button.MaterialButton android:id="@id/material_clock_period_am_button" android:layout_width="wrap_content" android:text="@string/material_timepicker_am" app:shapeAppearanceOverlay="?shapeAppearanceMediumComponent" style="@style/Widget.MaterialComponents.TimePicker.Button" />
+    <com.google.android.material.button.MaterialButton android:id="@id/material_clock_period_pm_button" android:layout_width="wrap_content" android:text="@string/material_timepicker_pm" app:shapeAppearanceOverlay="?shapeAppearanceMediumComponent" style="@style/Widget.MaterialComponents.TimePicker.Button" />
+</com.google.android.material.button.MaterialButtonToggleGroup>

com.discord/res/layout/material_clockface_textview.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:textSize="@dimen/material_clock_number_text_size" android:textColor="?colorOnSurface" android:padding="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout/material_clockface_view.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge android:layout_gravity="center" android:id="@id/material_clock_face" android:layout_width="256.0dip" android:layout_height="256.0dip"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.timepicker.ClockHandView android:id="@id/material_clock_hand" android:tag="skip" android:layout_width="fill_parent" android:layout_height="fill_parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:selectorSize="24.0dip" />
+</merge>

com.discord/res/layout/material_radial_view_group.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <View android:id="@id/circle_center" android:layout_width="1.0px" android:layout_height="1.0px" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+</merge>

com.discord/res/layout/material_textinput_timepicker.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="horizontal" android:background="?colorSurface" android:layout_width="wrap_content" android:layout_height="wrap_content" android:baselineAligned="false" android:layoutDirection="ltr" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <include layout="@layout/material_timepicker_textinput_display" />
+    <include android:id="@id/material_clock_period_toggle" layout="@layout/material_clock_period_toggle" />
+</LinearLayout>

com.discord/res/layout/material_time_chip.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.chip.Chip style="@style/Widget.MaterialComponents.TimePicker.Display" />

com.discord/res/layout/material_time_input.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout android:paddingTop="0.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" app:errorIconDrawable="@null" app:hintEnabled="false" app:shapeAppearance="?shapeAppearanceMediumComponent" app:shapeAppearanceOverlay="@null" style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <EditText android:id="@id/material_timepicker_edit_text" android:layout_width="96.0dip" android:layout_height="80.0dip" android:paddingStart="16.0dip" style="@style/Widget.MaterialComponents.TimePicker.Display.TextInputEditText" />
+    <TextView android:textAppearance="?textAppearanceCaption" android:id="@id/material_label" android:focusable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:labelFor="@id/material_timepicker_edit_text" />
+</com.google.android.material.textfield.TextInputLayout>

com.discord/res/layout/material_timepicker.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge android:id="@id/material_timepicker_container" android:layout_width="wrap_content" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <include android:id="@id/material_clock_display" layout="@layout/material_clock_display" />
+    <include android:id="@id/material_clock_period_toggle" layout="@layout/material_clock_period_toggle" />
+    <com.google.android.material.timepicker.ClockFaceView android:layout_gravity="center" android:id="@id/material_clock_face" android:layout_width="@dimen/material_clock_size" android:layout_height="@dimen/material_clock_size" android:layout_marginTop="36.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/material_clock_display" app:valueTextColor="?colorOnSurface" />
+</merge>

com.discord/res/layout/material_timepicker_dialog.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout android:paddingBottom="2.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView android:textStyle="bold" android:id="@id/header_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16.0dip" android:text="@string/material_timepicker_select_time" android:importantForAccessibility="no" android:layout_marginStart="24.0dip" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="?textAppearanceCaption" />
+    <androidx.constraintlayout.widget.Barrier android:id="@id/barrier" android:layout_width="wrap_content" android:layout_height="wrap_content" app:barrierDirection="bottom" app:constraint_referenced_ids="material_textinput_timepicker, material_timepicker_view" />
+    <com.google.android.material.timepicker.TimePickerView android:id="@id/material_timepicker_view" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24.0dip" android:layout_marginTop="@dimen/material_clock_face_margin_top" android:layout_marginRight="24.0dip" android:layout_marginBottom="24.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
+    <include android:id="@id/material_textinput_timepicker" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="24.0dip" android:layout_marginTop="52.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="24.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" layout="@layout/material_textinput_timepicker" />
+    <Button android:id="@id/material_timepicker_cancel_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@android:string/cancel" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toStartOf="@id/material_timepicker_ok_button" app:layout_constraintTop_toTopOf="@id/material_timepicker_ok_button" style="?borderlessButtonStyle" />
+    <Button android:id="@id/material_timepicker_ok_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/material_timepicker_dialog_buttons_margin_top" android:minWidth="64.0dip" android:text="@android:string/ok" android:layout_marginEnd="8.0dip" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/barrier" style="?borderlessButtonStyle" />
+    <com.google.android.material.button.MaterialButton android:id="@id/material_timepicker_mode_button" android:paddingLeft="16.0dip" android:paddingRight="16.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="48.0dip" android:checkable="true" android:layout_marginStart="8.0dip" app:iconPadding="0.0dip" app:iconTint="@color/material_timepicker_modebutton_tint" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/material_timepicker_ok_button" style="?borderlessButtonStyle" />
+</androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/material_timepicker_textinput_display.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <include android:id="@id/material_hour_text_input" layout="@layout/material_chip_input_combo" />
+    <include layout="@layout/material_clock_display_divider" />
+    <include android:id="@id/material_minute_text_input" layout="@layout/material_chip_input_combo" />
+</merge>

com.discord/res/layout/mtrl_picker_actions.xml

@@ -2,5 +2,5 @@
 <LinearLayout android:gravity="end" android:orientation="horizontal" android:id="@id/date_picker_actions" android:paddingRight="@dimen/mtrl_calendar_action_padding" android:layout_width="fill_parent" android:layout_height="@dimen/mtrl_calendar_action_height" android:paddingEnd="@dimen/mtrl_calendar_action_padding"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <Button android:layout_gravity="center_vertical" android:id="@id/cancel_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mtrl_picker_cancel" style="?buttonBarNegativeButtonStyle" />
-    <Button android:layout_gravity="center_vertical" android:id="@id/confirm_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mtrl_picker_confirm" style="?buttonBarPositiveButtonStyle" />
+    <Button android:layout_gravity="center_vertical" android:id="@id/confirm_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="@dimen/mtrl_calendar_action_confirm_button_min_width" android:text="@string/mtrl_picker_confirm" style="?buttonBarPositiveButtonStyle" />
 </LinearLayout>

com.discord/res/layout/notification_mute_settings_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.discord.app.AppTextView android:id="@id/notification_mute_settings_mute_item" android:text="@string/form_label_mute_server" android:drawableEnd="?ic_navigate_next" style="@style/UiKit.Settings.Item" />
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView android:id="@id/notification_mute_settings_mute_item" android:text="@string/form_label_mute_server" app:drawableEndCompat="?ic_navigate_next" style="@style/UiKit.Settings.Item" />
     <TextView android:id="@id/notification_mute_settings_mute_item_status" style="@style/UiKit.Settings.Item.Addition" />
     <TextView android:id="@id/notification_mute_settings_mute_item_description" style="@style/UiKit.Settings.Item.Addition" />
 </LinearLayout>

com.discord/res/layout/oauth_token_permission_list_item.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView android:gravity="center" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:drawablePadding="8.0dip" android:drawableStart="@drawable/ic_check_circle_green_24dp" style="@style/UiKit.TextView"
-  xmlns:android="http://schemas.android.com/apk/res/android" />
+<TextView android:gravity="center" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:drawablePadding="8.0dip" app:drawableStartCompat="@drawable/ic_check_circle_green_24dp" style="@style/UiKit.TextView"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

com.discord/res/layout/overlay_bubble_menu.xml

@@ -5,7 +5,7 @@
         <View android:id="@id/overlay_linked_anchor_view" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" />
         <View android:background="@color/white_alpha_30" android:layout_width="1.0dip" android:layout_height="32.0dip" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" />
         <androidx.recyclerview.widget.RecyclerView android:id="@id/overlay_members_rv" android:clipChildren="false" android:clipToPadding="false" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.ViewGroup.RecyclerView.Horizontal" />
-        <androidx.appcompat.widget.AppCompatTextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" style="@style/UiKit.TextView.H1.Bold" />
+        <TextView android:gravity="center" android:id="@id/overlay_members_overflow_tv" android:background="@drawable/drawable_uikit_primary_700_circle" android:visibility="gone" android:layout_width="@dimen/overlay_bubble_size" android:layout_height="@dimen/overlay_bubble_size" android:layout_marginEnd="4.0dip" style="@style/UiKit.TextView.H1.Bold" />
     </LinearLayout>
     <com.discord.views.OverlayMenuView android:id="@id/overlay_menu" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable" />
 </LinearLayout>