Changes of com.discord v1047

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1046.apk
+apkFileName: com.discord-1047.apk
 compressionType: false
 doNotCompress:
 - arsc
@@ -190,5 +190,5 @@ usesFramework:
   tag: null
 version: 2.4.1-197d46-SNAPSHOT
 versionInfo:
-  versionCode: '1046'
+  versionCode: '1047'
-  versionName: '11.5'
+  versionName: 12.0-alpha1

com.discord/assets/crashlytics-build.properties

@@ -3,9 +3,9 @@
 #
 #Do NOT modify, delete, or commit to source control!
 #
-#Sat Feb 29 19:25:27 UTC 2020
+#Sun Mar 01 06:09:59 UTC 2020
-version_name=11.5
+version_name=12.0-alpha1
 package_name=com.discord
-build_id=e26ad91d-880c-4db3-ad60-1491332f6af0
+build_id=3c92e1ef-e60a-486b-ac71-6014623c2631
-version_code=1046
+version_code=1047
 app_name=com.discord

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0H16V16H0V0Z M 0,0" />
+        <path android:fillColor="#ff000000" android:pathData="M14.6667,2H16.6667V3.3333H14.6667V5.3333H13.3333V3.3333H11.3333V2H13.3333V0H14.6667V2ZM7.3333,8C8.8033,8 10,6.8033 10,5.3333C10,3.8633 8.8033,2.6667 7.3333,2.6667C5.8633,2.6667 4.6667,3.8633 4.6667,5.3333C4.6667,6.8033 5.8633,8 7.3333,8ZM7.3333,8.6667C4.1927,8.6667 2,10.3113 2,12.6667V13.3333H12.6667V12.6667C12.6667,10.3113 10.474,8.6667 7.3333,8.6667Z" android:fillType="evenOdd" />
+    </group>
+</vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:autoMirrored="true" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M26.0693,4.1412C26.4827,3.9346 26.9733,3.9559 27.3667,4.1999C27.76,4.4412 28,4.8706 28,5.3332V22.6665C28,23.2225 27.656,23.7212 27.136,23.9159L17.3333,27.5919V8.5092L26.0693,4.1412ZM14.6667,8.5091L5.9293,4.1399C5.5187,3.9346 5.0253,3.9559 4.6333,4.1999C4.24,4.4412 4,4.8706 4,5.3332V22.6665C4,23.2225 4.3453,23.7199 4.864,23.9159L14.6667,27.5919V8.5091ZM18.6667,15.9999L26.6667,11.9999V7.9999L18.6667,11.9999V15.9999Z" android:fillType="evenOdd" />
+</vector>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ff000000" android:pathData="M12,22C12.4883,22 12.9684,21.965 13.438,21.8974C12.5414,20.8489 12,19.4877 12,18C12,17.6593 12.0284,17.3252 12.083,17H6V16.0244C6,14.0732 10,13 12,13C12.6215,13 13.436,13.1036 14.2637,13.305C15.2888,12.4882 16.5874,12 18,12C19.4877,12 20.8489,12.5414 21.8974,13.438C21.965,12.9684 22,12.4883 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,12C13.66,12 15,10.66 15,9C15,7.34 13.66,6 12,6C10.34,6 9,7.34 9,9C9,10.66 10.34,12 12,12Z" android:fillType="evenOdd" />
+    <path android:fillColor="#ff000000" android:pathData="M18,22C20.2091,22 22,20.2091 22,18C22,15.7909 20.2091,14 18,14C15.7909,14 14,15.7909 14,18C14,20.2091 15.7909,22 18,22Z" />
+</vector>

com.discord/res/drawable/drawable_circle_background_secondary.xml

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

com.discord/res/drawable/drawable_guild_template_create.xml

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

com.discord/res/drawable/drawable_guild_template_creator.xml

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

com.discord/res/drawable/drawable_guild_template_friend.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#ff19b491" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_friend_wave_16dp" android:left="8.0dip" android:top="8.0dip" android:right="8.0dip" android:bottom="8.0dip" />
+</layer-list>

com.discord/res/drawable/drawable_guild_template_gaming.xml

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

com.discord/res/drawable/drawable_guild_template_hobby.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#ff0067e0" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_hobby_16dp" android:left="8.0dip" android:top="8.0dip" android:right="8.0dip" android:bottom="8.0dip" />
+</layer-list>

com.discord/res/drawable/drawable_guild_template_study.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#ffefbc12" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_book_16dp" android:left="8.0dip" android:top="8.0dip" android:right="8.0dip" android:bottom="8.0dip" />
+</layer-list>

com.discord/res/drawable/guild_use_cases_gaming_32dp.xml

@@ -6,5 +6,5 @@
             <solid android:color="@color/status_red_500" />
         </shape>
     </item>
-    <item android:gravity="center" android:height="16.0dip" android:width="16.0dip" android:drawable="@drawable/ic_game_controller_white_16dp" />
+    <item android:gravity="center" android:height="16.0dip" android:width="16.0dip" android:drawable="@drawable/ic_game_controller_16dp" />
 </layer-list>

com.discord/res/drawable/ic_add_circle_filled_16dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M16.0001,2.668C8.6481,2.668 2.6667,8.6493 2.6667,16.0013C2.6667,23.3533 8.6481,29.3346 16.0001,29.3346C23.3521,29.3346 29.3334,23.3533 29.3334,16.0013C29.3334,8.6493 23.3521,2.668 16.0001,2.668ZM22.6667,17.3346H17.3334V22.668H14.6667V17.3346H9.3334V14.668H14.6667V9.3346H17.3334V14.668H22.6667V17.3346Z" />
+</vector>

com.discord/res/drawable/ic_content_creator_16dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M28.7014,10.8654C28.3081,10.6214 27.8161,10.6014 27.4041,10.8067L24.0001,12.5094V9.3334C24.0001,7.8628 22.8041,6.6667 21.3334,6.6667H5.3334C3.8628,6.6667 2.6667,7.8628 2.6667,9.3334V22.6667C2.6667,24.1387 3.8628,25.3334 5.3334,25.3334H21.3334C22.8041,25.3334 24.0001,24.1387 24.0001,22.6667V19.4907L27.4041,21.1921C27.5921,21.2867 27.7961,21.3334 28.0001,21.3334C28.2441,21.3334 28.4867,21.2654 28.7014,21.1347C29.0934,20.8907 29.3334,20.4627 29.3334,20.0001V12.0001C29.3334,11.5374 29.0934,11.1094 28.7014,10.8654Z" />
+</vector>

com.discord/res/drawable/ic_friend_wave_16dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:autoMirrored="true" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M2.6667,5.3333V7.3333C2.6667,12.8666 5.6134,17.7066 10.0001,20.3999V26.6666H30.0001V23.9999C30.0001,20.4533 22.8934,18.6666 19.3334,18.6666C19.3334,18.6666 19.1067,18.6666 19.0001,18.6666C12.6667,18.6666 7.3334,13.3333 7.3334,7.3333V5.3333H2.6667ZM19.3334,5.3333C16.3879,5.3333 14.0001,7.7211 14.0001,10.6666C14.0001,13.6121 16.3879,15.9999 19.3334,15.9999C22.2789,15.9999 24.6667,13.6121 24.6667,10.6666C24.6667,7.7211 22.2789,5.3333 19.3334,5.3333Z" />
+</vector>

com.discord/res/drawable/ic_game_controller_16dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M7.5532,6.6667H24.4468C26.5438,6.6667 28.2848,8.2863 28.4363,10.3778L29.3242,22.6366C29.4245,24.022 28.3827,25.2265 26.9973,25.3268C26.9368,25.3312 26.8762,25.3334 26.8156,25.3334C25.2253,25.3334 23.838,24.2539 23.4473,22.7124L22.7597,20.0001H9.2402L8.5527,22.7124C8.1619,24.2539 6.7746,25.3334 5.1843,25.3334C3.7953,25.3334 2.6692,24.2073 2.6692,22.8183C2.6692,22.7576 2.6714,22.697 2.6758,22.6366L3.5636,10.3778C3.7151,8.2863 5.4561,6.6667 7.5532,6.6667ZM19.3334,13.3334C20.4379,13.3334 21.3334,12.438 21.3334,11.3334C21.3334,10.2288 20.4379,9.3334 19.3334,9.3334C18.2288,9.3334 17.3334,10.2288 17.3334,11.3334C17.3334,12.438 18.2288,13.3334 19.3334,13.3334ZM24.6667,17.3334C25.7713,17.3334 26.6667,16.438 26.6667,15.3334C26.6667,14.2288 25.7713,13.3334 24.6667,13.3334C23.5621,13.3334 22.6667,14.2288 22.6667,15.3334C22.6667,16.438 23.5621,17.3334 24.6667,17.3334ZM8,12.0001H5.3334V14.6667H8V17.3334H10.6667V14.6667H13.3334V12.0001H10.6667V9.3334H8V12.0001Z" />
+</vector>

com.discord/res/drawable/ic_game_controller_white_16dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="16.0" android:viewportHeight="16.0"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffffff" android:pathData="M3.7766,3.3333H12.2234C13.2719,3.3333 14.1424,4.1431 14.2182,5.1889L14.6621,11.3182C14.7123,12.011 14.1914,12.6132 13.4986,12.6634C13.4684,12.6656 13.4381,12.6667 13.4078,12.6667C12.6127,12.6667 11.919,12.1269 11.7236,11.3562L11.3799,10H4.6201L4.2763,11.3562C4.0809,12.1269 3.3873,12.6667 2.5922,12.6667C1.8976,12.6667 1.3346,12.1036 1.3346,11.4091C1.3346,11.3788 1.3357,11.3485 1.3379,11.3182L1.7818,5.1889C1.8576,4.1431 2.7281,3.3333 3.7766,3.3333ZM9.6667,6.6667C10.219,6.6667 10.6667,6.2189 10.6667,5.6667C10.6667,5.1144 10.219,4.6667 9.6667,4.6667C9.1144,4.6667 8.6667,5.1144 8.6667,5.6667C8.6667,6.2189 9.1144,6.6667 9.6667,6.6667ZM12.3333,8.6667C12.8856,8.6667 13.3333,8.219 13.3333,7.6667C13.3333,7.1144 12.8856,6.6667 12.3333,6.6667C11.7811,6.6667 11.3333,7.1144 11.3333,7.6667C11.3333,8.219 11.7811,8.6667 12.3333,8.6667ZM4,6H2.6667V7.3333H4V8.6667H5.3333V7.3333H6.6667V6H5.3333V4.6667H4V6Z" />
-</vector>

com.discord/res/drawable/ic_hobby_16dp.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="16.0dip" android:width="16.0dip" android:viewportWidth="32.0" android:viewportHeight="32.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M11.0001,4.6667C11.0001,3.1933 9.8054,2 8.3334,2C6.8614,2 5.6667,3.1933 5.6667,4.6667V8.6667H11.0001V4.6667Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M11,10H5.6667C5.6667,14 3,15.3333 3,20.6667C3,26 5.6667,30 7,30H9.6667C10.3653,30 11.4293,28.8933 12.2853,27.0787C11.4653,25.5693 11,23.8387 11,22C11,19.7867 11.6747,17.7293 12.8307,16.0253C12.0493,13.9693 11,12.5093 11,10Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M21.6667,14C17.2481,14 13.6667,17.5813 13.6667,22C13.6667,26.4187 17.2481,30 21.6667,30C26.0854,30 29.6667,26.4187 29.6667,22C29.6667,17.5813 26.0841,14 21.6667,14ZM19.0001,19.3333C18.2627,19.3333 17.6667,18.7373 17.6667,18C17.6667,17.2627 18.2627,16.6667 19.0001,16.6667C19.7374,16.6667 20.3334,17.2627 20.3334,18C20.3334,18.7373 19.7374,19.3333 19.0001,19.3333ZM21.6667,23.3333C20.9294,23.3333 20.3334,22.7373 20.3334,22C20.3334,21.2627 20.9294,20.6667 21.6667,20.6667C22.4041,20.6667 23.0001,21.2627 23.0001,22C23.0001,22.7373 22.4041,23.3333 21.6667,23.3333ZM24.3334,19.3333C23.5961,19.3333 23.0001,18.7373 23.0001,18C23.0001,17.2627 23.5961,16.6667 24.3334,16.6667C25.0707,16.6667 25.6667,17.2627 25.6667,18C25.6667,18.7373 25.0707,19.3333 24.3334,19.3333Z" />
+</vector>

com.discord/res/drawable/ic_tab_friends.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M2,4V5.5C2,9.65 4.21,13.28 7.5,15.3V20H22.5V18C22.5,15.34 17.17,14 14.5,14C14.5,14 14.33,14 14.25,14C9.5,14 5.5,10 5.5,5.5V4H2ZM14.5,4C12.2909,4 10.5,5.7909 10.5,8C10.5,10.2091 12.2909,12 14.5,12C16.7091,12 18.5,10.2091 18.5,8C18.5,5.7909 16.7091,4 14.5,4Z" />
+</vector>

com.discord/res/drawable/ic_tab_home.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M9.9315,10.5885C9.2801,10.5885 8.7658,11.16 8.7658,11.8571C8.7658,12.5543 9.2915,13.1257 9.9315,13.1257C10.583,13.1257 11.0972,12.5543 11.0972,11.8571C11.1087,11.16 10.583,10.5885 9.9315,10.5885ZM14.103,10.5885C13.4515,10.5885 12.9372,11.16 12.9372,11.8571C12.9372,12.5543 13.463,13.1257 14.103,13.1257C14.7544,13.1257 15.2687,12.5543 15.2687,11.8571C15.2687,11.16 14.7544,10.5885 14.103,10.5885Z" />
+    <path android:fillColor="#ffffffff" android:pathData="M19.6571,1H4.3429C3.0514,1 2,2.0514 2,3.3543V18.8057C2,20.1086 3.0514,21.16 4.3429,21.16H17.3029L16.6971,19.0457L18.16,20.4057L19.5429,21.6857L22,23.8571V3.3543C22,2.0514 20.9486,1 19.6571,1ZM15.2457,15.9257C15.2457,15.9257 14.8343,15.4343 14.4914,15C15.9886,14.5771 16.56,13.64 16.56,13.64C16.0914,13.9486 15.6457,14.1657 15.2457,14.3143C14.6743,14.5543 14.1257,14.7143 13.5886,14.8057C12.4914,15.0114 11.4857,14.9543 10.6286,14.7943C9.9771,14.6686 9.4171,14.4857 8.9486,14.3029C8.6857,14.2 8.4,14.0743 8.1143,13.9143C8.08,13.8914 8.0457,13.88 8.0114,13.8571C7.9886,13.8457 7.9771,13.8343 7.9657,13.8229C7.76,13.7086 7.6457,13.6286 7.6457,13.6286C7.6457,13.6286 8.1943,14.5429 9.6457,14.9771C9.3029,15.4114 8.88,15.9257 8.88,15.9257C6.3543,15.8457 5.3943,14.1886 5.3943,14.1886C5.3943,10.5086 7.04,7.5257 7.04,7.5257C8.6857,6.2914 10.2514,6.3257 10.2514,6.3257L10.3657,6.4629C8.3086,7.0571 7.36,7.96 7.36,7.96C7.36,7.96 7.6114,7.8229 8.0343,7.6286C9.2571,7.0914 10.2286,6.9429 10.6286,6.9086C10.6971,6.8971 10.7543,6.8857 10.8229,6.8857C11.52,6.7943 12.3086,6.7714 13.1314,6.8629C14.2171,6.9886 15.3829,7.3086 16.5714,7.96C16.5714,7.96 15.6686,7.1029 13.7257,6.5086L13.8857,6.3257C13.8857,6.3257 15.4514,6.2914 17.0971,7.5257C17.0971,7.5257 18.7429,10.5086 18.7429,14.1886C18.7429,14.1886 17.7714,15.8457 15.2457,15.9257Z" />
+</vector>

com.discord/res/drawable/ic_tab_mentions.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M12,2C6.486,2 2,6.486 2,12C2,17.515 6.486,22 12,22C14.039,22 15.993,21.398 17.652,20.259L16.521,18.611C15.195,19.519 13.633,20 12,20C7.589,20 4,16.411 4,12C4,7.589 7.589,4 12,4C16.411,4 20,7.589 20,12V12.782C20,14.17 19.402,15 18.4,15L18.398,15.018C18.338,15.005 18.273,15 18.209,15H18C17.437,15 16.6,14.182 16.6,13.631V12C16.6,9.464 14.537,7.4 12,7.4C9.463,7.4 7.4,9.463 7.4,12C7.4,14.537 9.463,16.6 12,16.6C13.234,16.6 14.35,16.106 15.177,15.313C15.826,16.269 16.93,17 18,17L18.002,16.981C18.064,16.994 18.129,17 18.195,17H18.4C20.552,17 22,15.306 22,12.782V12C22,6.486 17.514,2 12,2ZM12,14.599C10.566,14.599 9.4,13.433 9.4,11.999C9.4,10.565 10.566,9.399 12,9.399C13.434,9.399 14.6,10.565 14.6,11.999C14.6,13.433 13.434,14.599 12,14.599Z" />
+</vector>

com.discord/res/drawable/ic_tab_search.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffffff" android:pathData="M21.707,20.293L16.314,14.9C17.403,13.504 18,11.799 18,10C18,7.863 17.167,5.854 15.656,4.344C14.146,2.832 12.137,2 10,2C7.863,2 5.854,2.832 4.344,4.344C2.833,5.854 2,7.863 2,10C2,12.137 2.833,14.146 4.344,15.656C5.854,17.168 7.863,18 10,18C11.799,18 13.504,17.404 14.9,16.314L20.293,21.706L21.707,20.293ZM10,16C8.397,16 6.891,15.376 5.758,14.243C4.624,13.11 4,11.603 4,10C4,8.398 4.624,6.891 5.758,5.758C6.891,4.624 8.397,4 10,4C11.603,4 13.109,4.624 14.242,5.758C15.376,6.891 16,8.398 16,10C16,11.603 15.376,13.11 14.242,14.243C13.109,15.376 11.603,16 10,16Z" />
+</vector>

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

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

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

@@ -4,9 +4,9 @@
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <TextView android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />

com.discord/res/layout/audio_output_selection_dialog.xml

@@ -3,9 +3,9 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:id="@id/audio_output_selection_dialog_header" android:background="?colorBackgroundTertiary" android:text="@string/audio_devices_output_selection_prompt" style="@style/UiKit.ListItem" />
     <RadioGroup android:id="@id/audio_output_selection_dialog_radio_group" style="@style/UiKit.ViewGroup.LinearLayout">
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_bluetooth_radio" android:text="@string/audio_devices_bluetooth" android:drawableEnd="@drawable/ic_bluetooth_24dp" style="@style/UiKit.RadioButtonListItem" />
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_bluetooth_radio" android:text="@string/audio_devices_bluetooth" android:drawableEnd="@drawable/ic_bluetooth_24dp" style="@style/UiKit.ListItem.Icon.Radio" />
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_speaker_radio" android:text="@string/audio_devices_speaker" android:drawableEnd="@drawable/ic_sound_24dp" style="@style/UiKit.RadioButtonListItem" />
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_speaker_radio" android:text="@string/audio_devices_speaker" android:drawableEnd="@drawable/ic_sound_24dp" style="@style/UiKit.ListItem.Icon.Radio" />
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_wired_radio" android:text="@string/audio_devices_wired" android:drawableEnd="@drawable/ic_headset_24dp" style="@style/UiKit.RadioButtonListItem" />
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_wired_radio" android:text="@string/audio_devices_wired" android:drawableEnd="@drawable/ic_headset_24dp" style="@style/UiKit.ListItem.Icon.Radio" />
-        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_earpiece_radio" android:text="@string/audio_devices_earpiece" android:drawableEnd="@drawable/ic_phone_24dp" style="@style/UiKit.RadioButtonListItem" />
+        <com.google.android.material.radiobutton.MaterialRadioButton android:id="@id/audio_output_selection_earpiece_radio" android:text="@string/audio_devices_earpiece" android:drawableEnd="@drawable/ic_phone_24dp" style="@style/UiKit.ListItem.Icon.Radio" />
     </RadioGroup>
 </LinearLayout>

com.discord/res/layout/guild_role_chip.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextView.Subtext.Semibold" android:textColor="?colorTextNormal" android:ellipsize="end" android:maxLines="1" app:chipBackgroundColor="?colorBackgroundTertiary" app:chipCornerRadius="4.0dip" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12.0sp" app:chipStartPadding="@dimen/uikit_spacing_medium" app:ensureMinTouchTargetSize="false" style="@style/UiKit.TextView"
+<com.google.android.material.chip.Chip android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:ellipsize="end" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:chipBackgroundColor="?colorBackgroundTertiary" app:chipCornerRadius="4.0dip" app:chipIcon="@drawable/drawable_circle_white_12dp" app:chipIconSize="12.0sp" app:chipStartPadding="@dimen/uikit_spacing_medium" app:ensureMinTouchTargetSize="false"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" />

com.discord/res/layout/guild_role_item.xml

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

com.discord/res/layout/layout_search.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center_vertical" android:background="?search_action_bar_bg" android:layout_height="44.0dip" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:id="@id/search_back" android:padding="@dimen/uikit_spacing_medium" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="?theme_search_back_arrow" android:contentDescription="@string/back" style="@style/UiKit.ImageView.Clickable" />
+    <ImageView android:id="@id/search_back" android:padding="@dimen/uikit_spacing_medium" android:src="?theme_search_back_arrow" android:contentDescription="@string/back" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.ImageView.Clickable" />
-    <EditText android:id="@id/search_input" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.SearchInput">
+    <EditText android:id="@id/search_input" android:layout_width="0.0dip" android:layout_weight="1.0" android:layout_marginStart="@dimen/uikit_spacing_medium" style="@style/UiKit.SearchInput">
         <requestFocus />
     </EditText>
     <ImageView android:id="@id/search_clear" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_marginLeft="@dimen/uikit_spacing_medium" android:layout_marginRight="@dimen/uikit_spacing_medium" android:src="?theme_search_clear_icon" android:contentDescription="@string/reset" style="@style/UiKit.ImageView.Clickable" />

com.discord/res/layout/tabs_host_bottom_navigation_view.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout android:background="?colorBackgroundFloating" android:layout_width="fill_parent" android:layout_height="wrap_content"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <LinearLayout android:layout_gravity="center_horizontal" android:id="@id/tabs_host_bottom_nav_tabs_container" android:background="?colorBackgroundFloating" android:weightSum="5.0" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+        <FrameLayout android:id="@id/tabs_host_bottom_nav_home_item" style="@style/TabsHostBottomNavItem">
+            <ImageView android:id="@id/tabs_host_bottom_nav_home_icon" android:src="@drawable/ic_tab_home" style="@style/TabsHostBottomNavIcon" />
+        </FrameLayout>
+        <FrameLayout android:id="@id/tabs_host_bottom_nav_friends_item" style="@style/TabsHostBottomNavItem">
+            <ImageView android:id="@id/tabs_host_bottom_nav_friends_icon" android:src="@drawable/ic_tab_friends" style="@style/TabsHostBottomNavIcon" />
+        </FrameLayout>
+        <FrameLayout android:id="@id/tabs_host_bottom_nav_search_item" style="@style/TabsHostBottomNavItem">
+            <ImageView android:id="@id/tabs_host_bottom_nav_search_icon" android:src="@drawable/ic_tab_search" style="@style/TabsHostBottomNavIcon" />
+        </FrameLayout>
+        <FrameLayout android:id="@id/tabs_host_bottom_nav_mentions_item" style="@style/TabsHostBottomNavItem">
+            <ImageView android:id="@id/tabs_host_bottom_nav_mentions_icon" android:src="@drawable/ic_tab_mentions" style="@style/TabsHostBottomNavIcon" />
+        </FrameLayout>
+        <FrameLayout android:id="@id/tabs_host_bottom_nav_user_settings_item" style="@style/TabsHostBottomNavItem">
+            <com.discord.views.user.UserAvatarPresenceView android:layout_gravity="center" android:id="@id/tabs_host_bottom_nav_user_avatar_presence_view" android:layout_width="24.0dip" android:layout_height="24.0dip" app:user_avatar_background_color="?colorBackgroundFloating" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>

com.discord/res/layout/user_avatar_presence_view.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:id="@id/user_avatar_presence_container" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout"
+<RelativeLayout android:id="@id/user_avatar_presence_container" android:layout_width="fill_parent" style="@style/UiKit.ViewGroup.RelativeLayout"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_avatar" android:layout_centerVertical="true" app:roundWithOverlayColor="?primary_700" style="@style/Avatar.XXLarge" />
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/user_avatar_presence_avatar" android:layout_width="fill_parent" android:layout_height="fill_parent" app:actualImageScaleType="fitCenter" app:placeholderImage="@drawable/asset_default_avatar_80dp" app:roundWithOverlayColor="?primary_700" />
     <com.discord.views.StatusView android:id="@id/user_avatar_presence_status" android:layout_width="27.0dip" android:layout_height="wrap_content" android:layout_alignBottom="@id/user_avatar_presence_avatar" android:translationX="3.0dip" android:translationY="3.0dip" android:layout_alignEnd="@id/user_avatar_presence_avatar" app:sv_background_color="?colorBackgroundTertiary" app:sv_border_width="3.0dip" app:sv_corner_radius="4.0dip" />
 </RelativeLayout>

com.discord/res/layout/user_profile_header_view.xml

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

com.discord/res/layout/user_profile_voice_settings_view.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView android:text="@string/user_profile_volume" style="@style/UiKit.ListItem" />
+    <TextView android:id="@id/user_sheet_volume_label" android:text="@string/user_profile_volume" style="@style/UiKit.ListItem" />
-    <LinearLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+    <LinearLayout android:id="@id/user_sheet_volume_wrap" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:src="?ic_volume_mute" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
         <SeekBar android:id="@id/user_sheet_volume" android:layout_width="0.0dip" android:layout_height="wrap_content" android:maxHeight="8.0dip" android:max="100" android:progressDrawable="@drawable/drawable_settings_progress" android:thumb="@drawable/drawable_thumb_white" android:layout_weight="1.0" android:splitTrack="false" />
         <ImageView android:src="?ic_volume_up" android:contentDescription="@string/sample_empty_string" style="@style/UiKit.ImageView" />
     </LinearLayout>
-    <androidx.appcompat.widget.SwitchCompat android:id="@id/user_sheet_muted" android:text="@string/mute" style="@style/UiKit.ListItem" />
+    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/user_sheet_muted" android:text="@string/mute" style="@style/UiKit.ListItem.Switch" />
+    <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/user_sheet_deafen" android:text="@string/deafen" style="@style/UiKit.ListItem.Switch" />
 </LinearLayout>

com.discord/res/layout/view_channel_override_item.xml

@@ -4,7 +4,7 @@
     <androidx.constraintlayout.widget.Guideline android:id="@id/guideline" app:layout_constraintGuide_begin="@dimen/uikit_guideline_item_row" style="@style/UiKit.Guideline" />
     <ImageView android:padding="@dimen/uikit_spacing_medium" android:layout_margin="@dimen/uikit_spacing_medium" android:src="?ic_channel_text" android:contentDescription="@string/text_channel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <TextView android:id="@id/channel_override_name" app:layout_constraintBottom_toTopOf="@id/channel_override_category_name" app:layout_constraintEnd_toStartOf="@id/channel_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <TextView android:id="@id/channel_override_category_name" android:visibility="gone" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/channel_override_name" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/channel_override_category_name" android:visibility="gone" android:lineSpacingMultiplier="1.0" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/channel_override_status" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/channel_override_name" style="@style/UiKit.TextView.Subtext.SingleLine" />
     <com.discord.app.AppTextView android:textColor="?primary_100" android:id="@id/channel_override_status" android:padding="@dimen/uikit_spacing_small" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/navigation_indicator" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
     <ImageView android:id="@id/navigation_indicator" android:layout_margin="@dimen/uikit_spacing_medium" android:src="@drawable/ic_chevron_right_grey_12dp" android:contentDescription="@string/form_label_channel_notifcation_settings" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/view_global_search_item.xml

@@ -5,7 +5,7 @@
     <ImageView android:id="@id/item_unread" android:src="@drawable/ic_unread_white_9dp" android:contentDescription="@string/new_unreads" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.ImageView" />
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:padding="@dimen/uikit_spacing_xsmall" android:layout_width="@dimen/avatar_size_standard" android:layout_height="@dimen/avatar_size_standard" android:layout_margin="@dimen/uikit_spacing_small" android:contentDescription="@string/text_channel" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintDimensionRatio="1:1" app:layout_constraintEnd_toStartOf="@id/guideline" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/ic_channel_text_grey_18dp" app:placeholderImageScaleType="centerInside" app:roundAsCircle="true" style="@style/UiKit.ImageView" />
     <androidx.appcompat.widget.AppCompatTextView android:textSize="@dimen/uikit_textsize_medium" android:id="@id/item_name_tv" android:layout_width="0.0dip" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/item_description_tv" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Large.SingleLine" />
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <androidx.appcompat.widget.AppCompatTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/item_description_tv" android:visibility="gone" android:layout_width="0.0dip" android:textAllCaps="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_group_tv" app:layout_constraintStart_toStartOf="@id/item_name_tv" app:layout_constraintTop_toBottomOf="@id/item_name_tv" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
     <androidx.appcompat.widget.AppCompatTextView android:gravity="end" android:id="@id/item_group_tv" android:textAlignment="viewEnd" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/item_mentions_tv" app:layout_constraintRight_toLeftOf="@id/item_mentions_tv" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_max="140.0dip" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxxlarge" app:layout_goneMarginEnd="@dimen/uikit_spacing_medium" app:layout_goneMarginRight="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView.Subtext.SingleLine" />
     <androidx.appcompat.widget.AppCompatTextView android:id="@id/item_mentions_tv" android:visibility="gone" android:text="@string/sample_number_99" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Icon.Mentions.Large" />
 </merge>

com.discord/res/layout/view_server_settings_icon_name.xml

@@ -4,8 +4,8 @@
     <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.XXLarge" />
     <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.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" 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" />
-    <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="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_label" style="@style/UiKit.TextView.Subtext.Semibold" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="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_label" style="@style/UiKit.TextView.Subtext" />
     <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginTop="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/server_settings_overview_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/server_settings_overview_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/server_settings_overview_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">
         <EditText android:id="@id/server_settings_overview_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_server_name" style="@style/UiKit.Form.Field.EditText" />
     </com.google.android.material.textfield.TextInputLayout>

com.discord/res/layout/view_server_settings_public_setting_selector.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge android:id="@id/server_settings_public_setting_selector" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_alignParentStart="true" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:id="@id/server_settings_public_setting_selector_title" android:text="@string/enable_public_modal_rules_channel_title" style="@style/UiKit.Settings.Item.Label" />
+            <TextView android:id="@id/server_settings_public_setting_selector_subtitle" android:drawablePadding="@dimen/uikit_spacing_xsmall" android:drawableStart="@drawable/ic_channel_text_16dp" style="@style/UiKit.Settings.Item.Addition" />
+        </LinearLayout>
+        <ImageView android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_chevron_down_grey_12dp" android:layout_centerVertical="true" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" />
+    </RelativeLayout>
+    <TextView android:id="@id/server_settings_public_setting_selector_description" android:text="@string/enable_public_modal_rules_channel_help" style="@style/UiKit.Settings.Item.SubText" />
+</merge>

com.discord/res/layout/view_server_settings_upload_banner.xml

@@ -8,7 +8,7 @@
         <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_banner_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
         <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_banner_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="@dimen/uikit_spacing_medium" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
     </FrameLayout>
-    <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_banner_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
     <TextView android:id="@id/server_settings_overview_upload_banner_nitro_tier" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
     <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/form_help_server_banner" style="@style/UiKit.Settings.Item.SubText" />
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_banner_learn_more" android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_banner_recommend" style="@style/UiKit.Settings.Item.SubText" />

com.discord/res/layout/view_server_settings_upload_splash.xml

@@ -8,7 +8,7 @@
         <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@id/server_settings_overview_upload_splash_fab" android:focusable="false" android:clickable="false" android:src="@drawable/ic_upload_image_40dp" android:scaleType="centerCrop" android:contentDescription="@string/sample_empty_string" app:backgroundTint="@color/white" app:fabCustomSize="@dimen/uikit_spacing_xxlarge" app:maxImageSize="@dimen/uikit_spacing_xxlarge" style="@style/Settings.FloatingActionButton" />
         <TextView android:layout_gravity="center" android:id="@id/server_settings_overview_upload_splash_unlock" android:drawableTop="@drawable/ic_perk_lock" android:drawablePadding="@dimen/uikit_spacing_medium" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
     </FrameLayout>
-    <TextView android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext.Semibold" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/server_settings_overview_upload_splash_remove" android:background="?selectableItemBackground" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" style="@style/UiKit.TextView.Subtext" />
     <TextView android:id="@id/server_settings_overview_upload_splash_nitro_tier" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="fill_parent" android:drawablePadding="@dimen/uikit_spacing_small" android:drawableStart="@drawable/ic_nitro_badge_nitro_gradient_16dp" style="@style/UiKit.TextView" />
     <TextView android:paddingBottom="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_info" style="@style/UiKit.Settings.Item.SubText" />
     <com.discord.utilities.view.text.LinkifiedTextView android:id="@id/server_settings_overview_upload_splash_learn_more" android:paddingTop="@dimen/uikit_spacing_small" android:text="@string/guild_settings_splash_recommend" style="@style/UiKit.Settings.Item.SubText" />

com.discord/res/layout/view_setting_switch.xml

@@ -6,6 +6,6 @@
             <TextView android:id="@id/setting_label" style="@style/UiKit.TextView" />
             <TextView android:id="@id/setting_subtext" android:layout_marginTop="@dimen/uikit_spacing_small" style="@style/UiKit.TextView" />
         </LinearLayout>
-        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" android:buttonTint="?colorCompoundButton" />
+        <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/setting_button" android:clickable="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_alignParentEnd="true" />
     </RelativeLayout>
 </merge>

com.discord/res/layout/view_toolbar_title.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout android:background="?selectableItemBackground" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Toolbar.TextAppearance.Title" />
+    <androidx.appcompat.widget.AppCompatTextView android:id="@id/toolbar_title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:drawablePadding="@dimen/uikit_spacing_small" app:drawableTint="?colorTextMuted" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbar_title_subtext" app:layout_constraintEnd_toStartOf="@id/toolbar_presence" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/toolbar_presence" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextAppearance.Toolbar.Title" />
-    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.Toolbar.TextAppearance.Subtitle" />
+    <TextView android:id="@id/toolbar_title_subtext" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/toolbar_title" app:layout_constraintStart_toStartOf="@id/toolbar_title" app:layout_constraintTop_toBottomOf="@id/toolbar_title" style="@style/UiKit.TextAppearance.Toolbar.Subtitle" />
     <com.discord.views.StatusView android:id="@id/toolbar_presence" android:visibility="gone" android:layout_width="12.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_small" app:layout_constraintBottom_toBottomOf="@id/toolbar_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/toolbar_title" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/toolbar_title" app:layout_constraintTop_toTopOf="@id/toolbar_title" />
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_channel_group_dm_settings.xml

@@ -9,8 +9,8 @@
             <androidx.constraintlayout.widget.ConstraintLayout android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
                 <com.facebook.drawee.view.SimpleDraweeView android:id="@id/settings_group_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.XXLarge" />
                 <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/edit" android:elevation="@dimen/app_elevation" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="@id/settings_group_icon" style="@style/UiKit.ImageView" />
-                <com.discord.app.AppTextView android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_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/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <com.discord.app.AppTextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_small" android:gravity="center_horizontal" android:id="@id/settings_group_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/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon" style="@style/UiKit.TextView.Subtext" />
-                <TextView android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext.Semibold" />
+                <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textColor="@color/brand_500" android:id="@id/settings_group_icon_remove" android:background="?selectableItemBackground" android:padding="@dimen/uikit_spacing_medium" android:visibility="gone" android:layout_width="wrap_content" android:text="@string/remove" android:layout_centerHorizontal="true" app:layout_constraintEnd_toEndOf="@id/settings_group_icon" app:layout_constraintLeft_toLeftOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="@id/settings_group_icon" app:layout_constraintStart_toStartOf="@id/settings_group_icon" app:layout_constraintTop_toBottomOf="@id/settings_group_icon_label" style="@style/UiKit.TextView.Subtext" />
                 <com.google.android.material.textfield.TextInputLayout android:layout_width="0.0dip" android:layout_marginTop="0.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/settings_group_icon" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintLeft_toRightOf="@id/settings_group_icon" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toEndOf="@id/settings_group_icon" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.Form.Field.EditText.Wrap">
                     <EditText android:id="@id/channel_settings_edit_name" android:paddingLeft="@dimen/uikit_spacing_small" android:paddingRight="@dimen/uikit_spacing_small" android:hint="@string/form_label_channel_name" style="@style/UiKit.Form.Field.EditText" />
                 </com.google.android.material.textfield.TextInputLayout>

com.discord/res/layout/widget_channel_members_list_item_add.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageView android:id="@id/channel_members_list_item_add" android:background="@drawable/drawable_circle_background_secondary" android:padding="@dimen/uikit_spacing_medium" android:layout_width="32.0dip" android:layout_height="32.0dip" android:src="@drawable/ic_add_person_16dp" android:scaleType="fitCenter" android:tint="?colorInteractiveNormal" android:contentDescription="@string/invite_members" android:layout_marginEnd="@dimen/uikit_spacing_large" />
+    <TextView android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorHeaderPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/invite_members" style="@style/UiKit.TextView" />
+</LinearLayout>

com.discord/res/layout/widget_channel_members_list_item_header.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height"
+<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingTop="@dimen/uikit_spacing_medium" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="wrap_content"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?primary_400" android:gravity="bottom" android:id="@id/channel_members_list_item_header_text" android:layout_width="fill_parent" android:layout_height="fill_parent" android:singleLine="true" android:textAllCaps="true" style="@style/UiKit.TextView.Semibold" />
-    <View android:layout_gravity="bottom" android:id="@id/channel_members_list_item_header_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:visibility="gone" android:layout_width="150.0dip" android:layout_height="@dimen/channel_list_placeholder_height" />
 </FrameLayout>

com.discord/res/layout/widget_channel_members_list_item_placeholder_header.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:paddingBottom="@dimen/uikit_spacing_medium" android:layout_width="fill_parent" android:layout_height="@dimen/channel_list_row_height"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <View android:layout_gravity="bottom" android:id="@id/channel_members_list_item_header_placeholder" android:background="@drawable/drawable_empty_text_placeholder_dark" android:layout_width="150.0dip" android:layout_height="@dimen/channel_list_placeholder_height" />
+</FrameLayout>

com.discord/res/layout/widget_channel_settings_cannot_delete.xml

@@ -4,7 +4,7 @@
     <TextView android:id="@id/channel_settings_cannot_delete_title" android:padding="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:text="@string/cannot_delete_channel" style="@style/UiKit.TextView.H1.Bold" />
     <View android:layout_marginTop="0.0dip" style="@style/UiKit.Divider" />
     <TextView android:id="@id/channel_settings_cannot_delete_body" style="@style/UiKit.Settings.Item.SubText" />
-    <TextView android:textColor="@color/status_yellow" android:id="@id/channel_settings_cannot_delete_note" android:paddingTop="0.0dip" android:text="@string/mobile_update_channels_not_available_yet" style="@style/UiKit.Settings.Item.SubText" />
+    <TextView android:paddingTop="0.0dip" android:text="@string/android_designate_other_channel" style="@style/UiKit.Settings.Item.SubText" />
     <View style="@style/UiKit.Settings.Divider" />
     <LinearLayout android:gravity="end" android:background="?colorBackgroundSecondary" android:padding="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.google.android.material.button.MaterialButton android:id="@id/channel_settings_cannot_delete_confirm" android:text="@string/okay" style="@style/UiKit.Material.Button.Fit" />

com.discord/res/layout/widget_friends_list_v2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.discord.app.AppViewFlipper android:id="@id/friends_list_flipper" android:layout_width="fill_parent" android:layout_height="fill_parent"
+<com.discord.app.AppViewFlipper android:id="@id/friends_list_flipper" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.recyclerview.widget.RecyclerView android:id="@id/friends_list_recycler_v2" android:background="?colorBackgroundPrimary" android:scrollbars="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.RecyclerView" />
     <LinearLayout style="@style/FriendsList.EmptyState">

com.discord/res/layout/widget_friends_tab.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <fragment android:name="com.discord.widgets.friends.FriendsListRouter" android:id="@id/widget_friends_tab_friends_list_router" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/action_bar_toolbar_layout" />
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout">
+        <androidx.appcompat.widget.Toolbar app:contentInsetStartWithNavigation="0.0dip" app:title="@string/friends" style="@style/AppTheme.Toolbar" />
+        <com.google.android.material.tabs.TabLayout android:id="@id/action_bar_tabs" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:tabIndicatorColor="?tabSelectedTextColor" app:tabMode="scrollable" app:tabSelectedTextColor="?tabSelectedTextColor" app:tabTextAppearance="@style/App.TabLayout.Text" app:tabTextColor="?tabTextColor" />
+    </com.google.android.material.appbar.AppBarLayout>
+</RelativeLayout>

com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml

@@ -2,10 +2,10 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
-        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
+        <androidx.appcompat.widget.Toolbar app:navigationContentDescription="@string/close" app:navigationIcon="?ic_action_bar_close" app:title="@string/invite_people" style="@style/AppTheme.Toolbar" />
     </com.google.android.material.appbar.AppBarLayout>
     <LinearLayout android:id="@id/guild_invite_empty_suggestions_container" android:clipChildren="false" android:clipToPadding="false" android:layout_height="fill_parent" app:layout_behavior="@string/action_bar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.Page.LinearLayout">
-        <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="@color/primary_600" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
+        <LinearLayout android:gravity="center_vertical" android:orientation="vertical" android:background="?colorBackgroundPrimary" android:paddingLeft="@dimen/uikit_spacing_large" android:paddingRight="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginStart="@dimen/uikit_spacing_large" android:layout_marginEnd="@dimen/uikit_spacing_large">
             <ImageView android:layout_gravity="center_horizontal" android:layout_width="wrap_content" android:layout_height="70.0dip" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:src="@drawable/img_plus_illo" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <TextView android:gravity="center" android:id="@id/guild_invite_friends_title" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/instant_invite_friends" style="@style/UiKit.TextView.H1" />
             <TextView android:gravity="center" android:id="@id/guild_invite_friends_subtitle" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/uikit_spacing_xxlarge" android:text="@string/instant_invite_friends_description" style="@style/UiKit.TextView" />

com.discord/res/layout/widget_guild_invite_share_item.xml

@@ -2,7 +2,7 @@
 <LinearLayout android:gravity="center_vertical" android:background="?selectableItemBackground" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.facebook.drawee.view.SimpleDraweeView android:id="@id/item_icon_iv" android:layout_marginEnd="@dimen/uikit_spacing_large" app:placeholderImage="?colorPrimaryCircle" style="@style/Avatar.Standard" />
-    <TextView android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:textSize="@dimen/uikit_textsize_large" android:id="@id/item_name_tv" android:layout_width="0.0dip" android:layout_weight="1.0" style="@style/UiKit.TextView.Subtext.SingleLine" />
     <com.google.android.material.button.MaterialButton android:textColor="@color/status_green_500" android:id="@id/item_invite_btn" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:layout_width="wrap_content" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_invite" android:textAllCaps="false" style="@style/UiKit.Material.Button.Green.Outline" />
     <com.google.android.material.button.MaterialButton android:textColor="?primary_300_alpha_30" android:id="@id/item_sent" android:paddingTop="0.0dip" android:paddingBottom="0.0dip" android:visibility="gone" android:minWidth="@dimen/uikit_spacing_xxxlarge" android:text="@string/invite_friend_modal_sent" android:textAllCaps="false" style="@style/UiKit.Material.Button.Transparent.Fit" />
 </LinearLayout>

com.discord/res/layout/widget_guild_profile_sheet_v2.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/guild_profile_sheet_constraint_layout" android:background="?colorBackgroundTertiary" android:paddingBottom="@dimen/uikit_spacing_large" android:layout_width="fill_parent" android:layout_height="wrap_content">
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_banner" android:layout_width="0.0dip" android:layout_height="wrap_content" app:actualImageScaleType="centerCrop" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:viewAspectRatio="1.78" />
+        <androidx.cardview.widget.CardView android:id="@id/guild_profile_sheet_icon_card" android:layout_width="@dimen/avatar_size_xxlarge" android:layout_height="@dimen/avatar_size_xxlarge" android:layout_marginTop="@dimen/uikit_spacing_large" android:layout_marginStart="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="20.0dip" app:cardElevation="0.0dip" app:layout_constraintBottom_toBottomOf="@id/guild_profile_sheet_banner" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_banner">
+            <com.facebook.drawee.view.SimpleDraweeView android:id="@id/guild_profile_sheet_icon" android:layout_width="fill_parent" android:layout_height="fill_parent" app:roundedCornerRadius="16.0dip" />
+            <TextView android:ellipsize="none" android:layout_gravity="center" android:id="@id/guild_profile_sheet_icon_name" android:padding="@dimen/uikit_spacing_small" style="@style/UiKit.TextView.Large.SingleLine" />
+        </androidx.cardview.widget.CardView>
+        <LinearLayout android:id="@id/guild_profile_sheet_content_container" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/guild_profile_sheet_icon_card" style="@style/UiKit.ViewGroup.LinearLayout">
+            <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <ImageView android:layout_gravity="center" android:id="@id/guild_profile_sheet_guild_verified_premium_icon" android:visibility="gone" android:layout_width="24.0dip" android:layout_height="24.0dip" android:importantForAccessibility="no" android:layout_marginEnd="@dimen/uikit_spacing_medium" />
+                <TextView android:textSize="@dimen/uikit_textsize_xxlarge" android:id="@id/guild_profile_sheet_name" android:maxLines="1" style="@style/UiKit.TextView.H1.Bold" />
+            </LinearLayout>
+            <TextView android:id="@id/guild_profile_sheet_description" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.TextView" />
+            <LinearLayout android:gravity="center" android:layout_width="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <LinearLayout android:gravity="center" android:id="@id/guild_profile_sheet_online_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_green_500" app:roundAsCircle="true" />
+                    <com.discord.app.AppTextView android:id="@id/guild_profile_sheet_online_count_text" android:layout_marginEnd="@dimen/uikit_spacing_large" style="@style/GuildProfileSheet.DiscoverableGuild.Text" />
+                </LinearLayout>
+                <LinearLayout android:gravity="center" android:id="@id/guild_profile_sheet_member_count" android:layout_width="wrap_content" android:layout_height="wrap_content">
+                    <com.facebook.drawee.view.SimpleDraweeView android:layout_width="@dimen/uikit_spacing_medium" android:layout_height="@dimen/uikit_spacing_medium" android:layout_marginEnd="@dimen/uikit_spacing_medium" app:placeholderImage="@color/status_grey_500" app:roundAsCircle="true" />
+                    <com.discord.app.AppTextView android:id="@id/guild_profile_sheet_member_count_text" style="@style/GuildProfileSheet.DiscoverableGuild.Text" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>

com.discord/res/layout/widget_main_panel_center_content.xml

@@ -2,7 +2,7 @@
 <merge android:layout_width="fill_parent" android:layout_height="fill_parent"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <fragment android:name="com.discord.widgets.chat.list.WidgetChatList" android:id="@id/widget_chat_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/widget_chat_input" android:layout_below="@id/action_bar_toolbar_layout" />
-    <fragment android:name="com.discord.widgets.friends.FriendsListRouter" android:id="@id/friends_list_router" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/action_bar_toolbar_layout" />
+    <FrameLayout android:id="@id/widget_main_friends_list_content" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_below="@id/action_bar_toolbar_layout" />
     <fragment android:name="com.discord.widgets.status.WidgetStatus" android:id="@id/widget_status" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/action_bar_toolbar_layout" />
     <fragment android:name="com.discord.widgets.chat.overlay.WidgetChatOverlay" android:id="@id/widget_chat_overlay_actions" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@id/widget_chat_input" android:layout_centerHorizontal="true" />
     <fragment android:name="com.discord.widgets.chat.input.WidgetChatInput" android:id="@id/widget_chat_input" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@id/widget_chat_voice" android:layout_alignWithParentIfMissing="true" />

com.discord/res/layout/widget_main_panel_left.xml

@@ -5,6 +5,6 @@
     <fragment android:name="com.discord.widgets.channels.list.WidgetChannelsList" android:id="@id/widget_channels" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@id/widget_profile_strip" android:layout_toEndOf="@id/widget_guilds" />
     <View android:background="@color/black_alpha_20" android:layout_width="0.25dip" android:layout_height="fill_parent" android:layout_alignEnd="@id/widget_guilds" />
     <View android:background="@color/black_alpha_20" android:layout_width="fill_parent" android:layout_height="0.25dip" android:layout_above="@id/widget_profile_strip" />
-    <fragment android:name="com.discord.widgets.user.profile.WidgetUserProfileStrip" android:id="@id/widget_profile_strip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" />
+    <FrameLayout android:id="@id/widget_profile_strip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/action_bar_toolbar_layout" android:layout_alignParentBottom="true" />
     <TextView android:textColor="@color/primary_100" android:gravity="center" android:id="@id/guild_list_add_hint" android:background="@drawable/asset_tooltip_server_create" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="136.0dip" android:text="@string/add_a_server_mobile" android:lineSpacingMultiplier="1.0" android:layout_marginStart="14.0dip" style="@style/UiKit.TextView.Semibold" />
 </RelativeLayout>

com.discord/res/layout/widget_notice_popup.xml

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

com.discord/res/layout/widget_notice_popup_channel.xml

@@ -4,9 +4,9 @@
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_icon" android:visibility="gone" android:layout_margin="@dimen/uikit_spacing_medium" style="@style/Avatar.Notification" />
         <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="0.0dip" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:layout_weight="1.0" style="@style/UiKit.ViewGroup">
-            <TextView android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_title" android:lineSpacingMultiplier="1.0" app:layout_constrainedWidth="true" app:layout_constraintEnd_toStartOf="@id/popup_subtitle" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread_inside" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/popup_subtitle" app:layout_constraintWidth_min="@dimen/uikit_spacing_xxlarge" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <TextView android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.Semibold.SingleLine" />
+            <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/popup_subtitle" android:lineSpacingMultiplier="1.0" android:layout_marginStart="4.0dip" app:layout_constrainedWidth="true" app:layout_constraintBaseline_toBaselineOf="@id/popup_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/popup_title" style="@style/UiKit.TextView.Subtext.SingleLine" />
-            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textColor="?primary_200" android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
+            <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:ellipsize="end" android:id="@id/popup_body" android:layout_width="fill_parent" android:layout_marginTop="@dimen/uikit_spacing_xsmall" android:maxLines="3" android:lineSpacingMultiplier="1.0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_title" style="@style/UiKit.TextView" />
             <com.facebook.drawee.view.SimpleDraweeView android:id="@id/popup_attachment" android:visibility="gone" android:layout_width="@dimen/uikit_spacing_xxxlarge" android:layout_height="@dimen/uikit_spacing_xxxlarge" app:actualImageScaleType="centerCrop" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="@id/popup_title" app:layout_constraintTop_toBottomOf="@id/popup_body" app:placeholderImage="?ic_insert_drive_file" app:placeholderImageScaleType="centerInside" />
         </androidx.constraintlayout.widget.ConstraintLayout>
         <ImageView android:layout_gravity="center|top" android:id="@id/popup_close_btn" android:src="?ic_settings" android:contentDescription="@string/dismiss" style="@style/UiKit.ImageView.Clickable.Corner.TopEnd" />

com.discord/res/layout/widget_nux_guild_template.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="vertical" android:background="?primary_600" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <androidx.appcompat.widget.Toolbar android:background="@color/transparent" app:navigationIcon="?ic_action_bar_close" style="@style/AppTheme.Toolbar" />
+    <androidx.constraintlayout.widget.ConstraintLayout android:layout_height="0.0dip" android:layout_weight="1.0" android:paddingStart="@dimen/uikit_spacing_large" android:paddingEnd="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.ConstraintLayout">
+        <LinearLayout android:id="@id/nux_guild_template_section_top" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_custom_label" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/guild_template_selector_title" style="@style/UiKit.TextView.H1.Bold" />
+            <TextView android:gravity="center" android:layout_gravity="center" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/guild_template_selector_description" style="@style/UiKit.TextView" />
+            <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_create" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" style="@style/Nux.GuildTemplates.Card">
+                <TextView android:text="@string/guild_template_selector_option_create" android:drawableStart="@drawable/drawable_guild_template_create" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.ListItem.Label" android:id="@id/nux_guild_template_section_custom_label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/guild_template_selector_option_header" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_custom" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_top" />
+        <androidx.core.widget.NestedScrollView android:id="@id/nux_guild_template_section_custom" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/nux_guild_template_section_bottom" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_custom_label" style="@style/UiKit.ViewGroup.NestedScrollView">
+            <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout">
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_friend" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                    <TextView android:text="@string/guild_template_selector_option_friend" android:drawableStart="@drawable/drawable_guild_template_friend" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+                </com.google.android.material.card.MaterialCardView>
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_study" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                    <TextView android:text="@string/guild_template_selector_option_study" android:drawableStart="@drawable/drawable_guild_template_study" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+                </com.google.android.material.card.MaterialCardView>
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_gaming" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                    <TextView android:text="@string/guild_template_selector_option_gaming" android:drawableStart="@drawable/drawable_guild_template_gaming" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+                </com.google.android.material.card.MaterialCardView>
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_hobby" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                    <TextView android:text="@string/guild_template_selector_option_hobby" android:drawableStart="@drawable/drawable_guild_template_hobby" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+                </com.google.android.material.card.MaterialCardView>
+                <com.google.android.material.card.MaterialCardView android:id="@id/nux_guild_template_action_creator" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/Nux.GuildTemplates.Card">
+                    <TextView android:text="@string/guild_template_selector_option_creator" android:drawableStart="@drawable/drawable_guild_template_creator" android:drawableEnd="@drawable/icon_carrot" style="@style/Nux.GuildTemplates.Card.Action" />
+                </com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+        <LinearLayout android:id="@id/nux_guild_template_section_bottom" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:layout_marginBottom="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/nux_guild_template_section_custom" style="@style/UiKit.ViewGroup.LinearLayout">
+            <TextView android:textSize="20.0sp" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/uikit_spacing_large" android:text="@string/nux_post_reg_join_server_title" style="@style/UiKit.TextView.Semibold" />
+            <com.google.android.material.button.MaterialButton android:id="@id/nux_guild_template_action_join" android:text="@string/nuf_join_a_friend" style="@style/UiKit.Material.Button.Secondary" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

com.discord/res/layout/widget_premium_guild_transfer.xml

@@ -8,10 +8,10 @@
         <LinearLayout android:gravity="center" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginTop="@dimen/uikit_spacing_xxxlarge" android:layout_marginRight="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.LinearLayout">
             <ImageView android:src="@drawable/drawable_boost_removal" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
             <TextView android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_header" style="@style/UiKit.TextView.H1.Bold" />
-            <TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit.TextView" />
+            <TextView android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:id="@id/premium_guild_transfer_confirmation_blurb" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscribe_confirm_transfer_blurb" style="@style/UiKit.TextView" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_previous_guild_header" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xxlarge" android:text="@string/premium_guild_subscribe_confirm_transfer_from_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
             <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_previous_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorHeaderSecondary" android:layout_gravity="start" android:id="@id/premium_guild_transfer_target_guild_header" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_large" android:text="@string/premium_guild_subscribe_confirm_transfer_to_guild" android:textAllCaps="true" style="@style/UiKit.TextView.Bold" />
             <com.discord.views.premiumguild.PremiumGuildConfirmationView android:id="@id/premium_guild_transfer_target_guild" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_medium" android:layout_marginBottom="@dimen/uikit_spacing_large" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" />
             <TextView android:textColor="@color/status_red_500" android:id="@id/premium_guild_transfer_error" android:visibility="invisible" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/premium_guild_subscription_error_mobile" style="@style/UiKit.TextView" />
             <com.google.android.material.button.MaterialButton android:id="@id/premium_guild_transfer_select" android:layout_marginBottom="@dimen/uikit_spacing_xlarge" android:text="@string/premium_guild_subscribe_transfer_confirm_confirmation" style="@style/UiKit.Material.Button" />

com.discord/res/layout/widget_remote_auth_pending_login.xml

@@ -5,7 +5,7 @@
     <TextView android:gravity="center" android:text="@string/qr_code_login_confirm" style="@style/UiKit.TextView.H1" />
     <TextView android:textColor="@color/status_red_500" android:layout_marginTop="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_description" android:textAlignment="center" style="@style/UiKit.TextView" />
     <androidx.cardview.widget.CardView android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/uikit_spacing_xlarge" app:cardBackgroundColor="?colorBackgroundSecondary" app:cardCornerRadius="4.0dip" app:cardElevation="0.0dip">
-        <androidx.appcompat.widget.SwitchCompat android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem" />
+        <com.google.android.material.switchmaterial.SwitchMaterial android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_temporary_switch" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/confirm_qr_keep_me_signed_in" style="@style/UiKit.ListItem" />
     </androidx.cardview.widget.CardView>
     <com.google.android.material.button.MaterialButton android:id="@id/remote_auth_login_button" android:layout_marginTop="@dimen/uikit_spacing_xlarge" android:layout_marginBottom="@dimen/uikit_spacing_medium" android:text="@string/confirm_qr_login_on_computer" style="@style/UiKit.Material.Button" />
     <com.google.android.material.button.MaterialButton android:textColor="?colorHeaderPrimary" android:id="@id/remote_auth_cancel_button" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/cancel" style="@style/UiKit.Material.Button.Transparent" />

com.discord/res/layout/widget_server_settings.xml

@@ -26,6 +26,11 @@
                 <TextView android:id="@id/server_settings_option_vanity_url" android:text="@string/vanity_url" android:drawableStart="?ic_link_a60" style="@style/UiKit.Settings.Item.Icon" />
                 <TextView android:id="@id/server_settings_emojis_option" android:text="@string/emoji" android:drawableStart="?ic_reactions" style="@style/UiKit.Settings.Item.Icon" />
             </LinearLayout>
+            <LinearLayout android:id="@id/server_settings_section_public" style="@style/UiKit.ViewGroup.LinearLayout">
+                <View android:id="@id/server_settings_section_public_divider" style="@style/UiKit.Settings.Divider" />
+                <TextView android:text="@string/public_string" style="@style/UiKit.Settings.Item.Header" />
+                <TextView android:id="@id/server_settings_public_overview_option" android:text="@string/guild_settings_public_server" android:drawableStart="?ic_overview_a60" style="@style/UiKit.Settings.Item.Icon" />
+            </LinearLayout>
             <LinearLayout android:id="@id/server_settings_section_user_management" style="@style/UiKit.ViewGroup.LinearLayout">
                 <View android:id="@id/server_settings_section_user_management_divider" style="@style/UiKit.Settings.Divider" />
                 <TextView android:text="@string/user_management" style="@style/UiKit.Settings.Item.Header" />

com.discord/res/layout/widget_server_settings_public_overview.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.google.android.material.appbar.AppBarLayout style="@style/AppTheme.AppBarLayout.Flat">
+        <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar" />
+    </com.google.android.material.appbar.AppBarLayout>
+    <ScrollView android:id="@id/server_settings_public_overview_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
+        <LinearLayout android:focusableInTouchMode="true" style="@style/UiKit.ViewGroup.LinearLayout">
+            <com.discord.widgets.servers.publicguild.PublicServerSettingSelectorView android:id="@id/server_settings_public_rules_channel" app:pssv_description_text="@string/public_rules_channel_help" app:pssv_title_text="@string/public_rules_channel_title" style="@style/UiKit.ViewGroup.LinearLayout" />
+            <View style="@style/UiKit.Settings.Divider" />
+            <com.discord.widgets.servers.publicguild.PublicServerSettingSelectorView android:id="@id/server_settings_public_updates_channel" app:pssv_description_text="@string/public_updates_channel_help" app:pssv_title_text="@string/public_updates_channel_title" style="@style/UiKit.ViewGroup.LinearLayout" />
+            <View style="@style/UiKit.Settings.Divider" />
+            <com.discord.widgets.servers.publicguild.PublicServerSettingSelectorView android:id="@id/server_settings_public_locale" app:pssv_description_text="@string/form_help_server_language" app:pssv_title_text="@string/form_label_server_language" style="@style/UiKit.ViewGroup.LinearLayout" />
+        </LinearLayout>
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

com.discord/res/layout/widget_settings.xml

@@ -2,14 +2,19 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:background="?toolbarColor" style="@style/AppTheme.AppBarLayout">
-        <com.google.android.material.appbar.CollapsingToolbarLayout style="@style/AppTheme.CollapsingToolbarLayout">
+        <com.google.android.material.appbar.CollapsingToolbarLayout app:titleEnabled="false" style="@style/AppTheme.CollapsingToolbarLayout">
             <com.discord.widgets.user.profile.UserProfileHeaderView android:id="@id/user_settings_profile_header_view" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="?actionBarSize" app:layout_collapseMode="parallax" app:user_profile_header_background_color="?toolbarColor" />
-            <androidx.appcompat.widget.Toolbar app:navigationIcon="?ic_action_bar_back" style="@style/AppTheme.Toolbar" />
+            <androidx.appcompat.widget.Toolbar app:layout_collapseMode="pin" app:navigationContentDescription="@string/back" app:navigationIcon="?ic_action_bar_back" app:title="@string/user_settings" style="@style/AppTheme.Toolbar" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <androidx.appcompat.widget.LinearLayoutCompat style="@style/UiKit.ViewGroup.LinearLayout">
             <TextView android:text="@string/user_settings" style="@style/UiKit.Settings.Item.Header" />
+            <LinearLayout android:gravity="center_vertical" android:id="@id/settings_set_status_container" android:visibility="gone" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
+                <androidx.appcompat.widget.AppCompatTextView android:layout_width="0.0dip" android:text="@string/set_status" android:layout_weight="1.0" android:drawableStart="@drawable/ic_status_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
+                <com.discord.views.StatusView android:id="@id/settings_status_view" android:layout_width="16.0dip" android:layout_height="wrap_content" android:layout_marginStart="@dimen/uikit_spacing_large" app:sv_background_color="?colorPrimary" app:sv_border_width="2.0dip" app:sv_corner_radius="4.0dip" />
+                <TextView android:id="@id/settings_presence_text" android:layout_width="wrap_content" android:layout_marginEnd="@dimen/uikit_spacing_medium" style="@style/UiKit.Settings.Item" />
+            </LinearLayout>
             <TextView android:id="@id/settings_account" android:text="@string/user_settings_my_account" android:drawableStart="?ic_my_account_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_privacy" android:text="@string/privacy_and_safety" android:drawableStart="?ic_privacy_a60" style="@style/UiKit.Settings.Item.Icon" />
             <TextView android:id="@id/settings_authorized_apps" android:text="@string/authorized_apps" android:drawableStart="?ic_authed_apps_a60" style="@style/UiKit.Settings.Item.Icon" />

com.discord/res/layout/widget_settings_account.xml

@@ -6,9 +6,9 @@
     </com.google.android.material.appbar.AppBarLayout>
     <androidx.core.widget.NestedScrollView android:id="@id/settings_account_scroll" style="@style/UiKit.ViewGroup.NestedScrollView.AppBarScrollingViewBehavior">
         <LinearLayout android:paddingBottom="@dimen/padding_bottom_fab_screen" android:animateLayoutChanges="true" style="@style/UiKit.ViewGroup.LinearLayout">
-            <RelativeLayout android:id="@id/settings_account_verification" android:background="@color/status_red_500" android:visibility="gone" style="@style/UiKit.ViewGroup.RelativeLayout">
+            <RelativeLayout android:gravity="center" android:id="@id/settings_account_verification" android:background="@color/status_red_500" android:visibility="gone" style="@style/UiKit.ViewGroup.RelativeLayout">
                 <TextView android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:text="@string/unverified_account_title" android:layout_centerInParent="true" android:layout_toStartOf="@id/settings_account_verification_resend" style="@style/UiKit.TextView.Semibold" />
-                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:textColor="@color/primary_100" android:id="@id/settings_account_verification_resend" android:paddingLeft="12.0dip" android:paddingRight="12.0dip" android:layout_width="wrap_content" android:layout_margin="@dimen/uikit_spacing_medium" android:minHeight="0.0dip" android:text="@string/verify_account" android:layout_centerVertical="true" android:textAllCaps="false" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.White.Outline" />
+                <com.google.android.material.button.MaterialButton android:textSize="@dimen/uikit_textsize_small" android:id="@id/settings_account_verification_resend" android:layout_width="wrap_content" android:minHeight="0.0dip" android:text="@string/verify_account" android:layout_centerVertical="true" android:layout_marginStart="@dimen/uikit_spacing_medium" android:layout_alignParentEnd="true" style="@style/UiKit.Material.Button.White.Outline" />
             </RelativeLayout>
             <RelativeLayout android:background="?primary_630" android:paddingTop="@dimen/uikit_spacing_xxlarge" android:paddingBottom="@dimen/uikit_spacing_large" style="@style/UiKit.ViewGroup.RelativeLayout">
                 <LinearLayout android:gravity="center_vertical" android:id="@id/settings_account_avatar_wrap" android:layout_marginLeft="@dimen/uikit_spacing_large" android:layout_marginRight="@dimen/uikit_spacing_large" android:layout_marginBottom="@dimen/uikit_spacing_medium" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">

com.discord/res/layout/widget_settings_item_connected_account.xml

@@ -8,9 +8,9 @@
         <ImageView android:id="@id/connected_account_disconnect" android:padding="@dimen/uikit_spacing_small" android:src="@drawable/ic_close_white_24dp" android:contentDescription="@string/disconnect_account" android:layout_marginEnd="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="@id/connected_account_img" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/connected_account_img" style="@style/UiKit.ImageView.Clickable" />
         <View android:id="@id/connected_account_divider" android:layout_height="0.5dip" android:layout_marginTop="@dimen/uikit_spacing_large" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_img" style="@style/UiKit.Divider" />
         <LinearLayout android:paddingTop="@dimen/uikit_spacing_medium" android:paddingBottom="@dimen/uikit_spacing_medium" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/connected_account_divider" style="@style/UiKit.ViewGroup.LinearLayout">
-            <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_switch" android:text="@string/display_on_profile" style="@style/Connections.Switch" />
-            <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_display_activity_switch" android:text="@string/display_activity" style="@style/Connections.Switch" />
-            <androidx.appcompat.widget.SwitchCompat android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />
+            <com.google.android.material.switchmaterial.SwitchMaterial android:id="@id/connected_account_sync_friends_switch" android:text="@string/sync_friends" style="@style/Connections.Switch" />
             <com.discord.app.AppTextView android:textColor="@color/primary_100" android:id="@id/connected_account_extra_info" android:padding="@dimen/uikit_spacing_large" android:visibility="gone" android:drawableEnd="?ic_open_in_new_24dp" style="@style/UiKit.TextView" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_tabs_host.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout android:layout_width="fill_parent" android:layout_height="fill_parent"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <FrameLayout android:id="@id/widget_tabs_host_nav_host" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
+        <fragment android:name="com.discord.widgets.main.WidgetMain" android:id="@id/widget_tabs_host_home" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        <fragment android:name="com.discord.widgets.friends.WidgetFriendsTab" android:id="@id/widget_tabs_host_friends" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        <fragment android:name="com.discord.widgets.user.search.WidgetGlobalSearch" android:id="@id/widget_tabs_host_search" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        <fragment android:name="com.discord.widgets.user.WidgetUserMentions" android:id="@id/widget_tabs_host_mentions" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+        <fragment android:name="com.discord.widgets.settings.WidgetSettings" android:id="@id/widget_tabs_host_user_settings" android:layout_width="fill_parent" android:layout_height="fill_parent" />
+    </FrameLayout>
+    <com.discord.widgets.tabs.TabsHostBottomNavigationView android:id="@id/widget_tabs_host_bottom_navigation_view" android:visibility="invisible" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_user_account_verify.xml

@@ -10,21 +10,21 @@
         <LinearLayout android:layout_marginLeft="20.0dip" android:layout_marginRight="20.0dip" style="@style/UiKit.Alert.Verify.Account.Method.Wrapper">
             <RelativeLayout android:id="@id/alert_verify_account_by_email" style="@style/UiKit.Alert.Verify.Account.Method.Container">
                 <LinearLayout style="@style/UiKit.Alert.Verify.Account.Method">
-                    <TextView android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
+                    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext" />
                     <TextView android:text="@string/email" android:textAllCaps="true" style="@style/UiKit.TextView.H1" />
                 </LinearLayout>
                 <ImageView android:src="?img_verify_email" android:layout_centerHorizontal="true" android:contentDescription="@string/email" style="@style/UiKit.ImageView" />
             </RelativeLayout>
             <RelativeLayout android:id="@id/alert_verify_account_by_phone" style="@style/UiKit.Alert.Verify.Account.Method.Container">
                 <LinearLayout style="@style/UiKit.Alert.Verify.Account.Method">
-                    <TextView android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
+                    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext" />
                     <TextView android:text="@string/phone" android:textAllCaps="true" style="@style/UiKit.TextView.H1" />
                 </LinearLayout>
                 <ImageView android:src="?img_verify_phone" android:layout_centerHorizontal="true" android:contentDescription="@string/phone" style="@style/UiKit.ImageView" />
             </RelativeLayout>
             <RelativeLayout android:id="@id/alert_verify_account_by_captcha" style="@style/UiKit.Alert.Verify.Account.Method.Container">
                 <LinearLayout style="@style/UiKit.Alert.Verify.Account.Method">
-                    <TextView android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext.Semibold" />
+                    <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:layout_marginTop="16.0dip" android:text="@string/verify_by" android:textAllCaps="true" style="@style/UiKit.TextView.Subtext" />
                     <TextView android:text="@string/captcha" android:textAllCaps="true" style="@style/UiKit.TextView.H1" />
                 </LinearLayout>
                 <ImageView android:src="?img_verify_phone" android:layout_centerHorizontal="true" android:contentDescription="@string/phone" style="@style/UiKit.ImageView" />

com.discord/res/layout/widget_user_phone_add.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ScrollView android:id="@id/user_phone_add_wrap" android:layout_height="fill_parent" android:layout_above="@id/user_phone_add_anchor" style="@style/UiKit.ViewGroup.ScrollView">
+    <ScrollView android:layout_height="fill_parent" android:layout_above="@id/user_phone_add_anchor" style="@style/UiKit.ViewGroup.ScrollView">
         <LinearLayout style="@style/UiKit.Copy.Container">
             <com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone.Frozen" />
             <LinearLayout style="@style/UiKit.Copy">

com.discord/res/layout/widget_user_phone_verify.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout style="@style/UiKit.ViewGroup.Page"
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <ScrollView android:id="@id/user_phone_verify_wrap" android:layout_height="fill_parent" android:layout_above="@id/user_phone_digit_verification" style="@style/UiKit.ViewGroup.ScrollView.Page">
+    <ScrollView android:layout_height="fill_parent" android:layout_above="@id/user_phone_digit_verification" style="@style/UiKit.ViewGroup.ScrollView.Page">
         <LinearLayout style="@style/UiKit.Copy.Container">
             <com.airbnb.lottie.LottieAnimationView style="@style/UiKit.Anim.Verify.By.Phone" />
             <LinearLayout style="@style/UiKit.Copy">

com.discord/res/layout/widget_user_profile_strip.xml

@@ -6,7 +6,7 @@
         <com.facebook.drawee.view.SimpleDraweeView android:id="@id/profile_strip_avatar_image" android:layout_marginTop="12.0dip" android:layout_marginBottom="12.0dip" android:layout_marginStart="@dimen/uikit_spacing_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@id/guideline" app:layout_constraintEnd_toStartOf="@id/profile_strip_name" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_chainStyle="spread" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@color/purple_brand_dark" app:roundAsCircle="true" style="@style/Avatar.Standard" />
         <com.discord.views.StatusView android:id="@id/profile_strip_status" android:layout_width="12.0dip" android:layout_height="wrap_content" android:translationX="1.5dip" android:translationY="1.5dip" app:layout_constraintBottom_toBottomOf="@id/profile_strip_avatar_image" app:layout_constraintRight_toRightOf="@id/profile_strip_avatar_image" app:sv_background_color="?colorBackgroundSecondary" app:sv_border_width="1.5dip" app:sv_show_mobile="false" />
         <TextView android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorInteractiveActive" android:ellipsize="end" android:id="@id/profile_strip_name" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toTopOf="@id/profile_strip_discriminator" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_chainStyle="packed" style="@style/UiKit.TextView.Semibold" />
-        <TextView android:id="@id/profile_strip_discriminator" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/profile_strip_name" style="@style/UiKit.TextView.Subtext.Semibold" />
+        <TextView android:textAppearance="@style/UiKit.TextAppearance.Semibold" android:id="@id/profile_strip_discriminator" android:layout_width="0.0dip" android:singleLine="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/profile_strip_name" style="@style/UiKit.TextView.Subtext" />
     </androidx.constraintlayout.widget.ConstraintLayout>
     <ImageView android:id="@id/profile_strip_search" android:src="@drawable/ic_quickswitcher_24dp" android:tint="?colorHeaderSecondary" android:contentDescription="@string/quick_switcher" style="@style/UiKit.Profile.Strip.Icon" />
     <ImageView android:id="@id/profile_strip_mentions" android:src="@drawable/ic_mentions_24dp" android:tint="?colorHeaderSecondary" android:contentDescription="@string/mentions" style="@style/UiKit.Profile.Strip.Icon" />

com.discord/res/values/attrs.xml

@@ -1362,6 +1362,8 @@
     <attr name="progressBarPadding" format="dimension" />
     <attr name="progressBarStyle" format="reference" />
     <attr name="progress_gradient" format="reference" />
+    <attr name="pssv_description_text" format="reference|string" />
+    <attr name="pssv_title_text" format="reference|string" />
     <attr name="ptrn_shapes" format="reference" />
     <attr name="queryBackground" format="reference" />
     <attr name="queryHint" format="string" />

com.discord/res/values/ids.xml

@@ -287,6 +287,7 @@
     <item type="id" name="channel_follow_success_image" />
     <item type="id" name="channel_follow_success_text" />
     <item type="id" name="channel_list_item_private_status" />
+    <item type="id" name="channel_members_list_item_add" />
     <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" />
@@ -333,7 +334,6 @@
     <item type="id" name="channel_selector_list" />
     <item type="id" name="channel_settings_cannot_delete_body" />
     <item type="id" name="channel_settings_cannot_delete_confirm" />
-    <item type="id" name="channel_settings_cannot_delete_note" />
     <item type="id" name="channel_settings_cannot_delete_title" />
     <item type="id" name="channel_settings_channel_name" />
     <item type="id" name="channel_settings_delete_body" />
@@ -787,7 +787,6 @@
     <item type="id" name="friends_list_pending_item_header_text" />
     <item type="id" name="friends_list_recycler" />
     <item type="id" name="friends_list_recycler_v2" />
-    <item type="id" name="friends_list_router" />
     <item type="id" name="friends_list_router_content" />
     <item type="id" name="ghost_view" />
     <item type="id" name="ghost_view_holder" />
@@ -879,14 +878,21 @@
     <item type="id" name="guild_notifications_add_override" />
     <item type="id" name="guild_notifications_channel_list" />
     <item type="id" name="guild_notifications_override_list" />
+    <item type="id" name="guild_profile_sheet_banner" />
+    <item type="id" name="guild_profile_sheet_constraint_layout" />
+    <item type="id" name="guild_profile_sheet_content_container" />
     <item type="id" name="guild_profile_sheet_description" />
     <item type="id" name="guild_profile_sheet_emoji_imageview" />
     <item type="id" name="guild_profile_sheet_emojis" />
     <item type="id" name="guild_profile_sheet_guild_verified_premium_icon" />
     <item type="id" name="guild_profile_sheet_icon" />
+    <item type="id" name="guild_profile_sheet_icon_card" />
+    <item type="id" name="guild_profile_sheet_icon_name" />
     <item type="id" name="guild_profile_sheet_member_count" />
+    <item type="id" name="guild_profile_sheet_member_count_text" />
     <item type="id" name="guild_profile_sheet_name" />
     <item type="id" name="guild_profile_sheet_online_count" />
+    <item type="id" name="guild_profile_sheet_online_count_text" />
     <item type="id" name="guild_profile_sheet_premium_upsell_emojis" />
     <item type="id" name="guild_profile_sheet_premium_upsell_text" />
     <item type="id" name="guild_profile_sheet_splash" />
@@ -1251,6 +1257,17 @@
     <item type="id" name="notification_mute_settings_mute_item" />
     <item type="id" name="notification_mute_settings_mute_item_description" />
     <item type="id" name="notification_mute_settings_mute_item_status" />
+    <item type="id" name="nux_guild_template_action_create" />
+    <item type="id" name="nux_guild_template_action_creator" />
+    <item type="id" name="nux_guild_template_action_friend" />
+    <item type="id" name="nux_guild_template_action_gaming" />
+    <item type="id" name="nux_guild_template_action_hobby" />
+    <item type="id" name="nux_guild_template_action_join" />
+    <item type="id" name="nux_guild_template_action_study" />
+    <item type="id" name="nux_guild_template_section_bottom" />
+    <item type="id" name="nux_guild_template_section_custom" />
+    <item type="id" name="nux_guild_template_section_custom_label" />
+    <item type="id" name="nux_guild_template_section_top" />
     <item type="id" name="nux_guild_use_cases_dismiss" />
     <item type="id" name="nux_guild_use_cases_item_chat_with_friends" />
     <item type="id" name="nux_guild_use_cases_item_club" />
@@ -1383,10 +1400,13 @@
     <item type="id" name="premium_guild_subscription_uncancel_header" />
     <item type="id" name="premium_guild_subscription_uncancel_image" />
     <item type="id" name="premium_guild_subscription_uncancel_nevermind" />
+    <item type="id" name="premium_guild_transfer_confirmation_blurb" />
     <item type="id" name="premium_guild_transfer_error" />
     <item type="id" name="premium_guild_transfer_previous_guild" />
+    <item type="id" name="premium_guild_transfer_previous_guild_header" />
     <item type="id" name="premium_guild_transfer_select" />
     <item type="id" name="premium_guild_transfer_target_guild" />
+    <item type="id" name="premium_guild_transfer_target_guild_header" />
     <item type="id" name="premium_perks_upload_text" />
     <item type="id" name="premium_settings_active_guild_subscription" />
     <item type="id" name="premium_settings_active_subscription" />
@@ -1717,6 +1737,15 @@
     <item type="id" name="server_settings_overview_upload_splash_nitro_tier" />
     <item type="id" name="server_settings_overview_upload_splash_remove" />
     <item type="id" name="server_settings_overview_upload_splash_unlock" />
+    <item type="id" name="server_settings_public_locale" />
+    <item type="id" name="server_settings_public_overview_option" />
+    <item type="id" name="server_settings_public_overview_scroll" />
+    <item type="id" name="server_settings_public_rules_channel" />
+    <item type="id" name="server_settings_public_setting_selector" />
+    <item type="id" name="server_settings_public_setting_selector_description" />
+    <item type="id" name="server_settings_public_setting_selector_subtitle" />
+    <item type="id" name="server_settings_public_setting_selector_title" />
+    <item type="id" name="server_settings_public_updates_channel" />
     <item type="id" name="server_settings_role_item_bottom_divider" />
     <item type="id" name="server_settings_role_item_divider_targeted" />
     <item type="id" name="server_settings_role_item_drag_overlay" />
@@ -1725,6 +1754,8 @@
     <item type="id" name="server_settings_roles_option" />
     <item type="id" name="server_settings_roles_recycler" />
     <item type="id" name="server_settings_section_general_settings" />
+    <item type="id" name="server_settings_section_public" />
+    <item type="id" name="server_settings_section_public_divider" />
     <item type="id" name="server_settings_section_user_management" />
     <item type="id" name="server_settings_section_user_management_divider" />
     <item type="id" name="server_settings_security_dialog_cancel" />
@@ -1882,6 +1913,7 @@
     <item type="id" name="settings_notifications_vibrations" />
     <item type="id" name="settings_notifications_wake_lock" />
     <item type="id" name="settings_notifications_wrap" />
+    <item type="id" name="settings_presence_text" />
     <item type="id" name="settings_privacy" />
     <item type="id" name="settings_privacy_basic_service" />
     <item type="id" name="settings_privacy_controls" />
@@ -1899,6 +1931,8 @@
     <item type="id" name="settings_privacy_request_data_link" />
     <item type="id" name="settings_privacy_statistics" />
     <item type="id" name="settings_qr_scanner" />
+    <item type="id" name="settings_set_status_container" />
+    <item type="id" name="settings_status_view" />
     <item type="id" name="settings_support" />
     <item type="id" name="settings_text_images" />
     <item type="id" name="settings_text_images_allow_animate_emoji_switch" />
@@ -1984,6 +2018,17 @@
     <item type="id" name="suggestion_item_header_history_text" />
     <item type="id" name="swipeRefreshLayout" />
     <item type="id" name="switchWidget" />
+    <item type="id" name="tabs_host_bottom_nav_friends_icon" />
+    <item type="id" name="tabs_host_bottom_nav_friends_item" />
+    <item type="id" name="tabs_host_bottom_nav_home_icon" />
+    <item type="id" name="tabs_host_bottom_nav_home_item" />
+    <item type="id" name="tabs_host_bottom_nav_mentions_icon" />
+    <item type="id" name="tabs_host_bottom_nav_mentions_item" />
+    <item type="id" name="tabs_host_bottom_nav_search_icon" />
+    <item type="id" name="tabs_host_bottom_nav_search_item" />
+    <item type="id" name="tabs_host_bottom_nav_tabs_container" />
+    <item type="id" name="tabs_host_bottom_nav_user_avatar_presence_view" />
+    <item type="id" name="tabs_host_bottom_nav_user_settings_item" />
     <item type="id" name="tag_accessibility_actions" />
     <item type="id" name="tag_accessibility_clickable_spans" />
     <item type="id" name="tag_accessibility_heading" />
@@ -2073,9 +2118,7 @@
     <item type="id" name="user_phone_add_country_code" />
     <item type="id" name="user_phone_add_next" />
     <item type="id" name="user_phone_add_number" />
-    <item type="id" name="user_phone_add_wrap" />
     <item type="id" name="user_phone_digit_verification" />
-    <item type="id" name="user_phone_verify_wrap" />
     <item type="id" name="user_profile_adapter_item_empty" />
     <item type="id" name="user_profile_adapter_item_empty_text" />
     <item type="id" name="user_profile_adapter_item_friend_avatar" />
@@ -2117,6 +2160,7 @@
     <item type="id" name="user_sheet_connections_view" />
     <item type="id" name="user_sheet_content" />
     <item type="id" name="user_sheet_copy_id" />
+    <item type="id" name="user_sheet_deafen" />
     <item type="id" name="user_sheet_developer_header" />
     <item type="id" name="user_sheet_friend_request_accept_button" />
     <item type="id" name="user_sheet_friend_request_ignore_button" />
@@ -2140,6 +2184,8 @@
     <item type="id" name="user_sheet_roles_list" />
     <item type="id" name="user_sheet_video_action_button" />
     <item type="id" name="user_sheet_volume" />
+    <item type="id" name="user_sheet_volume_label" />
+    <item type="id" name="user_sheet_volume_wrap" />
     <item type="id" name="user_status_presence_custom_clear" />
     <item type="id" name="user_status_presence_custom_emoji" />
     <item type="id" name="user_status_presence_custom_text" />
@@ -2248,7 +2294,9 @@
     <item type="id" name="widget_collapsed_user_count" />
     <item type="id" name="widget_collapsed_user_imageview" />
     <item type="id" name="widget_connected_list" />
+    <item type="id" name="widget_friends_tab_friends_list_router" />
     <item type="id" name="widget_guilds" />
+    <item type="id" name="widget_main_friends_list_content" />
     <item type="id" name="widget_profile_strip" />
     <item type="id" name="widget_search_results" />
     <item type="id" name="widget_search_suggestions" />
@@ -2259,6 +2307,13 @@
     <item type="id" name="widget_server_settings_emojis_upload_description" />
     <item type="id" name="widget_server_settings_emojis_view_flipper" />
     <item type="id" name="widget_status" />
+    <item type="id" name="widget_tabs_host_bottom_navigation_view" />
+    <item type="id" name="widget_tabs_host_friends" />
+    <item type="id" name="widget_tabs_host_home" />
+    <item type="id" name="widget_tabs_host_mentions" />
+    <item type="id" name="widget_tabs_host_nav_host" />
+    <item type="id" name="widget_tabs_host_search" />
+    <item type="id" name="widget_tabs_host_user_settings" />
     <item type="id" name="wrapper_controls" />
     <item type="id" name="wrapper_reset_rotate" />
     <item type="id" name="wrapper_rotate_by_angle" />

com.discord/res/values/plurals.xml

@@ -536,6 +536,10 @@
         <item quantity="other">%s times</item>
         <item quantity="one">%s time</item>
     </plurals>
+    <plurals name="guild_subscription_purchase_modal_unused_slot_notice_slotCount">
+        <item quantity="other">%s unused Boosts</item>
+        <item quantity="one">%s unused Boost</item>
+    </plurals>
     <plurals name="humanize_duration_days_time">
         <item quantity="other">%s days</item>
         <item quantity="one">a day</item>
@@ -717,10 +721,50 @@
         <item quantity="other">%s Boosts</item>
         <item quantity="one">%s Boost</item>
     </plurals>
+    <plurals name="premium_guild_subscribe_confirm_cancel_warning_canceledCount">
+        <item quantity="other">%s Boosts are</item>
+        <item quantity="one">This Boost is</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_confirmation_label_slotCount">
+        <item quantity="other">Boosts</item>
+        <item quantity="one">Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_confirmation_slotCount">
+        <item quantity="other">Boost %s times</item>
+        <item quantity="one">Boost</item>
+    </plurals>
     <plurals name="premium_guild_subscribe_confirm_cooldown_warning_days">
         <item quantity="other">%s days</item>
         <item quantity="one">%s day</item>
     </plurals>
+    <plurals name="premium_guild_subscribe_confirm_cooldown_warning_slotCount">
+        <item quantity="other">these Boosts</item>
+        <item quantity="one">this Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_transfer_blurb_guildCount">
+        <item quantity="other">The current servers</item>
+        <item quantity="one">The current server</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_transfer_blurb_slotCount">
+        <item quantity="other">these Server Boosts</item>
+        <item quantity="one">this Server Boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_transfer_from_guild_guildCount">
+        <item quantity="other">servers</item>
+        <item quantity="one">server</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_confirm_transfer_to_guild_slotCount">
+        <item quantity="other">boosts</item>
+        <item quantity="one">boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_transfer_confirm_confirmation_label_slotCount">
+        <item quantity="other">boosts</item>
+        <item quantity="one">boost</item>
+    </plurals>
+    <plurals name="premium_guild_subscribe_transfer_confirm_confirmation_slotCount">
+        <item quantity="other">Boosts</item>
+        <item quantity="one">Boost</item>
+    </plurals>
     <plurals name="premium_guild_subscription_available_numSubscriptions">
         <item quantity="other">%s Boosts</item>
         <item quantity="one">%s Boost</item>
@@ -904,5 +948,5 @@
         <item quantity="other">%s People</item>
         <item quantity="one">%s Person</item>
     </plurals>
-    <item type="plurals" name="APKTOOL_DUMMY_cf">false</item>
+    <item type="plurals" name="APKTOOL_DUMMY_da">false</item>
 </resources>

com.discord/res/values/strings.xml

@@ -120,8 +120,6 @@
     <string name="add_a_role">Add a Role</string>
     <string name="add_a_server">Add a Server</string>
     <string name="add_a_server_mobile">Tap to add a server!</string>
-    <string name="add_a_server_mobile_variant_1">Tap to create your first group!</string>
-    <string name="add_a_server_mobile_variant_2">Tap to create your first Discord!</string>
     <string name="add_by_id">Add Friends</string>
     <string name="add_channel_or_category">Add a Channel or Category</string>
     <string name="add_channel_to_override">Add a channel to override its default notification settings</string>
@@ -181,6 +179,7 @@
     <string name="allow_tts_command">Allow playback and usage of /tts command.</string>
     <string name="already_have_account">Already have an account?</string>
     <string name="amount">Amount</string>
+    <string name="android_designate_other_channel">You must designate another inside Server Settings before this channel can be deleted.</string>
     <string name="android_unknown_view_holder">Unknown view holder type: %1$s.</string>
     <string name="animate_emoji">Play animated emoji.</string>
     <string name="animate_emoji_note">I want emoji to move and groove.</string>
@@ -610,7 +609,7 @@
     <string name="beginning_channel_no_history">You do not have permission to view the message history of **#%1$s**.</string>
     <string name="beginning_chat">Welcome to the beginning of the chat.</string>
     <string name="beginning_chat_dm_mobile">This is the very beginning of your legendary conversation with %1$s.</string>
-    <string name="beginning_chat_nickname_mobile">In your contacts as %1$s</string>
+    <string name="beginning_chat_nickname_mobile">Added from your contacts: $[](nicknameHook)</string>
     <string name="beginning_dm">This is the beginning of your direct message history with **@%1$s**.</string>
     <string name="beginning_group_dm">Welcome to the beginning of the **%1$s** group.</string>
     <string name="beginning_group_dm_managed">"You will automatically leave this group when you're done. GLHF!"</string>
@@ -1006,7 +1005,7 @@ ONE MORE THING {fixed}
     <string name="cloud_sync_modal_or">OR</string>
     <string name="collapse">Collapse</string>
     <string name="collapse_category">Collapse Category</string>
-    <string name="com.crashlytics.android.build_id">e26ad91d-880c-4db3-ad60-1491332f6af0</string>
+    <string name="com.crashlytics.android.build_id">3c92e1ef-e60a-486b-ac71-6014623c2631</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_me_description">Displays text with emphasis.</string>
@@ -1105,14 +1104,14 @@ ONE MORE THING {fixed}
     <string name="contact_sync_enter_phone_number_title">Verify your phone number</string>
     <string name="contact_sync_failed_alert_message">Something went wrong while syncing your contacts. Please wait a moment and try again.</string>
     <string name="contact_sync_failed_alert_title">Uh oh something went wrong.</string>
-    <string name="contact_sync_landing_screen_button">"Let's do it"</string>
+    <string name="contact_sync_failed_no_phone_alert_message">You cannot enable contact sync without a verified phone number.</string>
-    <string name="contact_sync_landing_screen_description">"By turning on Friend Sync, Discord will keep your friends list up to date with your contacts if: 
+    <string name="contact_sync_failed_no_phone_alert_title">No Verified Phone</string>
+    <string name="contact_sync_landing_screen_button">Add Friends</string>
+    <string name="contact_sync_landing_screen_description">"By turning on Friend Sync, we’ll automatically add your phone contacts as friends on Discord if: 
  
- 1. You’re both on Discord 
+ 1. You both have each other’s phone numbers 
  
- 2. You both have each other's phone numbers 
+ 2. You both have Friend Sync turned on"</string>
- 
- 3. You both have Friend Sync turned on"</string>
     <string name="contact_sync_landing_screen_title">Discord is more fun with friends</string>
     <string name="contact_sync_no_results_description">None of your friends have synced their contacts on Discord yet, but we’ll let you know when they do.</string>
     <string name="contact_sync_no_results_got_it">Got It</string>
@@ -1173,7 +1172,7 @@ ONE MORE THING {fixed}
     <string name="create_server_button_cta">Create a server</string>
     <string name="create_server_button_cta_mobile">Create a new Server</string>
     <string name="create_server_button_cta_mobile_desc">Make a server, invite your friends, throw a party!</string>
-    <string name="create_server_default_server_name_format">"%1$s's Server"</string>
+    <string name="create_server_default_server_name_format">"%1$s's server"</string>
     <string name="create_server_description">By creating a server, you will have access to **free** voice and text chat to use amongst your friends.</string>
     <string name="create_server_description_mobile">Your server is where your gaming group hangs out. Make one to start chatting with your friends for free.</string>
     <string name="create_server_description_mobile_refresh">Your server is where your group hangs out. Make one to start chatting with your friends for free.</string>
@@ -2490,8 +2489,10 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)."</string>
     <string name="guild_settings_public">Public</string>
     <string name="guild_settings_public_mod_channel_help">"This is the channel where Discord will send announcements and updates relevant to Public server admins and moderators, like new moderation features and the server's eligibility in Discovery."</string>
     <string name="guild_settings_public_mod_channel_title">Moderators-only Channel</string>
+    <string name="guild_settings_public_no_option_selected">None Selected</string>
     <string name="guild_settings_public_rules_channel_help">Public servers must have clearly posted server rules and/or guidelines for members. Please select the channel that hosts this.</string>
     <string name="guild_settings_public_server">Public Server</string>
+    <string name="guild_settings_public_update_failed">Failed to update your settings. Please try again.</string>
     <string name="guild_settings_server_banner">Server Banner</string>
     <string name="guild_settings_server_invite_background">Server Invite Background</string>
     <string name="guild_settings_splash_info">This image will display when users receive an invite to the server.</string>
@@ -2526,12 +2527,16 @@ You've Boosted %1$s."</string>
 You've Boosted the server."</string>
     <string name="guild_subscription_purchase_modal_transferred_description_mobile1">Boost transfer success!</string>
     <string name="guild_subscription_purchase_modal_transferred_description_mobile2">"You've Boosted %1$s **%2$s**."</string>
+    <string name="guild_subscription_purchase_modal_unused_slot_notice">"Looks like you have %1$s. We'll add 'em to this server for you."</string>
     <string name="guild_template_accepting_title">Working…</string>
     <string name="guild_template_category_text_channels">Text Channels</string>
     <string name="guild_template_category_voice_channels">Voice Channels</string>
     <string name="guild_template_create_server">Create Server</string>
     <string name="guild_template_invalid_subtitle">You can ask the owner to make a new one though</string>
     <string name="guild_template_invalid_title">Invalid server template</string>
+    <string name="guild_template_mobile_invalid_cta">Tap to learn more</string>
+    <string name="guild_template_mobile_invalid_error">"This template link is invalid or has expired.
+Want to know more about Discord?"</string>
     <string name="guild_template_modal_channels_descriptions">Use channels to organize your chatroom by specific topics.</string>
     <string name="guild_template_modal_channels_tip">You can always edit the channels after creating the server.</string>
     <string name="guild_template_modal_error_title">Whoops…</string>
@@ -2539,6 +2544,26 @@ You've Boosted the server."</string>
     <string name="guild_template_modal_roles_header">Roles and Permissions</string>
     <string name="guild_template_modal_title">Create a server based on:</string>
     <string name="guild_template_modal_unauthenticated_title">You received a server template based on:</string>
+    <string name="guild_template_name_announcements">announcements</string>
+    <string name="guild_template_name_category_text">Text Channels</string>
+    <string name="guild_template_name_category_voice">Voice Channels</string>
+    <string name="guild_template_name_events">events</string>
+    <string name="guild_template_name_game">games</string>
+    <string name="guild_template_name_game_new">new-games</string>
+    <string name="guild_template_name_game_room">game-room-%1$s</string>
+    <string name="guild_template_name_general">general</string>
+    <string name="guild_template_name_giveaways">giveaways</string>
+    <string name="guild_template_name_homework">homework</string>
+    <string name="guild_template_name_meetups">meetups</string>
+    <string name="guild_template_name_memes">memes</string>
+    <string name="guild_template_name_music">music</string>
+    <string name="guild_template_name_notes">notes-resources</string>
+    <string name="guild_template_name_off_topic">off-topic</string>
+    <string name="guild_template_name_random">random</string>
+    <string name="guild_template_name_social">social-posts</string>
+    <string name="guild_template_name_strategy">strategy-discussion</string>
+    <string name="guild_template_name_welcome">welcome</string>
+    <string name="guild_template_name_welcome_and_rules">welcome-and-rules</string>
     <string name="guild_template_open">Open Template</string>
     <string name="guild_template_preview_description">Channels are places in your server where people can talk about different things.</string>
     <string name="guild_template_preview_protip_body">You can always edit the channels after creating the server.</string>
@@ -2546,6 +2571,13 @@ You've Boosted the server."</string>
     <string name="guild_template_resolved_embed_title">Server template from</string>
     <string name="guild_template_resolving_title">Loading server template</string>
     <string name="guild_template_selector_description">A server is a superpowered group chat where people come together around a topic or to hang out.</string>
+    <string name="guild_template_selector_option_create">Create my own</string>
+    <string name="guild_template_selector_option_creator">Content Creator</string>
+    <string name="guild_template_selector_option_friend">Friend Group Chat</string>
+    <string name="guild_template_selector_option_gaming">Gaming Group</string>
+    <string name="guild_template_selector_option_header">Start from a template</string>
+    <string name="guild_template_selector_option_hobby">Hobby Group</string>
+    <string name="guild_template_selector_option_study">Study Group</string>
     <string name="guild_template_selector_suggestion">"Don't see what you're looking for? [Let us know if you have any suggestions.](%1$s)"</string>
     <string name="guild_template_selector_title">Create Your Server</string>
     <string name="guild_template_settings_description">Kick-start a friend’s new server by sharing a template based on your own server setup.</string>
@@ -2838,6 +2870,8 @@ You've Boosted the server."</string>
     <string name="invite_embed_spectate">Spectate Game</string>
     <string name="invite_embed_spectate_via_desktop_app">Spectate via Desktop App</string>
     <string name="invite_embed_watch_has_ended">The watching party is over!</string>
+    <string name="invite_empty_body">"Share this link with friends and they'll automatically join your server."</string>
+    <string name="invite_empty_title">Invite a friend to your server!</string>
     <string name="invite_expired_subtext_mobile">• expires in %1$s</string>
     <string name="invite_expires_days">Your invite link expires in 1 day.</string>
     <string name="invite_expires_days_or_uses">Your invite link expires in 1 day, or after %1$s.</string>
@@ -3216,12 +3250,9 @@ Want to know more about Discord?"</string>
     <string name="missing_entitlement_modal_body_unknown_application">"Discord cannot launch this game for you because you've lost entitlement to it. This can be for a variety of reasons, such as a lapsed Nitro subscription, a refund, or if the game has been removed from the Discord store. [Please see this help article for more information or support.](%1$s)"</string>
     <string name="missing_entitlement_modal_header">Unable to launch %1$s</string>
     <string name="missing_entitlement_modal_header_unknown_application">Unable to launch game</string>
-    <string name="mobile_delete_rules_channel_body">Public servers are required to have a rules channel. You must designate another before this channel can be deleted.</string>
-    <string name="mobile_delete_updates_channel_body">Public servers are required to have a moderator-only channel where Discord can send relevant public server updates. You must designate another before this channel can be deleted.</string>
     <string name="mobile_designate_other_channel">You must designate another inside [Server Settings > Public Server Settings](onClick) before this channel can be deleted.</string>
     <string name="mobile_enable_hardware_scaling">Enable Hardware Scaling</string>
     <string name="mobile_enable_hardware_scaling_desc">Experimental feature that may improve performance in video calls. Beware, may cause jank.</string>
-    <string name="mobile_update_channels_not_available_yet">Sorry, designating another channel is not yet available on mobile. Please visit the desktop app.</string>
     <string name="moderation">Moderation</string>
     <string name="modify_followed_news_header">Are you sure?</string>
     <string name="monthly">Monthly</string>
@@ -3377,6 +3408,7 @@ Want to know more about Discord?"</string>
     <string name="noise_cancellation_description">Mute all background noise.</string>
     <string name="noise_cancellation_popout_footer">Powered by</string>
     <string name="noise_cancellation_popout_header">Noise Cancellation</string>
+    <string name="noise_cancellation_popout_learn_more">Learn More</string>
     <string name="noise_cancellation_popout_mic_test_title">Mic Test</string>
     <string name="noise_cancellation_popout_stop">Stop</string>
     <string name="noise_cancellation_popout_test">Test</string>
@@ -3415,6 +3447,7 @@ Want to know more about Discord?"</string>
     <string name="notice_dispatch_error_with_code">Oh no, an error has occurred. Code %1$s</string>
     <string name="notice_dispatch_install_script_progress">Discord has to install some stuff before we can launch your game. Installing (%1$s of %2$s).</string>
     <string name="notice_dispatch_install_script_progress_with_name">Discord has to install some stuff before we can launch your game. Installing %1$s (%2$s of %3$s).</string>
+    <string name="notice_enable_public_guild_upsell_message">Get tailored features and tools that can help grow your community!</string>
     <string name="notice_funimation_promotion">Hey Nitro subscriber, congrats! You get a month of Funimation on us.</string>
     <string name="notice_funimation_promotion_redeem">Redeem</string>
     <string name="notice_hardware_mute">Well, it looks like the **%1$s %2$s** microphone hardware mute switch is on.</string>
@@ -3488,7 +3521,7 @@ Want to know more about Discord?"</string>
     <string name="nuf_create_server_body">No invite code? No worries! Start a Discord server for you and your friends. We’ll provide the voice and text chat - it’s 100%% free.</string>
     <string name="nuf_create_server_button">Create Server</string>
     <string name="nuf_create_server_error">Invalid server name</string>
-    <string name="nuf_create_server_note">By creating a server, you agree to our [Community Guidelines](https://discordapp.com/guidelines).</string>
+    <string name="nuf_create_server_note_guidelines">By creating a server, you agree to our [Community Guidelines](%1$s).</string>
     <string name="nuf_create_server_protip">**PROTIP:** You can always edit the channels, roles, and permissions after creating the server.</string>
     <string name="nuf_create_server_title">Create a Server</string>
     <string name="nuf_download_app_body">Download our desktop app for easier access to your servers, and app-only features (including Push to Talk)!</string>
@@ -3891,29 +3924,35 @@ To keep your sub, go to Settings and update your payment."</string>
     <string name="premium_guild_perks_modal_previous_perks">Boosted servers get everything previous, and —</string>
     <string name="premium_guild_perks_modal_protip">$[Protip:](protipHook) Discord Nitro includes %1$s! [Learn more.](onLearnMore)</string>
     <string name="premium_guild_perks_modal_protip_mobile">**PROTIP:** Discord Nitro includes %1$s! [Learn more.](%2$s)</string>
+    <string name="premium_guild_perks_modal_subscribe_to_tier_tooltip">Boost to **%1$s**</string>
     <string name="premium_guild_perks_modal_subscriber_perks_header">Get cool rewards for becoming a Booster!</string>
     <string name="premium_guild_plan_month">Server Boost Monthly</string>
     <string name="premium_guild_plan_year">Server Boost Yearly</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">Ready to Boost this server?</string>
-    <string name="premium_guild_subscribe_confirm_cancel_warning">This Boost is pending cancellation and will automatically be removed from this server on %1$s.</string>
+    <string name="premium_guild_subscribe_confirm_cancel_warning">%1$s pending cancellation and will automatically be removed from this server on %2$s.</string>
-    <string name="premium_guild_subscribe_confirm_confirmation">Boost</string>
+    <string name="premium_guild_subscribe_confirm_confirmation">%1$s</string>
-    <string name="premium_guild_subscribe_confirm_confirmation_label">Select this server. It will take a moment for your boost to take effect.</string>
+    <string name="premium_guild_subscribe_confirm_confirmation_label">Select this server. It will take a moment for your %1$s to take effect.</string>
-    <string name="premium_guild_subscribe_confirm_cooldown_warning">Boosting this server will prevent transferring this Boost to another server for %1$s.</string>
+    <string name="premium_guild_subscribe_confirm_cooldown_warning">Boosting this server will prevent transferring %1$s to another server for %2$s.</string>
-    <string name="premium_guild_subscribe_confirm_transfer_blurb">Are you sure you want to transfer this Server Boost? The current server will lose progress if you continue.</string>
+    <string name="premium_guild_subscribe_confirm_transfer_blurb">Are you sure you want to transfer %1$s? %2$s will lose progress if you continue.</string>
-    <string name="premium_guild_subscribe_confirm_transfer_from_guild">Current server</string>
+    <string name="premium_guild_subscribe_confirm_transfer_from_guild">Current %1$s</string>
     <string name="premium_guild_subscribe_confirm_transfer_header">Transfer Server Boost?</string>
-    <string name="premium_guild_subscribe_confirm_transfer_to_guild">Move boost to</string>
+    <string name="premium_guild_subscribe_confirm_transfer_to_guild">Move %1$s to</string>
     <string name="premium_guild_subscribe_search_guild_placeholder">Search servers</string>
     <string name="premium_guild_subscribe_select_guild_header">Select a Server</string>
     <string name="premium_guild_subscribe_select_guild_transfer_header">Select a server to transfer to</string>
     <string name="premium_guild_subscribe_success_okay">Okay!</string>
     <string name="premium_guild_subscribe_success_thanks">Thanks for the Boost!</string>
-    <string name="premium_guild_subscribe_transfer_confirm_confirmation">Yes, Transfer Boost</string>
+    <string name="premium_guild_subscribe_transfer_confirm_confirmation">Yes, Transfer %1$s</string>
-    <string name="premium_guild_subscribe_transfer_confirm_confirmation_label">Transfer Boost to this server. It will take a moment for your boost to take effect.</string>
+    <string name="premium_guild_subscribe_transfer_confirm_confirmation_label">Transfer %1$s to this server. It will take a moment for your %1$s to take effect.</string>
     <string name="premium_guild_subscribe_transfer_error_body">There was an error with the Boost transfer. Please try again.</string>
     <string name="premium_guild_subscribe_transfer_error_header">Transfer Error</string>
+    <string name="premium_guild_subscribe_unused_slots_cancel">Cancel</string>
+    <string name="premium_guild_subscribe_unused_slots_counter">Server Boost(s)</string>
+    <string name="premium_guild_subscribe_unused_slots_description">You have some unused Boosts. How many do you want to use for this server?</string>
+    <string name="premium_guild_subscribe_unused_slots_header">Unused Boosts</string>
+    <string name="premium_guild_subscribe_unused_slots_next">Next</string>
     <string name="premium_guild_subscriber_feature_member_badge">Show off with a new Member List icon</string>
     <string name="premium_guild_subscriber_feature_profile_badge">New profile badge that evolves over time</string>
     <string name="premium_guild_subscriber_feature_role">Get an exclusive Booster role</string>
@@ -3945,6 +3984,7 @@ The changes to your subscription are reflected below:"</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_guild_affinity_notice">Support your top server with a boost and get a special badge!</string>
     <string name="premium_guild_subscription_guild_affinity_notice_button">Boost This Server</string>
+    <string name="premium_guild_subscription_guild_affinity_notice_small_guild">Unlock perks for your favorite server and get a special badge!</string>
     <string name="premium_guild_subscription_guild_subsription_subtitle">You Boosted %1$s</string>
     <string name="premium_guild_subscription_header_subscribe_tooltip_close">Got it</string>
     <string name="premium_guild_subscription_header_subscribe_tooltip_header">Server Boosting</string>
@@ -4040,7 +4080,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="premium_retention_emoji_picker_update_payment_information">Update your payment information.</string>
     <string name="premium_settings">Nitro Settings</string>
     <string name="premium_settings_billing_info">Billing Information</string>
-    <string name="premium_settings_cancelled_info">Your **%1$s** subscription will end on **%2$s**.</string>
+    <string name="premium_settings_cancelled_info">Your subscription will end on **%1$s**.</string>
     <string name="premium_settings_get">Get Nitro</string>
     <string name="premium_settings_manage">Manage Nitro</string>
     <string name="premium_settings_past_due_info">Your **%1$s** subscription is past due. Please update your payment info or your subscription will end on **%2$s**.</string>
@@ -4152,13 +4192,22 @@ The changes to your subscription are reflected below:"</string>
     <string name="public_rules_selector_title">Select a Rules Channel</string>
     <string name="public_server_settings">Public Server Settings</string>
     <string name="public_string">Public</string>
-    <string name="public_success_modal_announcement_channels">Set up [Announcement Channels](%1$s) to deliver updates beyond your server.</string>
+    <string name="public_success_modal_announcement_channels">**Create [Announcement Channels](%1$s)** so users can follow and get your announcements in their own servers.</string>
-    <string name="public_success_modal_body">*Airhorn sound effects*</string>
+    <string name="public_success_modal_body">"Here's what you should do next:"</string>
     <string name="public_success_modal_discovery_eligibility">Check if you qualify to be in Server Discovery so more people can find you.</string>
+    <string name="public_success_modal_guild_discovery">**Enable Server Discovery** so new people can find you directly on Discord.</string>
     <string name="public_success_modal_header">Your server is now public!</string>
+    <string name="public_success_modal_more">"**More features and tools to come!** We'll let you know directly in your moderators-only channel."</string>
     <string name="public_updates_channel_help">This is the channel where Discord will send announcements specific to Public server admins or mods. This is also where system messages about your server will show up, like changes to your Discovery eligibility.</string>
     <string name="public_updates_channel_title">Mod-only Channel</string>
     <string name="public_updates_selector_title">Select a Mod-only Channel</string>
+    <string name="public_upsell_modal_announcement_channels">**$[Create Announcement channels](focusHook)** so users can follow and get your announcements in their own servers.</string>
+    <string name="public_upsell_modal_body">If so, set your server to Public and get tailored features and tools that can help grow your community!</string>
+    <string name="public_upsell_modal_button">Set my server to Public</string>
+    <string name="public_upsell_modal_guild_discovery">**$[Unlock the ability to apply to Server Discovery](focusHook)** so new people can find you directly on Discord.</string>
+    <string name="public_upsell_modal_header">Is this server a public community?</string>
+    <string name="public_upsell_modal_moderator_features">**$[Stay informed of new moderator features and updates](focusHook)** from Discord inside your server.</string>
+    <string name="public_upsell_modal_more">And **$[more to come](focusHook)**, like moderation tools and server analytics!</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_body_reach">This message will be sent to **%1$s 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_body_settings">See more stats in Server Settings.</string>
@@ -5209,7 +5258,7 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="user_settings_hypesquad">HypeSquad</string>
     <string name="user_settings_keybinds_action">Action</string>
     <string name="user_settings_keybinds_keybind">Keybind</string>
-    <string name="user_settings_krisp_description">[Learn more about Krisp](%1$s)</string>
+    <string name="user_settings_krisp_description">Learn more about Krisp</string>
     <string name="user_settings_label_current_password">Current Password</string>
     <string name="user_settings_label_discriminator">Discriminator</string>
     <string name="user_settings_label_email">Email</string>
@@ -5448,5 +5497,5 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="youre_viewing_older_messages">"You're viewing older messages"</string>
     <string name="zh_cn">Chinese, China</string>
     <string name="zh_tw">Chinese, Taiwan</string>
-    <item type="string" name="APKTOOL_DUMMY_380">false</item>
+    <item type="string" name="APKTOOL_DUMMY_37f">false</item>
 </resources>

com.discord/res/values/styles.xml

@@ -992,8 +992,8 @@
         <item name="android:minHeight">?actionBarSize</item>
         <item name="layout_collapseMode">pin</item>
         <item name="popupTheme">@style/AppTheme.Toolbar.Popup</item>
-        <item name="subtitleTextAppearance">@style/UiKit.Toolbar.TextAppearance.Subtitle</item>
+        <item name="subtitleTextAppearance">@style/UiKit.TextAppearance.Toolbar.Subtitle</item>
-        <item name="titleTextAppearance">@style/UiKit.Toolbar.TextAppearance.Title</item>
+        <item name="titleTextAppearance">@style/UiKit.TextAppearance.Toolbar.Title</item>
     </style>
     <style name="AppTheme.Toolbar.Popup" parent="@style/ThemeOverlay.AppCompat.Light">
         <item name="fontFamily">@font/whitney_medium</item>
@@ -2546,11 +2546,9 @@
         <item name="borderWidth">0.0dip</item>
         <item name="fabSize">mini</item>
     </style>
-    <style name="Feedback.PromptTextAppearance" parent="@style/TextAppearance.AppCompat">
+    <style name="Feedback.PromptTextAppearance" parent="@style/UiKit.TextAppearance">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
         <item name="android:textColor">?colorHeaderSecondary</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="fontFamily">@font/whitney_medium</item>
     </style>
     <style name="Feedback.Row" parent="">
         <item name="android:layout_width">fill_parent</item>
@@ -2579,11 +2577,10 @@
         <item name="android:paddingBottom">@dimen/uikit_spacing_medium</item>
         <item name="android:layout_marginTop">@dimen/uikit_spacing_medium</item>
     </style>
-    <style name="Feedback.SectionHeaderTextAppearance" parent="@style/TextAppearance.AppCompat">
+    <style name="Feedback.SectionHeaderTextAppearance" parent="@style/UiKit.TextAppearance.Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?colorHeaderSecondary</item>
         <item name="android:textAllCaps">true</item>
-        <item name="fontFamily">@font/whitney_semibold</item>
     </style>
     <style name="FlexInput" parent="@style/AppTheme">
         <item name="flexInputColorHighlight">?colorControlHighlight</item>
@@ -2923,6 +2920,10 @@
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">true</item>
     </style>
+    <style name="GuildProfileSheet.DiscoverableGuild.Text" parent="@style/UiKit.TextView.SingleLine">
+        <item name="android:textSize">@dimen/uikit_textsize_small</item>
+        <item name="android:textColor">?colorTextMuted</item>
+    </style>
     <style name="Icon.Game" parent="">
         <item name="android:layout_width">50.0dip</item>
         <item name="android:layout_height">50.0dip</item>
@@ -3045,6 +3046,21 @@
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">@font/whitney_semibold</item>
     </style>
+    <style name="Nux.GuildTemplates.Card" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="cardBackgroundColor">?colorBackgroundSecondaryAlt</item>
+        <item name="cardCornerRadius">8.0dip</item>
+        <item name="cardElevation">0.0dip</item>
+        <item name="rippleColor">@color/status_green</item>
+    </style>
+    <style name="Nux.GuildTemplates.Card.Action" parent="@style/UiKit.TextView.Bold">
+        <item name="android:textSize">@dimen/uikit_spacing_large</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
+    </style>
     <style name="Overlay.Dialog" parent="@style/UiKit.ViewGroup">
         <item name="android:theme">@style/AppTheme.Dark</item>
         <item name="cardBackgroundColor">@color/primary_630</item>
@@ -3398,6 +3414,18 @@
         <item name="android:layoutDirection">rtl</item>
         <item name="fontFamily">@font/whitney_medium</item>
     </style>
+    <style name="TabsHostBottomNavIcon" parent="@style/UiKit.ImageView">
+        <item name="android:layout_gravity">center</item>
+        <item name="android:tint">?colorInteractiveNormal</item>
+    </style>
+    <style name="TabsHostBottomNavItem">
+        <item name="android:gravity">center</item>
+        <item name="android:background">?bg_pressed_highlight</item>
+        <item name="android:padding">@dimen/uikit_spacing_large</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1.0</item>
+    </style>
     <style name="Test.ShapeAppearanceOverlay.MaterialComponents.MaterialCalendar.Day" parent="">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">@dimen/test_mtrl_calendar_day_cornerSize</item>
@@ -4428,24 +4456,31 @@
         <item name="android:paddingEnd">@dimen/uikit_spacing_small</item>
     </style>
     <style name="UiKit.ImageView.HideInLandscape" parent="@style/UiKit.ImageView" />
-    <style name="UiKit.ListItem" parent="@style/UiKit.TextView.Semibold">
+    <style name="UiKit.ListItem" parent="@style/UiKit">
-        <item name="android:textSize">@dimen/uikit_textsize_large</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance.ListItem</item>
-        <item name="android:textColor">?colorHeaderPrimary</item>
+        <item name="android:textColor">?colorInteractiveActive</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:background">?bg_pressed_highlight</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
         <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
         <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">56.0dip</item>
-        <item name="android:fontFamily">@font/whitney_semibold</item>
         <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
         <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
     </style>
     <style name="UiKit.ListItem.Icon" parent="@style/UiKit.ListItem">
         <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
     </style>
+    <style name="UiKit.ListItem.Icon.Radio" parent="@style/UiKit.ListItem.Icon">
+        <item name="android:textSize">@dimen/uikit_textsize_large</item>
+        <item name="android:textColor">?colorHeaderPrimary</item>
+        <item name="android:fontFamily">@font/whitney_semibold</item>
+        <item name="android:layoutDirection">rtl</item>
+        <item name="android:layout_marginStart">12.0dip</item>
+    </style>
+    <style name="UiKit.ListItem.Switch" parent="@style/UiKit.ListItem">
+        <item name="switchTextAppearance">@style/UiKit.TextAppearance.ListItem</item>
+    </style>
     <style name="UiKit.LottieAnimationView" parent="">
         <item name="lottie_autoPlay">true</item>
         <item name="lottie_loop">true</item>
@@ -4594,23 +4629,6 @@
         <item name="android:elevation">2.0dip</item>
         <item name="fontFamily">@font/whitney_semibold</item>
     </style>
-    <style name="UiKit.RadioButtonListItem" parent="@style/UiKit.TextView.Semibold">
-        <item name="android:textSize">@dimen/uikit_textsize_large</item>
-        <item name="android:textColor">?colorHeaderPrimary</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingTop">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingBottom">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">56.0dip</item>
-        <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
-        <item name="android:fontFamily">@font/whitney_semibold</item>
-        <item name="android:layoutDirection">rtl</item>
-        <item name="android:paddingStart">@dimen/uikit_spacing_large</item>
-        <item name="android:paddingEnd">@dimen/uikit_spacing_large</item>
-        <item name="android:layout_marginStart">12.0dip</item>
-    </style>
     <style name="UiKit.Search.Chip" parent="@style/UiKit.TextView">
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">@color/primary_300</item>
@@ -4796,6 +4814,16 @@
         <item name="android:textAllCaps">true</item>
         <item name="fontFamily">@font/whitney_semibold</item>
     </style>
+    <style name="UiKit.TextAppearance" parent="@style/TextAppearance.AppCompat">
+        <item name="android:textSize">@dimen/uikit_textsize_medium</item>
+        <item name="android:textColor">?colorTextNormal</item>
+        <item name="android:textColorLink">?colorTextLink</item>
+        <item name="android:textDirection">locale</item>
+        <item name="fontFamily">@font/whitney_medium</item>
+    </style>
+    <style name="UiKit.TextAppearance.Bold" parent="@style/UiKit.TextAppearance">
+        <item name="fontFamily">@font/whitney_bold</item>
+    </style>
     <style name="UiKit.TextAppearance.Button" parent="@style/TextAppearance.MaterialComponents.Button">
         <item name="android:textSize">@dimen/uikit_textsize_medium</item>
         <item name="android:textColor">?colorInteractiveActive</item>
@@ -4805,6 +4833,29 @@
         <item name="android:letterSpacing">0.0</item>
         <item name="fontFamily">@font/whitney_semibold</item>
     </style>
+    <style name="UiKit.TextAppearance.ListItem" parent="@style/UiKit.TextAppearance.Semibold">
+        <item name="android:textSize">@dimen/uikit_textsize_large</item>
+        <item name="android:textColor">?colorInteractiveActive</item>
+    </style>
+    <style name="UiKit.TextAppearance.ListItem.Label" parent="@style/UiKit.TextAppearance.Bold">
+        <item name="android:textSize">@dimen/uikit_textsize_small</item>
+        <item name="android:textColor">?colorHeaderSecondary</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+    <style name="UiKit.TextAppearance.Semibold" parent="@style/UiKit.TextAppearance">
+        <item name="fontFamily">@font/whitney_semibold</item>
+    </style>
+    <style name="UiKit.TextAppearance.Toolbar" parent="@style/UiKit.TextAppearance.Semibold">
+        <item name="android:maxLines">1</item>
+    </style>
+    <style name="UiKit.TextAppearance.Toolbar.Subtitle" parent="@style/UiKit.TextAppearance.Toolbar">
+        <item name="android:textSize">12.0dip</item>
+        <item name="android:textColor">?colorTextMuted</item>
+    </style>
+    <style name="UiKit.TextAppearance.Toolbar.Title" parent="@style/UiKit.TextAppearance.Toolbar">
+        <item name="android:textSize">20.0dip</item>
+        <item name="android:textColor">?colorHeaderPrimary</item>
+    </style>
     <style name="UiKit.TextInputLayout" parent="@style/UiKit">
         <item name="android:textColorHint">?primary_400</item>
         <item name="android:focusable">false</item>
@@ -4835,24 +4886,20 @@
         <item name="fontFamily">@font/whitney_medium</item>
     </style>
     <style name="UiKit.TextView" parent="">
-        <item name="android:textSize">@dimen/uikit_textsize_medium</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance</item>
-        <item name="android:textColor">?colorTextNormal</item>
-        <item name="android:textColorLink">?colorTextLink</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:textDirection">locale</item>
-        <item name="fontFamily">@font/whitney_medium</item>
     </style>
     <style name="UiKit.TextView.Bold" parent="@style/UiKit.TextView">
-        <item name="fontFamily">@font/whitney_bold</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance.Bold</item>
     </style>
     <style name="UiKit.TextView.H1" parent="@style/UiKit.TextView.Semibold">
         <item name="android:textSize">20.0sp</item>
         <item name="android:textColor">?primary_100</item>
     </style>
     <style name="UiKit.TextView.H1.Bold" parent="@style/UiKit.TextView.H1">
-        <item name="fontFamily">@font/whitney_bold</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance.Bold</item>
     </style>
     <style name="UiKit.TextView.H2" parent="@style/UiKit.TextView.Semibold">
         <item name="android:textSize">@dimen/uikit_textsize_large</item>
@@ -4892,7 +4939,7 @@
         <item name="android:drawablePadding">@dimen/uikit_spacing_large</item>
     </style>
     <style name="UiKit.TextView.Semibold" parent="@style/UiKit.TextView">
-        <item name="fontFamily">@font/whitney_semibold</item>
+        <item name="android:textAppearance">@style/UiKit.TextAppearance.Semibold</item>
     </style>
     <style name="UiKit.TextView.SingleLine" parent="@style/UiKit.TextView">
         <item name="android:ellipsize">end</item>
@@ -4903,14 +4950,6 @@
         <item name="android:textSize">@dimen/uikit_textsize_small</item>
         <item name="android:textColor">?colorTextMuted</item>
     </style>
-    <style name="UiKit.TextView.Subtext.Semibold" parent="@style/UiKit.TextView.Subtext">
-        <item name="fontFamily">@font/whitney_semibold</item>
-    </style>
-    <style name="UiKit.TextView.Subtext.Semibold.SingleLine" parent="@style/UiKit.TextView.Subtext.Semibold">
-        <item name="android:ellipsize">end</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:singleLine">true</item>
-    </style>
     <style name="UiKit.TextView.Subtext.SingleLine" parent="@style/UiKit.TextView.Subtext">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
@@ -4927,19 +4966,6 @@
         <item name="android:textAllCaps">false</item>
         <item name="fontFamily">@font/whitney_medium</item>
     </style>
-    <style name="UiKit.Toolbar.TextAppearance" parent="@style/UiKit.TextView.Semibold">
-        <item name="android:textColor">?colorHeaderPrimary</item>
-        <item name="android:layout_width">0.0dip</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:singleLine">true</item>
-    </style>
-    <style name="UiKit.Toolbar.TextAppearance.Subtitle" parent="@style/UiKit.Toolbar.TextAppearance">
-        <item name="android:textSize">12.0dip</item>
-        <item name="android:textColor">?colorTextMuted</item>
-    </style>
-    <style name="UiKit.Toolbar.TextAppearance.Title" parent="@style/UiKit.Toolbar.TextAppearance">
-        <item name="android:textSize">20.0dip</item>
-    </style>
     <style name="UiKit.User.Phone.Add.Number" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
     <style name="UiKit.User.Phone.Verify.Digits" parent="@style/UiKit.ViewGroup.LinearLayout.Horizontal" />
     <style name="UiKit.User.Verify.Char" parent="@style/UiKit.TextView">