Changes of com.discord v1255

com.discord/AndroidManifest.xml

@@ -165,14 +165,16 @@
         <service android:directBootAware="true" android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
             <meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.perf.FirebasePerfRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.ndk.CrashlyticsNdkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.CrashlyticsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.messaging.FirebaseMessagingRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.ndk.CrashlyticsNdkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.ktx.FirebaseAnalyticsKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.connector.internal.AnalyticsConnectorRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.CrashlyticsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.remoteconfig.RemoteConfigRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
         </service>
         <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
@@ -193,7 +195,7 @@
         <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
         <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService"/>
         <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
-        <provider android:authorities="com.discord.firebaseinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
+        <provider android:authorities="com.discord.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
         <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
         <service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
             <intent-filter>
@@ -240,7 +242,12 @@
                 <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
             </intent-filter>
         </receiver>
-        <service android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
+        <receiver android:directBootAware="false" android:enabled="true" android:exported="true" android:name="androidx.work.impl.diagnostics.DiagnosticsReceiver" android:permission="android.permission.DUMP">
+            <intent-filter>
+                <action android:name="androidx.work.diagnostics.REQUEST_DIAGNOSTICS"/>
+            </intent-filter>
+        </receiver>
+        <service android:directBootAware="true" android:exported="false" android:name="androidx.room.MultiInstanceInvalidationService"/>
         <service android:exported="false" android:name="com.google.android.datatransport.runtime.backends.TransportBackendDiscovery">
             <meta-data android:name="backend:com.google.android.datatransport.cct.CctBackendFactory" android:value="cct"/>
         </service>

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1254.apk
+apkFileName: com.discord-1255.apk
 compressionType: false
 doNotCompress:
 - resources.arsc
@@ -3050,9 +3050,12 @@ sdkInfo:
 sharedLibrary: false
 sparseResources: false
 unknownFiles:
+  DebugProbesKt.bin: '8'
   firebase-abt.properties: '8'
+  firebase-analytics-ktx.properties: '8'
   firebase-analytics.properties: '8'
   firebase-appindexing.properties: '8'
+  firebase-common-ktx.properties: '8'
   firebase-common.properties: '8'
   firebase-components.properties: '8'
   firebase-config.properties: '8'
@@ -3106,5 +3109,5 @@ usesFramework:
   tag: null
 version: 2.4.2-83a459-SNAPSHOT
 versionInfo:
-  versionCode: '1254'
-  versionName: '38.3'
+  versionCode: '1255'
+  versionName: '39.01'

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_100.xml

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

com.discord/res/drawable/drawable_overlay_mentions_primary_600.xml

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

com.discord/res/drawable/drawable_overlay_mentions_primary_800.xml

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

com.discord/res/drawable/drawable_overlay_mentions_white.xml

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