diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 269f6149a2..505e2cee40 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1069.apk
+apkFileName: com.discord-1070.apk
compressionType: false
doNotCompress:
- arsc
@@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1069'
- versionName: 15-alpha3
+ versionCode: '1070'
+ versionName: 15-alpha4
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index b700810d57..5c6d2840c1 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
-#Thu Mar 19 02:07:15 UTC 2020
-version_name=15-alpha3
+#Thu Mar 19 19:49:59 UTC 2020
+version_name=15-alpha4
package_name=com.discord
-build_id=8084ef42-cb0b-4b21-8954-3f46b094858d
-version_code=1069
+build_id=f4d68a38-b24c-4372-9a7f-f496e42a1e3d
+version_code=1070
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index f2d20860f0..4d4d8ffcae 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-ldpi/img_nitro_pattern.png b/com.discord/res/drawable-ldpi/img_nitro_pattern.png
index 5f1e6b191e..9b74a731f3 100644
Binary files a/com.discord/res/drawable-ldpi/img_nitro_pattern.png and b/com.discord/res/drawable-ldpi/img_nitro_pattern.png differ
diff --git a/com.discord/res/drawable/ic_menu_24dp.xml b/com.discord/res/drawable/ic_menu_24dp.xml
new file mode 100644
index 0000000000..9a64c97297
--- /dev/null
+++ b/com.discord/res/drawable/ic_menu_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_channels_list.xml b/com.discord/res/layout-v22/widget_channels_list.xml
index c2b80b44e5..ae73d658bf 100644
--- a/com.discord/res/layout-v22/widget_channels_list.xml
+++ b/com.discord/res/layout-v22/widget_channels_list.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/recycler_item_bottom_nav_space.xml b/com.discord/res/layout/recycler_item_bottom_nav_space.xml
new file mode 100644
index 0000000000..7f96282337
--- /dev/null
+++ b/com.discord/res/layout/recycler_item_bottom_nav_space.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml
index 68aa833e3f..70a2213a1e 100644
--- a/com.discord/res/layout/widget_channels_list.xml
+++ b/com.discord/res/layout/widget_channels_list.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_home_overlapping_panels.xml b/com.discord/res/layout/widget_home_overlapping_panels.xml
new file mode 100644
index 0000000000..c3af837c7b
--- /dev/null
+++ b/com.discord/res/layout/widget_home_overlapping_panels.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_home_tab.xml b/com.discord/res/layout/widget_home_tab.xml
new file mode 100644
index 0000000000..067bcfb8bd
--- /dev/null
+++ b/com.discord/res/layout/widget_home_tab.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_center.xml b/com.discord/res/layout/widget_main_panel_center.xml
index 53d66440d7..cb96d8ad1d 100644
--- a/com.discord/res/layout/widget_main_panel_center.xml
+++ b/com.discord/res/layout/widget_main_panel_center.xml
@@ -1,5 +1,5 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_tabs_host.xml b/com.discord/res/layout/widget_tabs_host.xml
index 19294b0939..5816c4ffe8 100644
--- a/com.discord/res/layout/widget_tabs_host.xml
+++ b/com.discord/res/layout/widget_tabs_host.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index 87e0e3a7fe..981cd216df 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -207,6 +207,8 @@
- 0.38
- 0.7
- 0.54
+ 1472.0dip
+ 8.0dip
4.0dip
20.0dip
800.0dip
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index c8be3bdc0f..4fe5717acc 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -2321,6 +2321,7 @@
+
@@ -2332,6 +2333,9 @@
+
+
+
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index fb8eb6ac76..eef9bdda7b 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -2272,266 +2272,268 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3087,311 +3089,312 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3483,119 +3486,119 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3652,15 +3655,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -3721,20 +3724,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3746,54 +3749,54 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3809,18 +3812,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6314,44 +6317,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6550,461 +6557,464 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10365,5473 +10375,5482 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 879b5ec643..e30d781762 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -44,6 +44,13 @@
Currently using the Discord-specific font scale.
"Currently using your device's font scale."
Space Between Message Groups
+ Reduced Motion
+ Sync with computer
+ "Discord's reduced motion will match your computer's settings"
+ Reduce the amount and intensity of animations, hover effects, and other moving effects across Discord.
+ Enable Reduced Motion
+ "Discord's reduced motion will be on and separate from your computer settings"
+ This setting has been automatically disabled because of your **Reduced Motion** setting.
Zoom level
Account
Click to copy username
@@ -1029,7 +1036,7 @@ Fixes and Updates {fixed}
OR
Collapse
Collapse Category
- 8084ef42-cb0b-4b21-8954-3f46b094858d
+ f4d68a38-b24c-4372-9a7f-f496e42a1e3d
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -1578,6 +1585,7 @@ Fixes and Updates {fixed}
This image will be displayed on your Discovery Listing. The recommended minimum size is 1920x1080 and recommended aspect ratio is 16:9.
This lists your server in Server Discovery, which allows people to find your server via search or recommendations.
Automatically scan and delete media sent in this server that contains explicit content. Please choose how broadly the filter will apply to members in your server. **We recommend setting a filter for a public Discord.**
+ Hardware acceleration uses your GPU for efficient video encoding, if available.
If a channel is selected then an invite link will be generated with the widget, otherwise only online members and voice channels will be provided.
Pruning will kick **%1$s** who have not been seen in **%2$s** and are not assigned to any roles. They can re-join the server using a new invite.
Post messages that reach servers outside your own. Users can opt into Following this channel, so select posts you Publish from here will appear directly in their own servers. [Learn more.](%1$s)
@@ -5375,6 +5383,7 @@ You cannot take any moderation actions until you enable it."
Discord uses only the best organic locally-sourced Opus Voice codec.
Audio Codec
Use an experimental method to capture audio from games
+ H.264 Hardware Acceleration
Stop Testing
"Let's Check"
"Having mic issues? Start a test and say something silly -- we'll play your voice back to you."
@@ -5576,5 +5585,5 @@ You cannot take any moderation actions until you enable it."
"You're viewing older messages"
Chinese, China
Chinese, Taiwan
- - false
+ - false
diff --git a/com.discord/smali/androidx/activity/R$dimen.smali b/com.discord/smali/androidx/activity/R$dimen.smali
index fcd45957c1..f62c1fd556 100644
--- a/com.discord/smali/androidx/activity/R$dimen.smali
+++ b/com.discord/smali/androidx/activity/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 9fdbbd360c..270c3094c2 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index 45ed64fc53..9223317611 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$dimen.smali b/com.discord/smali/androidx/appcompat/R$dimen.smali
index 73935349dd..3079c1f1e7 100644
--- a/com.discord/smali/androidx/appcompat/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/R$dimen.smali
@@ -203,51 +203,51 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 7f487df9db..d2e8b28791 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -203,33 +203,33 @@
.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800b5
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 6f3b469a43..9e7bade544 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -297,7 +297,7 @@
.field public static final up:I = 0x7f0a08d5
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index 305005af25..995b28d6b4 100644
--- a/com.discord/smali/androidx/appcompat/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/R$layout.smali
@@ -85,13 +85,13 @@
.field public static final notification_template_part_time:I = 0x7f0d007d
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index 0251960ad6..40a9ca5f9c 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -69,9 +69,9 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final search_menu_title:I = 0x7f1211b3
+.field public static final search_menu_title:I = 0x7f1211bb
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$dimen.smali b/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
index be6561400f..956cbf4f7e 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
index 6f9fb8dbab..f0eb1fa1e2 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
@@ -17,29 +17,29 @@
# static fields
.field public static final abc_vector_test:I = 0x7f080073
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$string.smali b/com.discord/smali/androidx/appcompat/resources/R$string.smali
index 02b7a3ffd5..d9016c9492 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
index bb4ae14398..7f09cc0276 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 0fa041fde4..97e0c3a877 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 8c71d687e9..9ac6501322 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$dimen.smali b/com.discord/smali/androidx/browser/R$dimen.smali
index 37ffb140cf..701d2a4f28 100644
--- a/com.discord/smali/androidx/browser/R$dimen.smali
+++ b/com.discord/smali/androidx/browser/R$dimen.smali
@@ -33,35 +33,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index 4e32aff0da..f206c78778 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 0990f833fe..ae17a4d5ce 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 6c468feff3..704472117f 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -41,7 +41,7 @@
.field public static final top:I = 0x7f0a08bd
-.field public static final wrap:I = 0x7f0a09c0
+.field public static final wrap:I = 0x7f0a09c4
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
index 0085b29e23..582609e62b 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 8d31847b79..0a899b0490 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index fa6e3d3fda..b650b9068e 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/core/R$dimen.smali b/com.discord/smali/androidx/core/R$dimen.smali
index 251dad725a..d8218fea5f 100644
--- a/com.discord/smali/androidx/core/R$dimen.smali
+++ b/com.discord/smali/androidx/core/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 90c6d9401d..791f754314 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index 3d4823d2ba..fa465aee92 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$dimen.smali b/com.discord/smali/androidx/core/ktx/R$dimen.smali
index 0c37dd3b2a..10e3b09a87 100644
--- a/com.discord/smali/androidx/core/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/core/ktx/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali
index 9d21431756..8a6a09ca76 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$string.smali b/com.discord/smali/androidx/core/ktx/R$string.smali
index 44cd6c4ac2..33385e8ec8 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$dimen.smali b/com.discord/smali/androidx/customview/R$dimen.smali
index 4c887e80a4..2dd54044aa 100644
--- a/com.discord/smali/androidx/customview/R$dimen.smali
+++ b/com.discord/smali/androidx/customview/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index e29ee4884c..2b0106274a 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 4a80d500f3..5f8f57e19f 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$dimen.smali b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
index 9e5030e214..b4ee838d9d 100644
--- a/com.discord/smali/androidx/drawerlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
@@ -31,35 +31,35 @@
.field public static final def_drawer_elevation:I = 0x7f07007b
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index 0601abf29d..cce8b0b24a 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index de93ed1af4..b033cbd9af 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
index 833d8e8b4a..9dded9eb45 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index 1386a02799..568e6df3fc 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index 3ed1aaf795..cc28d79e52 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$dimen.smali b/com.discord/smali/androidx/fragment/R$dimen.smali
index 91e50083cf..d620659a0b 100644
--- a/com.discord/smali/androidx/fragment/R$dimen.smali
+++ b/com.discord/smali/androidx/fragment/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 3fbe980de7..f7addd0a5a 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 0263a48596..8ea04f9948 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
index 38e8ebcbf8..0579fa3856 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index 4f5510e918..433fb39c19 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index d0cd34c468..cc1ac861d6 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
index bbb73e02d5..9c588b5675 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index 444ee3c4eb..d0b8774c80 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index 86d4aeb466..d4daf7b45a 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$dimen.smali b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
index dffffeee23..d5fed6312b 100644
--- a/com.discord/smali/androidx/legacy/v4/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
@@ -29,43 +29,43 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final subtitle_corner_radius:I = 0x7f070192
+.field public static final subtitle_corner_radius:I = 0x7f070194
-.field public static final subtitle_outline_width:I = 0x7f070193
+.field public static final subtitle_outline_width:I = 0x7f070195
-.field public static final subtitle_shadow_offset:I = 0x7f070194
+.field public static final subtitle_shadow_offset:I = 0x7f070196
-.field public static final subtitle_shadow_radius:I = 0x7f070195
+.field public static final subtitle_shadow_radius:I = 0x7f070197
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index 7cab66d476..0a8b107e4a 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index bf9dbcf0e3..b801ccead2 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
index 6ccb9527a0..592156c07c 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
index ad35b8ac92..b8a77ed1fb 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index 075c3553ce..6225e0115c 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$dimen.smali b/com.discord/smali/androidx/loader/R$dimen.smali
index 264469ab21..a2de3c6383 100644
--- a/com.discord/smali/androidx/loader/R$dimen.smali
+++ b/com.discord/smali/androidx/loader/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index 3be67c1167..f8c5a2ca31 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index ecf5999b7e..60096c0eee 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/media/R$dimen.smali b/com.discord/smali/androidx/media/R$dimen.smali
index 2f1519eddb..d6dca950fe 100644
--- a/com.discord/smali/androidx/media/R$dimen.smali
+++ b/com.discord/smali/androidx/media/R$dimen.smali
@@ -29,43 +29,43 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final subtitle_corner_radius:I = 0x7f070192
+.field public static final subtitle_corner_radius:I = 0x7f070194
-.field public static final subtitle_outline_width:I = 0x7f070193
+.field public static final subtitle_outline_width:I = 0x7f070195
-.field public static final subtitle_shadow_offset:I = 0x7f070194
+.field public static final subtitle_shadow_offset:I = 0x7f070196
-.field public static final subtitle_shadow_radius:I = 0x7f070195
+.field public static final subtitle_shadow_radius:I = 0x7f070197
# direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 3b36fb3444..fe5a46cb26 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 51fc61178a..aa3b8d96f3 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$dimen.smali b/com.discord/smali/androidx/preference/R$dimen.smali
index 69b8526ba8..7cea6255d1 100644
--- a/com.discord/smali/androidx/preference/R$dimen.smali
+++ b/com.discord/smali/androidx/preference/R$dimen.smali
@@ -209,67 +209,67 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final preference_dropdown_padding_start:I = 0x7f070186
+.field public static final preference_dropdown_padding_start:I = 0x7f070188
-.field public static final preference_icon_minWidth:I = 0x7f070187
+.field public static final preference_icon_minWidth:I = 0x7f070189
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070188
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f07018a
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070189
+.field public static final preference_seekbar_padding_vertical:I = 0x7f07018b
-.field public static final preference_seekbar_value_minWidth:I = 0x7f07018a
+.field public static final preference_seekbar_value_minWidth:I = 0x7f07018c
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali
index 3f472946f4..925343de58 100644
--- a/com.discord/smali/androidx/preference/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/R$drawable.smali
@@ -205,35 +205,35 @@
.field public static final ic_arrow_down_24dp:I = 0x7f0801f9
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final preference_list_divider_material:I = 0x7f080502
+.field public static final preference_list_divider_material:I = 0x7f080503
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index ff6394b41f..a50e12727f 100644
--- a/com.discord/smali/androidx/preference/R$id.smali
+++ b/com.discord/smali/androidx/preference/R$id.smali
@@ -323,7 +323,7 @@
.field public static final up:I = 0x7f0a08d5
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$layout.smali b/com.discord/smali/androidx/preference/R$layout.smali
index 7069a25527..364808be4d 100644
--- a/com.discord/smali/androidx/preference/R$layout.smali
+++ b/com.discord/smali/androidx/preference/R$layout.smali
@@ -121,13 +121,13 @@
.field public static final preference_widget_switch_compat:I = 0x7f0d0097
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 57f7fe2e5c..27b65430e5 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120467
+.field public static final copy:I = 0x7f12046e
-.field public static final expand_button_title:I = 0x7f1205b7
+.field public static final expand_button_title:I = 0x7f1205be
-.field public static final not_set:I = 0x7f120d65
+.field public static final not_set:I = 0x7f120d6d
-.field public static final preference_copied:I = 0x7f120ef6
+.field public static final preference_copied:I = 0x7f120efe
-.field public static final search_menu_title:I = 0x7f1211b3
+.field public static final search_menu_title:I = 0x7f1211bb
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
-.field public static final summary_collapsed_preference_list:I = 0x7f1212bb
+.field public static final summary_collapsed_preference_list:I = 0x7f1212c3
-.field public static final v7_preference_off:I = 0x7f1214d0
+.field public static final v7_preference_off:I = 0x7f1214d9
-.field public static final v7_preference_on:I = 0x7f1214d1
+.field public static final v7_preference_on:I = 0x7f1214da
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$dimen.smali b/com.discord/smali/androidx/preference/ktx/R$dimen.smali
index 63fc575d3b..9bfe9996cf 100644
--- a/com.discord/smali/androidx/preference/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$dimen.smali
@@ -209,67 +209,67 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final preference_dropdown_padding_start:I = 0x7f070186
+.field public static final preference_dropdown_padding_start:I = 0x7f070188
-.field public static final preference_icon_minWidth:I = 0x7f070187
+.field public static final preference_icon_minWidth:I = 0x7f070189
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070188
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f07018a
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070189
+.field public static final preference_seekbar_padding_vertical:I = 0x7f07018b
-.field public static final preference_seekbar_value_minWidth:I = 0x7f07018a
+.field public static final preference_seekbar_value_minWidth:I = 0x7f07018c
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
index 71025e90ee..ea6b837d49 100644
--- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
@@ -205,35 +205,35 @@
.field public static final ic_arrow_down_24dp:I = 0x7f0801f9
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final preference_list_divider_material:I = 0x7f080502
+.field public static final preference_list_divider_material:I = 0x7f080503
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$id.smali b/com.discord/smali/androidx/preference/ktx/R$id.smali
index 4fb54ffddc..73cf9964d2 100644
--- a/com.discord/smali/androidx/preference/ktx/R$id.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$id.smali
@@ -323,7 +323,7 @@
.field public static final up:I = 0x7f0a08d5
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$layout.smali b/com.discord/smali/androidx/preference/ktx/R$layout.smali
index 75a99d06fd..9ab7b99b7a 100644
--- a/com.discord/smali/androidx/preference/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$layout.smali
@@ -121,13 +121,13 @@
.field public static final preference_widget_switch_compat:I = 0x7f0d0097
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index 9d815b0aa3..035f2ae1b7 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120467
+.field public static final copy:I = 0x7f12046e
-.field public static final expand_button_title:I = 0x7f1205b7
+.field public static final expand_button_title:I = 0x7f1205be
-.field public static final not_set:I = 0x7f120d65
+.field public static final not_set:I = 0x7f120d6d
-.field public static final preference_copied:I = 0x7f120ef6
+.field public static final preference_copied:I = 0x7f120efe
-.field public static final search_menu_title:I = 0x7f1211b3
+.field public static final search_menu_title:I = 0x7f1211bb
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
-.field public static final summary_collapsed_preference_list:I = 0x7f1212bb
+.field public static final summary_collapsed_preference_list:I = 0x7f1212c3
-.field public static final v7_preference_off:I = 0x7f1214d0
+.field public static final v7_preference_off:I = 0x7f1214d9
-.field public static final v7_preference_on:I = 0x7f1214d1
+.field public static final v7_preference_on:I = 0x7f1214da
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$dimen.smali b/com.discord/smali/androidx/recyclerview/R$dimen.smali
index aa337cc098..713eb26d04 100644
--- a/com.discord/smali/androidx/recyclerview/R$dimen.smali
+++ b/com.discord/smali/androidx/recyclerview/R$dimen.smali
@@ -35,41 +35,41 @@
.field public static final fastscroll_minimum_range:I = 0x7f0700bb
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 36498ffd49..f1bb3b090c 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 2ff6ca679e..ace7db111f 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/room/R$dimen.smali b/com.discord/smali/androidx/room/R$dimen.smali
index dbd1a96a8c..34119bd39a 100644
--- a/com.discord/smali/androidx/room/R$dimen.smali
+++ b/com.discord/smali/androidx/room/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index 68bd9ed73f..435f63e481 100644
--- a/com.discord/smali/androidx/room/R$drawable.smali
+++ b/com.discord/smali/androidx/room/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index b83779974a..9da3abcdbf 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
index 0257fc2c70..4844de235e 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 6b277d092e..b70ca734dc 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index 574c347b6f..f55f3c0f6c 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
index 577e951880..e4bcaac0ab 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 0a51d514d4..4cbc474c3f 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index e7959cd25c..fe99790a42 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$dimen.smali b/com.discord/smali/androidx/transition/R$dimen.smali
index fc9ebb1435..6b02afc6f4 100644
--- a/com.discord/smali/androidx/transition/R$dimen.smali
+++ b/com.discord/smali/androidx/transition/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index c7da02092c..b8f0adf299 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 205b83de0c..5372f1f333 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
index b949b898b6..fdf19f159b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 55117aa028..67bcad8731 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index e8addded29..cb4a0caf3b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
index 1979f993f2..92fd08b282 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
index 14ed557d3a..bafbc7a2ca 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
index b661b0b1c8..1c8da23454 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$dimen.smali b/com.discord/smali/androidx/viewpager/R$dimen.smali
index 60f62cd803..ead7ef966c 100644
--- a/com.discord/smali/androidx/viewpager/R$dimen.smali
+++ b/com.discord/smali/androidx/viewpager/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index e3204de177..dd633f480e 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index ad42fe1cf6..bc05af7ac3 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$dimen.smali b/com.discord/smali/androidx/viewpager2/R$dimen.smali
index 08137debe0..90203c98a2 100644
--- a/com.discord/smali/androidx/viewpager2/R$dimen.smali
+++ b/com.discord/smali/androidx/viewpager2/R$dimen.smali
@@ -35,41 +35,41 @@
.field public static final fastscroll_minimum_range:I = 0x7f0700bb
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali
index cc86339abb..7c8ad7403c 100644
--- a/com.discord/smali/androidx/viewpager2/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index 4f6681ee4f..cf68c7917a 100644
--- a/com.discord/smali/androidx/viewpager2/R$string.smali
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/work/R$dimen.smali b/com.discord/smali/androidx/work/R$dimen.smali
index 168ab66c3a..7b57e599fb 100644
--- a/com.discord/smali/androidx/work/R$dimen.smali
+++ b/com.discord/smali/androidx/work/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index 18dff05320..20e35c9f4d 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 52030217fe..7f81086af9 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$dimen.smali b/com.discord/smali/androidx/work/ktx/R$dimen.smali
index abf3ed37e6..29cd4287c8 100644
--- a/com.discord/smali/androidx/work/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/work/ktx/R$dimen.smali
@@ -29,35 +29,35 @@
.field public static final compat_notification_large_icon_max_width:I = 0x7f070078
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali
index a2a0d9e1b6..e0626ace2c 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index d199bd2f71..8281f1b3b0 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
# direct methods
diff --git a/com.discord/smali/com/angarron/colorpicker/R$a.smali b/com.discord/smali/com/angarron/colorpicker/R$a.smali
index 110706602e..2cb6975573 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$a.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$a.smali
@@ -209,9 +209,9 @@
.field public static final useLogo:I = 0x7f0a08d9
-.field public static final withText:I = 0x7f0a09bf
+.field public static final withText:I = 0x7f0a09c3
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
# direct methods
diff --git a/com.discord/smali/com/angarron/colorpicker/R$b.smali b/com.discord/smali/com/angarron/colorpicker/R$b.smali
index 3bf644f144..bbb9d103a8 100644
--- a/com.discord/smali/com/angarron/colorpicker/R$b.smali
+++ b/com.discord/smali/com/angarron/colorpicker/R$b.smali
@@ -83,13 +83,13 @@
.field public static final notification_template_part_time:I = 0x7f0d007d
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
# direct methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 0f986cd8a7..fe59d066e0 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -38,11 +38,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1069"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1070"
-.field public static final VERSION_CODE:I = 0x42d
+.field public static final VERSION_CODE:I = 0x42e
-.field public static final VERSION_NAME:Ljava/lang/String; = "15-alpha3"
+.field public static final VERSION_NAME:Ljava/lang/String; = "15-alpha4"
# direct methods
diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali
index 73e39c6026..0af382aecd 100644
--- a/com.discord/smali/com/discord/app/AppActivity.smali
+++ b/com.discord/smali/com/discord/app/AppActivity.smali
@@ -352,12 +352,16 @@
return-object v0
.end method
-.method public final a(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+.method public final a(ZLjava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
.locals 4
.param p2 # Ljava/lang/Integer;
.annotation build Landroidx/annotation/DrawableRes;
.end annotation
.end param
+ .param p3 # Ljava/lang/Integer;
+ .annotation build Landroidx/annotation/ColorInt;
+ .end annotation
+ .end param
iget-object v0, p0, Lcom/discord/app/AppActivity;->l:Landroidx/appcompat/widget/Toolbar;
@@ -392,6 +396,16 @@
move-result-object v1
+ if-eqz p3, :cond_1
+
+ if-eqz v1, :cond_1
+
+ invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I
+
+ move-result p1
+
+ invoke-static {v1, p1}, Landroidx/core/graphics/drawable/DrawableCompat;->setTint(Landroid/graphics/drawable/Drawable;I)V
+
:cond_1
invoke-virtual {v0, v1}, Landroidx/appcompat/widget/Toolbar;->setNavigationIcon(Landroid/graphics/drawable/Drawable;)V
diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali
index 1b9de4540e..71d09e895e 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -82,7 +82,7 @@
iget-object v3, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment;
- const v4, 0x7f120533
+ const v4, 0x7f12053a
invoke-virtual {v3, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index 4afc23c7c6..1c6086406e 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -60,7 +60,7 @@
iget-object v2, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
- const v3, 0x7f12140f
+ const v3, 0x7f121417
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/app/AppFragment.smali b/com.discord/smali/com/discord/app/AppFragment.smali
index 6b413956da..df432782fd 100644
--- a/com.discord/smali/com/discord/app/AppFragment.smali
+++ b/com.discord/smali/com/discord/app/AppFragment.smali
@@ -215,32 +215,41 @@
throw p0
.end method
-.method public static synthetic setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- .locals 0
+.method public static synthetic setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+ .locals 1
- if-nez p4, :cond_2
+ if-nez p5, :cond_3
- and-int/lit8 p4, p3, 0x1
+ and-int/lit8 p5, p4, 0x1
- if-eqz p4, :cond_0
+ if-eqz p5, :cond_0
const/4 p1, 0x1
:cond_0
- and-int/lit8 p3, p3, 0x2
+ and-int/lit8 p5, p4, 0x2
- if-eqz p3, :cond_1
+ const/4 v0, 0x0
- const/4 p2, 0x0
+ if-eqz p5, :cond_1
+
+ move-object p2, v0
:cond_1
- invoke-virtual {p0, p1, p2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+ and-int/lit8 p4, p4, 0x4
+
+ if-eqz p4, :cond_2
+
+ move-object p3, v0
+
+ :cond_2
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
move-result-object p0
return-object p0
- :cond_2
+ :cond_3
new-instance p0, Ljava/lang/UnsupportedOperationException;
const-string p1, "Super calls with default arguments not supported in this target, function: setActionBarDisplayHomeAsUpEnabled"
@@ -846,15 +855,21 @@
.end method
.method public final setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- .locals 3
-
- const/4 v0, 0x0
+ .locals 6
const/4 v1, 0x0
- const/4 v2, 0x3
+ const/4 v2, 0x0
- invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+ const/4 v3, 0x0
+
+ const/4 v4, 0x7
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
move-result-object v0
@@ -862,13 +877,21 @@
.end method
.method public final setActionBarDisplayHomeAsUpEnabled(Z)Landroidx/appcompat/widget/Toolbar;
- .locals 2
+ .locals 6
- const/4 v0, 0x0
+ const/4 v2, 0x0
- const/4 v1, 0x2
+ const/4 v3, 0x0
- invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+ const/4 v4, 0x6
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ move v1, p1
+
+ invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
move-result-object p1
@@ -876,11 +899,41 @@
.end method
.method public final setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+ .locals 6
+ .param p2 # Ljava/lang/Integer;
+ .annotation build Landroidx/annotation/DrawableRes;
+ .end annotation
+ .end param
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x4
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ move v1, p1
+
+ move-object v2, p2
+
+ invoke-static/range {v0 .. v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;Ljava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
.locals 1
.param p2 # Ljava/lang/Integer;
.annotation build Landroidx/annotation/DrawableRes;
.end annotation
.end param
+ .param p3 # Ljava/lang/Integer;
+ .annotation build Landroidx/annotation/ColorInt;
+ .end annotation
+ .end param
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
@@ -888,7 +941,7 @@
if-eqz v0, :cond_0
- invoke-virtual {v0, p1, p2}, Lcom/discord/app/AppActivity;->a(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
+ invoke-virtual {v0, p1, p2, p3}, Lcom/discord/app/AppActivity;->a(ZLjava/lang/Integer;Ljava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
move-result-object p1
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index de09e98949..a80aeb2635 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -323,7 +323,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120ecc
+ const p1, 0x7f120ed4
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -332,7 +332,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f120ec6
+ const p1, 0x7f120ece
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -341,7 +341,7 @@
goto :goto_0
:cond_2
- const p1, 0x7f120ec5
+ const p1, 0x7f120ecd
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -350,7 +350,7 @@
goto :goto_0
:cond_3
- const p1, 0x7f120ec7
+ const p1, 0x7f120ecf
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService.smali b/com.discord/smali/com/discord/app/DiscordConnectService.smali
index 4e1484910b..6606a0b265 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -99,7 +99,7 @@
move-result-object v0
- const v1, 0x7f08035b
+ const v1, 0x7f08035c
invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -115,7 +115,7 @@
move-result-object v0
- const v1, 0x7f120434
+ const v1, 0x7f12043b
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -125,7 +125,7 @@
move-result-object v0
- const v1, 0x7f12043b
+ const v1, 0x7f120442
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -271,7 +271,7 @@
:goto_2
if-eqz v5, :cond_3
- const v3, 0x7f120e50
+ const v3, 0x7f120e58
const/16 v4, 0xc
diff --git a/com.discord/smali/com/discord/gateway/R$dimen.smali b/com.discord/smali/com/discord/gateway/R$dimen.smali
index fea7364afa..c22bc511c0 100644
--- a/com.discord/smali/com/discord/gateway/R$dimen.smali
+++ b/com.discord/smali/com/discord/gateway/R$dimen.smali
@@ -315,377 +315,377 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final material_emphasis_disabled:I = 0x7f0700db
+.field public static final material_emphasis_disabled:I = 0x7f0700dd
-.field public static final material_emphasis_high_type:I = 0x7f0700dc
+.field public static final material_emphasis_high_type:I = 0x7f0700de
-.field public static final material_emphasis_medium:I = 0x7f0700dd
+.field public static final material_emphasis_medium:I = 0x7f0700df
-.field public static final material_text_view_test_line_height:I = 0x7f0700de
+.field public static final material_text_view_test_line_height:I = 0x7f0700e0
-.field public static final material_text_view_test_line_height_override:I = 0x7f0700df
+.field public static final material_text_view_test_line_height_override:I = 0x7f0700e1
-.field public static final mtrl_alert_dialog_background_inset_bottom:I = 0x7f0700e1
+.field public static final mtrl_alert_dialog_background_inset_bottom:I = 0x7f0700e3
-.field public static final mtrl_alert_dialog_background_inset_end:I = 0x7f0700e2
+.field public static final mtrl_alert_dialog_background_inset_end:I = 0x7f0700e4
-.field public static final mtrl_alert_dialog_background_inset_start:I = 0x7f0700e3
+.field public static final mtrl_alert_dialog_background_inset_start:I = 0x7f0700e5
-.field public static final mtrl_alert_dialog_background_inset_top:I = 0x7f0700e4
+.field public static final mtrl_alert_dialog_background_inset_top:I = 0x7f0700e6
-.field public static final mtrl_alert_dialog_picker_background_inset:I = 0x7f0700e5
+.field public static final mtrl_alert_dialog_picker_background_inset:I = 0x7f0700e7
-.field public static final mtrl_badge_horizontal_edge_offset:I = 0x7f0700e6
+.field public static final mtrl_badge_horizontal_edge_offset:I = 0x7f0700e8
-.field public static final mtrl_badge_long_text_horizontal_padding:I = 0x7f0700e7
+.field public static final mtrl_badge_long_text_horizontal_padding:I = 0x7f0700e9
-.field public static final mtrl_badge_radius:I = 0x7f0700e8
+.field public static final mtrl_badge_radius:I = 0x7f0700ea
-.field public static final mtrl_badge_text_horizontal_edge_offset:I = 0x7f0700e9
+.field public static final mtrl_badge_text_horizontal_edge_offset:I = 0x7f0700eb
-.field public static final mtrl_badge_text_size:I = 0x7f0700ea
+.field public static final mtrl_badge_text_size:I = 0x7f0700ec
-.field public static final mtrl_badge_with_text_radius:I = 0x7f0700eb
+.field public static final mtrl_badge_with_text_radius:I = 0x7f0700ed
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700ec
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700ee
-.field public static final mtrl_bottomappbar_fab_bottom_margin:I = 0x7f0700ed
+.field public static final mtrl_bottomappbar_fab_bottom_margin:I = 0x7f0700ef
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700ee
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700f0
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700ef
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700f1
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700f0
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700f2
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700f1
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700f3
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700f2
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700f4
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700f3
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700f5
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700f4
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700f6
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700f5
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700f7
-.field public static final mtrl_btn_elevation:I = 0x7f0700f6
+.field public static final mtrl_btn_elevation:I = 0x7f0700f8
-.field public static final mtrl_btn_focused_z:I = 0x7f0700f7
+.field public static final mtrl_btn_focused_z:I = 0x7f0700f9
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700f8
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700fa
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700f9
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700fb
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700fa
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700fc
-.field public static final mtrl_btn_inset:I = 0x7f0700fb
+.field public static final mtrl_btn_inset:I = 0x7f0700fd
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700fc
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700fe
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700fd
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ff
-.field public static final mtrl_btn_padding_left:I = 0x7f0700fe
+.field public static final mtrl_btn_padding_left:I = 0x7f070100
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ff
+.field public static final mtrl_btn_padding_right:I = 0x7f070101
-.field public static final mtrl_btn_padding_top:I = 0x7f070100
+.field public static final mtrl_btn_padding_top:I = 0x7f070102
-.field public static final mtrl_btn_pressed_z:I = 0x7f070101
+.field public static final mtrl_btn_pressed_z:I = 0x7f070103
-.field public static final mtrl_btn_stroke_size:I = 0x7f070102
+.field public static final mtrl_btn_stroke_size:I = 0x7f070104
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f070103
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f070105
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f070104
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f070106
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f070105
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f070107
-.field public static final mtrl_btn_text_size:I = 0x7f070106
+.field public static final mtrl_btn_text_size:I = 0x7f070108
-.field public static final mtrl_btn_z:I = 0x7f070107
+.field public static final mtrl_btn_z:I = 0x7f070109
-.field public static final mtrl_calendar_action_height:I = 0x7f070108
+.field public static final mtrl_calendar_action_height:I = 0x7f07010a
-.field public static final mtrl_calendar_action_padding:I = 0x7f070109
+.field public static final mtrl_calendar_action_padding:I = 0x7f07010b
-.field public static final mtrl_calendar_bottom_padding:I = 0x7f07010a
+.field public static final mtrl_calendar_bottom_padding:I = 0x7f07010c
-.field public static final mtrl_calendar_content_padding:I = 0x7f07010b
+.field public static final mtrl_calendar_content_padding:I = 0x7f07010d
-.field public static final mtrl_calendar_day_corner:I = 0x7f07010c
+.field public static final mtrl_calendar_day_corner:I = 0x7f07010e
-.field public static final mtrl_calendar_day_height:I = 0x7f07010d
+.field public static final mtrl_calendar_day_height:I = 0x7f07010f
-.field public static final mtrl_calendar_day_horizontal_padding:I = 0x7f07010e
+.field public static final mtrl_calendar_day_horizontal_padding:I = 0x7f070110
-.field public static final mtrl_calendar_day_today_stroke:I = 0x7f07010f
+.field public static final mtrl_calendar_day_today_stroke:I = 0x7f070111
-.field public static final mtrl_calendar_day_vertical_padding:I = 0x7f070110
+.field public static final mtrl_calendar_day_vertical_padding:I = 0x7f070112
-.field public static final mtrl_calendar_day_width:I = 0x7f070111
+.field public static final mtrl_calendar_day_width:I = 0x7f070113
-.field public static final mtrl_calendar_days_of_week_height:I = 0x7f070112
+.field public static final mtrl_calendar_days_of_week_height:I = 0x7f070114
-.field public static final mtrl_calendar_dialog_background_inset:I = 0x7f070113
+.field public static final mtrl_calendar_dialog_background_inset:I = 0x7f070115
-.field public static final mtrl_calendar_header_content_padding:I = 0x7f070114
+.field public static final mtrl_calendar_header_content_padding:I = 0x7f070116
-.field public static final mtrl_calendar_header_content_padding_fullscreen:I = 0x7f070115
+.field public static final mtrl_calendar_header_content_padding_fullscreen:I = 0x7f070117
-.field public static final mtrl_calendar_header_divider_thickness:I = 0x7f070116
+.field public static final mtrl_calendar_header_divider_thickness:I = 0x7f070118
-.field public static final mtrl_calendar_header_height:I = 0x7f070117
+.field public static final mtrl_calendar_header_height:I = 0x7f070119
-.field public static final mtrl_calendar_header_height_fullscreen:I = 0x7f070118
+.field public static final mtrl_calendar_header_height_fullscreen:I = 0x7f07011a
-.field public static final mtrl_calendar_header_selection_line_height:I = 0x7f070119
+.field public static final mtrl_calendar_header_selection_line_height:I = 0x7f07011b
-.field public static final mtrl_calendar_header_text_padding:I = 0x7f07011a
+.field public static final mtrl_calendar_header_text_padding:I = 0x7f07011c
-.field public static final mtrl_calendar_header_toggle_margin_bottom:I = 0x7f07011b
+.field public static final mtrl_calendar_header_toggle_margin_bottom:I = 0x7f07011d
-.field public static final mtrl_calendar_header_toggle_margin_top:I = 0x7f07011c
+.field public static final mtrl_calendar_header_toggle_margin_top:I = 0x7f07011e
-.field public static final mtrl_calendar_landscape_header_width:I = 0x7f07011d
+.field public static final mtrl_calendar_landscape_header_width:I = 0x7f07011f
-.field public static final mtrl_calendar_maximum_default_fullscreen_minor_axis:I = 0x7f07011e
+.field public static final mtrl_calendar_maximum_default_fullscreen_minor_axis:I = 0x7f070120
-.field public static final mtrl_calendar_month_horizontal_padding:I = 0x7f07011f
+.field public static final mtrl_calendar_month_horizontal_padding:I = 0x7f070121
-.field public static final mtrl_calendar_month_vertical_padding:I = 0x7f070120
+.field public static final mtrl_calendar_month_vertical_padding:I = 0x7f070122
-.field public static final mtrl_calendar_navigation_bottom_padding:I = 0x7f070121
+.field public static final mtrl_calendar_navigation_bottom_padding:I = 0x7f070123
-.field public static final mtrl_calendar_navigation_height:I = 0x7f070122
+.field public static final mtrl_calendar_navigation_height:I = 0x7f070124
-.field public static final mtrl_calendar_navigation_top_padding:I = 0x7f070123
+.field public static final mtrl_calendar_navigation_top_padding:I = 0x7f070125
-.field public static final mtrl_calendar_pre_l_text_clip_padding:I = 0x7f070124
+.field public static final mtrl_calendar_pre_l_text_clip_padding:I = 0x7f070126
-.field public static final mtrl_calendar_selection_baseline_to_top_fullscreen:I = 0x7f070125
+.field public static final mtrl_calendar_selection_baseline_to_top_fullscreen:I = 0x7f070127
-.field public static final mtrl_calendar_selection_text_baseline_to_bottom:I = 0x7f070126
+.field public static final mtrl_calendar_selection_text_baseline_to_bottom:I = 0x7f070128
-.field public static final mtrl_calendar_selection_text_baseline_to_bottom_fullscreen:I = 0x7f070127
+.field public static final mtrl_calendar_selection_text_baseline_to_bottom_fullscreen:I = 0x7f070129
-.field public static final mtrl_calendar_selection_text_baseline_to_top:I = 0x7f070128
+.field public static final mtrl_calendar_selection_text_baseline_to_top:I = 0x7f07012a
-.field public static final mtrl_calendar_text_input_padding_top:I = 0x7f070129
+.field public static final mtrl_calendar_text_input_padding_top:I = 0x7f07012b
-.field public static final mtrl_calendar_title_baseline_to_top:I = 0x7f07012a
+.field public static final mtrl_calendar_title_baseline_to_top:I = 0x7f07012c
-.field public static final mtrl_calendar_title_baseline_to_top_fullscreen:I = 0x7f07012b
+.field public static final mtrl_calendar_title_baseline_to_top_fullscreen:I = 0x7f07012d
-.field public static final mtrl_calendar_year_corner:I = 0x7f07012c
+.field public static final mtrl_calendar_year_corner:I = 0x7f07012e
-.field public static final mtrl_calendar_year_height:I = 0x7f07012d
+.field public static final mtrl_calendar_year_height:I = 0x7f07012f
-.field public static final mtrl_calendar_year_horizontal_padding:I = 0x7f07012e
+.field public static final mtrl_calendar_year_horizontal_padding:I = 0x7f070130
-.field public static final mtrl_calendar_year_vertical_padding:I = 0x7f07012f
+.field public static final mtrl_calendar_year_vertical_padding:I = 0x7f070131
-.field public static final mtrl_calendar_year_width:I = 0x7f070130
+.field public static final mtrl_calendar_year_width:I = 0x7f070132
-.field public static final mtrl_card_checked_icon_margin:I = 0x7f070131
+.field public static final mtrl_card_checked_icon_margin:I = 0x7f070133
-.field public static final mtrl_card_checked_icon_size:I = 0x7f070132
+.field public static final mtrl_card_checked_icon_size:I = 0x7f070134
-.field public static final mtrl_card_corner_radius:I = 0x7f070133
+.field public static final mtrl_card_corner_radius:I = 0x7f070135
-.field public static final mtrl_card_dragged_z:I = 0x7f070134
+.field public static final mtrl_card_dragged_z:I = 0x7f070136
-.field public static final mtrl_card_elevation:I = 0x7f070135
+.field public static final mtrl_card_elevation:I = 0x7f070137
-.field public static final mtrl_card_spacing:I = 0x7f070136
+.field public static final mtrl_card_spacing:I = 0x7f070138
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f070137
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f070139
-.field public static final mtrl_chip_text_size:I = 0x7f070138
+.field public static final mtrl_chip_text_size:I = 0x7f07013a
-.field public static final mtrl_exposed_dropdown_menu_popup_elevation:I = 0x7f070139
+.field public static final mtrl_exposed_dropdown_menu_popup_elevation:I = 0x7f07013b
-.field public static final mtrl_exposed_dropdown_menu_popup_vertical_offset:I = 0x7f07013a
+.field public static final mtrl_exposed_dropdown_menu_popup_vertical_offset:I = 0x7f07013c
-.field public static final mtrl_exposed_dropdown_menu_popup_vertical_padding:I = 0x7f07013b
+.field public static final mtrl_exposed_dropdown_menu_popup_vertical_padding:I = 0x7f07013d
-.field public static final mtrl_extended_fab_bottom_padding:I = 0x7f07013c
+.field public static final mtrl_extended_fab_bottom_padding:I = 0x7f07013e
-.field public static final mtrl_extended_fab_corner_radius:I = 0x7f07013d
+.field public static final mtrl_extended_fab_corner_radius:I = 0x7f07013f
-.field public static final mtrl_extended_fab_disabled_elevation:I = 0x7f07013e
+.field public static final mtrl_extended_fab_disabled_elevation:I = 0x7f070140
-.field public static final mtrl_extended_fab_disabled_translation_z:I = 0x7f07013f
+.field public static final mtrl_extended_fab_disabled_translation_z:I = 0x7f070141
-.field public static final mtrl_extended_fab_elevation:I = 0x7f070140
+.field public static final mtrl_extended_fab_elevation:I = 0x7f070142
-.field public static final mtrl_extended_fab_end_padding:I = 0x7f070141
+.field public static final mtrl_extended_fab_end_padding:I = 0x7f070143
-.field public static final mtrl_extended_fab_end_padding_icon:I = 0x7f070142
+.field public static final mtrl_extended_fab_end_padding_icon:I = 0x7f070144
-.field public static final mtrl_extended_fab_icon_size:I = 0x7f070143
+.field public static final mtrl_extended_fab_icon_size:I = 0x7f070145
-.field public static final mtrl_extended_fab_icon_text_spacing:I = 0x7f070144
+.field public static final mtrl_extended_fab_icon_text_spacing:I = 0x7f070146
-.field public static final mtrl_extended_fab_min_height:I = 0x7f070145
+.field public static final mtrl_extended_fab_min_height:I = 0x7f070147
-.field public static final mtrl_extended_fab_min_width:I = 0x7f070146
+.field public static final mtrl_extended_fab_min_width:I = 0x7f070148
-.field public static final mtrl_extended_fab_start_padding:I = 0x7f070147
+.field public static final mtrl_extended_fab_start_padding:I = 0x7f070149
-.field public static final mtrl_extended_fab_start_padding_icon:I = 0x7f070148
+.field public static final mtrl_extended_fab_start_padding_icon:I = 0x7f07014a
-.field public static final mtrl_extended_fab_top_padding:I = 0x7f070149
+.field public static final mtrl_extended_fab_top_padding:I = 0x7f07014b
-.field public static final mtrl_extended_fab_translation_z_base:I = 0x7f07014a
+.field public static final mtrl_extended_fab_translation_z_base:I = 0x7f07014c
-.field public static final mtrl_extended_fab_translation_z_hovered_focused:I = 0x7f07014b
+.field public static final mtrl_extended_fab_translation_z_hovered_focused:I = 0x7f07014d
-.field public static final mtrl_extended_fab_translation_z_pressed:I = 0x7f07014c
+.field public static final mtrl_extended_fab_translation_z_pressed:I = 0x7f07014e
-.field public static final mtrl_fab_elevation:I = 0x7f07014d
+.field public static final mtrl_fab_elevation:I = 0x7f07014f
-.field public static final mtrl_fab_min_touch_target:I = 0x7f07014e
+.field public static final mtrl_fab_min_touch_target:I = 0x7f070150
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f07014f
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f070151
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f070150
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f070152
-.field public static final mtrl_high_ripple_default_alpha:I = 0x7f070151
+.field public static final mtrl_high_ripple_default_alpha:I = 0x7f070153
-.field public static final mtrl_high_ripple_focused_alpha:I = 0x7f070152
+.field public static final mtrl_high_ripple_focused_alpha:I = 0x7f070154
-.field public static final mtrl_high_ripple_hovered_alpha:I = 0x7f070153
+.field public static final mtrl_high_ripple_hovered_alpha:I = 0x7f070155
-.field public static final mtrl_high_ripple_pressed_alpha:I = 0x7f070154
+.field public static final mtrl_high_ripple_pressed_alpha:I = 0x7f070156
-.field public static final mtrl_large_touch_target:I = 0x7f070155
+.field public static final mtrl_large_touch_target:I = 0x7f070157
-.field public static final mtrl_low_ripple_default_alpha:I = 0x7f070156
+.field public static final mtrl_low_ripple_default_alpha:I = 0x7f070158
-.field public static final mtrl_low_ripple_focused_alpha:I = 0x7f070157
+.field public static final mtrl_low_ripple_focused_alpha:I = 0x7f070159
-.field public static final mtrl_low_ripple_hovered_alpha:I = 0x7f070158
+.field public static final mtrl_low_ripple_hovered_alpha:I = 0x7f07015a
-.field public static final mtrl_low_ripple_pressed_alpha:I = 0x7f070159
+.field public static final mtrl_low_ripple_pressed_alpha:I = 0x7f07015b
-.field public static final mtrl_min_touch_target_size:I = 0x7f07015a
+.field public static final mtrl_min_touch_target_size:I = 0x7f07015c
-.field public static final mtrl_navigation_elevation:I = 0x7f07015b
+.field public static final mtrl_navigation_elevation:I = 0x7f07015d
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f07015c
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f07015e
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f07015d
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f07015f
-.field public static final mtrl_navigation_item_icon_size:I = 0x7f07015e
+.field public static final mtrl_navigation_item_icon_size:I = 0x7f070160
-.field public static final mtrl_navigation_item_shape_horizontal_margin:I = 0x7f07015f
+.field public static final mtrl_navigation_item_shape_horizontal_margin:I = 0x7f070161
-.field public static final mtrl_navigation_item_shape_vertical_margin:I = 0x7f070160
+.field public static final mtrl_navigation_item_shape_vertical_margin:I = 0x7f070162
-.field public static final mtrl_shape_corner_size_large_component:I = 0x7f070161
+.field public static final mtrl_shape_corner_size_large_component:I = 0x7f070163
-.field public static final mtrl_shape_corner_size_medium_component:I = 0x7f070162
+.field public static final mtrl_shape_corner_size_medium_component:I = 0x7f070164
-.field public static final mtrl_shape_corner_size_small_component:I = 0x7f070163
+.field public static final mtrl_shape_corner_size_small_component:I = 0x7f070165
-.field public static final mtrl_snackbar_action_text_color_alpha:I = 0x7f070164
+.field public static final mtrl_snackbar_action_text_color_alpha:I = 0x7f070166
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f070165
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f070167
-.field public static final mtrl_snackbar_background_overlay_color_alpha:I = 0x7f070166
+.field public static final mtrl_snackbar_background_overlay_color_alpha:I = 0x7f070168
-.field public static final mtrl_snackbar_margin:I = 0x7f070167
+.field public static final mtrl_snackbar_margin:I = 0x7f070169
-.field public static final mtrl_switch_thumb_elevation:I = 0x7f070168
+.field public static final mtrl_switch_thumb_elevation:I = 0x7f07016a
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070169
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f07016b
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f07016a
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f07016c
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f07016b
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f07016d
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f07016c
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f07016e
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f07016d
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f07016f
-.field public static final mtrl_textinput_end_icon_margin_start:I = 0x7f07016e
+.field public static final mtrl_textinput_end_icon_margin_start:I = 0x7f070170
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f07016f
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070171
-.field public static final mtrl_textinput_start_icon_margin_end:I = 0x7f070170
+.field public static final mtrl_textinput_start_icon_margin_end:I = 0x7f070172
-.field public static final mtrl_toolbar_default_height:I = 0x7f070171
+.field public static final mtrl_toolbar_default_height:I = 0x7f070173
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final preference_dropdown_padding_start:I = 0x7f070186
+.field public static final preference_dropdown_padding_start:I = 0x7f070188
-.field public static final preference_icon_minWidth:I = 0x7f070187
+.field public static final preference_icon_minWidth:I = 0x7f070189
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070188
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f07018a
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070189
+.field public static final preference_seekbar_padding_vertical:I = 0x7f07018b
-.field public static final preference_seekbar_value_minWidth:I = 0x7f07018a
+.field public static final preference_seekbar_value_minWidth:I = 0x7f07018c
-.field public static final subtitle_corner_radius:I = 0x7f070192
+.field public static final subtitle_corner_radius:I = 0x7f070194
-.field public static final subtitle_outline_width:I = 0x7f070193
+.field public static final subtitle_outline_width:I = 0x7f070195
-.field public static final subtitle_shadow_offset:I = 0x7f070194
+.field public static final subtitle_shadow_offset:I = 0x7f070196
-.field public static final subtitle_shadow_radius:I = 0x7f070195
+.field public static final subtitle_shadow_radius:I = 0x7f070197
-.field public static final test_mtrl_calendar_day_cornerSize:I = 0x7f070198
+.field public static final test_mtrl_calendar_day_cornerSize:I = 0x7f07019a
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index bb57bc9874..b484d60006 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -279,69 +279,69 @@
.field public static final ic_keyboard_arrow_right_black_24dp:I = 0x7f08031a
-.field public static final ic_menu_arrow_down_black_24dp:I = 0x7f08032e
+.field public static final ic_menu_arrow_down_black_24dp:I = 0x7f08032f
-.field public static final ic_menu_arrow_up_black_24dp:I = 0x7f08032f
+.field public static final ic_menu_arrow_up_black_24dp:I = 0x7f080330
-.field public static final ic_mtrl_checked_circle:I = 0x7f080347
+.field public static final ic_mtrl_checked_circle:I = 0x7f080348
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080348
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080349
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080349
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f08034a
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08034a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08034b
-.field public static final mtrl_dialog_background:I = 0x7f0804ec
+.field public static final mtrl_dialog_background:I = 0x7f0804ed
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804ed
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804ee
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ee
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ef
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ef
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f0
-.field public static final mtrl_ic_cancel:I = 0x7f0804f0
+.field public static final mtrl_ic_cancel:I = 0x7f0804f1
-.field public static final mtrl_ic_error:I = 0x7f0804f1
+.field public static final mtrl_ic_error:I = 0x7f0804f2
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f2
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f3
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f3
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f4
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f4
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f5
-.field public static final navigation_empty_icon:I = 0x7f0804f5
+.field public static final navigation_empty_icon:I = 0x7f0804f6
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final preference_list_divider_material:I = 0x7f080502
+.field public static final preference_list_divider_material:I = 0x7f080503
-.field public static final test_custom_background:I = 0x7f080511
+.field public static final test_custom_background:I = 0x7f080512
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$id.smali b/com.discord/smali/com/discord/gateway/R$id.smali
index d95e24549c..9098bffc24 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -571,11 +571,11 @@
.field public static final wide:I = 0x7f0a0991
-.field public static final wrap:I = 0x7f0a09c0
+.field public static final wrap:I = 0x7f0a09c4
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
-.field public static final wrap_reverse:I = 0x7f0a09c2
+.field public static final wrap_reverse:I = 0x7f0a09c6
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$layout.smali b/com.discord/smali/com/discord/gateway/R$layout.smali
index 650c56d07c..ccc4a46b48 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -225,39 +225,39 @@
.field public static final preference_widget_switch_compat:I = 0x7f0d0097
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
-.field public static final test_action_chip:I = 0x7f0d00ab
+.field public static final test_action_chip:I = 0x7f0d00ac
-.field public static final test_design_checkbox:I = 0x7f0d00ac
+.field public static final test_design_checkbox:I = 0x7f0d00ad
-.field public static final test_reflow_chipgroup:I = 0x7f0d00ad
+.field public static final test_reflow_chipgroup:I = 0x7f0d00ae
-.field public static final test_toolbar:I = 0x7f0d00ae
+.field public static final test_toolbar:I = 0x7f0d00af
-.field public static final test_toolbar_custom_background:I = 0x7f0d00af
+.field public static final test_toolbar_custom_background:I = 0x7f0d00b0
-.field public static final test_toolbar_elevation:I = 0x7f0d00b0
+.field public static final test_toolbar_elevation:I = 0x7f0d00b1
-.field public static final test_toolbar_surface:I = 0x7f0d00b1
+.field public static final test_toolbar_surface:I = 0x7f0d00b2
-.field public static final text_view_with_line_height_from_appearance:I = 0x7f0d00b2
+.field public static final text_view_with_line_height_from_appearance:I = 0x7f0d00b3
-.field public static final text_view_with_line_height_from_layout:I = 0x7f0d00b3
+.field public static final text_view_with_line_height_from_layout:I = 0x7f0d00b4
-.field public static final text_view_with_line_height_from_style:I = 0x7f0d00b4
+.field public static final text_view_with_line_height_from_style:I = 0x7f0d00b5
-.field public static final text_view_with_theme_line_height:I = 0x7f0d00b5
+.field public static final text_view_with_theme_line_height:I = 0x7f0d00b6
-.field public static final text_view_without_line_height:I = 0x7f0d00b6
+.field public static final text_view_without_line_height:I = 0x7f0d00b7
-.field public static final view_chip_default:I = 0x7f0d00d5
+.field public static final view_chip_default:I = 0x7f0d00d6
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index 5a87d1df16..ad7ef61709 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -69,165 +69,165 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final app_name:I = 0x7f1200ce
+.field public static final app_name:I = 0x7f1200d5
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d6
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dd
-.field public static final bottom_sheet_behavior:I = 0x7f120329
+.field public static final bottom_sheet_behavior:I = 0x7f120330
-.field public static final character_counter_content_description:I = 0x7f1203b9
+.field public static final character_counter_content_description:I = 0x7f1203c0
-.field public static final character_counter_overflowed_content_description:I = 0x7f1203ba
+.field public static final character_counter_overflowed_content_description:I = 0x7f1203c1
-.field public static final character_counter_pattern:I = 0x7f1203bb
+.field public static final character_counter_pattern:I = 0x7f1203c2
-.field public static final chip_text:I = 0x7f1203c6
+.field public static final chip_text:I = 0x7f1203cd
-.field public static final clear_text_end_icon_content_description:I = 0x7f1203d1
+.field public static final clear_text_end_icon_content_description:I = 0x7f1203d8
-.field public static final common_google_play_services_enable_button:I = 0x7f1203fb
+.field public static final common_google_play_services_enable_button:I = 0x7f120402
-.field public static final common_google_play_services_enable_text:I = 0x7f1203fc
+.field public static final common_google_play_services_enable_text:I = 0x7f120403
-.field public static final common_google_play_services_enable_title:I = 0x7f1203fd
+.field public static final common_google_play_services_enable_title:I = 0x7f120404
-.field public static final common_google_play_services_install_button:I = 0x7f1203fe
+.field public static final common_google_play_services_install_button:I = 0x7f120405
-.field public static final common_google_play_services_install_text:I = 0x7f1203ff
+.field public static final common_google_play_services_install_text:I = 0x7f120406
-.field public static final common_google_play_services_install_title:I = 0x7f120400
+.field public static final common_google_play_services_install_title:I = 0x7f120407
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120401
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120408
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120402
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120409
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120403
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12040a
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120404
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12040b
-.field public static final common_google_play_services_update_button:I = 0x7f120405
+.field public static final common_google_play_services_update_button:I = 0x7f12040c
-.field public static final common_google_play_services_update_text:I = 0x7f120406
+.field public static final common_google_play_services_update_text:I = 0x7f12040d
-.field public static final common_google_play_services_update_title:I = 0x7f120407
+.field public static final common_google_play_services_update_title:I = 0x7f12040e
-.field public static final common_google_play_services_updating_text:I = 0x7f120408
+.field public static final common_google_play_services_updating_text:I = 0x7f12040f
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120409
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120410
-.field public static final common_open_on_phone:I = 0x7f12040a
+.field public static final common_open_on_phone:I = 0x7f120411
-.field public static final common_signin_button_text:I = 0x7f12040b
+.field public static final common_signin_button_text:I = 0x7f120412
-.field public static final common_signin_button_text_long:I = 0x7f12040c
+.field public static final common_signin_button_text_long:I = 0x7f120413
-.field public static final copy:I = 0x7f120467
+.field public static final copy:I = 0x7f12046e
-.field public static final error_icon_content_description:I = 0x7f1205a8
+.field public static final error_icon_content_description:I = 0x7f1205af
-.field public static final expand_button_title:I = 0x7f1205b7
+.field public static final expand_button_title:I = 0x7f1205be
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205c3
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205ca
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205c5
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205cc
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205c6
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205cd
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120a3c
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120a44
-.field public static final icon_content_description:I = 0x7f120ac8
+.field public static final icon_content_description:I = 0x7f120ad0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cc9
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cd1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cca
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cd2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ccb
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cd3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ccc
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cd4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ccd
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cd5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cce
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cd6
-.field public static final mtrl_picker_cancel:I = 0x7f120ccf
+.field public static final mtrl_picker_cancel:I = 0x7f120cd7
-.field public static final mtrl_picker_confirm:I = 0x7f120cd0
+.field public static final mtrl_picker_confirm:I = 0x7f120cd8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cd1
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cd9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cd2
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cda
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cd3
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cdb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cd4
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cdc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cd5
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cdd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cd6
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cde
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cd7
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cdf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cd8
+.field public static final mtrl_picker_invalid_range:I = 0x7f120ce0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cd9
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120ce1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cda
+.field public static final mtrl_picker_out_of_range:I = 0x7f120ce2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cdb
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120ce3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cdc
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120ce4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cdd
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120ce5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120cde
+.field public static final mtrl_picker_range_header_title:I = 0x7f120ce6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cdf
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ce7
-.field public static final mtrl_picker_save:I = 0x7f120ce0
+.field public static final mtrl_picker_save:I = 0x7f120ce8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120ce1
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120ce9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ce2
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cea
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ce3
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ceb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ce4
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cec
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ce5
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ced
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120ce6
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cee
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ce7
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cef
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120ce8
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cf0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120ce9
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cf1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cea
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cf2
-.field public static final not_set:I = 0x7f120d65
+.field public static final not_set:I = 0x7f120d6d
-.field public static final password_toggle_content_description:I = 0x7f120e7f
+.field public static final password_toggle_content_description:I = 0x7f120e87
-.field public static final path_password_eye:I = 0x7f120e81
+.field public static final path_password_eye:I = 0x7f120e89
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120e82
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120e8a
-.field public static final path_password_eye_mask_visible:I = 0x7f120e83
+.field public static final path_password_eye_mask_visible:I = 0x7f120e8b
-.field public static final path_password_strike_through:I = 0x7f120e84
+.field public static final path_password_strike_through:I = 0x7f120e8c
-.field public static final preference_copied:I = 0x7f120ef6
+.field public static final preference_copied:I = 0x7f120efe
-.field public static final search_menu_title:I = 0x7f1211b3
+.field public static final search_menu_title:I = 0x7f1211bb
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
-.field public static final summary_collapsed_preference_list:I = 0x7f1212bb
+.field public static final summary_collapsed_preference_list:I = 0x7f1212c3
-.field public static final v7_preference_off:I = 0x7f1214d0
+.field public static final v7_preference_off:I = 0x7f1214d9
-.field public static final v7_preference_on:I = 0x7f1214d1
+.field public static final v7_preference_on:I = 0x7f1214da
# direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$b.smali b/com.discord/smali/com/discord/overlay/R$b.smali
index e09dbd2f7a..efc47a48a3 100644
--- a/com.discord/smali/com/discord/overlay/R$b.smali
+++ b/com.discord/smali/com/discord/overlay/R$b.smali
@@ -205,57 +205,57 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final movement_threshold_dp:I = 0x7f0700e0
+.field public static final movement_threshold_dp:I = 0x7f0700e2
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
-.field public static final trash_wrap_min_dimen:I = 0x7f0701a2
+.field public static final trash_wrap_min_dimen:I = 0x7f0701a4
-.field public static final vertical_safe_margin:I = 0x7f0701d2
+.field public static final vertical_safe_margin:I = 0x7f0701d4
# direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali
index 32f4965bd6..117eea5db0 100644
--- a/com.discord/smali/com/discord/overlay/R$c.smali
+++ b/com.discord/smali/com/discord/overlay/R$c.smali
@@ -207,37 +207,37 @@
.field public static final ic_close_24dp:I = 0x7f080266
-.field public static final ic_trash_outline:I = 0x7f080407
+.field public static final ic_trash_outline:I = 0x7f080408
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
-.field public static final trash_bg:I = 0x7f080514
+.field public static final trash_bg:I = 0x7f080515
# direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$d.smali b/com.discord/smali/com/discord/overlay/R$d.smali
index 7e9207de33..10aaa26031 100644
--- a/com.discord/smali/com/discord/overlay/R$d.smali
+++ b/com.discord/smali/com/discord/overlay/R$d.smali
@@ -303,7 +303,7 @@
.field public static final up:I = 0x7f0a08d5
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
# direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$e.smali b/com.discord/smali/com/discord/overlay/R$e.smali
index 837cdbd910..ce9ea954d5 100644
--- a/com.discord/smali/com/discord/overlay/R$e.smali
+++ b/com.discord/smali/com/discord/overlay/R$e.smali
@@ -85,15 +85,15 @@
.field public static final notification_template_part_time:I = 0x7f0d007d
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
-.field public static final trash_wrap:I = 0x7f0d00b7
+.field public static final trash_wrap:I = 0x7f0d00b8
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$dimen.smali b/com.discord/smali/com/discord/restapi/R$dimen.smali
index ba899945ec..633ab12959 100644
--- a/com.discord/smali/com/discord/restapi/R$dimen.smali
+++ b/com.discord/smali/com/discord/restapi/R$dimen.smali
@@ -315,377 +315,377 @@
.field public static final hint_pressed_alpha_material_light:I = 0x7f0700ce
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d0
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d2
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d1
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d3
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d2
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d4
-.field public static final material_emphasis_disabled:I = 0x7f0700db
+.field public static final material_emphasis_disabled:I = 0x7f0700dd
-.field public static final material_emphasis_high_type:I = 0x7f0700dc
+.field public static final material_emphasis_high_type:I = 0x7f0700de
-.field public static final material_emphasis_medium:I = 0x7f0700dd
+.field public static final material_emphasis_medium:I = 0x7f0700df
-.field public static final material_text_view_test_line_height:I = 0x7f0700de
+.field public static final material_text_view_test_line_height:I = 0x7f0700e0
-.field public static final material_text_view_test_line_height_override:I = 0x7f0700df
+.field public static final material_text_view_test_line_height_override:I = 0x7f0700e1
-.field public static final mtrl_alert_dialog_background_inset_bottom:I = 0x7f0700e1
+.field public static final mtrl_alert_dialog_background_inset_bottom:I = 0x7f0700e3
-.field public static final mtrl_alert_dialog_background_inset_end:I = 0x7f0700e2
+.field public static final mtrl_alert_dialog_background_inset_end:I = 0x7f0700e4
-.field public static final mtrl_alert_dialog_background_inset_start:I = 0x7f0700e3
+.field public static final mtrl_alert_dialog_background_inset_start:I = 0x7f0700e5
-.field public static final mtrl_alert_dialog_background_inset_top:I = 0x7f0700e4
+.field public static final mtrl_alert_dialog_background_inset_top:I = 0x7f0700e6
-.field public static final mtrl_alert_dialog_picker_background_inset:I = 0x7f0700e5
+.field public static final mtrl_alert_dialog_picker_background_inset:I = 0x7f0700e7
-.field public static final mtrl_badge_horizontal_edge_offset:I = 0x7f0700e6
+.field public static final mtrl_badge_horizontal_edge_offset:I = 0x7f0700e8
-.field public static final mtrl_badge_long_text_horizontal_padding:I = 0x7f0700e7
+.field public static final mtrl_badge_long_text_horizontal_padding:I = 0x7f0700e9
-.field public static final mtrl_badge_radius:I = 0x7f0700e8
+.field public static final mtrl_badge_radius:I = 0x7f0700ea
-.field public static final mtrl_badge_text_horizontal_edge_offset:I = 0x7f0700e9
+.field public static final mtrl_badge_text_horizontal_edge_offset:I = 0x7f0700eb
-.field public static final mtrl_badge_text_size:I = 0x7f0700ea
+.field public static final mtrl_badge_text_size:I = 0x7f0700ec
-.field public static final mtrl_badge_with_text_radius:I = 0x7f0700eb
+.field public static final mtrl_badge_with_text_radius:I = 0x7f0700ed
-.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700ec
+.field public static final mtrl_bottomappbar_fabOffsetEndMode:I = 0x7f0700ee
-.field public static final mtrl_bottomappbar_fab_bottom_margin:I = 0x7f0700ed
+.field public static final mtrl_bottomappbar_fab_bottom_margin:I = 0x7f0700ef
-.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700ee
+.field public static final mtrl_bottomappbar_fab_cradle_margin:I = 0x7f0700f0
-.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700ef
+.field public static final mtrl_bottomappbar_fab_cradle_rounded_corner_radius:I = 0x7f0700f1
-.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700f0
+.field public static final mtrl_bottomappbar_fab_cradle_vertical_offset:I = 0x7f0700f2
-.field public static final mtrl_bottomappbar_height:I = 0x7f0700f1
+.field public static final mtrl_bottomappbar_height:I = 0x7f0700f3
-.field public static final mtrl_btn_corner_radius:I = 0x7f0700f2
+.field public static final mtrl_btn_corner_radius:I = 0x7f0700f4
-.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700f3
+.field public static final mtrl_btn_dialog_btn_min_width:I = 0x7f0700f5
-.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700f4
+.field public static final mtrl_btn_disabled_elevation:I = 0x7f0700f6
-.field public static final mtrl_btn_disabled_z:I = 0x7f0700f5
+.field public static final mtrl_btn_disabled_z:I = 0x7f0700f7
-.field public static final mtrl_btn_elevation:I = 0x7f0700f6
+.field public static final mtrl_btn_elevation:I = 0x7f0700f8
-.field public static final mtrl_btn_focused_z:I = 0x7f0700f7
+.field public static final mtrl_btn_focused_z:I = 0x7f0700f9
-.field public static final mtrl_btn_hovered_z:I = 0x7f0700f8
+.field public static final mtrl_btn_hovered_z:I = 0x7f0700fa
-.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700f9
+.field public static final mtrl_btn_icon_btn_padding_left:I = 0x7f0700fb
-.field public static final mtrl_btn_icon_padding:I = 0x7f0700fa
+.field public static final mtrl_btn_icon_padding:I = 0x7f0700fc
-.field public static final mtrl_btn_inset:I = 0x7f0700fb
+.field public static final mtrl_btn_inset:I = 0x7f0700fd
-.field public static final mtrl_btn_letter_spacing:I = 0x7f0700fc
+.field public static final mtrl_btn_letter_spacing:I = 0x7f0700fe
-.field public static final mtrl_btn_padding_bottom:I = 0x7f0700fd
+.field public static final mtrl_btn_padding_bottom:I = 0x7f0700ff
-.field public static final mtrl_btn_padding_left:I = 0x7f0700fe
+.field public static final mtrl_btn_padding_left:I = 0x7f070100
-.field public static final mtrl_btn_padding_right:I = 0x7f0700ff
+.field public static final mtrl_btn_padding_right:I = 0x7f070101
-.field public static final mtrl_btn_padding_top:I = 0x7f070100
+.field public static final mtrl_btn_padding_top:I = 0x7f070102
-.field public static final mtrl_btn_pressed_z:I = 0x7f070101
+.field public static final mtrl_btn_pressed_z:I = 0x7f070103
-.field public static final mtrl_btn_stroke_size:I = 0x7f070102
+.field public static final mtrl_btn_stroke_size:I = 0x7f070104
-.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f070103
+.field public static final mtrl_btn_text_btn_icon_padding:I = 0x7f070105
-.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f070104
+.field public static final mtrl_btn_text_btn_padding_left:I = 0x7f070106
-.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f070105
+.field public static final mtrl_btn_text_btn_padding_right:I = 0x7f070107
-.field public static final mtrl_btn_text_size:I = 0x7f070106
+.field public static final mtrl_btn_text_size:I = 0x7f070108
-.field public static final mtrl_btn_z:I = 0x7f070107
+.field public static final mtrl_btn_z:I = 0x7f070109
-.field public static final mtrl_calendar_action_height:I = 0x7f070108
+.field public static final mtrl_calendar_action_height:I = 0x7f07010a
-.field public static final mtrl_calendar_action_padding:I = 0x7f070109
+.field public static final mtrl_calendar_action_padding:I = 0x7f07010b
-.field public static final mtrl_calendar_bottom_padding:I = 0x7f07010a
+.field public static final mtrl_calendar_bottom_padding:I = 0x7f07010c
-.field public static final mtrl_calendar_content_padding:I = 0x7f07010b
+.field public static final mtrl_calendar_content_padding:I = 0x7f07010d
-.field public static final mtrl_calendar_day_corner:I = 0x7f07010c
+.field public static final mtrl_calendar_day_corner:I = 0x7f07010e
-.field public static final mtrl_calendar_day_height:I = 0x7f07010d
+.field public static final mtrl_calendar_day_height:I = 0x7f07010f
-.field public static final mtrl_calendar_day_horizontal_padding:I = 0x7f07010e
+.field public static final mtrl_calendar_day_horizontal_padding:I = 0x7f070110
-.field public static final mtrl_calendar_day_today_stroke:I = 0x7f07010f
+.field public static final mtrl_calendar_day_today_stroke:I = 0x7f070111
-.field public static final mtrl_calendar_day_vertical_padding:I = 0x7f070110
+.field public static final mtrl_calendar_day_vertical_padding:I = 0x7f070112
-.field public static final mtrl_calendar_day_width:I = 0x7f070111
+.field public static final mtrl_calendar_day_width:I = 0x7f070113
-.field public static final mtrl_calendar_days_of_week_height:I = 0x7f070112
+.field public static final mtrl_calendar_days_of_week_height:I = 0x7f070114
-.field public static final mtrl_calendar_dialog_background_inset:I = 0x7f070113
+.field public static final mtrl_calendar_dialog_background_inset:I = 0x7f070115
-.field public static final mtrl_calendar_header_content_padding:I = 0x7f070114
+.field public static final mtrl_calendar_header_content_padding:I = 0x7f070116
-.field public static final mtrl_calendar_header_content_padding_fullscreen:I = 0x7f070115
+.field public static final mtrl_calendar_header_content_padding_fullscreen:I = 0x7f070117
-.field public static final mtrl_calendar_header_divider_thickness:I = 0x7f070116
+.field public static final mtrl_calendar_header_divider_thickness:I = 0x7f070118
-.field public static final mtrl_calendar_header_height:I = 0x7f070117
+.field public static final mtrl_calendar_header_height:I = 0x7f070119
-.field public static final mtrl_calendar_header_height_fullscreen:I = 0x7f070118
+.field public static final mtrl_calendar_header_height_fullscreen:I = 0x7f07011a
-.field public static final mtrl_calendar_header_selection_line_height:I = 0x7f070119
+.field public static final mtrl_calendar_header_selection_line_height:I = 0x7f07011b
-.field public static final mtrl_calendar_header_text_padding:I = 0x7f07011a
+.field public static final mtrl_calendar_header_text_padding:I = 0x7f07011c
-.field public static final mtrl_calendar_header_toggle_margin_bottom:I = 0x7f07011b
+.field public static final mtrl_calendar_header_toggle_margin_bottom:I = 0x7f07011d
-.field public static final mtrl_calendar_header_toggle_margin_top:I = 0x7f07011c
+.field public static final mtrl_calendar_header_toggle_margin_top:I = 0x7f07011e
-.field public static final mtrl_calendar_landscape_header_width:I = 0x7f07011d
+.field public static final mtrl_calendar_landscape_header_width:I = 0x7f07011f
-.field public static final mtrl_calendar_maximum_default_fullscreen_minor_axis:I = 0x7f07011e
+.field public static final mtrl_calendar_maximum_default_fullscreen_minor_axis:I = 0x7f070120
-.field public static final mtrl_calendar_month_horizontal_padding:I = 0x7f07011f
+.field public static final mtrl_calendar_month_horizontal_padding:I = 0x7f070121
-.field public static final mtrl_calendar_month_vertical_padding:I = 0x7f070120
+.field public static final mtrl_calendar_month_vertical_padding:I = 0x7f070122
-.field public static final mtrl_calendar_navigation_bottom_padding:I = 0x7f070121
+.field public static final mtrl_calendar_navigation_bottom_padding:I = 0x7f070123
-.field public static final mtrl_calendar_navigation_height:I = 0x7f070122
+.field public static final mtrl_calendar_navigation_height:I = 0x7f070124
-.field public static final mtrl_calendar_navigation_top_padding:I = 0x7f070123
+.field public static final mtrl_calendar_navigation_top_padding:I = 0x7f070125
-.field public static final mtrl_calendar_pre_l_text_clip_padding:I = 0x7f070124
+.field public static final mtrl_calendar_pre_l_text_clip_padding:I = 0x7f070126
-.field public static final mtrl_calendar_selection_baseline_to_top_fullscreen:I = 0x7f070125
+.field public static final mtrl_calendar_selection_baseline_to_top_fullscreen:I = 0x7f070127
-.field public static final mtrl_calendar_selection_text_baseline_to_bottom:I = 0x7f070126
+.field public static final mtrl_calendar_selection_text_baseline_to_bottom:I = 0x7f070128
-.field public static final mtrl_calendar_selection_text_baseline_to_bottom_fullscreen:I = 0x7f070127
+.field public static final mtrl_calendar_selection_text_baseline_to_bottom_fullscreen:I = 0x7f070129
-.field public static final mtrl_calendar_selection_text_baseline_to_top:I = 0x7f070128
+.field public static final mtrl_calendar_selection_text_baseline_to_top:I = 0x7f07012a
-.field public static final mtrl_calendar_text_input_padding_top:I = 0x7f070129
+.field public static final mtrl_calendar_text_input_padding_top:I = 0x7f07012b
-.field public static final mtrl_calendar_title_baseline_to_top:I = 0x7f07012a
+.field public static final mtrl_calendar_title_baseline_to_top:I = 0x7f07012c
-.field public static final mtrl_calendar_title_baseline_to_top_fullscreen:I = 0x7f07012b
+.field public static final mtrl_calendar_title_baseline_to_top_fullscreen:I = 0x7f07012d
-.field public static final mtrl_calendar_year_corner:I = 0x7f07012c
+.field public static final mtrl_calendar_year_corner:I = 0x7f07012e
-.field public static final mtrl_calendar_year_height:I = 0x7f07012d
+.field public static final mtrl_calendar_year_height:I = 0x7f07012f
-.field public static final mtrl_calendar_year_horizontal_padding:I = 0x7f07012e
+.field public static final mtrl_calendar_year_horizontal_padding:I = 0x7f070130
-.field public static final mtrl_calendar_year_vertical_padding:I = 0x7f07012f
+.field public static final mtrl_calendar_year_vertical_padding:I = 0x7f070131
-.field public static final mtrl_calendar_year_width:I = 0x7f070130
+.field public static final mtrl_calendar_year_width:I = 0x7f070132
-.field public static final mtrl_card_checked_icon_margin:I = 0x7f070131
+.field public static final mtrl_card_checked_icon_margin:I = 0x7f070133
-.field public static final mtrl_card_checked_icon_size:I = 0x7f070132
+.field public static final mtrl_card_checked_icon_size:I = 0x7f070134
-.field public static final mtrl_card_corner_radius:I = 0x7f070133
+.field public static final mtrl_card_corner_radius:I = 0x7f070135
-.field public static final mtrl_card_dragged_z:I = 0x7f070134
+.field public static final mtrl_card_dragged_z:I = 0x7f070136
-.field public static final mtrl_card_elevation:I = 0x7f070135
+.field public static final mtrl_card_elevation:I = 0x7f070137
-.field public static final mtrl_card_spacing:I = 0x7f070136
+.field public static final mtrl_card_spacing:I = 0x7f070138
-.field public static final mtrl_chip_pressed_translation_z:I = 0x7f070137
+.field public static final mtrl_chip_pressed_translation_z:I = 0x7f070139
-.field public static final mtrl_chip_text_size:I = 0x7f070138
+.field public static final mtrl_chip_text_size:I = 0x7f07013a
-.field public static final mtrl_exposed_dropdown_menu_popup_elevation:I = 0x7f070139
+.field public static final mtrl_exposed_dropdown_menu_popup_elevation:I = 0x7f07013b
-.field public static final mtrl_exposed_dropdown_menu_popup_vertical_offset:I = 0x7f07013a
+.field public static final mtrl_exposed_dropdown_menu_popup_vertical_offset:I = 0x7f07013c
-.field public static final mtrl_exposed_dropdown_menu_popup_vertical_padding:I = 0x7f07013b
+.field public static final mtrl_exposed_dropdown_menu_popup_vertical_padding:I = 0x7f07013d
-.field public static final mtrl_extended_fab_bottom_padding:I = 0x7f07013c
+.field public static final mtrl_extended_fab_bottom_padding:I = 0x7f07013e
-.field public static final mtrl_extended_fab_corner_radius:I = 0x7f07013d
+.field public static final mtrl_extended_fab_corner_radius:I = 0x7f07013f
-.field public static final mtrl_extended_fab_disabled_elevation:I = 0x7f07013e
+.field public static final mtrl_extended_fab_disabled_elevation:I = 0x7f070140
-.field public static final mtrl_extended_fab_disabled_translation_z:I = 0x7f07013f
+.field public static final mtrl_extended_fab_disabled_translation_z:I = 0x7f070141
-.field public static final mtrl_extended_fab_elevation:I = 0x7f070140
+.field public static final mtrl_extended_fab_elevation:I = 0x7f070142
-.field public static final mtrl_extended_fab_end_padding:I = 0x7f070141
+.field public static final mtrl_extended_fab_end_padding:I = 0x7f070143
-.field public static final mtrl_extended_fab_end_padding_icon:I = 0x7f070142
+.field public static final mtrl_extended_fab_end_padding_icon:I = 0x7f070144
-.field public static final mtrl_extended_fab_icon_size:I = 0x7f070143
+.field public static final mtrl_extended_fab_icon_size:I = 0x7f070145
-.field public static final mtrl_extended_fab_icon_text_spacing:I = 0x7f070144
+.field public static final mtrl_extended_fab_icon_text_spacing:I = 0x7f070146
-.field public static final mtrl_extended_fab_min_height:I = 0x7f070145
+.field public static final mtrl_extended_fab_min_height:I = 0x7f070147
-.field public static final mtrl_extended_fab_min_width:I = 0x7f070146
+.field public static final mtrl_extended_fab_min_width:I = 0x7f070148
-.field public static final mtrl_extended_fab_start_padding:I = 0x7f070147
+.field public static final mtrl_extended_fab_start_padding:I = 0x7f070149
-.field public static final mtrl_extended_fab_start_padding_icon:I = 0x7f070148
+.field public static final mtrl_extended_fab_start_padding_icon:I = 0x7f07014a
-.field public static final mtrl_extended_fab_top_padding:I = 0x7f070149
+.field public static final mtrl_extended_fab_top_padding:I = 0x7f07014b
-.field public static final mtrl_extended_fab_translation_z_base:I = 0x7f07014a
+.field public static final mtrl_extended_fab_translation_z_base:I = 0x7f07014c
-.field public static final mtrl_extended_fab_translation_z_hovered_focused:I = 0x7f07014b
+.field public static final mtrl_extended_fab_translation_z_hovered_focused:I = 0x7f07014d
-.field public static final mtrl_extended_fab_translation_z_pressed:I = 0x7f07014c
+.field public static final mtrl_extended_fab_translation_z_pressed:I = 0x7f07014e
-.field public static final mtrl_fab_elevation:I = 0x7f07014d
+.field public static final mtrl_fab_elevation:I = 0x7f07014f
-.field public static final mtrl_fab_min_touch_target:I = 0x7f07014e
+.field public static final mtrl_fab_min_touch_target:I = 0x7f070150
-.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f07014f
+.field public static final mtrl_fab_translation_z_hovered_focused:I = 0x7f070151
-.field public static final mtrl_fab_translation_z_pressed:I = 0x7f070150
+.field public static final mtrl_fab_translation_z_pressed:I = 0x7f070152
-.field public static final mtrl_high_ripple_default_alpha:I = 0x7f070151
+.field public static final mtrl_high_ripple_default_alpha:I = 0x7f070153
-.field public static final mtrl_high_ripple_focused_alpha:I = 0x7f070152
+.field public static final mtrl_high_ripple_focused_alpha:I = 0x7f070154
-.field public static final mtrl_high_ripple_hovered_alpha:I = 0x7f070153
+.field public static final mtrl_high_ripple_hovered_alpha:I = 0x7f070155
-.field public static final mtrl_high_ripple_pressed_alpha:I = 0x7f070154
+.field public static final mtrl_high_ripple_pressed_alpha:I = 0x7f070156
-.field public static final mtrl_large_touch_target:I = 0x7f070155
+.field public static final mtrl_large_touch_target:I = 0x7f070157
-.field public static final mtrl_low_ripple_default_alpha:I = 0x7f070156
+.field public static final mtrl_low_ripple_default_alpha:I = 0x7f070158
-.field public static final mtrl_low_ripple_focused_alpha:I = 0x7f070157
+.field public static final mtrl_low_ripple_focused_alpha:I = 0x7f070159
-.field public static final mtrl_low_ripple_hovered_alpha:I = 0x7f070158
+.field public static final mtrl_low_ripple_hovered_alpha:I = 0x7f07015a
-.field public static final mtrl_low_ripple_pressed_alpha:I = 0x7f070159
+.field public static final mtrl_low_ripple_pressed_alpha:I = 0x7f07015b
-.field public static final mtrl_min_touch_target_size:I = 0x7f07015a
+.field public static final mtrl_min_touch_target_size:I = 0x7f07015c
-.field public static final mtrl_navigation_elevation:I = 0x7f07015b
+.field public static final mtrl_navigation_elevation:I = 0x7f07015d
-.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f07015c
+.field public static final mtrl_navigation_item_horizontal_padding:I = 0x7f07015e
-.field public static final mtrl_navigation_item_icon_padding:I = 0x7f07015d
+.field public static final mtrl_navigation_item_icon_padding:I = 0x7f07015f
-.field public static final mtrl_navigation_item_icon_size:I = 0x7f07015e
+.field public static final mtrl_navigation_item_icon_size:I = 0x7f070160
-.field public static final mtrl_navigation_item_shape_horizontal_margin:I = 0x7f07015f
+.field public static final mtrl_navigation_item_shape_horizontal_margin:I = 0x7f070161
-.field public static final mtrl_navigation_item_shape_vertical_margin:I = 0x7f070160
+.field public static final mtrl_navigation_item_shape_vertical_margin:I = 0x7f070162
-.field public static final mtrl_shape_corner_size_large_component:I = 0x7f070161
+.field public static final mtrl_shape_corner_size_large_component:I = 0x7f070163
-.field public static final mtrl_shape_corner_size_medium_component:I = 0x7f070162
+.field public static final mtrl_shape_corner_size_medium_component:I = 0x7f070164
-.field public static final mtrl_shape_corner_size_small_component:I = 0x7f070163
+.field public static final mtrl_shape_corner_size_small_component:I = 0x7f070165
-.field public static final mtrl_snackbar_action_text_color_alpha:I = 0x7f070164
+.field public static final mtrl_snackbar_action_text_color_alpha:I = 0x7f070166
-.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f070165
+.field public static final mtrl_snackbar_background_corner_radius:I = 0x7f070167
-.field public static final mtrl_snackbar_background_overlay_color_alpha:I = 0x7f070166
+.field public static final mtrl_snackbar_background_overlay_color_alpha:I = 0x7f070168
-.field public static final mtrl_snackbar_margin:I = 0x7f070167
+.field public static final mtrl_snackbar_margin:I = 0x7f070169
-.field public static final mtrl_switch_thumb_elevation:I = 0x7f070168
+.field public static final mtrl_switch_thumb_elevation:I = 0x7f07016a
-.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f070169
+.field public static final mtrl_textinput_box_corner_radius_medium:I = 0x7f07016b
-.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f07016a
+.field public static final mtrl_textinput_box_corner_radius_small:I = 0x7f07016c
-.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f07016b
+.field public static final mtrl_textinput_box_label_cutout_padding:I = 0x7f07016d
-.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f07016c
+.field public static final mtrl_textinput_box_stroke_width_default:I = 0x7f07016e
-.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f07016d
+.field public static final mtrl_textinput_box_stroke_width_focused:I = 0x7f07016f
-.field public static final mtrl_textinput_end_icon_margin_start:I = 0x7f07016e
+.field public static final mtrl_textinput_end_icon_margin_start:I = 0x7f070170
-.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f07016f
+.field public static final mtrl_textinput_outline_box_expanded_padding:I = 0x7f070171
-.field public static final mtrl_textinput_start_icon_margin_end:I = 0x7f070170
+.field public static final mtrl_textinput_start_icon_margin_end:I = 0x7f070172
-.field public static final mtrl_toolbar_default_height:I = 0x7f070171
+.field public static final mtrl_toolbar_default_height:I = 0x7f070173
-.field public static final notification_action_icon_size:I = 0x7f070173
+.field public static final notification_action_icon_size:I = 0x7f070175
-.field public static final notification_action_text_size:I = 0x7f070174
+.field public static final notification_action_text_size:I = 0x7f070176
-.field public static final notification_big_circle_margin:I = 0x7f070175
+.field public static final notification_big_circle_margin:I = 0x7f070177
-.field public static final notification_content_margin_start:I = 0x7f070176
+.field public static final notification_content_margin_start:I = 0x7f070178
-.field public static final notification_large_icon_height:I = 0x7f070177
+.field public static final notification_large_icon_height:I = 0x7f070179
-.field public static final notification_large_icon_width:I = 0x7f070178
+.field public static final notification_large_icon_width:I = 0x7f07017a
-.field public static final notification_main_column_padding_top:I = 0x7f070179
+.field public static final notification_main_column_padding_top:I = 0x7f07017b
-.field public static final notification_media_narrow_margin:I = 0x7f07017a
+.field public static final notification_media_narrow_margin:I = 0x7f07017c
-.field public static final notification_right_icon_size:I = 0x7f07017b
+.field public static final notification_right_icon_size:I = 0x7f07017d
-.field public static final notification_right_side_padding_top:I = 0x7f07017c
+.field public static final notification_right_side_padding_top:I = 0x7f07017e
-.field public static final notification_small_icon_background_padding:I = 0x7f07017d
+.field public static final notification_small_icon_background_padding:I = 0x7f07017f
-.field public static final notification_small_icon_size_as_large:I = 0x7f07017e
+.field public static final notification_small_icon_size_as_large:I = 0x7f070180
-.field public static final notification_subtext_size:I = 0x7f07017f
+.field public static final notification_subtext_size:I = 0x7f070181
-.field public static final notification_top_pad:I = 0x7f070180
+.field public static final notification_top_pad:I = 0x7f070182
-.field public static final notification_top_pad_large_text:I = 0x7f070181
+.field public static final notification_top_pad_large_text:I = 0x7f070183
-.field public static final preference_dropdown_padding_start:I = 0x7f070186
+.field public static final preference_dropdown_padding_start:I = 0x7f070188
-.field public static final preference_icon_minWidth:I = 0x7f070187
+.field public static final preference_icon_minWidth:I = 0x7f070189
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070188
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f07018a
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070189
+.field public static final preference_seekbar_padding_vertical:I = 0x7f07018b
-.field public static final preference_seekbar_value_minWidth:I = 0x7f07018a
+.field public static final preference_seekbar_value_minWidth:I = 0x7f07018c
-.field public static final subtitle_corner_radius:I = 0x7f070192
+.field public static final subtitle_corner_radius:I = 0x7f070194
-.field public static final subtitle_outline_width:I = 0x7f070193
+.field public static final subtitle_outline_width:I = 0x7f070195
-.field public static final subtitle_shadow_offset:I = 0x7f070194
+.field public static final subtitle_shadow_offset:I = 0x7f070196
-.field public static final subtitle_shadow_radius:I = 0x7f070195
+.field public static final subtitle_shadow_radius:I = 0x7f070197
-.field public static final test_mtrl_calendar_day_cornerSize:I = 0x7f070198
+.field public static final test_mtrl_calendar_day_cornerSize:I = 0x7f07019a
-.field public static final tooltip_corner_radius:I = 0x7f07019a
+.field public static final tooltip_corner_radius:I = 0x7f07019c
-.field public static final tooltip_horizontal_padding:I = 0x7f07019b
+.field public static final tooltip_horizontal_padding:I = 0x7f07019d
-.field public static final tooltip_margin:I = 0x7f07019c
+.field public static final tooltip_margin:I = 0x7f07019e
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019d
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07019f
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07019e
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a0
-.field public static final tooltip_vertical_padding:I = 0x7f07019f
+.field public static final tooltip_vertical_padding:I = 0x7f0701a1
-.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a0
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701a2
-.field public static final tooltip_y_offset_touch:I = 0x7f0701a1
+.field public static final tooltip_y_offset_touch:I = 0x7f0701a3
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index ce78447c91..2bbec040be 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -279,69 +279,69 @@
.field public static final ic_keyboard_arrow_right_black_24dp:I = 0x7f08031a
-.field public static final ic_menu_arrow_down_black_24dp:I = 0x7f08032e
+.field public static final ic_menu_arrow_down_black_24dp:I = 0x7f08032f
-.field public static final ic_menu_arrow_up_black_24dp:I = 0x7f08032f
+.field public static final ic_menu_arrow_up_black_24dp:I = 0x7f080330
-.field public static final ic_mtrl_checked_circle:I = 0x7f080347
+.field public static final ic_mtrl_checked_circle:I = 0x7f080348
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080348
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080349
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080349
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f08034a
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f08034a
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f08034b
-.field public static final mtrl_dialog_background:I = 0x7f0804ec
+.field public static final mtrl_dialog_background:I = 0x7f0804ed
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804ed
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804ee
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ee
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ef
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ef
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f0
-.field public static final mtrl_ic_cancel:I = 0x7f0804f0
+.field public static final mtrl_ic_cancel:I = 0x7f0804f1
-.field public static final mtrl_ic_error:I = 0x7f0804f1
+.field public static final mtrl_ic_error:I = 0x7f0804f2
-.field public static final mtrl_popupmenu_background:I = 0x7f0804f2
+.field public static final mtrl_popupmenu_background:I = 0x7f0804f3
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f3
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804f4
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f4
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804f5
-.field public static final navigation_empty_icon:I = 0x7f0804f5
+.field public static final navigation_empty_icon:I = 0x7f0804f6
-.field public static final notification_action_background:I = 0x7f0804f6
+.field public static final notification_action_background:I = 0x7f0804f7
-.field public static final notification_bg:I = 0x7f0804f7
+.field public static final notification_bg:I = 0x7f0804f8
-.field public static final notification_bg_low:I = 0x7f0804f8
+.field public static final notification_bg_low:I = 0x7f0804f9
-.field public static final notification_bg_low_normal:I = 0x7f0804f9
+.field public static final notification_bg_low_normal:I = 0x7f0804fa
-.field public static final notification_bg_low_pressed:I = 0x7f0804fa
+.field public static final notification_bg_low_pressed:I = 0x7f0804fb
-.field public static final notification_bg_normal:I = 0x7f0804fb
+.field public static final notification_bg_normal:I = 0x7f0804fc
-.field public static final notification_bg_normal_pressed:I = 0x7f0804fc
+.field public static final notification_bg_normal_pressed:I = 0x7f0804fd
-.field public static final notification_icon_background:I = 0x7f0804fd
+.field public static final notification_icon_background:I = 0x7f0804fe
-.field public static final notification_template_icon_bg:I = 0x7f0804fe
+.field public static final notification_template_icon_bg:I = 0x7f0804ff
-.field public static final notification_template_icon_low_bg:I = 0x7f0804ff
+.field public static final notification_template_icon_low_bg:I = 0x7f080500
-.field public static final notification_tile_bg:I = 0x7f080500
+.field public static final notification_tile_bg:I = 0x7f080501
-.field public static final notify_panel_notification_icon_bg:I = 0x7f080501
+.field public static final notify_panel_notification_icon_bg:I = 0x7f080502
-.field public static final preference_list_divider_material:I = 0x7f080502
+.field public static final preference_list_divider_material:I = 0x7f080503
-.field public static final test_custom_background:I = 0x7f080511
+.field public static final test_custom_background:I = 0x7f080512
-.field public static final tooltip_frame_dark:I = 0x7f080512
+.field public static final tooltip_frame_dark:I = 0x7f080513
-.field public static final tooltip_frame_light:I = 0x7f080513
+.field public static final tooltip_frame_light:I = 0x7f080514
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$id.smali b/com.discord/smali/com/discord/restapi/R$id.smali
index b662577956..8fec608b1c 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -571,11 +571,11 @@
.field public static final wide:I = 0x7f0a0991
-.field public static final wrap:I = 0x7f0a09c0
+.field public static final wrap:I = 0x7f0a09c4
-.field public static final wrap_content:I = 0x7f0a09c1
+.field public static final wrap_content:I = 0x7f0a09c5
-.field public static final wrap_reverse:I = 0x7f0a09c2
+.field public static final wrap_reverse:I = 0x7f0a09c6
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$layout.smali b/com.discord/smali/com/discord/restapi/R$layout.smali
index b7f5a951ba..e16969d527 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -225,39 +225,39 @@
.field public static final preference_widget_switch_compat:I = 0x7f0d0097
-.field public static final select_dialog_item_material:I = 0x7f0d009f
+.field public static final select_dialog_item_material:I = 0x7f0d00a0
-.field public static final select_dialog_multichoice_material:I = 0x7f0d00a0
+.field public static final select_dialog_multichoice_material:I = 0x7f0d00a1
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a1
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d00a2
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a9
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00aa
-.field public static final test_action_chip:I = 0x7f0d00ab
+.field public static final test_action_chip:I = 0x7f0d00ac
-.field public static final test_design_checkbox:I = 0x7f0d00ac
+.field public static final test_design_checkbox:I = 0x7f0d00ad
-.field public static final test_reflow_chipgroup:I = 0x7f0d00ad
+.field public static final test_reflow_chipgroup:I = 0x7f0d00ae
-.field public static final test_toolbar:I = 0x7f0d00ae
+.field public static final test_toolbar:I = 0x7f0d00af
-.field public static final test_toolbar_custom_background:I = 0x7f0d00af
+.field public static final test_toolbar_custom_background:I = 0x7f0d00b0
-.field public static final test_toolbar_elevation:I = 0x7f0d00b0
+.field public static final test_toolbar_elevation:I = 0x7f0d00b1
-.field public static final test_toolbar_surface:I = 0x7f0d00b1
+.field public static final test_toolbar_surface:I = 0x7f0d00b2
-.field public static final text_view_with_line_height_from_appearance:I = 0x7f0d00b2
+.field public static final text_view_with_line_height_from_appearance:I = 0x7f0d00b3
-.field public static final text_view_with_line_height_from_layout:I = 0x7f0d00b3
+.field public static final text_view_with_line_height_from_layout:I = 0x7f0d00b4
-.field public static final text_view_with_line_height_from_style:I = 0x7f0d00b4
+.field public static final text_view_with_line_height_from_style:I = 0x7f0d00b5
-.field public static final text_view_with_theme_line_height:I = 0x7f0d00b5
+.field public static final text_view_with_theme_line_height:I = 0x7f0d00b6
-.field public static final text_view_without_line_height:I = 0x7f0d00b6
+.field public static final text_view_without_line_height:I = 0x7f0d00b7
-.field public static final view_chip_default:I = 0x7f0d00d5
+.field public static final view_chip_default:I = 0x7f0d00d6
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index ef22294c23..67b8f11027 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -69,163 +69,163 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d6
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200dd
-.field public static final bottom_sheet_behavior:I = 0x7f120329
+.field public static final bottom_sheet_behavior:I = 0x7f120330
-.field public static final character_counter_content_description:I = 0x7f1203b9
+.field public static final character_counter_content_description:I = 0x7f1203c0
-.field public static final character_counter_overflowed_content_description:I = 0x7f1203ba
+.field public static final character_counter_overflowed_content_description:I = 0x7f1203c1
-.field public static final character_counter_pattern:I = 0x7f1203bb
+.field public static final character_counter_pattern:I = 0x7f1203c2
-.field public static final chip_text:I = 0x7f1203c6
+.field public static final chip_text:I = 0x7f1203cd
-.field public static final clear_text_end_icon_content_description:I = 0x7f1203d1
+.field public static final clear_text_end_icon_content_description:I = 0x7f1203d8
-.field public static final common_google_play_services_enable_button:I = 0x7f1203fb
+.field public static final common_google_play_services_enable_button:I = 0x7f120402
-.field public static final common_google_play_services_enable_text:I = 0x7f1203fc
+.field public static final common_google_play_services_enable_text:I = 0x7f120403
-.field public static final common_google_play_services_enable_title:I = 0x7f1203fd
+.field public static final common_google_play_services_enable_title:I = 0x7f120404
-.field public static final common_google_play_services_install_button:I = 0x7f1203fe
+.field public static final common_google_play_services_install_button:I = 0x7f120405
-.field public static final common_google_play_services_install_text:I = 0x7f1203ff
+.field public static final common_google_play_services_install_text:I = 0x7f120406
-.field public static final common_google_play_services_install_title:I = 0x7f120400
+.field public static final common_google_play_services_install_title:I = 0x7f120407
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120401
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120408
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120402
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120409
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120403
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12040a
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120404
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12040b
-.field public static final common_google_play_services_update_button:I = 0x7f120405
+.field public static final common_google_play_services_update_button:I = 0x7f12040c
-.field public static final common_google_play_services_update_text:I = 0x7f120406
+.field public static final common_google_play_services_update_text:I = 0x7f12040d
-.field public static final common_google_play_services_update_title:I = 0x7f120407
+.field public static final common_google_play_services_update_title:I = 0x7f12040e
-.field public static final common_google_play_services_updating_text:I = 0x7f120408
+.field public static final common_google_play_services_updating_text:I = 0x7f12040f
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120409
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120410
-.field public static final common_open_on_phone:I = 0x7f12040a
+.field public static final common_open_on_phone:I = 0x7f120411
-.field public static final common_signin_button_text:I = 0x7f12040b
+.field public static final common_signin_button_text:I = 0x7f120412
-.field public static final common_signin_button_text_long:I = 0x7f12040c
+.field public static final common_signin_button_text_long:I = 0x7f120413
-.field public static final copy:I = 0x7f120467
+.field public static final copy:I = 0x7f12046e
-.field public static final error_icon_content_description:I = 0x7f1205a8
+.field public static final error_icon_content_description:I = 0x7f1205af
-.field public static final expand_button_title:I = 0x7f1205b7
+.field public static final expand_button_title:I = 0x7f1205be
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205c3
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205ca
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205c5
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205cc
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205c6
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205cd
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120a3c
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120a44
-.field public static final icon_content_description:I = 0x7f120ac8
+.field public static final icon_content_description:I = 0x7f120ad0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cc9
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cd1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cca
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cd2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ccb
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cd3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ccc
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cd4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ccd
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cd5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cce
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cd6
-.field public static final mtrl_picker_cancel:I = 0x7f120ccf
+.field public static final mtrl_picker_cancel:I = 0x7f120cd7
-.field public static final mtrl_picker_confirm:I = 0x7f120cd0
+.field public static final mtrl_picker_confirm:I = 0x7f120cd8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cd1
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cd9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cd2
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cda
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cd3
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cdb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cd4
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cdc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cd5
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cdd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cd6
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cde
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cd7
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cdf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cd8
+.field public static final mtrl_picker_invalid_range:I = 0x7f120ce0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cd9
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120ce1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cda
+.field public static final mtrl_picker_out_of_range:I = 0x7f120ce2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cdb
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120ce3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cdc
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120ce4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cdd
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120ce5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120cde
+.field public static final mtrl_picker_range_header_title:I = 0x7f120ce6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cdf
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ce7
-.field public static final mtrl_picker_save:I = 0x7f120ce0
+.field public static final mtrl_picker_save:I = 0x7f120ce8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120ce1
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120ce9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ce2
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cea
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ce3
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ceb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ce4
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cec
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ce5
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ced
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120ce6
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cee
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ce7
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cef
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120ce8
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cf0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120ce9
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cf1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cea
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cf2
-.field public static final not_set:I = 0x7f120d65
+.field public static final not_set:I = 0x7f120d6d
-.field public static final password_toggle_content_description:I = 0x7f120e7f
+.field public static final password_toggle_content_description:I = 0x7f120e87
-.field public static final path_password_eye:I = 0x7f120e81
+.field public static final path_password_eye:I = 0x7f120e89
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120e82
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120e8a
-.field public static final path_password_eye_mask_visible:I = 0x7f120e83
+.field public static final path_password_eye_mask_visible:I = 0x7f120e8b
-.field public static final path_password_strike_through:I = 0x7f120e84
+.field public static final path_password_strike_through:I = 0x7f120e8c
-.field public static final preference_copied:I = 0x7f120ef6
+.field public static final preference_copied:I = 0x7f120efe
-.field public static final search_menu_title:I = 0x7f1211b3
+.field public static final search_menu_title:I = 0x7f1211bb
-.field public static final status_bar_notification_info_overflow:I = 0x7f121269
+.field public static final status_bar_notification_info_overflow:I = 0x7f121271
-.field public static final summary_collapsed_preference_list:I = 0x7f1212bb
+.field public static final summary_collapsed_preference_list:I = 0x7f1212c3
-.field public static final v7_preference_off:I = 0x7f1214d0
+.field public static final v7_preference_off:I = 0x7f1214d9
-.field public static final v7_preference_on:I = 0x7f1214d1
+.field public static final v7_preference_on:I = 0x7f1214da
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
index 52d178ca62..bd0ca397b6 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
@@ -98,7 +98,7 @@
move-result-object v1
- invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v1
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics.smali b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
index 27aa3eda0e..bfa7bb2c24 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics.smali
@@ -322,7 +322,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
@@ -468,7 +468,7 @@
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildRoles()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v3
@@ -500,7 +500,7 @@
move-result-object v5
- invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v5
@@ -528,7 +528,7 @@
move-result-object v6
- invoke-virtual {v6}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputed()Ljava/util/Map;
+ invoke-virtual {v6}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v6
@@ -1344,7 +1344,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
@@ -1444,7 +1444,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
index 82b6cf6936..f719efbb00 100644
--- a/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
+++ b/com.discord/smali/com/discord/stores/StoreApplicationStreaming.smali
@@ -1198,7 +1198,7 @@
iget-object v3, v0, Lcom/discord/stores/StoreApplicationStreaming;->userStore:Lcom/discord/stores/StoreUser;
- invoke-virtual {v3}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v3
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index 4b4974d10d..72557d4838 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -214,7 +214,7 @@
const-string v1, "en"
- const v2, 0x7f12038e
+ const v2, 0x7f120395
invoke-virtual {v0, p1, v2, v1}, Lcom/discord/utilities/StringUtils;->getStringByLocale(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
@@ -282,7 +282,7 @@
goto :goto_2
:cond_3
- const p2, 0x7f12038f
+ const p2, 0x7f120396
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -427,7 +427,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f12038f
+ const v0, 0x7f120396
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
index e21925a10e..bff79d992e 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
@@ -310,7 +310,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildRoles()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
@@ -893,7 +893,7 @@
move-result-object v2
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildRoles()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
@@ -957,7 +957,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
@@ -977,7 +977,7 @@
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputed()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v3
@@ -1021,7 +1021,7 @@
move-result-object v5
- invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getUsersInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v5
@@ -1029,7 +1029,7 @@
move-result-object v6
- invoke-virtual {v5, v6}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v5, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v5
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
index 559d07eb16..3e6c601a53 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
@@ -79,12 +79,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f12037d
+ const p1, 0x7f120384
goto :goto_0
:cond_0
- const p1, 0x7f12039c
+ const p1, 0x7f1203a3
:goto_0
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index f19cc41334..c367a94d95 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -28,7 +28,7 @@
invoke-direct {p0}, Lcom/discord/stores/Store;->()V
- const/16 v0, 0x42d
+ const/16 v0, 0x42e
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
index b60e2138c2..33e495f8ba 100644
--- a/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
+++ b/com.discord/smali/com/discord/stores/StoreDynamicLink.smali
@@ -107,9 +107,9 @@
invoke-direct {v0, p1}, Lcom/discord/stores/StoreDynamicLink$getDynamicLinkObservable$firebaseDynamicLinks$1;->(Landroid/content/Intent;)V
- sget-object p1, Lrx/Emitter$a;->f:Lrx/Emitter$a;
+ sget-object p1, Lrx/Emitter$BackpressureMode;->f:Lrx/Emitter$BackpressureMode;
- invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
+ invoke-static {v0, p1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
index 4b63af6b07..301ee18064 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom$updateAvailableGuildEmojis$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
+ value = Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
index d1fc2a1980..1ffdf216a2 100644
--- a/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmojiCustom.smali
@@ -146,12 +146,14 @@
return-void
.end method
-.method private final updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
- .locals 4
+.method private final updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
+ .locals 5
.annotation system Ldalvik/annotation/Signature;
value = {
"(J",
- "Lcom/discord/models/domain/ModelGuildMember;",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;",
"Ljava/util/Collection<",
"+",
"Lcom/discord/models/domain/emoji/ModelEmojiCustom;",
@@ -221,15 +223,7 @@
goto :goto_0
:cond_2
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
-
- move-result-object v1
-
- const-string v2, "me.roles"
-
- invoke-static {v1, v2}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
move-result-object v1
@@ -246,7 +240,15 @@
move-object v3, v2
- check-cast v3, Ljava/lang/Long;
+ check-cast v3, Ljava/lang/Number;
+
+ invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
+
+ move-result-wide v3
+
+ invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v3
invoke-interface {v0, v3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
@@ -515,7 +517,7 @@
move-result-object v2
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembers()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
@@ -541,7 +543,7 @@
move-result-object v2
- check-cast v2, Lcom/discord/models/domain/ModelGuildMember;
+ check-cast v2, Lcom/discord/models/domain/ModelGuildMember$Computed;
if-eqz v2, :cond_0
@@ -555,13 +557,21 @@
invoke-direct {p0, v0, v1, v3}, Lcom/discord/stores/StoreEmojiCustom;->updateGlobalEmojis(JLjava/util/Collection;)V
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getRoles()Ljava/util/List;
+
+ move-result-object v2
+
+ const-string v3, "selfMember.roles"
+
+ invoke-static {v2, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
invoke-virtual {p1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom$Update;->getEmojis()Ljava/util/List;
move-result-object p1
invoke-static {p1, v4}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-direct {p0, v0, v1, v2, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
+ invoke-direct {p0, v0, v1, v2, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
:cond_0
return-void
@@ -617,7 +627,15 @@
invoke-direct {p0, v2, v3, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateGlobalEmojis(JLjava/util/Collection;)V
- invoke-direct {p0, v2, v3, v1, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+
+ move-result-object v0
+
+ const-string v1, "selfMember.roles"
+
+ invoke-static {v0, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-direct {p0, v2, v3, v0, p1}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -679,7 +697,15 @@
if-eqz v2, :cond_0
- invoke-direct {p0, v0, v1, p1, v2}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLcom/discord/models/domain/ModelGuildMember;Ljava/util/Collection;)V
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuildMember;->getRoles()Ljava/util/List;
+
+ move-result-object p1
+
+ const-string v3, "member.roles"
+
+ invoke-static {p1, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-direct {p0, v0, v1, p1, v2}, Lcom/discord/stores/StoreEmojiCustom;->updateAvailableGuildEmojis(JLjava/util/List;Ljava/util/Collection;)V
:cond_0
return-void
diff --git a/com.discord/smali/com/discord/stores/StoreExperiments.smali b/com.discord/smali/com/discord/stores/StoreExperiments.smali
index 52926aaad9..4c763465e6 100644
--- a/com.discord/smali/com/discord/stores/StoreExperiments.smali
+++ b/com.discord/smali/com/discord/stores/StoreExperiments.smali
@@ -1230,7 +1230,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeUser:Lcom/discord/stores/StoreUser;
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
@@ -1245,7 +1245,7 @@
:cond_0
iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
index a288d077d0..209386f36e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildMemberRequester.smali
@@ -95,7 +95,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildMembers()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
@@ -119,7 +119,7 @@
move-result-object p1
- check-cast p1, Lcom/discord/models/domain/ModelGuildMember;
+ check-cast p1, Lcom/discord/models/domain/ModelGuildMember$Computed;
goto :goto_0
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1.smali
new file mode 100644
index 0000000000..5f9d94c955
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1.smali
@@ -0,0 +1,27 @@
+.class public final Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+.super Ljava/lang/Object;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreGuilds;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observe$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observe$1.smali
index 10fd38774c..d5bb250287 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observe$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observe$1.smali
@@ -1,14 +1,14 @@
.class public final Lcom/discord/stores/StoreGuilds$observe$1;
-.super Ljava/lang/Object;
+.super Lw/u/b/k;
.source "StoreGuilds.kt"
# interfaces
-.implements Le0/l/i;
+.implements Lkotlin/jvm/functions/Function0;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreGuilds;->observe(J)Lrx/Observable;
+ value = Lcom/discord/stores/StoreGuilds;->observe()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -18,72 +18,63 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Le0/l/i<",
- "TT;TR;>;"
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ">;>;"
}
.end annotation
# instance fields
-.field public final synthetic $guildId:J
+.field public final synthetic this$0:Lcom/discord/stores/StoreGuilds;
# direct methods
-.method public constructor (J)V
+.method public constructor (Lcom/discord/stores/StoreGuilds;)V
.locals 0
- iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observe$1;->$guildId:J
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds$observe$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public final call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "+",
- "Lcom/discord/models/domain/ModelGuild;",
- ">;)",
- "Lcom/discord/models/domain/ModelGuild;"
- }
- .end annotation
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
- iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observe$1;->$guildId:J
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual {p0}, Lcom/discord/stores/StoreGuilds$observe$1;->invoke()Ljava/util/Map;
move-result-object v0
- invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/models/domain/ModelGuild;
-
- return-object p1
+ return-object v0
.end method
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+.method public final invoke()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ">;"
+ }
+ .end annotation
- check-cast p1, Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds$observe$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observe$1;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
- move-result-object p1
+ move-result-object v0
- return-object p1
+ return-object v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observe$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observe$2.smali
new file mode 100644
index 0000000000..d6801e425c
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observe$2.smali
@@ -0,0 +1,89 @@
+.class public final Lcom/discord/stores/StoreGuilds$observe$2;
+.super Ljava/lang/Object;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Le0/l/i;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreGuilds;->observe(J)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Le0/l/i<",
+ "TT;TR;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $guildId:J
+
+
+# direct methods
+.method public constructor (J)V
+ .locals 0
+
+ iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observe$2;->$guildId:J
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ">;)",
+ "Lcom/discord/models/domain/ModelGuild;"
+ }
+ .end annotation
+
+ iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observe$2;->$guildId:J
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Lcom/discord/models/domain/ModelGuild;
+
+ return-object p1
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observe$2;->call(Ljava/util/Map;)Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
index 28e9d9fcfe..e8fbf387bf 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$1.smali
@@ -1,14 +1,14 @@
.class public final Lcom/discord/stores/StoreGuilds$observeComputed$1;
-.super Ljava/lang/Object;
+.super Lw/u/b/k;
.source "StoreGuilds.kt"
# interfaces
-.implements Le0/l/i;
+.implements Lkotlin/jvm/functions/Function0;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreGuilds;->observeComputed(J)Lrx/Observable;
+ value = Lcom/discord/stores/StoreGuilds;->observeComputed()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -18,88 +18,68 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Le0/l/i<",
- "TT;TR;>;"
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+ ">;>;>;"
}
.end annotation
# instance fields
-.field public final synthetic $guildId:J
+.field public final synthetic this$0:Lcom/discord/stores/StoreGuilds;
# direct methods
-.method public constructor (J)V
+.method public constructor (Lcom/discord/stores/StoreGuilds;)V
.locals 0
- iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeComputed$1;->$guildId:J
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds$observeComputed$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
- check-cast p1, Ljava/util/Map;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeComputed$1;->call(Ljava/util/Map;)Ljava/util/Map;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Ljava/util/Map;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "+",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "+",
- "Lcom/discord/models/domain/ModelGuildMember$Computed;",
- ">;>;)",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Lcom/discord/models/domain/ModelGuildMember$Computed;",
- ">;"
- }
- .end annotation
-
- iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeComputed$1;->$guildId:J
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual {p0}, Lcom/discord/stores/StoreGuilds$observeComputed$1;->invoke()Ljava/util/Map;
move-result-object v0
- invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Ljava/util/Map;
-
- if-eqz p1, :cond_0
-
- goto :goto_0
-
- :cond_0
- invoke-static {}, Lcom/discord/stores/StoreGuilds;->access$getEmptyComputedMap$cp()Ljava/util/Map;
-
- move-result-object p1
-
- :goto_0
- return-object p1
+ return-object v0
+.end method
+
+.method public final invoke()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+ ">;>;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds$observeComputed$1;->this$0:Lcom/discord/stores/StoreGuilds;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getMembers()Ljava/util/Map;
+
+ move-result-object v0
+
+ return-object v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali
new file mode 100644
index 0000000000..182a7faf53
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeComputed$2.smali
@@ -0,0 +1,105 @@
+.class public final Lcom/discord/stores/StoreGuilds$observeComputed$2;
+.super Ljava/lang/Object;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Le0/l/i;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreGuilds;->observeComputed(J)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Le0/l/i<",
+ "TT;TR;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $guildId:J
+
+
+# direct methods
+.method public constructor (J)V
+ .locals 0
+
+ iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeComputed$2;->$guildId:J
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeComputed$2;->call(Ljava/util/Map;)Ljava/util/Map;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/util/Map;)Ljava/util/Map;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+ ">;>;)",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+ ">;"
+ }
+ .end annotation
+
+ iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeComputed$2;->$guildId:J
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/util/Map;
+
+ if-eqz p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-static {}, Lcom/discord/stores/StoreGuilds;->access$getEmptyComputedMap$cp()Ljava/util/Map;
+
+ move-result-object p1
+
+ :goto_0
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
index ba596d5916..295892824a 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$1.smali
@@ -1,14 +1,14 @@
.class public final Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;
-.super Ljava/lang/Object;
+.super Lw/u/b/k;
.source "StoreGuilds.kt"
# interfaces
-.implements Le0/l/i;
+.implements Lkotlin/jvm/functions/Function0;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreGuilds;->observeJoinedAt(J)Lrx/Observable;
+ value = Lcom/discord/stores/StoreGuilds;->observeJoinedAt()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -18,78 +18,63 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Le0/l/i<",
- "TT;TR;>;"
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/lang/Long;",
+ ">;>;"
}
.end annotation
# instance fields
-.field public final synthetic $guildId:J
+.field public final synthetic this$0:Lcom/discord/stores/StoreGuilds;
# direct methods
-.method public constructor (J)V
+.method public constructor (Lcom/discord/stores/StoreGuilds;)V
.locals 0
- iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->$guildId:J
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public final call(Ljava/util/Map;)J
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Ljava/lang/Long;",
- ">;)J"
- }
- .end annotation
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
- iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->$guildId:J
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual {p0}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->invoke()Ljava/util/Map;
move-result-object v0
- invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Ljava/lang/Long;
-
- invoke-static {p1}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAt(Ljava/lang/Long;)J
-
- move-result-wide v0
-
- return-wide v0
+ return-object v0
.end method
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 2
+.method public final invoke()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
- check-cast p1, Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->call(Ljava/util/Map;)J
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsJoinedAt()Ljava/util/Map;
- move-result-wide v0
+ move-result-object v0
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p1
-
- return-object p1
+ return-object v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali
new file mode 100644
index 0000000000..50c6599d23
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeJoinedAt$2.smali
@@ -0,0 +1,95 @@
+.class public final Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;
+.super Ljava/lang/Object;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Le0/l/i;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreGuilds;->observeJoinedAt(J)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Le0/l/i<",
+ "TT;TR;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $guildId:J
+
+
+# direct methods
+.method public constructor (J)V
+ .locals 0
+
+ iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->$guildId:J
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Map;)J
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/lang/Long;",
+ ">;)J"
+ }
+ .end annotation
+
+ iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->$guildId:J
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/lang/Long;
+
+ invoke-static {p1}, Lcom/discord/models/domain/ModelGuildMember;->getJoinedAt(Ljava/lang/Long;)J
+
+ move-result-wide v0
+
+ return-wide v0
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 2
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->call(Ljava/util/Map;)J
+
+ move-result-wide v0
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
index a0f8321276..06d17673c0 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$1.smali
@@ -1,14 +1,14 @@
.class public final Lcom/discord/stores/StoreGuilds$observeRoles$1;
-.super Ljava/lang/Object;
+.super Lw/u/b/k;
.source "StoreGuilds.kt"
# interfaces
-.implements Le0/l/i;
+.implements Lkotlin/jvm/functions/Function0;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
+ value = Lcom/discord/stores/StoreGuilds;->observeRoles()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -18,88 +18,68 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Le0/l/i<",
- "TT;TR;>;"
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;>;>;"
}
.end annotation
# instance fields
-.field public final synthetic $guildId:J
+.field public final synthetic this$0:Lcom/discord/stores/StoreGuilds;
# direct methods
-.method public constructor (J)V
+.method public constructor (Lcom/discord/stores/StoreGuilds;)V
.locals 0
- iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeRoles$1;->$guildId:J
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds$observeRoles$1;->this$0:Lcom/discord/stores/StoreGuilds;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
- check-cast p1, Ljava/util/Map;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeRoles$1;->call(Ljava/util/Map;)Ljava/util/Map;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/util/Map;)Ljava/util/Map;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "+",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "+",
- "Lcom/discord/models/domain/ModelGuildRole;",
- ">;>;)",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Lcom/discord/models/domain/ModelGuildRole;",
- ">;"
- }
- .end annotation
-
- iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeRoles$1;->$guildId:J
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual {p0}, Lcom/discord/stores/StoreGuilds$observeRoles$1;->invoke()Ljava/util/Map;
move-result-object v0
- invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Ljava/util/Map;
-
- if-eqz p1, :cond_0
-
- goto :goto_0
-
- :cond_0
- invoke-static {}, Lcom/discord/stores/StoreGuilds;->access$getEmptyRoles$cp()Ljava/util/Map;
-
- move-result-object p1
-
- :goto_0
- return-object p1
+ return-object v0
+.end method
+
+.method public final invoke()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;>;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds$observeRoles$1;->this$0:Lcom/discord/stores/StoreGuilds;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getRoles()Ljava/util/Map;
+
+ move-result-object v0
+
+ return-object v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali
new file mode 100644
index 0000000000..99ac1a83fa
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeRoles$2.smali
@@ -0,0 +1,105 @@
+.class public final Lcom/discord/stores/StoreGuilds$observeRoles$2;
+.super Ljava/lang/Object;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Le0/l/i;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreGuilds;->observeRoles(J)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Le0/l/i<",
+ "TT;TR;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $guildId:J
+
+
+# direct methods
+.method public constructor (J)V
+ .locals 0
+
+ iput-wide p1, p0, Lcom/discord/stores/StoreGuilds$observeRoles$2;->$guildId:J
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreGuilds$observeRoles$2;->call(Ljava/util/Map;)Ljava/util/Map;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/util/Map;)Ljava/util/Map;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;>;)",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;"
+ }
+ .end annotation
+
+ iget-wide v0, p0, Lcom/discord/stores/StoreGuilds$observeRoles$2;->$guildId:J
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/util/Map;
+
+ if-eqz p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-static {}, Lcom/discord/stores/StoreGuilds;->access$getEmptyRoles$cp()Ljava/util/Map;
+
+ move-result-object p1
+
+ :goto_0
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali b/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali
new file mode 100644
index 0000000000..a3c68c8fcb
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreGuilds$observeUnavailableGuilds$1.smali
@@ -0,0 +1,78 @@
+.class public final Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;
+.super Lw/u/b/k;
+.source "StoreGuilds.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreGuilds;->observeUnavailableGuilds()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lw/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Ljava/util/Set<",
+ "+",
+ "Ljava/lang/Long;",
+ ">;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreGuilds;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreGuilds;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;->this$0:Lcom/discord/stores/StoreGuilds;
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lw/u/b/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;->invoke()Ljava/util/Set;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final invoke()Ljava/util/Set;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Set<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;->this$0:Lcom/discord/stores/StoreGuilds;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getUnavailableGuilds()Ljava/util/Set;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuilds.smali b/com.discord/smali/com/discord/stores/StoreGuilds.smali
index b72eb353eb..ecb1ab5b55 100644
--- a/com.discord/smali/com/discord/stores/StoreGuilds.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuilds.smali
@@ -1,10 +1,7 @@
.class public final Lcom/discord/stores/StoreGuilds;
-.super Lcom/discord/stores/Store;
+.super Lcom/discord/stores/StoreV2;
.source "StoreGuilds.kt"
-# interfaces
-.implements Lcom/discord/stores/DispatchHandler;
-
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
@@ -18,6 +15,8 @@
# static fields
.field public static final Companion:Lcom/discord/stores/StoreGuilds$Companion;
+.field public static final ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
.field public static final HUGE_GUILD_SIZE:I = 0x7d0
.field public static final emptyComputedMap:Ljava/util/Map;
@@ -44,39 +43,6 @@
# instance fields
-.field public final guildJoinedAt:Ljava/util/Map;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Ljava/lang/Long;",
- ">;"
- }
- .end annotation
-.end field
-
-.field public final guildJoinedAtPublisher:Lcom/discord/utilities/persister/Persister;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Lcom/discord/utilities/persister/Persister<",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Ljava/lang/Long;",
- ">;>;"
- }
- .end annotation
-.end field
-
-.field public final guildLargeIds:Ljava/util/List;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/List<",
- "Ljava/lang/Long;",
- ">;"
- }
- .end annotation
-.end field
-
.field public final guildMembers:Ljava/util/Map;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -103,16 +69,17 @@
.end annotation
.end field
-.field public final guildMembersComputedPublisher:Lrx/subjects/BehaviorSubject;
+.field public guildMembersComputedSnapshot:Ljava/util/Map;
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lrx/subjects/BehaviorSubject<",
"Ljava/util/Map<",
"Ljava/lang/Long;",
+ "+",
"Ljava/util/Map<",
"Ljava/lang/Long;",
+ "+",
"Lcom/discord/models/domain/ModelGuildMember$Computed;",
- ">;>;>;"
+ ">;>;"
}
.end annotation
.end field
@@ -130,7 +97,7 @@
.end annotation
.end field
-.field public final guildRolesPublisher:Lcom/discord/utilities/persister/Persister;
+.field public final guildRolesCache:Lcom/discord/utilities/persister/Persister;
.annotation system Ldalvik/annotation/Signature;
value = {
"Lcom/discord/utilities/persister/Persister<",
@@ -144,6 +111,21 @@
.end annotation
.end field
+.field public guildRolesSnapshot:Ljava/util/Map;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;>;"
+ }
+ .end annotation
+.end field
+
.field public final guilds:Ljava/util/Map;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -167,18 +149,52 @@
.end annotation
.end field
-.field public final guildsPublisher:Lrx/subjects/BehaviorSubject;
+.field public final guildsJoinedAt:Ljava/util/Map;
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lrx/subjects/BehaviorSubject<",
"Ljava/util/Map<",
"Ljava/lang/Long;",
- "Lcom/discord/models/domain/ModelGuild;",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public final guildsJoinedAtCache:Lcom/discord/utilities/persister/Persister;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lcom/discord/utilities/persister/Persister<",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/lang/Long;",
">;>;"
}
.end annotation
.end field
+.field public guildsJoinedAtSnapshot:Ljava/util/Map;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public guildsSnapshot:Ljava/util/Map;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "+",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ">;"
+ }
+ .end annotation
+.end field
+
.field public final guildsUnavailable:Ljava/util/Set;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -189,23 +205,17 @@
.end annotation
.end field
-.field public final guildsUnavailablePublisher:Lrx/subjects/Subject;
+.field public guildsUnavailableSnapshot:Ljava/util/Set;
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lrx/subjects/Subject<",
"Ljava/util/Set<",
"Ljava/lang/Long;",
- ">;",
- "Ljava/util/Set<",
- "Ljava/lang/Long;",
- ">;>;"
+ ">;"
}
.end annotation
.end field
-.field public isComputedDirty:Z
-
-.field public isDirty:Z
+.field public final observationDeck:Lcom/discord/stores/updates/ObservationDeck;
.field public final userStore:Lcom/discord/stores/StoreUser;
@@ -234,18 +244,58 @@
sput-object v0, Lcom/discord/stores/StoreGuilds;->emptyRoles:Ljava/util/Map;
+ new-instance v0, Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ invoke-direct {v0}, Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;->()V
+
+ sput-object v0, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
return-void
.end method
-.method public constructor (Lcom/discord/stores/StoreUser;)V
- .locals 2
+.method public constructor (Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;)V
+ .locals 1
- if-eqz p1, :cond_0
+ const/4 v0, 0x0
- invoke-direct {p0}, Lcom/discord/stores/Store;->()V
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ invoke-direct {p0}, Lcom/discord/stores/StoreV2;->()V
iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->userStore:Lcom/discord/stores/StoreUser;
+ iput-object p2, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
+
+ invoke-static {}, Lw/q/l;->emptyMap()Ljava/util/Map;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsSnapshot:Ljava/util/Map;
+
+ invoke-static {}, Lw/q/l;->emptyMap()Ljava/util/Map;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedSnapshot:Ljava/util/Map;
+
+ invoke-static {}, Lw/q/l;->emptyMap()Ljava/util/Map;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesSnapshot:Ljava/util/Map;
+
+ sget-object p1, Lw/q/q;->d:Lw/q/q;
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailableSnapshot:Ljava/util/Set;
+
+ invoke-static {}, Lw/q/l;->emptyMap()Ljava/util/Map;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtSnapshot:Ljava/util/Map;
+
new-instance p1, Ljava/util/HashMap;
invoke-direct {p1}, Ljava/util/HashMap;->()V
@@ -280,98 +330,76 @@
invoke-direct {p1}, Ljava/util/HashMap;->()V
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAt:Ljava/util/Map;
-
- new-instance p1, Ljava/util/ArrayList;
-
- invoke-direct {p1}, Ljava/util/ArrayList;->()V
-
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildLargeIds:Ljava/util/List;
-
- new-instance p1, Ljava/util/HashMap;
-
- invoke-direct {p1}, Ljava/util/HashMap;->()V
-
- invoke-static {p1}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
- move-result-object p1
-
- const-string v0, "BehaviorSubject.create(HashMap())"
-
- invoke-static {p1, v0}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedPublisher:Lrx/subjects/BehaviorSubject;
-
- new-instance p1, Ljava/util/HashMap;
-
- invoke-direct {p1}, Ljava/util/HashMap;->()V
-
- invoke-static {p1}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsPublisher:Lrx/subjects/BehaviorSubject;
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
new-instance p1, Lcom/discord/utilities/persister/Persister;
- new-instance v0, Ljava/util/HashMap;
+ new-instance p2, Ljava/util/HashMap;
- invoke-direct {v0}, Ljava/util/HashMap;->()V
+ invoke-direct {p2}, Ljava/util/HashMap;->()V
- const-string v1, "STORE_GUILDS_V28"
+ const-string v0, "STORE_GUILDS_V28"
- invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
+ invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsCache:Lcom/discord/utilities/persister/Persister;
new-instance p1, Lcom/discord/utilities/persister/Persister;
- new-instance v0, Ljava/util/HashMap;
+ new-instance p2, Ljava/util/HashMap;
- invoke-direct {v0}, Ljava/util/HashMap;->()V
+ invoke-direct {p2}, Ljava/util/HashMap;->()V
- const-string v1, "STORE_GUILD_ROLES_V4"
+ const-string v0, "STORE_GUILD_ROLES_V4"
- invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
+ invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesPublisher:Lcom/discord/utilities/persister/Persister;
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesCache:Lcom/discord/utilities/persister/Persister;
new-instance p1, Lcom/discord/utilities/persister/Persister;
- new-instance v0, Ljava/util/HashMap;
+ new-instance p2, Ljava/util/HashMap;
- invoke-direct {v0}, Ljava/util/HashMap;->()V
+ invoke-direct {p2}, Ljava/util/HashMap;->()V
- const-string v1, "STORE_GUILD_JOINED_AT_V5"
+ const-string v0, "STORE_GUILD_JOINED_AT_V5"
- invoke-direct {p1, v1, v0}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
+ invoke-direct {p1, v0, p2}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAtPublisher:Lcom/discord/utilities/persister/Persister;
-
- new-instance p1, Lrx/subjects/SerializedSubject;
-
- new-instance v0, Ljava/util/HashSet;
-
- invoke-direct {v0}, Ljava/util/HashSet;->()V
-
- invoke-static {v0}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
- move-result-object v0
-
- invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;->(Lrx/subjects/Subject;)V
-
- iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailablePublisher:Lrx/subjects/Subject;
+ iput-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtCache:Lcom/discord/utilities/persister/Persister;
return-void
:cond_0
+ const-string p1, "observationDeck"
+
+ invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
const-string p1, "userStore"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
- const/4 p1, 0x0
+ throw v0
+.end method
- throw p1
+.method public synthetic constructor (Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ and-int/lit8 p3, p3, 0x2
+
+ if-eqz p3, :cond_0
+
+ invoke-static {}, Lcom/discord/stores/updates/ObservationDeckProvider;->get()Lcom/discord/stores/updates/ObservationDeck;
+
+ move-result-object p2
+
+ :cond_0
+ invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreGuilds;->(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;)V
+
+ return-void
.end method
.method public static final synthetic access$getEmptyComputedMap$cp()Ljava/util/Map;
@@ -391,7 +419,7 @@
.end method
.method private final handleGuild(Lcom/discord/models/domain/ModelGuild;Z)V
- .locals 4
+ .locals 3
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -399,8 +427,6 @@
move-result-wide v0
- const/4 v2, 0x1
-
if-eqz p2, :cond_0
iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
@@ -423,7 +449,7 @@
invoke-interface {p1, p2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
- iput-boolean v2, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
goto :goto_0
@@ -432,9 +458,9 @@
invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v3
+ move-result-object v2
- invoke-interface {p2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {p2, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p2
@@ -448,9 +474,9 @@
invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v3
+ move-result-object v2
- invoke-interface {p2, v3}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {p2, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p2
@@ -460,7 +486,7 @@
move-result p2
- xor-int/2addr p2, v2
+ xor-int/lit8 p2, p2, 0x1
if-eqz p2, :cond_1
@@ -476,7 +502,7 @@
invoke-interface {p2, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- iput-boolean v2, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
:cond_1
:goto_0
@@ -706,7 +732,15 @@
invoke-interface {p1, p2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- iput-boolean v4, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ new-array p1, v4, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 p2, 0x0
+
+ sget-object p3, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ aput-object p3, p1, p2
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
goto :goto_1
@@ -736,7 +770,7 @@
.end method
.method private final handleGuildMembers(JJLjava/util/Collection;Z)V
- .locals 2
+ .locals 3
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -754,11 +788,13 @@
const-wide/16 p5, 0x0
- const/4 v0, 0x1
+ const/4 v0, 0x0
- cmp-long v1, p3, p5
+ const/4 v1, 0x1
- if-lez v1, :cond_3
+ cmp-long v2, p3, p5
+
+ if-lez v2, :cond_3
iget-object p5, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
@@ -778,9 +814,9 @@
invoke-static {p3, p4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v1
+ move-result-object v2
- invoke-interface {p5, v1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {p5, v2}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p5
@@ -794,7 +830,7 @@
:goto_0
if-eqz p5, :cond_1
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
:cond_1
iget-object p5, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
@@ -826,7 +862,13 @@
:cond_2
if-eqz p6, :cond_6
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ new-array p1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ sget-object p2, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ aput-object p2, p1, v0
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
goto :goto_2
@@ -843,7 +885,7 @@
if-eqz p3, :cond_4
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
:cond_4
iget-object p3, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
@@ -858,7 +900,13 @@
if-eqz p1, :cond_6
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ new-array p1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ sget-object p2, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ aput-object p2, p1, v0
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
goto :goto_2
@@ -935,7 +983,7 @@
.end method
.method private final handleGuildRoles(JJLjava/util/List;Z)V
- .locals 2
+ .locals 1
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -949,15 +997,13 @@
}
.end annotation
- const/4 v0, 0x1
-
if-eqz p6, :cond_2
const-wide/16 p5, 0x0
- cmp-long v1, p3, p5
+ cmp-long v0, p3, p5
- if-lez v1, :cond_1
+ if-lez v0, :cond_1
iget-object p5, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
@@ -991,7 +1037,7 @@
:goto_0
if-eqz p1, :cond_5
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
goto :goto_2
@@ -1016,7 +1062,7 @@
invoke-interface {p3, p1}, Ljava/util/Map;->remove(Ljava/lang/Object;)Ljava/lang/Object;
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
goto :goto_2
@@ -1080,7 +1126,7 @@
move-result p4
- xor-int/2addr p4, v0
+ xor-int/lit8 p4, p4, 0x1
if-eqz p4, :cond_4
@@ -1094,7 +1140,7 @@
invoke-interface {p2, p4, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
goto :goto_1
@@ -1104,12 +1150,10 @@
.end method
.method private final handleGuildUnavailable(JZZ)V
- .locals 1
+ .locals 0
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- const/4 v0, 0x1
-
if-eqz p4, :cond_0
if-eqz p3, :cond_1
@@ -1134,7 +1178,7 @@
invoke-interface {p3, p1}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
goto :goto_0
@@ -1161,7 +1205,7 @@
invoke-interface {p3, p1}, Ljava/util/Set;->remove(Ljava/lang/Object;)Z
- iput-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
:cond_1
:goto_0
@@ -1186,7 +1230,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->userStore:Lcom/discord/stores/StoreUser;
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
@@ -1213,7 +1257,7 @@
if-eqz p3, :cond_3
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAt:Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -1225,7 +1269,7 @@
if-eqz v0, :cond_2
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAt:Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -1256,7 +1300,7 @@
:cond_2
:goto_0
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAt:Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -1272,217 +1316,20 @@
invoke-interface {v0, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- const/4 p1, 0x1
-
- iput-boolean p1, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->markChanged()V
:cond_3
:goto_1
return-void
.end method
-.method private final updateGuildMemberComputed()V
- .locals 8
- .annotation runtime Lcom/discord/stores/StoreThread;
- .end annotation
-
- new-instance v0, Ljava/util/HashMap;
-
- invoke-direct {v0}, Ljava/util/HashMap;->()V
-
- iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
-
- invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
- move-result-object v1
-
- invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
- move-result-object v1
-
- :goto_0
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v2
-
- if-eqz v2, :cond_2
-
- invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Ljava/util/Map$Entry;
-
- invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
- move-result-object v3
-
- check-cast v3, Ljava/util/Map;
-
- invoke-interface {v3}, Ljava/util/Map;->size()I
-
- move-result v4
-
- const/16 v5, 0x7d0
-
- if-ge v4, v5, :cond_0
-
- invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
- move-result-object v2
-
- new-instance v4, Ljava/util/HashMap;
-
- invoke-direct {v4, v3}, Ljava/util/HashMap;->(Ljava/util/Map;)V
-
- invoke-interface {v0, v2, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_0
-
- :cond_0
- instance-of v4, v3, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
- if-eqz v4, :cond_1
-
- check-cast v3, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
- goto :goto_1
-
- :cond_1
- new-instance v4, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
- const/4 v5, 0x0
-
- const/4 v6, 0x1
-
- const/4 v7, 0x0
-
- invoke-direct {v4, v5, v6, v7}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- invoke-virtual {v4, v3}, Lcom/discord/utilities/collections/ShallowPartitionMap;->putAll(Ljava/util/Map;)V
-
- invoke-interface {v2, v4}, Ljava/util/Map$Entry;->setValue(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-object v3, v4
-
- :goto_1
- invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
- move-result-object v2
-
- invoke-virtual {v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->fastCopy()Ljava/util/Map;
-
- move-result-object v3
-
- invoke-interface {v0, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_0
-
- :cond_2
- iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedPublisher:Lrx/subjects/BehaviorSubject;
-
- invoke-virtual {v1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
- return-void
-.end method
-
-.method private final updateRoles()V
- .locals 5
- .annotation runtime Lcom/discord/stores/StoreThread;
- .end annotation
-
- new-instance v0, Ljava/util/HashMap;
-
- invoke-direct {v0}, Ljava/util/HashMap;->()V
-
- iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
-
- invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
- move-result-object v1
-
- invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
- move-result-object v1
-
- :goto_0
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v2
-
- if-eqz v2, :cond_0
-
- invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Ljava/util/Map$Entry;
-
- invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
- move-result-object v3
-
- check-cast v3, Ljava/lang/Number;
-
- invoke-virtual {v3}, Ljava/lang/Number;->longValue()J
-
- move-result-wide v3
-
- invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Ljava/util/Map;
-
- invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v3
-
- new-instance v4, Ljava/util/HashMap;
-
- invoke-direct {v4, v2}, Ljava/util/HashMap;->(Ljava/util/Map;)V
-
- invoke-interface {v0, v3, v4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_0
-
- :cond_0
- iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesPublisher:Lcom/discord/utilities/persister/Persister;
-
- const/4 v2, 0x0
-
- const/4 v3, 0x2
-
- const/4 v4, 0x0
-
- invoke-static {v1, v0, v2, v3, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
-
- return-void
-.end method
-
# virtual methods
-.method public final getGuildMembers()Ljava/util/Map;
+.method public final getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
.locals 1
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Lcom/discord/models/domain/ModelGuildMember;",
- ">;>;"
- }
+ .annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembers:Ljava/util/Map;
-
- return-object v0
-.end method
-
-.method public final getGuildMembersComputed()Ljava/util/Map;
- .locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -1500,8 +1347,11 @@
return-object v0
.end method
-.method public final getGuildRoles()Ljava/util/Map;
+.method public final getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
.locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -1531,13 +1381,107 @@
}
.end annotation
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsSnapshot:Ljava/util/Map;
+
+ return-object v0
+.end method
+
+.method public final getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ">;"
+ }
+ .end annotation
+
iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
return-object v0
.end method
-.method public final getGuildsUnavailable()Ljava/util/Set;
+.method public final getGuildsJoinedAt()Ljava/util/Map;
.locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtSnapshot:Ljava/util/Map;
+
+ return-object v0
+.end method
+
+.method public final getMembers()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildMember$Computed;",
+ ">;>;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedSnapshot:Ljava/util/Map;
+
+ return-object v0
+.end method
+
+.method public final getRoles()Ljava/util/Map;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Ljava/util/Map<",
+ "Ljava/lang/Long;",
+ "Lcom/discord/models/domain/ModelGuildRole;",
+ ">;>;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildRolesSnapshot:Ljava/util/Map;
+
+ return-object v0
+.end method
+
+.method public final getUnavailableGuilds()Ljava/util/Set;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/Set<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailableSnapshot:Ljava/util/Set;
+
+ return-object v0
+.end method
+
+.method public final getUnavailableGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Set;
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -1553,7 +1497,7 @@
.end method
.method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
- .locals 11
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1575,10 +1519,6 @@
invoke-interface {v0}, Ljava/util/Map;->clear()V
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildLargeIds:Ljava/util/List;
-
- invoke-interface {v0}, Ljava/util/List;->clear()V
-
iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailable:Ljava/util/Set;
invoke-interface {v0}, Ljava/util/Set;->clear()V
@@ -1596,6 +1536,8 @@
move-result v0
+ const/4 v1, 0x0
+
if-eqz v0, :cond_1
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -1604,23 +1546,23 @@
check-cast v0, Lcom/discord/models/domain/ModelGuild;
- const-string v1, "guild"
+ const-string v2, "guild"
- invoke-static {v0, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v0, v2}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-result-wide v9
+ move-result-wide v10
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->isUnavailable()Z
- move-result v1
+ move-result v2
- if-eqz v1, :cond_0
+ if-eqz v2, :cond_0
iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailable:Ljava/util/Set;
- invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v1
@@ -1629,21 +1571,19 @@
goto :goto_0
:cond_0
- const-wide/16 v5, 0x0
+ const-wide/16 v6, 0x0
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getRoles()Ljava/util/List;
- move-result-object v7
+ move-result-object v8
- const/4 v8, 0x0
+ const/4 v9, 0x0
- move-object v2, p0
+ move-object v3, p0
- move-wide v3, v9
+ move-wide v4, v10
- invoke-direct/range {v2 .. v8}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
-
- const/4 v1, 0x0
+ invoke-direct/range {v3 .. v9}, Lcom/discord/stores/StoreGuilds;->handleGuildRoles(JJLjava/util/List;Z)V
invoke-direct {p0, v0, v1}, Lcom/discord/stores/StoreGuilds;->handleGuild(Lcom/discord/models/domain/ModelGuild;Z)V
@@ -1651,22 +1591,26 @@
move-result-object v1
- invoke-direct {p0, v9, v10, v1}, Lcom/discord/stores/StoreGuilds;->handleGuildMembersMap(JLjava/util/Map;)V
+ invoke-direct {p0, v10, v11, v1}, Lcom/discord/stores/StoreGuilds;->handleGuildMembersMap(JLjava/util/Map;)V
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getMembers()Ljava/util/Map;
move-result-object v0
- invoke-direct {p0, v9, v10, v0}, Lcom/discord/stores/StoreGuilds;->handleHasRoleAndJoinedAt(JLjava/util/Map;)V
+ invoke-direct {p0, v10, v11, v0}, Lcom/discord/stores/StoreGuilds;->handleHasRoleAndJoinedAt(JLjava/util/Map;)V
goto :goto_0
:cond_1
const/4 p1, 0x1
- iput-boolean p1, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ new-array p1, p1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
- iput-boolean p1, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ sget-object v0, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ aput-object v0, p1, v1
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
return-void
@@ -2092,9 +2036,9 @@
.end method
.method public init(Landroid/content/Context;)V
- .locals 1
+ .locals 4
- if-eqz p1, :cond_0
+ if-eqz p1, :cond_1
iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
@@ -2108,9 +2052,93 @@
invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
- return-void
+ iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+ move-result-object p1
+
+ :goto_0
+ invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/util/Map$Entry;
+
+ invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Ljava/lang/Number;
+
+ invoke-virtual {v1}, Ljava/lang/Number;->longValue()J
+
+ move-result-wide v1
+
+ invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/util/Map;
+
+ iget-object v3, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
+
+ invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v1
+
+ invoke-static {v0}, Lw/q/l;->toMutableMap(Ljava/util/Map;)Ljava/util/Map;
+
+ move-result-object v0
+
+ invoke-interface {v3, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ goto :goto_0
:cond_0
+ iget-object p1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
+
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/util/Map;
+
+ invoke-interface {p1, v0}, Ljava/util/Map;->putAll(Ljava/util/Map;)V
+
+ const/4 p1, 0x1
+
+ new-array p1, p1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v0, 0x0
+
+ sget-object v1, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ aput-object v1, p1, v0
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
+
+ return-void
+
+ :cond_1
const-string p1, "context"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
@@ -2121,7 +2149,7 @@
.end method
.method public final observe()Lrx/Observable;
- .locals 2
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -2133,19 +2161,33 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsPublisher:Lrx/subjects/BehaviorSubject;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
- invoke-static {}, Le/a/b/l;->a()Lrx/Observable$c;
+ const/4 v1, 0x1
- move-result-object v1
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
- invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+ const/4 v2, 0x0
+
+ aput-object p0, v1, v2
+
+ new-instance v4, Lcom/discord/stores/StoreGuilds$observe$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreGuilds$observe$1;->(Lcom/discord/stores/StoreGuilds;)V
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
move-result-object v0
- const-string v1, "guildsPublisher\n .compose(computation())"
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
- invoke-static {v0, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ move-result-object v0
return-object v0
.end method
@@ -2165,9 +2207,9 @@
move-result-object v0
- new-instance v1, Lcom/discord/stores/StoreGuilds$observe$1;
+ new-instance v1, Lcom/discord/stores/StoreGuilds$observe$2;
- invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observe$1;->(J)V
+ invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observe$2;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->f(Le0/l/i;)Lrx/Observable;
@@ -2185,7 +2227,7 @@
.end method
.method public final observeComputed()Lrx/Observable;
- .locals 1
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -2199,7 +2241,33 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedPublisher:Lrx/subjects/BehaviorSubject;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
+
+ const/4 v1, 0x1
+
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ sget-object v2, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ const/4 v3, 0x0
+
+ aput-object v2, v1, v3
+
+ new-instance v4, Lcom/discord/stores/StoreGuilds$observeComputed$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreGuilds$observeComputed$1;->(Lcom/discord/stores/StoreGuilds;)V
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object v0
invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
@@ -2225,9 +2293,9 @@
move-result-object v0
- new-instance v1, Lcom/discord/stores/StoreGuilds$observeComputed$1;
+ new-instance v1, Lcom/discord/stores/StoreGuilds$observeComputed$2;
- invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeComputed$1;->(J)V
+ invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeComputed$2;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->f(Le0/l/i;)Lrx/Observable;
@@ -2327,7 +2395,7 @@
.end method
.method public final observeJoinedAt()Lrx/Observable;
- .locals 2
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -2339,9 +2407,27 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAtPublisher:Lcom/discord/utilities/persister/Persister;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
- invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->getObservable()Lrx/Observable;
+ const/4 v1, 0x1
+
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v2, 0x0
+
+ aput-object p0, v1, v2
+
+ new-instance v4, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->(Lcom/discord/stores/StoreGuilds;)V
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
move-result-object v0
@@ -2353,7 +2439,7 @@
move-result-object v0
- const-string v1, "guildJoinedAtPublisher\n \u2026 .distinctUntilChanged()"
+ const-string v1, "observationDeck\n \u2026 .distinctUntilChanged()"
invoke-static {v0, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -2375,9 +2461,9 @@
move-result-object v0
- new-instance v1, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;
+ new-instance v1, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;
- invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$1;->(J)V
+ invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeJoinedAt$2;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->f(Le0/l/i;)Lrx/Observable;
@@ -2395,7 +2481,7 @@
.end method
.method public final observeRoles()Lrx/Observable;
- .locals 1
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -2409,9 +2495,27 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildRolesPublisher:Lcom/discord/utilities/persister/Persister;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
- invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->getObservable()Lrx/Observable;
+ const/4 v1, 0x1
+
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v2, 0x0
+
+ aput-object p0, v1, v2
+
+ new-instance v4, Lcom/discord/stores/StoreGuilds$observeRoles$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreGuilds$observeRoles$1;->(Lcom/discord/stores/StoreGuilds;)V
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
move-result-object v0
@@ -2439,9 +2543,9 @@
move-result-object v0
- new-instance v1, Lcom/discord/stores/StoreGuilds$observeRoles$1;
+ new-instance v1, Lcom/discord/stores/StoreGuilds$observeRoles$2;
- invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeRoles$1;->(J)V
+ invoke-direct {v1, p1, p2}, Lcom/discord/stores/StoreGuilds$observeRoles$2;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->f(Le0/l/i;)Lrx/Observable;
@@ -2538,7 +2642,7 @@
.end method
.method public final observeUnavailableGuilds()Lrx/Observable;
- .locals 2
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -2549,7 +2653,29 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailablePublisher:Lrx/subjects/Subject;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->observationDeck:Lcom/discord/stores/updates/ObservationDeck;
+
+ const/4 v1, 0x1
+
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v2, 0x0
+
+ aput-object p0, v1, v2
+
+ new-instance v4, Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreGuilds$observeUnavailableGuilds$1;->(Lcom/discord/stores/StoreGuilds;)V
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object v0
invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
@@ -2559,7 +2685,7 @@
move-result-object v0
- const-string v1, "guildsUnavailablePublish\u2026 .distinctUntilChanged()"
+ const-string v1, "observationDeck.connectR\u2026 .distinctUntilChanged()"
invoke-static {v0, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -2598,30 +2724,40 @@
return-object p1
.end method
-.method public onDispatchEnded()V
- .locals 5
+.method public snapshotData()V
+ .locals 8
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- iget-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ invoke-super {p0}, Lcom/discord/stores/StoreV2;->snapshotData()V
- const/4 v1, 0x0
+ new-instance v0, Ljava/util/HashMap;
- if-eqz v0, :cond_0
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAt:Ljava/util/Map;
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAtPublisher:Lcom/discord/utilities/persister/Persister;
+ invoke-direct {v0, v1}, Ljava/util/HashMap;->(Ljava/util/Map;)V
- new-instance v2, Ljava/util/HashMap;
+ iput-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtSnapshot:Ljava/util/Map;
- iget-object v3, p0, Lcom/discord/stores/StoreGuilds;->guildJoinedAt:Ljava/util/Map;
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtCache:Lcom/discord/utilities/persister/Persister;
- invoke-direct {v2, v3}, Ljava/util/HashMap;->(Ljava/util/Map;)V
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildsJoinedAtSnapshot:Ljava/util/Map;
+
+ const/4 v2, 0x2
const/4 v3, 0x0
- const/4 v4, 0x2
+ const/4 v4, 0x0
- invoke-static {v0, v2, v1, v4, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+ invoke-static {v0, v1, v4, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+
+ new-instance v0, Ljava/util/HashMap;
+
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
+
+ invoke-direct {v0, v1}, Ljava/util/HashMap;->(Ljava/util/Map;)V
+
+ iput-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsSnapshot:Ljava/util/Map;
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@@ -2633,49 +2769,189 @@
move-result-object v0
- iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
- invoke-static {v2, v0}, Lw/q/l;->minus(Ljava/util/Map;Ljava/lang/Iterable;)Ljava/util/Map;
+ invoke-static {v1, v0}, Lw/q/l;->minus(Ljava/util/Map;Ljava/lang/Iterable;)Ljava/util/Map;
move-result-object v0
- iget-object v2, p0, Lcom/discord/stores/StoreGuilds;->guildsCache:Lcom/discord/utilities/persister/Persister;
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildsCache:Lcom/discord/utilities/persister/Persister;
- invoke-static {v2, v0, v1, v4, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+ invoke-static {v1, v0, v4, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsPublisher:Lrx/subjects/BehaviorSubject;
+ new-instance v0, Ljava/util/HashSet;
- new-instance v2, Ljava/util/HashMap;
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailable:Ljava/util/Set;
- iget-object v3, p0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
+ invoke-direct {v0, v1}, Ljava/util/HashSet;->(Ljava/util/Collection;)V
- invoke-direct {v2, v3}, Ljava/util/HashMap;->(Ljava/util/Map;)V
+ iput-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailableSnapshot:Ljava/util/Set;
- invoke-virtual {v0, v2}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildRoles:Ljava/util/Map;
- iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailablePublisher:Lrx/subjects/Subject;
+ new-instance v1, Ljava/util/LinkedHashMap;
- new-instance v2, Ljava/util/HashSet;
+ invoke-interface {v0}, Ljava/util/Map;->size()I
- iget-object v3, p0, Lcom/discord/stores/StoreGuilds;->guildsUnavailable:Ljava/util/Set;
+ move-result v5
- invoke-direct {v2, v3}, Ljava/util/HashSet;->(Ljava/util/Collection;)V
+ invoke-static {v5}, Lw/q/l;->mapCapacity(I)I
- invoke-interface {v0, v2}, Le0/g;->onNext(Ljava/lang/Object;)V
+ move-result v5
- invoke-direct {p0}, Lcom/discord/stores/StoreGuilds;->updateRoles()V
+ invoke-direct {v1, v5}, Ljava/util/LinkedHashMap;->(I)V
+
+ invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+ move-result-object v0
+
+ invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v5
+
+ if-eqz v5, :cond_0
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Ljava/util/Map$Entry;
+
+ invoke-interface {v5}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+ move-result-object v6
+
+ invoke-interface {v5}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Ljava/util/Map;
+
+ new-instance v7, Ljava/util/HashMap;
+
+ invoke-direct {v7, v5}, Ljava/util/HashMap;->(Ljava/util/Map;)V
+
+ invoke-interface {v1, v6, v7}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ goto :goto_0
:cond_0
- iget-boolean v0, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ iput-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesSnapshot:Ljava/util/Map;
- if-eqz v0, :cond_1
+ iget-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildRolesCache:Lcom/discord/utilities/persister/Persister;
- invoke-direct {p0}, Lcom/discord/stores/StoreGuilds;->updateGuildMemberComputed()V
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildRolesSnapshot:Ljava/util/Map;
+
+ invoke-static {v0, v1, v4, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+
+ invoke-virtual {p0}, Lcom/discord/stores/StoreV2;->getUpdateSources()Ljava/util/Set;
+
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/stores/StoreGuilds;->ComputedMembersUpdate:Lcom/discord/stores/StoreGuilds$Companion$ComputedMembersUpdate$1;
+
+ invoke-interface {v0, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_4
+
+ new-instance v0, Ljava/util/HashMap;
+
+ invoke-direct {v0}, Ljava/util/HashMap;->()V
+
+ iget-object v1, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputed:Ljava/util/Map;
+
+ invoke-interface {v1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
+
+ move-result-object v1
+
+ invoke-interface {v1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+ move-result-object v1
+
+ :goto_1
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v2
+
+ if-eqz v2, :cond_3
+
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Ljava/util/Map$Entry;
+
+ invoke-interface {v2}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Ljava/util/Map;
+
+ invoke-interface {v5}, Ljava/util/Map;->size()I
+
+ move-result v6
+
+ const/16 v7, 0x7d0
+
+ if-ge v6, v7, :cond_1
+
+ invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+ move-result-object v2
+
+ new-instance v6, Ljava/util/HashMap;
+
+ invoke-direct {v6, v5}, Ljava/util/HashMap;->(Ljava/util/Map;)V
+
+ invoke-interface {v0, v2, v6}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ goto :goto_1
:cond_1
- iput-boolean v1, p0, Lcom/discord/stores/StoreGuilds;->isDirty:Z
+ instance-of v6, v5, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- iput-boolean v1, p0, Lcom/discord/stores/StoreGuilds;->isComputedDirty:Z
+ if-eqz v6, :cond_2
+ check-cast v5, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ goto :goto_2
+
+ :cond_2
+ new-instance v6, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ const/4 v7, 0x1
+
+ invoke-direct {v6, v4, v7, v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->(IILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-virtual {v6, v5}, Lcom/discord/utilities/collections/ShallowPartitionMap;->putAll(Ljava/util/Map;)V
+
+ invoke-interface {v2, v6}, Ljava/util/Map$Entry;->setValue(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-object v5, v6
+
+ :goto_2
+ invoke-interface {v2}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
+
+ move-result-object v2
+
+ invoke-virtual {v5}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->fastCopy()Ljava/util/Map;
+
+ move-result-object v5
+
+ invoke-interface {v0, v2, v5}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ goto :goto_1
+
+ :cond_3
+ iput-object v0, p0, Lcom/discord/stores/StoreGuilds;->guildMembersComputedSnapshot:Ljava/util/Map;
+
+ :cond_4
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
index a6f0532114..c6a0a1eb7e 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildsSorted.smali
@@ -155,13 +155,13 @@
iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
iget-object v1, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuildsUnavailable()Ljava/util/Set;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getUnavailableGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Set;
move-result-object v1
@@ -454,7 +454,7 @@
iget-object v4, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v4
@@ -779,7 +779,7 @@
iget-object v4, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v4
@@ -830,7 +830,7 @@
iget-object v4, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v4}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v4
@@ -882,7 +882,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreGuildsSorted;->guildStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreLurking.smali b/com.discord/smali/com/discord/stores/StoreLurking.smali
index 20a4aacaf6..aabbda53a2 100644
--- a/com.discord/smali/com/discord/stores/StoreLurking.smali
+++ b/com.discord/smali/com/discord/stores/StoreLurking.smali
@@ -291,7 +291,7 @@
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v3
@@ -704,7 +704,7 @@
iget-object v2, p0, Lcom/discord/stores/StoreLurking;->guildsStore:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreMFA.smali b/com.discord/smali/com/discord/stores/StoreMFA.smali
index eb653c9820..d30e513af0 100644
--- a/com.discord/smali/com/discord/stores/StoreMFA.smali
+++ b/com.discord/smali/com/discord/stores/StoreMFA.smali
@@ -157,7 +157,7 @@
move-result-object p1
- invoke-virtual {p1}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {p1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index a9a576bfa6..ae50ace8d3 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -59,7 +59,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f12043e
+ const p1, 0x7f120445
goto :goto_0
@@ -72,7 +72,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f12043b
+ const p1, 0x7f120442
goto :goto_0
@@ -85,7 +85,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f12043a
+ const p1, 0x7f120441
goto :goto_0
@@ -98,7 +98,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f12043d
+ const p1, 0x7f120444
goto :goto_0
@@ -111,7 +111,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f120442
+ const p1, 0x7f120449
goto :goto_0
@@ -124,7 +124,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f120441
+ const p1, 0x7f120448
goto :goto_0
@@ -137,7 +137,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f12043c
+ const p1, 0x7f120443
goto :goto_0
@@ -150,7 +150,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f120440
+ const p1, 0x7f120447
:goto_0
iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
index b98423e68f..890deeb882 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -76,7 +76,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
- const v1, 0x7f1214d3
+ const v1, 0x7f1214dc
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
index 6bceddd110..6747b21ea7 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
@@ -1020,7 +1020,7 @@
move-result-object v2
- invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreMessageReactions.smali b/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
index f01d9266cb..bf39ab008f 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageReactions.smali
@@ -756,7 +756,7 @@
iget-object v1, p0, Lcom/discord/stores/StoreMessageReactions;->userStore:Lcom/discord/stores/StoreUser;
- invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getUsersInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v1
@@ -768,7 +768,7 @@
move-result-object v2
- invoke-virtual {v1, v2}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v1, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v1
diff --git a/com.discord/smali/com/discord/stores/StoreMessages.smali b/com.discord/smali/com/discord/stores/StoreMessages.smali
index 6de3f8af29..4cc3623ec6 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -1258,9 +1258,9 @@
invoke-direct {v0, v7, v1, v2, v8}, Lcom/discord/stores/StoreMessages$sendMessage$1;->(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
- sget-object v1, Lrx/Emitter$a;->e:Lrx/Emitter$a;
+ sget-object v1, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
- invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$a;)Lrx/Observable;
+ invoke-static {v0, v1}, Lrx/Observable;->a(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
move-result-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
index 72bbb272f7..8276b1c57e 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
@@ -73,7 +73,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f120435
+ const v0, 0x7f12043c
invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
index f73109ae4e..3acae3cdac 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
@@ -61,7 +61,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f120439
+ const v0, 0x7f120440
const/4 v1, 0x2
@@ -69,7 +69,7 @@
const/4 v2, 0x0
- const v3, 0x7f121272
+ const v3, 0x7f12127a
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
@@ -79,7 +79,7 @@
const/4 v2, 0x1
- const v3, 0x7f121393
+ const v3, 0x7f12139b
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index c68b86d4f7..e36cc44f17 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -200,7 +200,7 @@
const-string v1, "CONNECTION_ISSUES"
- const v4, 0x7f08040b
+ const v4, 0x7f08040c
const/4 v8, 0x1
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali
index 1e6b23fcd5..664b1a94e8 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali
@@ -769,7 +769,7 @@
move-result-object v2
- invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v2
@@ -779,7 +779,7 @@
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v3
@@ -801,7 +801,7 @@
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputed()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v7
diff --git a/com.discord/smali/com/discord/stores/StorePermissions.smali b/com.discord/smali/com/discord/stores/StorePermissions.smali
index f4be0e8174..c0ac77ff9d 100644
--- a/com.discord/smali/com/discord/stores/StorePermissions.smali
+++ b/com.discord/smali/com/discord/stores/StorePermissions.smali
@@ -210,7 +210,7 @@
iget-object v1, v0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v1
@@ -228,7 +228,7 @@
iget-object v2, v0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputed()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
@@ -244,7 +244,7 @@
iget-object v3, v0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildRoles()Ljava/util/Map;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreGuilds;->getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v3
@@ -368,7 +368,7 @@
iget-object v0, p0, Lcom/discord/stores/StorePermissions;->storeUser:Lcom/discord/stores/StoreUser;
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
@@ -425,7 +425,7 @@
iget-object v1, p0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuilds()Ljava/util/Map;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->getGuildsInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v1
@@ -443,7 +443,7 @@
iget-object v2, p0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputed()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildMembersComputedInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
@@ -461,7 +461,7 @@
iget-object v2, p0, Lcom/discord/stores/StorePermissions;->storeGuilds:Lcom/discord/stores/StoreGuilds;
- invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildRoles()Ljava/util/Map;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreGuilds;->getGuildRolesInternal$app_productionDiscordExternalRelease()Ljava/util/Map;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
index ddc7c26fc1..e6a1ee7ff5 100644
--- a/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreRtcConnection.smali
@@ -487,7 +487,7 @@
move-result-object v1
- invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v1
@@ -857,6 +857,8 @@
.method private final logChannelJoin(Lcom/discord/models/domain/ModelChannel;)V
.locals 9
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
@@ -864,7 +866,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
@@ -959,6 +961,8 @@
.method private final logChannelLeave(Lcom/discord/models/domain/ModelChannel;)V
.locals 11
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
iget-object v0, p0, Lcom/discord/stores/StoreRtcConnection;->stream:Lcom/discord/stores/StoreStream;
@@ -966,7 +970,7 @@
move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v0}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v0
diff --git a/com.discord/smali/com/discord/stores/StoreSpotify.smali b/com.discord/smali/com/discord/stores/StoreSpotify.smali
index 8702d09565..2cec9e7ab1 100644
--- a/com.discord/smali/com/discord/stores/StoreSpotify.smali
+++ b/com.discord/smali/com/discord/stores/StoreSpotify.smali
@@ -488,7 +488,7 @@
move-result-object v7
- invoke-virtual {v7}, Lcom/discord/stores/StoreUser;->getMe()Lcom/discord/models/domain/ModelUser$Me;
+ invoke-virtual {v7}, Lcom/discord/stores/StoreUser;->getMeInternal$app_productionDiscordExternalRelease()Lcom/discord/models/domain/ModelUser$Me;
move-result-object v7
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
index dae75a8265..e7f57f4257 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -150,6 +150,16 @@
iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+
+ move-result-object v2
+
+ iget-object v3, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
+
+ invoke-virtual {v2, v3}, Lcom/discord/stores/StoreUser;->init(Landroid/content/Context;)V
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index a3db610e87..3c806a1c59 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -2,6 +2,9 @@
.super Ljava/lang/Object;
.source "StoreStream.kt"
+# interfaces
+.implements Lcom/discord/stores/DispatchHandler;
+
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
@@ -188,6 +191,16 @@
.field public final storeThreadScheduler:Lrx/Scheduler;
+.field public final storesV2:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Lcom/discord/stores/StoreV2;",
+ ">;"
+ }
+ .end annotation
+.end field
+
.field public final streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
.field public final subscriptions:Lcom/discord/stores/StoreSubscriptions;
@@ -249,7 +262,7 @@
.end method
.method public constructor ()V
- .locals 12
+ .locals 13
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -291,839 +304,867 @@
invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
- move-result-object v0
+ move-result-object v1
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- new-instance v0, Lcom/discord/stores/StoreAnalytics;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreAnalytics;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
- new-instance v0, Lcom/discord/stores/StoreAuthentication;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreAuthentication;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
- new-instance v0, Lcom/discord/stores/StoreChannels;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreChannels;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
-
- new-instance v0, Lcom/discord/stores/StoreChannelsSelected;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreChannelsSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
-
- new-instance v0, Lcom/discord/stores/StoreChannelConversions;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreChannelConversions;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->channelConversions:Lcom/discord/stores/StoreChannelConversions;
-
- new-instance v0, Lcom/discord/stores/StoreClientVersion;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreClientVersion;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->clientVersion:Lcom/discord/stores/StoreClientVersion;
-
- new-instance v0, Lcom/discord/stores/StoreGuildMemberCounts;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreGuildMemberCounts;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
-
- new-instance v0, Lcom/discord/stores/StoreGuildsNsfw;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreGuildsNsfw;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
-
- new-instance v0, Lcom/discord/stores/StoreBans;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreBans;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->bans:Lcom/discord/stores/StoreBans;
-
- new-instance v0, Lcom/discord/stores/StoreEmojiGuild;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreEmojiGuild;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildEmojis:Lcom/discord/stores/StoreEmojiGuild;
-
- new-instance v0, Lcom/discord/stores/StoreGuildIntegrations;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildIntegrations;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->integrations:Lcom/discord/stores/StoreGuildIntegrations;
-
- new-instance v0, Lcom/discord/stores/StoreInstantInvites;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreInstantInvites;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->instantInvites:Lcom/discord/stores/StoreInstantInvites;
-
- new-instance v0, Lcom/discord/stores/StoreGuildTemplates;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildTemplates;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildTemplates:Lcom/discord/stores/StoreGuildTemplates;
-
- new-instance v0, Lcom/discord/stores/StoreGuildSelected;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreGuildSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
-
- new-instance v0, Lcom/discord/stores/StoreInviteSettings;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreInviteSettings;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildInvite:Lcom/discord/stores/StoreInviteSettings;
-
- new-instance v0, Lcom/discord/stores/StoreMessages;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreMessages;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
-
- new-instance v0, Lcom/discord/stores/StoreMessagesLoader;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessagesLoader;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
-
- new-instance v0, Lcom/discord/stores/StoreMessagesMostRecent;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMessagesMostRecent;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
-
- new-instance v0, Lcom/discord/stores/StoreMessageAck;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreMessageAck;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
-
- new-instance v0, Lcom/discord/stores/StoreMessageState;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreMessageState;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState;
-
- new-instance v0, Lcom/discord/stores/StoreNotifications;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreNotifications;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
-
- new-instance v0, Lcom/discord/stores/StoreUserGuildSettings;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
-
- invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreUserGuildSettings;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreChannels;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
-
- new-instance v0, Lcom/discord/stores/StoreUser;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUser;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- new-instance v0, Lcom/discord/stores/StoreGuilds;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuilds;->(Lcom/discord/stores/StoreUser;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
-
- new-instance v0, Lcom/discord/stores/StoreExperiments;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v5, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- iget-object v6, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
-
- iget-object v7, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
-
- move-object v2, v0
-
- invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreExperiments;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreAuthentication;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
-
- new-instance v0, Lcom/discord/stores/StoreLurking;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+ new-instance v1, Lcom/discord/stores/StoreAnalytics;
iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreLurking;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/Dispatcher;)V
+ iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
+ invoke-direct {v1, p0, v2, v3}, Lcom/discord/stores/StoreAnalytics;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
- new-instance v0, Lcom/discord/stores/StoreUserConnections;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ new-instance v1, Lcom/discord/stores/StoreAuthentication;
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserConnections;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreAuthentication;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- new-instance v0, Lcom/discord/stores/StoreUsersMutualGuilds;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreUsersMutualGuilds;->(Lcom/discord/stores/StoreStream;)V
+ new-instance v1, Lcom/discord/stores/StoreChannels;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->usersMutualGuilds:Lcom/discord/stores/StoreUsersMutualGuilds;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreUserPresence;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreChannels;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreUserPresence;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+ new-instance v1, Lcom/discord/stores/StoreChannelsSelected;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreUserProfile;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreChannelsSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- invoke-direct {v0}, Lcom/discord/stores/StoreUserProfile;->()V
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->channelsSelected:Lcom/discord/stores/StoreChannelsSelected;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userProfile:Lcom/discord/stores/StoreUserProfile;
+ new-instance v1, Lcom/discord/stores/StoreChannelConversions;
- new-instance v0, Lcom/discord/stores/StoreUserNotes;
+ invoke-direct {v1}, Lcom/discord/stores/StoreChannelConversions;->()V
- invoke-direct {v0}, Lcom/discord/stores/StoreUserNotes;->()V
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->channelConversions:Lcom/discord/stores/StoreChannelConversions;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userNotes:Lcom/discord/stores/StoreUserNotes;
+ new-instance v1, Lcom/discord/stores/StoreClientVersion;
- new-instance v0, Lcom/discord/stores/StoreUserTyping;
+ invoke-direct {v1}, Lcom/discord/stores/StoreClientVersion;->()V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->clientVersion:Lcom/discord/stores/StoreClientVersion;
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserTyping;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+ new-instance v1, Lcom/discord/stores/StoreGuildMemberCounts;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->usersTyping:Lcom/discord/stores/StoreUserTyping;
+ invoke-direct {v1}, Lcom/discord/stores/StoreGuildMemberCounts;->()V
- new-instance v0, Lcom/discord/stores/StoreUserSettings;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreUserSettings;->(Lcom/discord/stores/StoreStream;)V
+ new-instance v1, Lcom/discord/stores/StoreGuildsNsfw;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreGuildsNsfw;->(Lcom/discord/stores/StoreStream;)V
- new-instance v0, Lcom/discord/stores/StoreUserRequiredActions;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
- invoke-direct {v0}, Lcom/discord/stores/StoreUserRequiredActions;->()V
+ new-instance v1, Lcom/discord/stores/StoreBans;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userRequiredAction:Lcom/discord/stores/StoreUserRequiredActions;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreUserRelationships;
+ invoke-direct {v1, v2}, Lcom/discord/stores/StoreBans;->(Lcom/discord/stores/Dispatcher;)V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->bans:Lcom/discord/stores/StoreBans;
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreUserRelationships;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+ new-instance v1, Lcom/discord/stores/StoreEmojiGuild;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreVoiceStates;
+ invoke-direct {v1, v2}, Lcom/discord/stores/StoreEmojiGuild;->(Lcom/discord/stores/Dispatcher;)V
- invoke-direct {v0}, Lcom/discord/stores/StoreVoiceStates;->()V
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildEmojis:Lcom/discord/stores/StoreEmojiGuild;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
+ new-instance v1, Lcom/discord/stores/StoreGuildIntegrations;
- new-instance v0, Lcom/discord/stores/StoreVoiceSpeaking;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- invoke-direct {v0}, Lcom/discord/stores/StoreVoiceSpeaking;->()V
+ invoke-direct {v1, v2}, Lcom/discord/stores/StoreGuildIntegrations;->(Lcom/discord/stores/Dispatcher;)V
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->integrations:Lcom/discord/stores/StoreGuildIntegrations;
- new-instance v0, Lcom/discord/stores/StorePermissions;
+ new-instance v1, Lcom/discord/stores/StoreInstantInvites;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ invoke-direct {v1}, Lcom/discord/stores/StoreInstantInvites;->()V
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->instantInvites:Lcom/discord/stores/StoreInstantInvites;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+ new-instance v1, Lcom/discord/stores/StoreGuildTemplates;
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StorePermissions;->(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;)V
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+ invoke-direct {v1, v2}, Lcom/discord/stores/StoreGuildTemplates;->(Lcom/discord/stores/Dispatcher;)V
- new-instance v0, Lcom/discord/stores/StoreTabsNavigation;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildTemplates:Lcom/discord/stores/StoreGuildTemplates;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ new-instance v1, Lcom/discord/stores/StoreGuildSelected;
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreTabsNavigation;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreGuildSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- new-instance v0, Lcom/discord/stores/StoreMaskedLinks;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildSelected:Lcom/discord/stores/StoreGuildSelected;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ new-instance v1, Lcom/discord/stores/StoreInviteSettings;
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreMaskedLinks;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+ invoke-direct {v1}, Lcom/discord/stores/StoreInviteSettings;->()V
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->maskedLinks:Lcom/discord/stores/StoreMaskedLinks;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildInvite:Lcom/discord/stores/StoreInviteSettings;
- new-instance v0, Lcom/discord/stores/StoreNavigation;
+ new-instance v1, Lcom/discord/stores/StoreMessages;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreNavigation;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
+ iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
+ invoke-direct {v1, p0, v2, v3}, Lcom/discord/stores/StoreMessages;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
- new-instance v0, Lcom/discord/stores/StoreEmojiCustom;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreEmojiCustom;->(Lcom/discord/stores/StoreStream;)V
+ new-instance v1, Lcom/discord/stores/StoreMessagesLoader;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreMessagesLoader;->(Lcom/discord/stores/StoreStream;)V
- new-instance v0, Lcom/discord/stores/StoreAudioDevices;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->messagesLoader:Lcom/discord/stores/StoreMessagesLoader;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ new-instance v1, Lcom/discord/stores/StoreMessagesMostRecent;
- const/4 v2, 0x2
+ invoke-direct {v1}, Lcom/discord/stores/StoreMessagesMostRecent;->()V
- const/4 v3, 0x0
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
- invoke-direct {v0, v1, v3, v2, v3}, Lcom/discord/stores/StoreAudioDevices;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ new-instance v1, Lcom/discord/stores/StoreMessageAck;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreVoiceChannelSelected;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreMessageAck;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ new-instance v1, Lcom/discord/stores/StoreMessageState;
- invoke-direct {v0, p0, v1, v4}, Lcom/discord/stores/StoreVoiceChannelSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+ invoke-direct {v1, v2}, Lcom/discord/stores/StoreMessageState;->(Lcom/discord/stores/Dispatcher;)V
- new-instance v0, Lcom/discord/stores/StoreGatewayConnection;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState;
- iget-object v7, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ new-instance v1, Lcom/discord/stores/StoreNotifications;
- sget-object v1, Lcom/discord/utilities/logging/AppGatewaySocketLogger;->Companion:Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-virtual {v1}, Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;->getINSTANCE()Lcom/discord/utilities/logging/AppGatewaySocketLogger;
+ invoke-direct {v1, v2, p0}, Lcom/discord/stores/StoreNotifications;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
- move-result-object v9
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->notifications:Lcom/discord/stores/StoreNotifications;
- const/4 v8, 0x0
+ new-instance v1, Lcom/discord/stores/StoreUserGuildSettings;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ iget-object v3, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+
+ invoke-direct {v1, v2, v3, v4, v5}, Lcom/discord/stores/StoreUserGuildSettings;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;Lcom/discord/stores/StoreChannels;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
+
+ new-instance v1, Lcom/discord/stores/StoreUser;
+
+ iget-object v8, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ const/4 v9, 0x0
const/4 v10, 0x4
const/4 v11, 0x0
- move-object v5, v0
-
- move-object v6, p0
-
- invoke-direct/range {v5 .. v11}, Lcom/discord/stores/StoreGatewayConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
-
- new-instance v0, Lcom/discord/stores/StoreConnectivity;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreConnectivity;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
-
- new-instance v0, Lcom/discord/stores/StoreCalls;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreCalls;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->calls:Lcom/discord/stores/StoreCalls;
-
- new-instance v0, Lcom/discord/stores/StoreCallsIncoming;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreCallsIncoming;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->callsIncoming:Lcom/discord/stores/StoreCallsIncoming;
-
- new-instance v0, Lcom/discord/stores/StoreChat;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreChat;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
-
- new-instance v0, Lcom/discord/stores/StoreMentions;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
-
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
-
- iget-object v5, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
-
- iget-object v6, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
-
- invoke-direct {v0, v1, v4, v5, v6}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
-
- new-instance v0, Lcom/discord/stores/StorePinnedMessages;
-
- invoke-direct {v0}, Lcom/discord/stores/StorePinnedMessages;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->pinnedMessages:Lcom/discord/stores/StorePinnedMessages;
-
- new-instance v0, Lcom/discord/stores/StoreRtcRegion;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1, v3, v2, v3}, Lcom/discord/stores/StoreRtcRegion;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
-
- new-instance v0, Lcom/discord/stores/StoreRtcConnection;
-
- iget-object v6, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v7, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v8, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
-
- iget-object v9, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
- move-object v4, v0
-
- move-object v5, p0
-
- invoke-direct/range {v4 .. v9}, Lcom/discord/stores/StoreRtcConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreRtcRegion;Lcom/discord/stores/StoreAnalytics;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
- new-instance v0, Lcom/discord/stores/StoreReadStates;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreReadStates;->(Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->readStates:Lcom/discord/stores/StoreReadStates;
-
- new-instance v0, Lcom/discord/stores/StoreVoiceParticipants;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreVoiceParticipants;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceParticipants:Lcom/discord/stores/StoreVoiceParticipants;
-
- new-instance v0, Lcom/discord/stores/StoreSearch;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildsNsfw:Lcom/discord/stores/StoreGuildsNsfw;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreSearch;->(Lcom/discord/stores/StoreGuildsNsfw;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->search:Lcom/discord/stores/StoreSearch;
-
- new-instance v0, Lcom/discord/stores/StoreMediaSettings;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaSettings;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
- new-instance v0, Lcom/discord/stores/StoreDynamicLink;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreDynamicLink;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->storeDynamicLink:Lcom/discord/stores/StoreDynamicLink;
-
- new-instance v0, Lcom/discord/stores/StoreChannelCategories;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
-
- invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreChannelCategories;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreChannels;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->storeChannelCategories:Lcom/discord/stores/StoreChannelCategories;
-
- new-instance v0, Lcom/discord/stores/StoreVideoSupport;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreVideoSupport;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->videoSupport:Lcom/discord/stores/StoreVideoSupport;
-
- new-instance v0, Lcom/discord/stores/StoreMediaEngine;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->(Lcom/discord/stores/StoreMediaSettings;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
-
- new-instance v0, Lcom/discord/stores/StoreMediaNotification;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
-
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
- invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaNotification:Lcom/discord/stores/StoreMediaNotification;
-
- new-instance v0, Lcom/discord/stores/StoreVideoStreams;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreVideoStreams;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
-
- new-instance v0, Lcom/discord/stores/StoreGameParty;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreGameParty;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->gameParty:Lcom/discord/stores/StoreGameParty;
-
- new-instance v0, Lcom/discord/stores/StoreNotices;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreNotices;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
-
- new-instance v0, Lcom/discord/stores/StoreGuildSubscriptions;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreGuildSubscriptions;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildSubscriptions:Lcom/discord/stores/StoreGuildSubscriptions;
-
- new-instance v0, Lcom/discord/stores/StoreChannelMembers;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- new-instance v2, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
-
- invoke-direct {v2, v3}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;->(Lcom/discord/stores/StoreChannels;)V
-
- new-instance v3, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
-
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
-
- invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;->(Lcom/discord/stores/StoreGuildMemberCounts;)V
-
- invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/stores/StoreChannelMembers;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->lazyChannelMembersStore:Lcom/discord/stores/StoreChannelMembers;
-
- new-instance v0, Lcom/discord/stores/StoreGuildMemberRequester;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreGuildMemberRequester;->(Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildMemberRequesterStore:Lcom/discord/stores/StoreGuildMemberRequester;
-
- new-instance v0, Lcom/discord/stores/StoreReviewRequest;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreReviewRequest;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->reviewRequestStore:Lcom/discord/stores/StoreReviewRequest;
-
- new-instance v0, Lcom/discord/stores/StoreChangeLog;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreChangeLog;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->changeLogStore:Lcom/discord/stores/StoreChangeLog;
-
- new-instance v0, Lcom/discord/stores/StoreRunningGame;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreRunningGame;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->runningGame:Lcom/discord/stores/StoreRunningGame;
-
- new-instance v0, Lcom/discord/stores/StoreSlowMode;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1, p0}, Lcom/discord/stores/StoreSlowMode;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->slowMode:Lcom/discord/stores/StoreSlowMode;
-
- new-instance v0, Lcom/discord/stores/StoreAuditLog;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreAuditLog;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->auditLog:Lcom/discord/stores/StoreAuditLog;
-
- new-instance v0, Lcom/discord/stores/StoreMessageUploads;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMessageUploads;->()V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageUploads:Lcom/discord/stores/StoreMessageUploads;
-
- new-instance v0, Lcom/discord/stores/StoreNux;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreNux;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->nux:Lcom/discord/stores/StoreNux;
-
- new-instance v0, Lcom/discord/stores/StoreLibrary;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreLibrary;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->library:Lcom/discord/stores/StoreLibrary;
-
- new-instance v0, Lcom/discord/stores/StoreGifting;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreGifting;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->gifting:Lcom/discord/stores/StoreGifting;
-
- new-instance v0, Lcom/discord/stores/StoreSpotify;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreSpotify;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->spotify:Lcom/discord/stores/StoreSpotify;
-
- new-instance v0, Lcom/discord/stores/StoreMessageReactions;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreMessageReactions;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageReactions:Lcom/discord/stores/StoreMessageReactions;
-
- new-instance v0, Lcom/discord/stores/StoreApplication;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreApplication;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->application:Lcom/discord/stores/StoreApplication;
-
- new-instance v0, Lcom/discord/stores/StorePaymentSources;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StorePaymentSources;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->paymentSources:Lcom/discord/stores/StorePaymentSources;
-
- new-instance v0, Lcom/discord/stores/StoreSubscriptions;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreSubscriptions;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->subscriptions:Lcom/discord/stores/StoreSubscriptions;
-
- new-instance v0, Lcom/discord/stores/StoreMFA;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, p0, v1}, Lcom/discord/stores/StoreMFA;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->mfa:Lcom/discord/stores/StoreMFA;
-
- new-instance v0, Lcom/discord/stores/StoreApplicationStreaming;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
-
- invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/stores/StoreApplicationStreaming;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
-
- new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection;
-
- iget-object v5, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
-
- iget-object v6, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
-
- iget-object v8, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v9, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v10, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
-
- move-object v4, v0
+ move-object v6, v1
move-object v7, p0
- invoke-direct/range {v4 .. v10}, Lcom/discord/stores/StoreStreamRtcConnection;->(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;)V
+ invoke-direct/range {v6 .. v11}, Lcom/discord/stores/StoreUser;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- new-instance v0, Lcom/discord/stores/StoreAudioManager;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
-
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreAudioManager;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
-
- new-instance v0, Lcom/discord/stores/StoreApplicationStreamPreviews;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreApplicationStreamPreviews;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreamPreviews:Lcom/discord/stores/StoreApplicationStreamPreviews;
-
- new-instance v0, Lcom/discord/stores/StoreGuildsSorted;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
-
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
-
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreGuildsSorted;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
-
- new-instance v0, Lcom/discord/stores/StoreExpandedGuildFolders;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreExpandedGuildFolders;->(Lcom/discord/stores/Dispatcher;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->expandedGuildFolders:Lcom/discord/stores/StoreExpandedGuildFolders;
-
- new-instance v0, Lcom/discord/stores/StoreEmoji;
-
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+ new-instance v1, Lcom/discord/stores/StoreGuilds;
iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+ const/4 v3, 0x2
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
+ const/4 v4, 0x0
- invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreEmoji;->(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
+ invoke-direct {v1, v2, v4, v3, v4}, Lcom/discord/stores/StoreGuilds;->(Lcom/discord/stores/StoreUser;Lcom/discord/stores/updates/ObservationDeck;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
- new-instance v0, Lcom/discord/stores/StorePremiumGuildSubscription;
+ new-instance v1, Lcom/discord/stores/StoreExperiments;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0, v1}, Lcom/discord/stores/StorePremiumGuildSubscription;->(Lcom/discord/stores/Dispatcher;)V
+ iget-object v7, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->premiumGuildSubscriptions:Lcom/discord/stores/StorePremiumGuildSubscription;
+ iget-object v8, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- new-instance v0, Lcom/discord/stores/StoreEntitlements;
+ iget-object v9, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iget-object v10, p0, Lcom/discord/stores/StoreStream;->authentication:Lcom/discord/stores/StoreAuthentication;
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreEntitlements;->(Lcom/discord/stores/Dispatcher;)V
+ move-object v5, v1
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->entitlements:Lcom/discord/stores/StoreEntitlements;
+ invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreExperiments;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreAuthentication;)V
- new-instance v0, Lcom/discord/stores/StoreAndroidPackages;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->experiments:Lcom/discord/stores/StoreExperiments;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ new-instance v1, Lcom/discord/stores/StoreLurking;
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreAndroidPackages;->(Lcom/discord/stores/Dispatcher;)V
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->androidPackages:Lcom/discord/stores/StoreAndroidPackages;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreGuildProfiles;
+ invoke-direct {v1, p0, v2, v5}, Lcom/discord/stores/StoreLurking;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/Dispatcher;)V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreGuildProfiles;->(Lcom/discord/stores/Dispatcher;)V
+ new-instance v1, Lcom/discord/stores/StoreUserConnections;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildProfiles:Lcom/discord/stores/StoreGuildProfiles;
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v0, Lcom/discord/stores/StoreUserAffinities;
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreUserConnections;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userConnections:Lcom/discord/stores/StoreUserConnections;
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreUserAffinities;->(Lcom/discord/stores/Dispatcher;)V
+ new-instance v1, Lcom/discord/stores/StoreUsersMutualGuilds;
- iput-object v0, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities;
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreUsersMutualGuilds;->(Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->usersMutualGuilds:Lcom/discord/stores/StoreUsersMutualGuilds;
+
+ new-instance v1, Lcom/discord/stores/StoreUserPresence;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+ invoke-direct {v1, v2, p0}, Lcom/discord/stores/StoreUserPresence;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->presences:Lcom/discord/stores/StoreUserPresence;
+
+ new-instance v1, Lcom/discord/stores/StoreUserProfile;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreUserProfile;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userProfile:Lcom/discord/stores/StoreUserProfile;
+
+ new-instance v1, Lcom/discord/stores/StoreUserNotes;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreUserNotes;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userNotes:Lcom/discord/stores/StoreUserNotes;
+
+ new-instance v1, Lcom/discord/stores/StoreUserTyping;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreUserTyping;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->usersTyping:Lcom/discord/stores/StoreUserTyping;
+
+ new-instance v1, Lcom/discord/stores/StoreUserSettings;
+
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreUserSettings;->(Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userSettings:Lcom/discord/stores/StoreUserSettings;
+
+ new-instance v1, Lcom/discord/stores/StoreUserRequiredActions;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreUserRequiredActions;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userRequiredAction:Lcom/discord/stores/StoreUserRequiredActions;
+
+ new-instance v1, Lcom/discord/stores/StoreUserRelationships;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreUserRelationships;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+ new-instance v1, Lcom/discord/stores/StoreVoiceStates;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreVoiceStates;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->voiceStates:Lcom/discord/stores/StoreVoiceStates;
+
+ new-instance v1, Lcom/discord/stores/StoreVoiceSpeaking;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreVoiceSpeaking;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->voiceSpeaking:Lcom/discord/stores/StoreVoiceSpeaking;
+
+ new-instance v1, Lcom/discord/stores/StorePermissions;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+
+ invoke-direct {v1, v2, v5, v6}, Lcom/discord/stores/StorePermissions;->(Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreGuilds;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+
+ new-instance v1, Lcom/discord/stores/StoreTabsNavigation;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, v2, p0}, Lcom/discord/stores/StoreTabsNavigation;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+
+ new-instance v1, Lcom/discord/stores/StoreMaskedLinks;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, v2, p0}, Lcom/discord/stores/StoreMaskedLinks;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->maskedLinks:Lcom/discord/stores/StoreMaskedLinks;
+
+ new-instance v1, Lcom/discord/stores/StoreNavigation;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->tabsNavigation:Lcom/discord/stores/StoreTabsNavigation;
+
+ invoke-direct {v1, p0, v2}, Lcom/discord/stores/StoreNavigation;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/StoreTabsNavigation;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->navigation:Lcom/discord/stores/StoreNavigation;
+
+ new-instance v1, Lcom/discord/stores/StoreEmojiCustom;
+
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreEmojiCustom;->(Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+
+ new-instance v1, Lcom/discord/stores/StoreAudioDevices;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, v2, v4, v3, v4}, Lcom/discord/stores/StoreAudioDevices;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
+ new-instance v1, Lcom/discord/stores/StoreVoiceChannelSelected;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+ invoke-direct {v1, p0, v2, v5}, Lcom/discord/stores/StoreVoiceChannelSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+
+ new-instance v1, Lcom/discord/stores/StoreGatewayConnection;
+
+ iget-object v8, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+ sget-object v2, Lcom/discord/utilities/logging/AppGatewaySocketLogger;->Companion:Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;
+
+ invoke-virtual {v2}, Lcom/discord/utilities/logging/AppGatewaySocketLogger$Companion;->getINSTANCE()Lcom/discord/utilities/logging/AppGatewaySocketLogger;
+
+ move-result-object v10
+
+ const/4 v9, 0x0
+
+ const/4 v11, 0x4
+
+ const/4 v12, 0x0
+
+ move-object v6, v1
+
+ move-object v7, p0
+
+ invoke-direct/range {v6 .. v12}, Lcom/discord/stores/StoreGatewayConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;Lcom/discord/utilities/logging/AppGatewaySocketLogger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
+
+ new-instance v1, Lcom/discord/stores/StoreConnectivity;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreConnectivity;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
+
+ new-instance v1, Lcom/discord/stores/StoreCalls;
+
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreCalls;->(Lcom/discord/stores/StoreStream;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->calls:Lcom/discord/stores/StoreCalls;
+
+ new-instance v1, Lcom/discord/stores/StoreCallsIncoming;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreCallsIncoming;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->callsIncoming:Lcom/discord/stores/StoreCallsIncoming;
+
+ new-instance v1, Lcom/discord/stores/StoreChat;
+
+ invoke-direct {v1}, Lcom/discord/stores/StoreChat;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
+
+ new-instance v1, Lcom/discord/stores/StoreMentions;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
+
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
+
+ iget-object v7, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
+
+ invoke-direct {v1, v2, v5, v6, v7}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
+
+ new-instance v1, Lcom/discord/stores/StorePinnedMessages;
+
+ invoke-direct {v1}, Lcom/discord/stores/StorePinnedMessages;->()V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->pinnedMessages:Lcom/discord/stores/StorePinnedMessages;
+
+ new-instance v1, Lcom/discord/stores/StoreRtcRegion;
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ invoke-direct {v1, v2, v4, v3, v4}, Lcom/discord/stores/StoreRtcRegion;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput-object v1, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
+
+ new-instance v1, Lcom/discord/stores/StoreRtcConnection;
+
+ iget-object v7, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ iget-object v8, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+
+ iget-object v9, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
+
+ iget-object v10, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+
+ move-object v5, v1
+
+ move-object v6, p0
+
+ invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreRtcConnection;->