Changes of com.discord v899

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-898.apk
+apkFileName: com.discord-899.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -308,5 +308,5 @@ usesFramework:
   tag: null
 version: 2.4.1-cc194d-SNAPSHOT
 versionInfo:
-  versionCode: '898'
-  versionName: 8.9.8
+  versionCode: '899'
+  versionName: 8.9.9

com.discord/assets/crashlytics-build.properties

@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Tue May 14 20:31:27 UTC 2019
-version_name=8.9.8
+#Thu May 16 21:14:24 UTC 2019
+version_name=8.9.9
 package_name=com.discord
-build_id=83fb2153-6e67-4d18-ab69-1c285fc50672
-version_code=898
+build_id=9ec31162-042b-4b7f-98cc-515f700a1ace
+version_code=899
 app_name=com.discord

com.discord/res/drawable-anydpi-v21/ic_member_list_boosted_badge_24dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fff47fff" android:pathData="M8,2L4,6V10L8,14L12,10V6L8,2ZM11,9.59L8,12.59L5,9.59V6.41L8,3.41L11,6.41V9.59Z" />
+    <path android:fillColor="#fff47fff" android:pathData="M6,6.83V9.17L8,11.17L10,9.17V6.83L8,4.83L6,6.83Z" />
+</vector>

com.discord/res/drawable-anydpi-v21/ic_profile_badge_premium_guild_subscription_lvl1_32dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffff73fa" android:pathData="M12,3L2,19H22L12,3ZM12,8.7L16.6,16H7.4L12,8.7Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M9.2,15L12,10.5L14.8,15H9.2Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M12,3V8.7L16.6,16L22,19L12,3Z" />
+</vector>

com.discord/res/drawable-anydpi-v21/ic_profile_badge_premium_guild_subscription_lvl2_32dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffff73fa" android:pathData="M12,3L3,12L12,21L21,12L12,3ZM12,17.22L6.78,12L12,6.78L17.22,12L12,17.22Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M11.9359,8.1178L8.0539,11.9998L11.9359,15.8818L15.8179,11.9998L11.9359,8.1178Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M12,3V6.78L17.22,12H21L12,3Z" />
+</vector>

com.discord/res/drawable-anydpi-v21/ic_profile_badge_premium_guild_subscription_lvl3_32dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffff73fa" android:pathData="M12,1L6,7V17L12,23L18,17V7L12,1ZM15,15.8L12,18.8L9,15.8V8.2L12,5.2L15,8.2V15.8Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M10,8.7V15.3L12,17.3L14,15.3V8.7L12,6.7L10,8.7Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M12,1V5.2L15,8.2L18,7L12,1Z" />
+</vector>

com.discord/res/drawable-anydpi-v21/ic_profile_badge_staff_32dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="22.0" android:viewportHeight="23.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff7289da" android:pathData="M4.3231,4.4332C4.3231,4.4332 4.5811,4.0472 4.6881,3.8762C4.7951,3.7052 4.4111,3.3012 4.2621,3.1732C4.1131,3.0452 3.8781,3.1092 3.8781,3.1092C2.0031,3.9402 1.0651,5.6452 0.9371,5.9862C0.8091,6.3272 1.2631,6.6992 1.5981,6.8812C1.7521,6.9652 1.9971,6.7792 2.1481,6.6412L2.1991,6.5892L2.2781,6.5092L2.2791,6.5082L7.3801,11.5892L8.0771,10.8922L9.3581,9.6112L4.3161,4.4402L4.3231,4.4332Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M16.3738,9.7931L16.6428,9.5371L19.0598,11.9311C19.0768,11.9461 19.0948,11.9521 19.1108,11.9521C19.1568,11.9521 19.1948,11.9101 19.1948,11.9101C19.1948,11.9101 21.8708,9.2551 21.8798,9.2461C21.9588,9.1681 21.8798,9.1251 21.8798,9.1251L19.8158,7.0471L19.8128,7.0501L19.5298,6.7731L19.6878,6.6211L20.0258,6.6601L19.9618,6.2121L20.0468,6.1261L19.9198,5.4801C19.4788,4.8551 18.2708,3.8541 18.2708,3.8541L17.6388,3.7401L17.5748,3.8251L17.0988,3.7541L17.1448,4.1601L17.1748,4.1901L17.0338,4.3321L16.2538,3.5691C16.2538,3.5691 11.7278,1.1111 11.4868,0.9971C11.3508,0.9341 11.2508,0.8921 11.1548,0.8921C11.0808,0.8921 11.0088,0.9171 10.9258,0.9761C10.7338,1.1111 10.8468,1.3831 10.8468,1.3831L13.6608,6.5831L14.2238,7.1411L14.0478,7.3171L14.0478,7.3171L13.9828,7.3821L13.5328,7.3201L13.6018,7.7661L13.4718,7.8961L13.4488,7.8731C13.4278,7.8521 13.3988,7.8411 13.3708,7.8411C13.3428,7.8411 13.3148,7.8521 13.2928,7.8731C13.2498,7.9161 13.2498,7.9861 13.2928,8.0291L13.3158,8.0521L13.2538,8.1151L13.2378,8.0981C13.2158,8.0771 13.1878,8.0661 13.1598,8.0661C13.1308,8.0661 13.1028,8.0771 13.0818,8.0981C13.0388,8.1411 13.0388,8.2111 13.0818,8.2541L13.0988,8.2711L11.9148,9.4611L11.8878,9.4341C11.8658,9.4131 11.8378,9.4021 11.8098,9.4021C11.7818,9.4021 11.7538,9.4131 11.7318,9.4341C11.6888,9.4771 11.6888,9.5471 11.7318,9.5901L11.7598,9.6171L11.6968,9.6801L11.6758,9.6601C11.6548,9.6381 11.6258,9.6271 11.5988,9.6271C11.5698,9.6271 11.5418,9.6381 11.5198,9.6601C11.4778,9.7031 11.4778,9.7721 11.5198,9.8151L11.5408,9.8361L11.3868,9.9921L11.3658,10.1901L11.4468,10.2731L11.4448,10.2741L11.3468,10.3741L4.9578,16.7621L4.8748,16.6931L4.6098,16.7311L4.4598,16.8831L4.4498,16.8731C4.4278,16.8511 4.3998,16.8401 4.3718,16.8401C4.3438,16.8401 4.3148,16.8511 4.2938,16.8731C4.2508,16.9161 4.2508,16.9851 4.2938,17.0281L4.3058,17.0401L4.2438,17.1041L4.2378,17.0981C4.2168,17.0761 4.1878,17.0651 4.1598,17.0651C4.1318,17.0651 4.1038,17.0761 4.0818,17.0981C4.0398,17.1411 4.0398,17.2101 4.0818,17.2531L4.0888,17.2611L2.9198,18.4501L2.8958,18.4261C2.8738,18.4041 2.8468,18.3941 2.8178,18.3941C2.7898,18.3941 2.7618,18.4041 2.7398,18.4261C2.6968,18.4691 2.6968,18.5391 2.7398,18.5821L2.7658,18.6071L2.7038,18.6701L2.6848,18.6511C2.6628,18.6301 2.6348,18.6191 2.6058,18.6191C2.5788,18.6191 2.5498,18.6301 2.5288,18.6511C2.4858,18.6941 2.4858,18.7641 2.5288,18.8071L2.5488,18.8281L2.4618,18.9171L2.0088,18.8361L2.0428,19.3421L1.8998,19.4881L2.0238,20.1701C2.0238,20.1701 2.2138,20.7641 2.6048,21.1581C2.9838,21.5401 3.5618,21.7231 3.5868,21.7421L4.2398,21.8561L4.4008,21.6981L4.8508,21.7711L4.7768,21.3261L4.9138,21.1921L4.9768,21.2551C4.9978,21.2761 5.0258,21.2871 5.0538,21.2871C5.0818,21.2871 5.1108,21.2761 5.1318,21.2551C5.1748,21.2111 5.1748,21.1421 5.1318,21.0991L5.0698,21.0371L5.1338,20.9751L5.1878,21.0291C5.2088,21.0511 5.2378,21.0621 5.2658,21.0621C5.2938,21.0621 5.3218,21.0511 5.3438,21.0291C5.3868,20.9861 5.3868,20.9171 5.3438,20.8741L5.2908,20.8201L6.4778,19.6491L6.5298,19.7011C6.5508,19.7231 6.5798,19.7331 6.6078,19.7331C6.6358,19.7331 6.6638,19.7231 6.6858,19.7011C6.7278,19.6581 6.7278,19.5881 6.6858,19.5451L6.6348,19.4951L6.6978,19.4321L6.7418,19.4761C6.7628,19.4971 6.7908,19.5081 6.8188,19.5081C6.8478,19.5081 6.8758,19.4971 6.8968,19.4761C6.9398,19.4331 6.9398,19.3631 6.8968,19.3201L6.8538,19.2771L6.9868,19.1471L7.0348,18.8621L6.9638,18.7911L6.9648,18.7901L7.0938,18.6621L13.4398,12.3141L13.4368,12.3081L13.5608,12.4361L13.7598,12.4141L13.9388,12.2341L13.9678,12.2631C13.9898,12.2841 14.0178,12.2951 14.0458,12.2951C14.0738,12.2951 14.1028,12.2841 14.1238,12.2631C14.1668,12.2201 14.1668,12.1501 14.1238,12.1071L14.0948,12.0781L14.1578,12.0161L14.1798,12.0381C14.2008,12.0591 14.2288,12.0701 14.2578,12.0701C14.2858,12.0701 14.3138,12.0591 14.3348,12.0381C14.3778,11.9951 14.3778,11.9251 14.3348,11.8821L14.3128,11.8591L15.4988,10.6711L15.5298,10.7021C15.5508,10.7231 15.5788,10.7341 15.6068,10.7341C15.6358,10.7341 15.6638,10.7231 15.6848,10.7021C15.7278,10.6591 15.7278,10.5891 15.6848,10.5461L15.6538,10.5151L15.7168,10.4521L15.7408,10.4771C15.7628,10.4981 15.7908,10.5091 15.8188,10.5091C15.8468,10.5091 15.8748,10.4981 15.8968,10.4771C15.9398,10.4331 15.9398,10.3641 15.8968,10.3211L15.8728,10.2961L16.0048,10.1641L16.4458,10.2331L16.3738,9.7931Z" />
+    <path android:fillColor="#ff7289da" android:pathData="M17.255,16.968l-2.813,-2.132l-0.501,-0.516l-1.941,1.941l0.488,0.466l1.833,2.749l2.472,2.707l2.849,-2.658z" />
+</vector>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffc0ff" android:pathData="M4,20C4.3,20 4.5,19.8 4.5,19.5V18.5C4.5,18.2 4.3,18 4,18C3.7,18 3.5,18.2 3.5,18.5V19.5C3.5,19.7 3.7,20 4,20Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M4,24C4.3,24 4.5,23.8 4.5,23.5V22.5C4.5,22.2 4.3,22 4,22C3.7,22 3.5,22.2 3.5,22.5V23.5C3.5,23.7 3.7,24 4,24Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M5,21C5,21.3 5.2,21.5 5.5,21.5H6.5C6.8,21.5 7,21.2 7,21C7,20.7 6.8,20.5 6.5,20.5H5.5C5.2,20.5 5,20.7 5,21Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M1,21C1,21.3 1.2,21.5 1.5,21.5H2.5C2.8,21.5 3,21.2 3,21C3,20.7 2.8,20.5 2.5,20.5H1.5C1.2,20.5 1,20.7 1,21Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M2,13L2.7,14.3L4,15L2.7,15.7L2,17L1.3,15.7L0,15L1.3,14.3L2,13Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M22,7L22.7,8.3L24,9L22.7,9.7L22,11L21.3,9.7L20,9L21.3,8.3L22,7Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M10,14.7V15.3L12,17.3L14,15.3V10.7L10,14.7Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M10,13.3L14,9.3V8.7L13.9,8.5L10,12.4V13.3Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M13.1,7.8L12,6.7L10,8.7V11L13.1,7.8Z" />
+    <path android:fillColor="#ffff73fa" android:pathData="M12,1L6,7V17L12,23V18.8L9,15.8V8.2L12,5.2V1ZM15,15.8L18,17V7L15,8.2V15.8Z" android:fillType="evenOdd" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M15,8.2L18,7L12,1V5.2L15,8.2Z" />
+    <path android:fillColor="#ffffc0ff" android:pathData="M15,15.8L18,17L12,23V18.8L15,15.8Z" />
+</vector>

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="32.0dip" android:width="32.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ff7289da" android:pathData="M9.32,8.43C9.32,8.43 9.58,8.05 9.69,7.88C9.8,7.71 9.41,7.3 9.26,7.17C9.11,7.05 8.88,7.11 8.88,7.11C7,7.94 6.07,9.65 5.94,9.99C5.81,10.33 6.26,10.7 6.6,10.88C6.75,10.97 7,10.78 7.15,10.64L7.2,10.59L7.28,10.51L7.28,10.51L12.38,15.59L13.08,14.89L14.36,13.61L9.32,8.44L9.32,8.43Z" android:fillType="evenOdd" />
-    <path android:fillColor="#ff7289da" android:pathData="M21.37,13.79L21.64,13.54L24.06,15.93C24.08,15.95 24.09,15.95 24.11,15.95C24.16,15.95 24.19,15.91 24.19,15.91C24.19,15.91 26.87,13.26 26.88,13.25C26.96,13.17 26.88,13.13 26.88,13.13L24.82,11.05L24.81,11.05L24.53,10.77L24.69,10.62L25.03,10.66L24.96,10.21L25.05,10.13L24.92,9.48C24.48,8.86 23.27,7.85 23.27,7.85L22.64,7.74L22.57,7.83L22.1,7.75L22.14,8.16L22.17,8.19L22.03,8.33L21.25,7.57C21.25,7.57 16.73,5.11 16.49,5C16.35,4.93 16.25,4.89 16.15,4.89C16.08,4.89 16.01,4.92 15.93,4.98C15.73,5.11 15.85,5.38 15.85,5.38L18.66,10.58L19.22,11.14L19.05,11.32L19.05,11.32L18.98,11.38L18.53,11.32L18.6,11.77L18.47,11.9L18.45,11.87C18.43,11.85 18.4,11.84 18.37,11.84C18.34,11.84 18.31,11.85 18.29,11.87C18.25,11.92 18.25,11.99 18.29,12.03L18.32,12.05L18.25,12.12L18.24,12.1C18.22,12.08 18.19,12.07 18.16,12.07C18.13,12.07 18.1,12.08 18.08,12.1C18.04,12.14 18.04,12.21 18.08,12.25L18.1,12.27L16.91,13.46L16.89,13.43C16.87,13.41 16.84,13.4 16.81,13.4C16.78,13.4 16.75,13.41 16.73,13.43C16.69,13.48 16.69,13.55 16.73,13.59L16.76,13.62L16.7,13.68L16.68,13.66C16.65,13.64 16.63,13.63 16.6,13.63C16.57,13.63 16.54,13.64 16.52,13.66C16.48,13.7 16.48,13.77 16.52,13.82L16.54,13.84L16.39,13.99L16.37,14.19L16.45,14.27L16.44,14.27L16.35,14.37L9.96,20.76L9.87,20.69L9.61,20.73L9.46,20.88L9.45,20.87C9.43,20.85 9.4,20.84 9.37,20.84C9.34,20.84 9.31,20.85 9.29,20.87C9.25,20.92 9.25,20.99 9.29,21.03L9.31,21.04L9.24,21.1L9.24,21.1C9.22,21.08 9.19,21.07 9.16,21.07C9.13,21.07 9.1,21.08 9.08,21.1C9.04,21.14 9.04,21.21 9.08,21.25L9.09,21.26L7.92,22.45L7.9,22.43C7.87,22.4 7.85,22.39 7.82,22.39C7.79,22.39 7.76,22.4 7.74,22.43C7.7,22.47 7.7,22.54 7.74,22.58L7.77,22.61L7.7,22.67L7.68,22.65C7.66,22.63 7.63,22.62 7.61,22.62C7.58,22.62 7.55,22.63 7.53,22.65C7.49,22.69 7.49,22.76 7.53,22.81L7.55,22.83L7.46,22.92L7.01,22.84L7.04,23.34L6.9,23.49L7.02,24.17C7.02,24.17 7.21,24.76 7.6,25.16C7.98,25.54 8.56,25.72 8.59,25.74L9.24,25.86L9.4,25.7L9.85,25.77L9.78,25.33L9.91,25.19L9.98,25.26C10,25.28 10.03,25.29 10.05,25.29C10.08,25.29 10.11,25.28 10.13,25.26C10.17,25.21 10.17,25.14 10.13,25.1L10.07,25.04L10.13,24.98L10.19,25.03C10.21,25.05 10.24,25.06 10.27,25.06C10.29,25.06 10.32,25.05 10.34,25.03C10.39,24.99 10.39,24.92 10.34,24.87L10.29,24.82L11.48,23.65L11.53,23.7C11.55,23.72 11.58,23.73 11.61,23.73C11.64,23.73 11.66,23.72 11.69,23.7C11.73,23.66 11.73,23.59 11.69,23.55L11.63,23.5L11.7,23.43L11.74,23.48C11.76,23.5 11.79,23.51 11.82,23.51C11.85,23.51 11.88,23.5 11.9,23.48C11.94,23.43 11.94,23.36 11.9,23.32L11.85,23.28L11.99,23.15L12.03,22.86L11.96,22.79L11.96,22.79L12.09,22.66L18.44,16.31L18.44,16.31L18.56,16.44L18.76,16.41L18.94,16.23L18.97,16.26C18.99,16.28 19.02,16.3 19.05,16.3C19.07,16.3 19.1,16.28 19.12,16.26C19.17,16.22 19.17,16.15 19.12,16.11L19.09,16.08L19.16,16.02L19.18,16.04C19.2,16.06 19.23,16.07 19.26,16.07C19.29,16.07 19.31,16.06 19.33,16.04C19.38,16 19.38,15.93 19.33,15.88L19.31,15.86L20.5,14.67L20.53,14.7C20.55,14.72 20.58,14.73 20.61,14.73C20.64,14.73 20.66,14.72 20.68,14.7C20.73,14.66 20.73,14.59 20.68,14.55L20.65,14.52L20.72,14.45L20.74,14.48C20.76,14.5 20.79,14.51 20.82,14.51C20.85,14.51 20.87,14.5 20.9,14.48C20.94,14.43 20.94,14.36 20.9,14.32L20.87,14.3L21,14.16L21.45,14.23L21.37,13.79Z" android:fillType="evenOdd" />
-    <path android:fillColor="#ff7289da" android:pathData="M22.25,20.97l-2.81,-2.13l-0.5,-0.52l-1.94,1.94l0.49,0.47l1.83,2.75l2.47,2.71l2.85,-2.66z" android:fillType="evenOdd" />
-</vector>

com.discord/res/layout-v17/widget_channel_members_list_item_user.xml

@@ -10,6 +10,7 @@
     <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/channel_members_list_item_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:text="@string/bot_tag" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_small" android:layout_marginEnd="@dimen/uikit_spacing_small" app:layout_constraintBaseline_toBaselineOf="@id/channel_members_list_item_name" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView" />
     <TextView android:textColor="@color/white_alpha_40" android:id="@id/channel_members_list_item_game" android:layout_marginLeft="@dimen/uikit_spacing_large" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView.Subtext" />
     <ImageView android:id="@id/channel_members_list_item_rich_presence_iv" android:src="@drawable/ic_rich_presence_grey_16dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="@id/channel_members_list_item_game" app:layout_constraintEnd_toEndOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_game" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_game" app:layout_constraintTop_toTopOf="@id/channel_members_list_item_game" style="@style/UiKit.ImageView" />
-    <ImageView android:id="@id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_server_owner_yellow_24px" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_server_owner_yellow_24px" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/channel_members_list_item_boosted_indicator" android:src="@drawable/ic_member_list_boosted_badge_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <View android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/channel_members_list_item_name" app:layout_constraintStart_toStartOf="@id/channel_members_list_item_name" style="@style/UiKit.Settings.Divider" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.views.CustomAppBarLayout android:id="@id/app_bar_layout" android:background="@color/primary_630" style="@style/AppTheme.AppBarLayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:background="@color/primary_630" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll">
+        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:background="@color/primary_630" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:scrimVisibleHeightTrigger="0.0dip">
             <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="@drawable/drawable_bottom_up_primary_630_gradient">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:maxHeight="150.0dip" app:actualImageScaleType="centerCrop" />
             </FrameLayout>

com.discord/res/layout-v17/widget_chat_list_adapter_item_invite.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.app.AppTextView android:id="@id/item_invite_header" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/invite_button_resolving" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.Header" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" />
     <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@id/item_invite_image_text" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="1" android:singleLine="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_invite_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView.Marquee" />
     <LinearLayout android:gravity="center_vertical" android:id="@id/item_invite_member_container" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:minWidth="100.0dip" android:minHeight="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">

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

@@ -2,14 +2,18 @@
 <merge android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+        <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_hero">
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+        </androidx.cardview.widget.CardView>
         <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="-3.0dip" android:layout_marginBottom="-3.0dip" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_marginEnd="-3.0dip" android:layout_alignParentEnd="true" />
     </RelativeLayout>
     <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Large" />
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_large">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
+            </androidx.cardview.widget.CardView>
             <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
         </LinearLayout>
         <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">

com.discord/res/layout-v17/widget_guilds_list_item_guild.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
-  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">
     <FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" style="@style/UiKit.GuildsListIcon" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" app:roundWithOverlayColor="@color/grey_guilds" style="@style/UiKit.GuildsListIcon" />
         <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
     </FrameLayout>
     <ImageView android:id="@id/guilds_item_voice" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:layout_alignRight="@id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" android:layout_alignEnd="@id/guilds_item_avatar_wrap" style="@style/UiKit.GuildsListVoiceIcon" />

com.discord/res/layout-v17/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_600" style="@style/Avatar.Large.ExtraExtra" />
                 <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />

com.discord/res/layout-v17/widget_user_profile_header.xml

@@ -10,9 +10,9 @@
     </RelativeLayout>
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.cardview.widget.CardView android:id="@id/profile_header_badge_wrap_outer" android:layout_width="wrap_content" android:layout_height="24.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorPrimary" app:cardCornerRadius="12.0dip">
-            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" android:paddingLeft="6.0dip" android:paddingTop="2.0dip" android:paddingRight="6.0dip" android:paddingBottom="2.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <LinearLayout android:id="@id/user_profile_header_badges" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
-                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:singleLine="true" android:textAllCaps="true" android:paddingStart="6.0dip" android:paddingEnd="6.0dip" style="@style/UiKit.TextView.Subtext.Semibold" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <TextView android:id="@id/profile_header_username" android:singleLine="true" style="@style/UiKit.TextView.H1" />

com.discord/res/layout-v17/widget_user_profile_header_badge.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_gravity="center" android:padding="@dimen/uikit_spacing_xsmall" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="24.0dip" android:layout_marginRight="@dimen/uikit_spacing_small" android:contentDescription="@string/sample_empty_string" android:layout_marginEnd="@dimen/uikit_spacing_small" style="@style/UiKit.ImageView"
+<ImageView android:layout_gravity="center" android:paddingLeft="4.0dip" android:paddingTop="2.0dip" android:paddingRight="4.0dip" android:paddingBottom="2.0dip" android:visibility="gone" android:layout_width="26.0dip" android:layout_height="18.0dip" android:contentDescription="@string/sample_empty_string" android:paddingStart="4.0dip" android:paddingEnd="4.0dip" style="@style/UiKit.ImageView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/layout-v21/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_600" style="@style/Avatar.Large.ExtraExtra" />
                 <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" android:textAlignment="center" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />

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

@@ -4,12 +4,16 @@
     <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+            <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_hero">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+            </androidx.cardview.widget.CardView>
             <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="-3.0dip" android:layout_marginBottom="-3.0dip" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" android:layout_marginEnd="-3.0dip" android:layout_alignParentEnd="true" />
         </RelativeLayout>
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Large" />
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_large">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
+            </androidx.cardview.widget.CardView>
             <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
         </LinearLayout>
         <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">

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

@@ -4,12 +4,16 @@
     <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+            <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_hero">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+            </androidx.cardview.widget.CardView>
             <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="-3.0dip" android:layout_marginBottom="-3.0dip" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" />
         </RelativeLayout>
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Large" />
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_large">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
+            </androidx.cardview.widget.CardView>
             <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
         </LinearLayout>
         <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">

com.discord/res/layout/widget_channel_members_list_item_user.xml

@@ -10,6 +10,7 @@
     <TextView android:textSize="9.5sp" android:textColor="@color/white" android:id="@id/channel_members_list_item_bot" android:background="@drawable/drawable_button_purple_neutral" android:paddingLeft="3.0dip" android:paddingTop="0.5dip" android:paddingRight="3.0dip" android:paddingBottom="0.5dip" android:layout_marginLeft="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_small" android:text="@string/bot_tag" android:singleLine="true" app:layout_constraintBaseline_toBaselineOf="@id/channel_members_list_item_name" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintHorizontal_weight="1.0" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView" />
     <TextView android:textColor="@color/white_alpha_40" android:id="@id/channel_members_list_item_game" android:layout_marginLeft="@dimen/uikit_spacing_large" android:singleLine="true" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_avatar" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_rich_presence_iv" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_avatar" app:layout_constraintTop_toBottomOf="@id/channel_members_list_item_name" style="@style/UiKit.TextView.Subtext" />
     <ImageView android:id="@id/channel_members_list_item_rich_presence_iv" android:src="@drawable/ic_rich_presence_grey_16dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="@id/channel_members_list_item_game" app:layout_constraintEnd_toEndOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintLeft_toRightOf="@id/channel_members_list_item_game" app:layout_constraintRight_toRightOf="@id/channel_members_list_item_group_owner_indicator" app:layout_constraintStart_toEndOf="@id/channel_members_list_item_game" app:layout_constraintTop_toTopOf="@id/channel_members_list_item_game" style="@style/UiKit.ImageView" />
-    <ImageView android:id="@id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_server_owner_yellow_24px" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/channel_members_list_item_group_owner_indicator" android:src="@drawable/ic_server_owner_yellow_24px" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintRight_toLeftOf="@id/channel_members_list_item_boosted_indicator" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
+    <ImageView android:id="@id/channel_members_list_item_boosted_indicator" android:src="@drawable/ic_member_list_boosted_badge_24dp" android:contentDescription="@string/user_activity_header_playing" app:layout_constrainedHeight="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <View android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/channel_members_list_item_name" app:layout_constraintStart_toStartOf="@id/channel_members_list_item_name" style="@style/UiKit.Settings.Divider" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_channels_list.xml

@@ -2,7 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout android:background="@color/primary_630" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.views.CustomAppBarLayout android:id="@id/app_bar_layout" android:background="@color/primary_630" style="@style/AppTheme.AppBarLayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:background="@color/primary_630" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll">
+        <com.google.android.material.appbar.CollapsingToolbarLayout android:id="@id/collapsing_toolbar" android:background="@color/primary_630" android:layout_width="fill_parent" android:layout_height="fill_parent" app:contentScrim="@color/primary_630" app:layout_scrollFlags="exitUntilCollapsed|scroll" app:scrimVisibleHeightTrigger="0.0dip">
             <FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:foreground="@drawable/drawable_bottom_up_primary_630_gradient">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/channels_list_banner" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:maxHeight="150.0dip" app:actualImageScaleType="centerCrop" />
             </FrameLayout>

com.discord/res/layout/widget_chat_list_adapter_item_invite.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/item_listen_together_container" style="@style/UiKit.Chat.Embed.Container"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.discord.app.AppTextView android:id="@id/item_invite_header" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/invite_button_resolving" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Chat.Embed.Header" />
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_invite_image" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" />
     <TextView android:textColor="@color/white" android:ellipsize="end" android:gravity="center" android:id="@id/item_invite_image_text" android:layout_width="42.0dip" android:layout_height="42.0dip" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" android:maxLines="1" android:singleLine="true" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView" />
     <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?primary_100" android:id="@id/item_invite_name" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_header" style="@style/UiKit.TextView.Marquee" />
     <LinearLayout android:gravity="center_vertical" android:id="@id/item_invite_member_container" android:layout_width="0.0dip" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginTop="@dimen/uikit_spacing_small" android:layout_marginRight="@dimen/uikit_spacing_large" android:minWidth="100.0dip" android:minHeight="@dimen/uikit_spacing_large" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/item_invite_image" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/item_invite_image" app:layout_constraintTop_toBottomOf="@id/item_invite_name" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">

com.discord/res/layout/widget_guild_invite_info.xml

@@ -2,14 +2,18 @@
 <merge android:gravity="center" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout android:id="@id/invite_avatar_wrap" android:visibility="gone" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginTop="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+        <androidx.cardview.widget.CardView android:layout_width="wrap_content" android:layout_height="wrap_content" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_hero">
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar" style="@style/Avatar.Hero" />
+        </androidx.cardview.widget.CardView>
         <RelativeLayout android:id="@id/invite_avatar_small_wrap" android:background="?colorPrimaryCircle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="-3.0dip" android:layout_marginBottom="-3.0dip" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" />
     </RelativeLayout>
     <ImageView android:id="@id/invite_expired_image" android:visibility="gone" android:layout_marginLeft="96.0dip" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginRight="96.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" android:src="?img_poop" android:contentDescription="@string/instant_invite_expired" style="@style/UiKit.ImageView" />
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <TextView android:textSize="18.0sp" android:id="@id/invite_title" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center_vertical" android:id="@id/invite_avatar_small" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Large" />
+            <androidx.cardview.widget.CardView android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" app:cardBackgroundColor="@color/transparent" app:cardCornerRadius="@dimen/avatar_size_large">
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/invite_avatar_small" style="@style/Avatar.Large" />
+            </androidx.cardview.widget.CardView>
             <TextView android:textSize="26.0sp" android:textColor="?primary_100" android:gravity="center" android:layout_gravity="center_vertical" android:id="@id/invite_message" android:drawablePadding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
         </LinearLayout>
         <LinearLayout android:gravity="center" android:id="@id/invite_members_wrap" android:visibility="gone" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Rotatable">

com.discord/res/layout/widget_guilds_list_item_guild.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
-  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">
     <FrameLayout android:gravity="center" android:id="@id/guilds_item_avatar_wrap" android:layout_width="@dimen/avatar_size_large" android:layout_height="@dimen/avatar_size_large" android:layout_centerInParent="true">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" style="@style/UiKit.GuildsListIcon" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guilds_item_avatar" app:roundWithOverlayColor="@color/grey_guilds" style="@style/UiKit.GuildsListIcon" />
         <TextView android:textColor="@color/white" android:gravity="center" android:id="@id/guilds_item_avatar_text" android:clickable="false" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:importantForAccessibility="no" style="@style/UiKit.TextView" />
     </FrameLayout>
     <ImageView android:id="@id/guilds_item_voice" android:layout_alignTop="@id/guilds_item_avatar_wrap" android:layout_alignRight="@id/guilds_item_avatar_wrap" android:contentDescription="@string/connection_status_voice_connected" style="@style/UiKit.GuildsListVoiceIcon" />

com.discord/res/layout/widget_server_settings.xml

@@ -5,7 +5,7 @@
         <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
             <LinearLayout android:gravity="center" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_xxlarge" android:layout_marginTop="?actionBarSize" style="@style/UiKit.ViewGroup.LinearLayout">
                 <RelativeLayout android:layout_gravity="center_horizontal" android:layout_width="@dimen/avatar_size_hero" android:layout_height="@dimen/avatar_size_hero" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
-                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_server_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Hero" />
+                    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_server_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_630" style="@style/Avatar.Hero" />
                     <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center_horizontal" android:id="@id/server_settings_server_icon_text" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.TextView.Large.SingleLine" />
                 </RelativeLayout>
                 <TextView android:id="@id/server_settings_server_name" android:singleLine="true" style="@style/UiKit.TextView.H1" />

com.discord/res/layout/widget_server_settings_overview.xml

@@ -7,7 +7,7 @@
     <ScrollView android:id="@id/server_settings_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
             <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/server_settings_overview_icon_name_container" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:clipToPadding="false" style="@style/UiKit.ViewGroup.ConstraintLayout">
-                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" style="@style/Avatar.Large.ExtraExtra" />
+                <com.facebook.drawee.view.SimpleDraweeView android:id="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/brand_500" app:roundAsCircle="true" app:roundWithOverlayColor="?primary_600" style="@style/Avatar.Large.ExtraExtra" />
                 <ImageView android:background="@drawable/drawable_uikit_white_circle" android:layout_width="@dimen/uikit_spacing_xxlarge" android:layout_height="@dimen/uikit_spacing_xxlarge" android:src="@drawable/ic_upload_image_40dp" android:contentDescription="@string/sample_empty_string" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" style="@style/UiKit.ImageView" />
                 <TextView android:textSize="42.0sp" android:textColor="@color/primary_100" android:ellipsize="none" android:gravity="center" android:id="@id/server_settings_overview_icon_text" android:layout_width="0.0dip" android:layout_height="0.0dip" android:layout_margin="@dimen/uikit_spacing_medium" android:singleLine="true" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="@id/server_settings_overview_icon" app:textAllCaps="true" style="@style/UiKit.TextView" />
                 <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/server_settings_overview_icon_label" android:layout_width="wrap_content" android:text="@string/minimum_size" android:maxLines="2" android:layout_centerHorizontal="true" app:layout_constrainedWidth="true" app:layout_constraintEnd_toEndOf="@id/server_settings_overview_icon" app:layout_constraintLeft_toLeftOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="@id/server_settings_overview_icon" app:layout_constraintStart_toStartOf="@id/server_settings_overview_icon" app:layout_constraintTop_toBottomOf="@id/server_settings_overview_icon" style="@style/UiKit.TextView.Subtext.Semibold" />

com.discord/res/layout/widget_user_profile_header.xml

@@ -10,9 +10,9 @@
     </RelativeLayout>
     <LinearLayout android:gravity="center" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout">
         <androidx.cardview.widget.CardView android:id="@id/profile_header_badge_wrap_outer" android:layout_width="wrap_content" android:layout_height="24.0dip" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorPrimary" app:cardCornerRadius="12.0dip">
-            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+            <LinearLayout android:gravity="center" android:id="@id/profile_header_badge_wrap" android:paddingLeft="6.0dip" android:paddingTop="2.0dip" android:paddingRight="6.0dip" android:paddingBottom="2.0dip" android:layout_width="wrap_content" android:layout_height="fill_parent" android:layout_centerInParent="true" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
                 <LinearLayout android:id="@id/user_profile_header_badges" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
-                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:textColor="?primary_400" android:id="@id/profile_header_badge_text" android:paddingLeft="6.0dip" android:paddingRight="6.0dip" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
             </LinearLayout>
         </androidx.cardview.widget.CardView>
         <TextView android:id="@id/profile_header_username" android:singleLine="true" style="@style/UiKit.TextView.H1" />

com.discord/res/layout/widget_user_profile_header_badge.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView android:layout_gravity="center" android:padding="@dimen/uikit_spacing_xsmall" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="24.0dip" android:layout_marginRight="@dimen/uikit_spacing_small" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView"
+<ImageView android:layout_gravity="center" android:paddingLeft="4.0dip" android:paddingTop="2.0dip" android:paddingRight="4.0dip" android:paddingBottom="2.0dip" android:visibility="gone" android:layout_width="26.0dip" android:layout_height="18.0dip" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView"
   xmlns:android="http://schemas.android.com/apk/res/android" />

com.discord/res/values/ids.xml

@@ -195,6 +195,7 @@
     <item type="id" name="change_password_two_factor" />
     <item type="id" name="channel_list_item_private_presence_bg" />
     <item type="id" name="channel_members_list_item_avatar" />
+    <item type="id" name="channel_members_list_item_boosted_indicator" />
     <item type="id" name="channel_members_list_item_bot" />
     <item type="id" name="channel_members_list_item_game" />
     <item type="id" name="channel_members_list_item_group_owner_indicator" />

com.discord/res/values/plurals.xml

@@ -565,6 +565,14 @@
         <item quantity="other">%d months</item>
         <item quantity="one">1 month</item>
     </plurals>
+    <plurals name="premium_guild_settings_members_subscribed_needed_number">
+        <item quantity="other">%d more Boosts</item>
+        <item quantity="one">%d more Boost</item>
+    </plurals>
+    <plurals name="premium_guild_settings_members_subscribed_number">
+        <item quantity="other">%d Members</item>
+        <item quantity="one">%d Member</item>
+    </plurals>
     <plurals name="premium_guild_settings_x_of_y_subscriptions_numRequired">
         <item quantity="other">%d Boosts</item>
         <item quantity="one">%d Boost</item>
@@ -581,6 +589,26 @@
         <item quantity="other">%d Months</item>
         <item quantity="one">%d Month</item>
     </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_days_days">
+        <item quantity="other">%d days</item>
+        <item quantity="one">%d day</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_days_hours">
+        <item quantity="other">%d hours</item>
+        <item quantity="one">%d hour</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_hours_hours">
+        <item quantity="other">%d hours</item>
+        <item quantity="one">%d hour</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_hours_minutes">
+        <item quantity="other">%d minutes</item>
+        <item quantity="one">%d minute</item>
+    </plurals>
+    <plurals name="premium_guild_subscription_error_rate_limit_minutes_minutes">
+        <item quantity="other">%d minutes</item>
+        <item quantity="one">%d minute</item>
+    </plurals>
     <plurals name="premium_guild_unsubscribe_confirm_cooldown_warning_days">
         <item quantity="other">%d days</item>
         <item quantity="one">%d day</item>
@@ -680,6 +708,6 @@
     <item type="plurals" name="APKTOOL_DUMMY_85">false</item>
     <item type="plurals" name="APKTOOL_DUMMY_86">false</item>
     <item type="plurals" name="APKTOOL_DUMMY_90">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_a4">false</item>
-    <item type="plurals" name="APKTOOL_DUMMY_a5">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_ab">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_ac">false</item>
 </resources>

com.discord/res/values/strings.xml

@@ -1004,7 +1004,7 @@ LOVE, DISCORD {fixed}
     <string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
     <string name="cloud_sync_modal_or">OR</string>
     <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">83fb2153-6e67-4d18-ab69-1c285fc50672</string>
+    <string name="com.crashlytics.android.build_id">9ec31162-042b-4b7f-98cc-515f700a1ace</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="coming_soon_notifications">Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.</string>
     <string name="coming_soon_title">COMING SOON!</string>
@@ -1091,6 +1091,7 @@ LOVE, DISCORD {fixed}
     <string name="connection_status_no_route">No Route</string>
     <string name="connection_status_rtc_connecting">RTC Connecting</string>
     <string name="connection_status_rtc_disconnected">RTC Disconnected</string>
+    <string name="connection_status_stream_connected">Connected to Stream</string>
     <string name="connection_status_video_connected">Video Connected</string>
     <string name="connection_status_voice_connected">Voice Connected</string>
     <string name="connection_verified">Verified</string>
@@ -1419,6 +1420,7 @@ LOVE, DISCORD {fixed}
     <string name="file_size_gb">%1$s GB</string>
     <string name="file_size_mb">%1$s MB</string>
     <string name="file_upload_limit_premium">50MB</string>
+    <string name="file_upload_limit_premium2">100MB</string>
     <string name="file_upload_limit_standard">8MB</string>
     <string name="files_permission_reason_msg">Storage permissions needed to show files</string>
     <string name="filter">Filter</string>
@@ -1431,9 +1433,11 @@ LOVE, DISCORD {fixed}
     <string name="focus_participant">Focus This Person</string>
     <string name="follow">Follow</string>
     <string name="follow_modal_body">"Select the server and channel you'd like to get updates sent to. You can remove this at any time in Server Settings > Webhooks."</string>
+    <string name="follow_modal_fail">Failed to follow the channel, please try again.</string>
     <string name="follow_modal_header">Give me %1$s #%2$s updates!</string>
     <string name="follow_modal_hint">Only servers and channels that you have webhook permissions for are shown.</string>
     <string name="follow_modal_hint_no_perms">"Uh oh, you don't have webhook permissions in any server you're in. Ask your server admin to give you the permission or ask them to come follow themselves!"</string>
+    <string name="follow_modal_too_many_webhooks">The selected channel has too many webhooks. Please remove a webhook or select another channel.</string>
     <string name="follow_news_chat_input_message">"Follow to get this channel's updates directly in your server."</string>
     <string name="force_sync">Force Sync</string>
     <string name="forgot_password">Forgot your password?</string>
@@ -2452,9 +2456,11 @@ LOVE, DISCORD {fixed}
     <string name="invite_button_title_invited">"You've been invited to join a server"</string>
     <string name="invite_button_title_invited_group_dm">"You've been invited to join a group DM"</string>
     <string name="invite_button_title_invited_invalid">You received an invite, but…</string>
+    <string name="invite_button_title_invited_stream">"You've been invited to watch a stream"</string>
     <string name="invite_button_title_inviter">You sent an invite to join a server</string>
     <string name="invite_button_title_inviter_group_dm">You sent an invite to join a group DM</string>
     <string name="invite_button_title_inviter_invalid">You sent an invite, but…</string>
+    <string name="invite_button_title_inviter_stream">You sent an invite to watch a stream</string>
     <string name="invite_button_title_streaming">Invite to watch stream</string>
     <string name="invite_copied">Copied</string>
     <string name="invite_edit_link">Edit invite link.</string>
@@ -2836,8 +2842,11 @@ Want to know more about Discord?"</string>
     <string name="new_terms_title">Terms of Service and Privacy Update</string>
     <string name="new_unreads">New Unreads</string>
     <string name="news_channel">News Channel</string>
-    <string name="news_channel_publish">Publish News</string>
-    <string name="news_channel_publish_edit">Edit News</string>
+    <string name="news_channel_edit_news">Edit News</string>
+    <string name="news_channel_post_to_activity">Post to Activity</string>
+    <string name="news_channel_publish">Publish</string>
+    <string name="news_channel_publish_news">Publish News</string>
+    <string name="news_channel_published">Published</string>
     <string name="next">Next</string>
     <string name="nickname">Nickname</string>
     <string name="nickname_changed">Nickname changed to %1$s.</string>
@@ -3330,6 +3339,9 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_guild_perks_modal_tier_zero_surpassed">You started here, and now you have become great.</string>
     <string name="premium_guild_perks_modal_tooltip_already_subscribed_this_server">You have already boosted this server!</string>
     <string name="premium_guild_perks_modal_tooltip_already_used_subscription">You have already used your boost for another server</string>
+    <string name="premium_guild_perks_modal_tooltip_gift">Gift Nitro to a friend to help Boost this server!</string>
+    <string name="premium_guild_settings_members_subscribed">%1$s have boosted this server</string>
+    <string name="premium_guild_settings_members_subscribed_needed">You need **%1$s** to unlock %2$s</string>
     <string name="premium_guild_settings_x_of_y_subscriptions">%1$s/%2$s</string>
     <string name="premium_guild_subscribe_confirm_blurb">Are you sure you want to send a Nitro Boost to:</string>
     <string name="premium_guild_subscribe_confirm_confirmation">Select this Server</string>
@@ -3339,6 +3351,9 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_guild_subscribe_select_guild_header">Select a Server</string>
     <string name="premium_guild_subscription_available_count">You have **%1$s** available!</string>
     <string name="premium_guild_subscription_duration">%1$s</string>
+    <string name="premium_guild_subscription_error_rate_limit_days">"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"</string>
+    <string name="premium_guild_subscription_error_rate_limit_hours">"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"</string>
+    <string name="premium_guild_subscription_error_rate_limit_minutes">"Looks like you're on cooldown. Please wait **%1$s** before trying again"</string>
     <string name="premium_guild_subscription_no_next_tier">This server is fully powered! Keep boosting!</string>
     <string name="premium_guild_subscription_remove_button">Remove Boost</string>
     <string name="premium_guild_subscription_select_server_button">Select a Server</string>
@@ -3464,6 +3479,9 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="ptt_limited_warning">Push to Talk (Limited) will only work when the browser tab has focus. [Download](onDownloadClick) the desktop application to get system-wide Push to Talk.</string>
     <string name="ptt_permission_body">You launched %1$s as administrator. Please relaunch Discord as an administrator in order to enable Push-to-talk detection while the game has focus.</string>
     <string name="ptt_permission_title">Push-to-talk Needs Permission</string>
+    <string name="publish_followed_news_body">This message will be sent to all servers following this channel. You can edit or delete this message later, and it will update correspondingly in each following server.</string>
+    <string name="publish_followed_news_fail_title">Failed to publish message</string>
+    <string name="publish_followed_news_generic_body">Sorry, something went wrong.</string>
     <string name="quick_dm_blocked">You cannot message blocked users</string>
     <string name="quick_dm_user">Message @%1$s</string>
     <string name="quick_launcher_empty_text">Discord can quickly launch most games you’ve recently played on this computer. Go ahead and launch one to see it appear here!</string>
@@ -3490,6 +3508,7 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="quote_attribution_facebook">submitted via [facebook](%1$s)</string>
     <string name="quote_attribution_instagram">submitted via [instagram](%1$s)</string>
     <string name="rate_limited">You are being rate limited.</string>
+    <string name="rate_limited_retry_after">You are being rate limited, please try again in %1$s seconds</string>
     <string name="rating_request_body_android">Head over to the Play Store and leave us a rating. Every little bit helps!</string>
     <string name="rating_request_title">Enjoying Discord?</string>
     <string name="reaction_tooltip_1">%1$s reacted with %2$s</string>
@@ -3949,6 +3968,7 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="stream_ended">This stream has ended</string>
     <string name="stream_full_modal_body">Sorry, this stream has the max amount of viewers.</string>
     <string name="stream_full_modal_header">Stream is Full</string>
+    <string name="stream_issue_modal_header">Stream Issue</string>
     <string name="stream_network_quality_error">Your network connection may be causing a decrease in video and audio quality. To improve voice audio, disable the stream.</string>
     <string name="stream_no_preview">No preview available</string>
     <string name="stream_paused">Preview Paused</string>
@@ -4507,6 +4527,7 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="voice_unavailable">Voice Unavailable</string>
     <string name="watch">Watch</string>
     <string name="watch_stream">Watch Stream</string>
+    <string name="watch_stream_in_app">Go to the app to watch</string>
     <string name="watch_stream_streaming">You’re Streaming!</string>
     <string name="watch_stream_tip">**PROTIP:** Double click user to watch</string>
     <string name="watch_stream_watching">Watching Stream</string>

com.discord/smali/androidx/appcompat/R$drawable.smali

@@ -183,33 +183,33 @@
 
 .field public static final abc_vector_test:I = 0x7f080064
 
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
-.field public static final tooltip_frame_dark:I = 0x7f0803c4
+.field public static final tooltip_frame_dark:I = 0x7f0803c9
 
-.field public static final tooltip_frame_light:I = 0x7f0803c5
+.field public static final tooltip_frame_light:I = 0x7f0803ca
 
 
 # direct methods

com.discord/smali/androidx/appcompat/R$id.smali

@@ -65,165 +65,165 @@
 
 .field public static final buttonPanel:I = 0x7f0a00b4
 
-.field public static final checkbox:I = 0x7f0a01b9
+.field public static final checkbox:I = 0x7f0a01ba
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final content:I = 0x7f0a01d9
+.field public static final content:I = 0x7f0a01da
 
-.field public static final contentPanel:I = 0x7f0a01da
+.field public static final contentPanel:I = 0x7f0a01db
 
-.field public static final custom:I = 0x7f0a01ee
+.field public static final custom:I = 0x7f0a01ef
 
-.field public static final customPanel:I = 0x7f0a01ef
+.field public static final customPanel:I = 0x7f0a01f0
 
-.field public static final decor_content_parent:I = 0x7f0a01f3
+.field public static final decor_content_parent:I = 0x7f0a01f4
 
-.field public static final default_activity_button:I = 0x7f0a01f4
+.field public static final default_activity_button:I = 0x7f0a01f5
 
-.field public static final edit_query:I = 0x7f0a0247
+.field public static final edit_query:I = 0x7f0a0248
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final expand_activities_button:I = 0x7f0a0265
+.field public static final expand_activities_button:I = 0x7f0a0266
 
-.field public static final expanded_menu:I = 0x7f0a0266
+.field public static final expanded_menu:I = 0x7f0a0267
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final group_divider:I = 0x7f0a02bc
+.field public static final group_divider:I = 0x7f0a02bd
 
-.field public static final home:I = 0x7f0a0316
+.field public static final home:I = 0x7f0a0317
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final image:I = 0x7f0a031c
+.field public static final image:I = 0x7f0a031d
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final listMode:I = 0x7f0a03a1
+.field public static final listMode:I = 0x7f0a03a2
 
-.field public static final list_item:I = 0x7f0a03a2
+.field public static final list_item:I = 0x7f0a03a3
 
-.field public static final message:I = 0x7f0a0402
+.field public static final message:I = 0x7f0a0403
 
-.field public static final multiply:I = 0x7f0a040a
+.field public static final multiply:I = 0x7f0a040b
 
-.field public static final none:I = 0x7f0a041f
+.field public static final none:I = 0x7f0a0420
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final parentPanel:I = 0x7f0a0433
+.field public static final parentPanel:I = 0x7f0a0434
 
-.field public static final progress_circular:I = 0x7f0a04a7
+.field public static final progress_circular:I = 0x7f0a04a8
 
-.field public static final progress_horizontal:I = 0x7f0a04a9
+.field public static final progress_horizontal:I = 0x7f0a04aa
 
-.field public static final radio:I = 0x7f0a04b4
+.field public static final radio:I = 0x7f0a04b5
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final screen:I = 0x7f0a04fc
+.field public static final screen:I = 0x7f0a04fd
 
-.field public static final scrollIndicatorDown:I = 0x7f0a04fe
+.field public static final scrollIndicatorDown:I = 0x7f0a04ff
 
-.field public static final scrollIndicatorUp:I = 0x7f0a04ff
+.field public static final scrollIndicatorUp:I = 0x7f0a0500
 
-.field public static final scrollView:I = 0x7f0a0500
+.field public static final scrollView:I = 0x7f0a0501
 
-.field public static final search_badge:I = 0x7f0a0504
+.field public static final search_badge:I = 0x7f0a0505
 
-.field public static final search_bar:I = 0x7f0a0505
+.field public static final search_bar:I = 0x7f0a0506
 
-.field public static final search_button:I = 0x7f0a0506
+.field public static final search_button:I = 0x7f0a0507
 
-.field public static final search_close_btn:I = 0x7f0a0508
+.field public static final search_close_btn:I = 0x7f0a0509
 
-.field public static final search_edit_frame:I = 0x7f0a0509
+.field public static final search_edit_frame:I = 0x7f0a050a
 
-.field public static final search_go_btn:I = 0x7f0a050c
+.field public static final search_go_btn:I = 0x7f0a050d
 
-.field public static final search_mag_icon:I = 0x7f0a050e
+.field public static final search_mag_icon:I = 0x7f0a050f
 
-.field public static final search_plate:I = 0x7f0a050f
+.field public static final search_plate:I = 0x7f0a0510
 
-.field public static final search_src_text:I = 0x7f0a0512
+.field public static final search_src_text:I = 0x7f0a0513
 
-.field public static final search_voice_btn:I = 0x7f0a051e
+.field public static final search_voice_btn:I = 0x7f0a051f
 
-.field public static final select_dialog_listview:I = 0x7f0a051f
+.field public static final select_dialog_listview:I = 0x7f0a0520
 
-.field public static final shortcut:I = 0x7f0a063a
+.field public static final shortcut:I = 0x7f0a063b
 
-.field public static final spacer:I = 0x7f0a0645
+.field public static final spacer:I = 0x7f0a0646
 
-.field public static final split_action_bar:I = 0x7f0a0646
+.field public static final split_action_bar:I = 0x7f0a0647
 
-.field public static final src_atop:I = 0x7f0a0649
+.field public static final src_atop:I = 0x7f0a064a
 
-.field public static final src_in:I = 0x7f0a064a
+.field public static final src_in:I = 0x7f0a064b
 
-.field public static final src_over:I = 0x7f0a064b
+.field public static final src_over:I = 0x7f0a064c
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final submenuarrow:I = 0x7f0a0662
+.field public static final submenuarrow:I = 0x7f0a0663
 
-.field public static final submit_area:I = 0x7f0a0663
+.field public static final submit_area:I = 0x7f0a0664
 
-.field public static final tabMode:I = 0x7f0a066f
+.field public static final tabMode:I = 0x7f0a0670
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0679
+.field public static final textSpacerNoButtons:I = 0x7f0a067a
 
-.field public static final textSpacerNoTitle:I = 0x7f0a067a
+.field public static final textSpacerNoTitle:I = 0x7f0a067b
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0688
+.field public static final titleDividerNoCustom:I = 0x7f0a0689
 
-.field public static final title_template:I = 0x7f0a0689
+.field public static final title_template:I = 0x7f0a068a
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
-.field public static final topPanel:I = 0x7f0a068f
+.field public static final topPanel:I = 0x7f0a0690
 
-.field public static final uniform:I = 0x7f0a069f
+.field public static final uniform:I = 0x7f0a06a0
 
-.field public static final up:I = 0x7f0a06a2
+.field public static final up:I = 0x7f0a06a3
 
-.field public static final wrap_content:I = 0x7f0a0763
+.field public static final wrap_content:I = 0x7f0a0764
 
 
 # direct methods

com.discord/smali/androidx/appcompat/R$string.smali

@@ -93,9 +93,9 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f12002a
 
-.field public static final search_menu_title:I = 0x7f120e74
+.field public static final search_menu_title:I = 0x7f120e87
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/asynclayoutinflater/R$id.smali

@@ -29,47 +29,47 @@
 
 .field public static final blocking:I = 0x7f0a00ac
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
 
 # direct methods

com.discord/smali/androidx/asynclayoutinflater/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/browser/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/browser/R$id.smali

@@ -41,59 +41,59 @@
 
 .field public static final browser_actions_menu_view:I = 0x7f0a00b3
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final none:I = 0x7f0a041f
+.field public static final none:I = 0x7f0a0420
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
 
 # direct methods

com.discord/smali/androidx/browser/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/constraintlayout/widget/R$id.smali

@@ -17,31 +17,31 @@
 # static fields
 .field public static final bottom:I = 0x7f0a00ad
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final gone:I = 0x7f0a02bb
+.field public static final gone:I = 0x7f0a02bc
 
-.field public static final invisible:I = 0x7f0a033c
+.field public static final invisible:I = 0x7f0a033d
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final packed:I = 0x7f0a042f
+.field public static final packed:I = 0x7f0a0430
 
-.field public static final parent:I = 0x7f0a0432
+.field public static final parent:I = 0x7f0a0433
 
-.field public static final percent:I = 0x7f0a0465
+.field public static final percent:I = 0x7f0a0466
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final spread:I = 0x7f0a0647
+.field public static final spread:I = 0x7f0a0648
 
-.field public static final spread_inside:I = 0x7f0a0648
+.field public static final spread_inside:I = 0x7f0a0649
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
-.field public static final wrap:I = 0x7f0a0762
+.field public static final wrap:I = 0x7f0a0763
 
 
 # direct methods

com.discord/smali/androidx/coordinatorlayout/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/coordinatorlayout/R$id.smali

@@ -31,59 +31,59 @@
 
 .field public static final bottom:I = 0x7f0a00ad
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final none:I = 0x7f0a041f
+.field public static final none:I = 0x7f0a0420
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
 
 # direct methods

com.discord/smali/androidx/coordinatorlayout/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/core/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/core/R$id.smali

@@ -29,47 +29,47 @@
 
 .field public static final blocking:I = 0x7f0a00ac
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
 
 # direct methods

com.discord/smali/androidx/core/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/customview/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/customview/R$id.smali

@@ -29,47 +29,47 @@
 
 .field public static final blocking:I = 0x7f0a00ac
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
 
 # direct methods

com.discord/smali/androidx/customview/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/drawerlayout/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/drawerlayout/R$id.smali

@@ -29,47 +29,47 @@
 
 .field public static final blocking:I = 0x7f0a00ac
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
 
 # direct methods

com.discord/smali/androidx/drawerlayout/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/fragment/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/fragment/R$id.smali

@@ -31,59 +31,59 @@
 
 .field public static final bottom:I = 0x7f0a00ad
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final none:I = 0x7f0a041f
+.field public static final none:I = 0x7f0a0420
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
 
 # direct methods

com.discord/smali/androidx/fragment/R$string.smali

@@ -15,7 +15,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f30
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
 
 
 # direct methods

com.discord/smali/androidx/legacy/coreui/R$drawable.smali

@@ -15,29 +15,29 @@
 
 
 # static fields
-.field public static final notification_action_background:I = 0x7f0803b4
+.field public static final notification_action_background:I = 0x7f0803b9
 
-.field public static final notification_bg:I = 0x7f0803b5
+.field public static final notification_bg:I = 0x7f0803ba
 
-.field public static final notification_bg_low:I = 0x7f0803b6
+.field public static final notification_bg_low:I = 0x7f0803bb
 
-.field public static final notification_bg_low_normal:I = 0x7f0803b7
+.field public static final notification_bg_low_normal:I = 0x7f0803bc
 
-.field public static final notification_bg_low_pressed:I = 0x7f0803b8
+.field public static final notification_bg_low_pressed:I = 0x7f0803bd
 
-.field public static final notification_bg_normal:I = 0x7f0803b9
+.field public static final notification_bg_normal:I = 0x7f0803be
 
-.field public static final notification_bg_normal_pressed:I = 0x7f0803ba
+.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
 
-.field public static final notification_icon_background:I = 0x7f0803bb
+.field public static final notification_icon_background:I = 0x7f0803c0
 
-.field public static final notification_template_icon_bg:I = 0x7f0803bc
+.field public static final notification_template_icon_bg:I = 0x7f0803c1
 
-.field public static final notification_template_icon_low_bg:I = 0x7f0803bd
+.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
 
-.field public static final notification_tile_bg:I = 0x7f0803be
+.field public static final notification_tile_bg:I = 0x7f0803c3
 
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803bf
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
 
 
 # direct methods

com.discord/smali/androidx/legacy/coreui/R$id.smali

@@ -31,59 +31,59 @@
 
 .field public static final bottom:I = 0x7f0a00ad
 
-.field public static final chronometer:I = 0x7f0a01bd
+.field public static final chronometer:I = 0x7f0a01be
 
-.field public static final end:I = 0x7f0a025f
+.field public static final end:I = 0x7f0a0260
 
-.field public static final forever:I = 0x7f0a0287
+.field public static final forever:I = 0x7f0a0288
 
-.field public static final icon:I = 0x7f0a0318
+.field public static final icon:I = 0x7f0a0319
 
-.field public static final icon_group:I = 0x7f0a0319
+.field public static final icon_group:I = 0x7f0a031a
 
-.field public static final info:I = 0x7f0a032e
+.field public static final info:I = 0x7f0a032f
 
-.field public static final italic:I = 0x7f0a035b
+.field public static final italic:I = 0x7f0a035c
 
-.field public static final left:I = 0x7f0a039c
+.field public static final left:I = 0x7f0a039d
 
-.field public static final line1:I = 0x7f0a039e
+.field public static final line1:I = 0x7f0a039f
 
-.field public static final line3:I = 0x7f0a039f
+.field public static final line3:I = 0x7f0a03a0
 
-.field public static final none:I = 0x7f0a041f
+.field public static final none:I = 0x7f0a0420
 
-.field public static final normal:I = 0x7f0a0420
+.field public static final normal:I = 0x7f0a0421
 
-.field public static final notification_background:I = 0x7f0a0427
+.field public static final notification_background:I = 0x7f0a0428
 
-.field public static final notification_main_column:I = 0x7f0a0428
+.field public static final notification_main_column:I = 0x7f0a0429
 
-.field public static final notification_main_column_container:I = 0x7f0a0429
+.field public static final notification_main_column_container:I = 0x7f0a042a
 
-.field public static final right:I = 0x7f0a04cc
+.field public static final right:I = 0x7f0a04cd
 
-.field public static final right_icon:I = 0x7f0a04cd
+.field public static final right_icon:I = 0x7f0a04ce
 
-.field public static final right_side:I = 0x7f0a04ce
+.field public static final right_side:I = 0x7f0a04cf
 
-.field public static final start:I = 0x7f0a064d
+.field public static final start:I = 0x7f0a064e
 
-.field public static final tag_transition_group:I = 0x7f0a0670
+.field public static final tag_transition_group:I = 0x7f0a0671
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0671
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0672
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0672
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0673
 
-.field public static final text:I = 0x7f0a0677
+.field public static final text:I = 0x7f0a0678
 
-.field public static final text2:I = 0x7f0a0678
+.field public static final text2:I = 0x7f0a0679
 
-.field public static final time:I = 0x7f0a0686
+.field public static final time:I = 0x7f0a0687
 
-.field public static final title:I = 0x7f0a0687
+.field public static final title:I = 0x7f0a0688
 
-.field public static final top:I = 0x7f0a068e
+.field public static final top:I = 0x7f0a068f
 
 
 # direct methods