diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 4a349908cc..92d348c622 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1066.apk
+apkFileName: com.discord-1068.apk
compressionType: false
doNotCompress:
- arsc
@@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1066'
- versionName: '14.0'
+ versionCode: '1068'
+ versionName: 15-alpha2
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 038e571935..cb742545de 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!
#
-#Mon Mar 16 20:30:20 UTC 2020
-version_name=14.0
+#Tue Mar 17 01:01:30 UTC 2020
+version_name=15-alpha2
package_name=com.discord
-build_id=81ebaa6d-88ce-4808-b833-b2ee70b3a386
-version_code=1066
+build_id=f011780e-b973-48db-a781-86086d8f38bc
+version_code=1068
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 2e90ebd0a9..31fff6ddf3 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 9e6593c5e7..f3875ac1cf 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -13290,601 +13290,601 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -15780,57 +15780,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index c1369f51b2..577311e22b 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1025,7 +1025,7 @@ Fixes and Updates {fixed}
OR
Collapse
Collapse Category
- 81ebaa6d-88ce-4808-b833-b2ee70b3a386
+ f011780e-b973-48db-a781-86086d8f38bc
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -2991,11 +2991,6 @@ Want to know more about Discord?"
You don’t have any photos in your photo library. The best time to start is now.
Take a Photo
Tap to see full message.
- View my channels
- Channels are where people in your server chat about different topics.
- These are your channels!
- "There's no ringing or calling. Pop into a voice channel when you're free, and people can jump in to talk with you."
- Voice channels are where people come together to talk.
In a voice call
Open Voice Channel
Allows Discord conversations to appear as suggestions for sharing and search in iOS. Disabling this will hide those suggestions and make iOS forget which friends and servers are your favorite.
@@ -3555,6 +3550,9 @@ Want to know more about Discord?"
"From here on out, things only get better with friends. Let's take a minute and setup **your server**, shall we?"
Login or Register to get started
Join over 200 million people who use Discord to chat with friends for free.
+ View my channels
+ Channels are where people in your server chat about different topics.
+ These are your channels!
Chat with friends
Welcome to Discord! First off, register your account so we can save all your servers and settings for future use.
By registering your account, you save all your servers and settings for future use!
@@ -3586,6 +3584,8 @@ Want to know more about Discord?"
"I'll just look around for now"
Welcome to Discord, %1$s
Welcome to Discord
+ "There's no ringing or calling. Pop into a voice channel when you're free, and people can jump in to talk with you."
+ Voice channels are where people come together to talk.
Voice chat while gaming
Join over 200 million gamers who use Discord to chat with friends for free.
Welcome to Discord
@@ -5494,6 +5494,9 @@ You cannot take any moderation actions until you enable it."
**Reach us** via [our help desk](%1$s) or on Twitter [@discordapp](%2$s) if you have any questions or need help.
Welcome to the server, %1$s!
**Learn about Discord** at your own pace by exploring the floating quest indicators.
+ What are you looking to do
+ Welcome to the /r/FireEmblemHeroes Discord server, official server for all Fire Emblem Heroes discussion!
+ Welcome to %1$s
"What's New"
%1$s
Whitelist Failed
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 3dfcf12128..7b7f6486c6 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -73,7 +73,7 @@
.field public static final expand_button_title:I = 0x7f1205b2
-.field public static final not_set:I = 0x7f120d52
+.field public static final not_set:I = 0x7f120d4d
.field public static final preference_copied:I = 0x7f120edd
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index 16e4e35fae..9299b28d97 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -73,7 +73,7 @@
.field public static final expand_button_title:I = 0x7f1205b2
-.field public static final not_set:I = 0x7f120d52
+.field public static final not_set:I = 0x7f120d4d
.field public static final preference_copied:I = 0x7f120edd
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 88c200f9be..37ead22eca 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/1066"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1068"
-.field public static final VERSION_CODE:I = 0x42a
+.field public static final VERSION_CODE:I = 0x42c
-.field public static final VERSION_NAME:Ljava/lang/String; = "14.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "15-alpha2"
# 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 18f7a9dbb7..a071df6c86 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -137,75 +137,75 @@
.field public static final icon_content_description:I = 0x7f120ab0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb6
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb7
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb8
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb9
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cba
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cb5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cbb
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cb6
-.field public static final mtrl_picker_cancel:I = 0x7f120cbc
+.field public static final mtrl_picker_cancel:I = 0x7f120cb7
-.field public static final mtrl_picker_confirm:I = 0x7f120cbd
+.field public static final mtrl_picker_confirm:I = 0x7f120cb8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cbe
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cb9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cbf
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cba
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cc0
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cbb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cc1
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cbc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cc2
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cbd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cc3
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cbe
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cc4
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cbf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cc5
+.field public static final mtrl_picker_invalid_range:I = 0x7f120cc0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc6
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cc7
+.field public static final mtrl_picker_out_of_range:I = 0x7f120cc2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc8
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc9
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cca
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120cc5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120ccb
+.field public static final mtrl_picker_range_header_title:I = 0x7f120cc6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ccc
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cc7
-.field public static final mtrl_picker_save:I = 0x7f120ccd
+.field public static final mtrl_picker_save:I = 0x7f120cc8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cce
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cc9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ccf
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cca
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120cd0
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ccb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cd1
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ccc
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120cd2
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ccd
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cd3
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cce
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cd4
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ccf
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd5
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd6
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd7
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd2
-.field public static final not_set:I = 0x7f120d52
+.field public static final not_set:I = 0x7f120d4d
.field public static final password_toggle_content_description:I = 0x7f120e66
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index 82301b2ad6..66697cfffe 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -135,75 +135,75 @@
.field public static final icon_content_description:I = 0x7f120ab0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb6
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb7
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb8
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb9
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cba
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cb5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cbb
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cb6
-.field public static final mtrl_picker_cancel:I = 0x7f120cbc
+.field public static final mtrl_picker_cancel:I = 0x7f120cb7
-.field public static final mtrl_picker_confirm:I = 0x7f120cbd
+.field public static final mtrl_picker_confirm:I = 0x7f120cb8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cbe
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cb9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cbf
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cba
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cc0
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cbb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cc1
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cbc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cc2
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cbd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cc3
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cbe
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cc4
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cbf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cc5
+.field public static final mtrl_picker_invalid_range:I = 0x7f120cc0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc6
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cc7
+.field public static final mtrl_picker_out_of_range:I = 0x7f120cc2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc8
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc9
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cca
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120cc5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120ccb
+.field public static final mtrl_picker_range_header_title:I = 0x7f120cc6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ccc
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cc7
-.field public static final mtrl_picker_save:I = 0x7f120ccd
+.field public static final mtrl_picker_save:I = 0x7f120cc8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cce
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cc9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ccf
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cca
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120cd0
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ccb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cd1
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ccc
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120cd2
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ccd
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cd3
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cce
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cd4
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ccf
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd5
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd6
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd7
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd2
-.field public static final not_set:I = 0x7f120d52
+.field public static final not_set:I = 0x7f120d4d
.field public static final password_toggle_content_description:I = 0x7f120e66
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 94a5a3f6bd..fa8827e9f7 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, 0x42a
+ const/16 v0, 0x42c
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 05d0b42697..2e96bd09e8 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -1836,7 +1836,7 @@
move-result-object p2
- const v0, 0x7f120bf2
+ const v0, 0x7f120bed
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index d6ca9025e4..4c5b5794f0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -177,7 +177,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1066"
+ const-string v4, "Discord-Android/1068"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -185,7 +185,7 @@
const/4 v1, 0x2
- const/16 v2, 0x42a
+ const/16 v2, 0x42c
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -201,7 +201,7 @@
const/4 v1, 0x3
- const-string v2, "14.0"
+ const-string v2, "15-alpha2"
const-string v3, ""
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index fbc938858a..91e812003c 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -1879,7 +1879,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120d43
+ const p1, 0x7f120d3e
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3787,22 +3787,22 @@
goto/16 :goto_0
:sswitch_0
- const p1, 0x7f120c33
+ const p1, 0x7f120c2e
goto/16 :goto_0
:sswitch_1
- const p1, 0x7f120c41
+ const p1, 0x7f120c3c
goto/16 :goto_0
:sswitch_2
- const p1, 0x7f120c3b
+ const p1, 0x7f120c36
goto/16 :goto_0
:sswitch_3
- const p1, 0x7f120c37
+ const p1, 0x7f120c32
goto/16 :goto_0
@@ -3817,7 +3817,7 @@
goto/16 :goto_0
:sswitch_6
- const p1, 0x7f120cb2
+ const p1, 0x7f120cad
goto/16 :goto_0
@@ -3827,7 +3827,7 @@
goto/16 :goto_0
:sswitch_8
- const p1, 0x7f120ce3
+ const p1, 0x7f120cde
goto/16 :goto_0
@@ -3847,7 +3847,7 @@
goto :goto_0
:sswitch_c
- const p1, 0x7f120c76
+ const p1, 0x7f120c71
goto :goto_0
@@ -3867,7 +3867,7 @@
goto :goto_0
:sswitch_10
- const p1, 0x7f120c34
+ const p1, 0x7f120c2f
goto :goto_0
@@ -3907,7 +3907,7 @@
goto :goto_0
:sswitch_18
- const p1, 0x7f120c3d
+ const p1, 0x7f120c38
goto :goto_0
@@ -3920,12 +3920,12 @@
if-ne p1, p2, :cond_0
- const p1, 0x7f120c2f
+ const p1, 0x7f120c2a
goto :goto_0
:cond_0
- const p1, 0x7f120c31
+ const p1, 0x7f120c2c
goto :goto_0
@@ -3940,7 +3940,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f120be7
+ const p1, 0x7f120be2
goto :goto_0
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index ca9161b30b..310f4ec2b6 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -699,7 +699,7 @@
packed-switch v0, :pswitch_data_0
:pswitch_0
- const v0, 0x7f120cf9
+ const v0, 0x7f120cf4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -725,7 +725,7 @@
return-object p1
:pswitch_2
- const v0, 0x7f120cf8
+ const v0, 0x7f120cf3
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -738,7 +738,7 @@
return-object p1
:pswitch_3
- const v0, 0x7f120cf5
+ const v0, 0x7f120cf0
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -764,7 +764,7 @@
return-object p1
:pswitch_5
- const v0, 0x7f120cf7
+ const v0, 0x7f120cf2
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -777,7 +777,7 @@
return-object p1
:pswitch_6
- const v0, 0x7f120cf3
+ const v0, 0x7f120cee
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -792,7 +792,7 @@
:pswitch_7
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120cf0
+ const v1, 0x7f120ceb
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -807,7 +807,7 @@
:pswitch_8
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120cf4
+ const v1, 0x7f120cef
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -833,7 +833,7 @@
return-object p1
:pswitch_a
- const v0, 0x7f120cf2
+ const v0, 0x7f120ced
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -846,7 +846,7 @@
return-object p1
:pswitch_b
- const v0, 0x7f120cf1
+ const v0, 0x7f120cec
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -861,7 +861,7 @@
:pswitch_c
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120cf6
+ const v1, 0x7f120cf1
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 68520bc5f6..03778df98d 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1353,7 +1353,7 @@
if-eqz p2, :cond_1
- const v1, 0x7f120b8d
+ const v1, 0x7f120b88
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1590,7 +1590,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f120d94
+ const v0, 0x7f120d8f
new-array v1, v5, [Ljava/lang/Object;
@@ -1609,7 +1609,7 @@
goto/16 :goto_2
:cond_2
- const v0, 0x7f120d92
+ const v0, 0x7f120d8d
new-array v1, v5, [Ljava/lang/Object;
@@ -1657,7 +1657,7 @@
if-ne v1, v5, :cond_5
- const v0, 0x7f120d9a
+ const v0, 0x7f120d95
new-array v1, v5, [Ljava/lang/Object;
@@ -1678,7 +1678,7 @@
:cond_5
if-ne v1, v7, :cond_6
- const v0, 0x7f120d98
+ const v0, 0x7f120d93
new-array v1, v5, [Ljava/lang/Object;
@@ -1724,7 +1724,7 @@
if-nez v0, :cond_a
- const v0, 0x7f120d90
+ const v0, 0x7f120d8b
new-array v1, v5, [Ljava/lang/Object;
@@ -1783,7 +1783,7 @@
goto :goto_2
:cond_8
- const v0, 0x7f120d9d
+ const v0, 0x7f120d98
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1792,7 +1792,7 @@
goto :goto_1
:cond_9
- const v0, 0x7f120d8e
+ const v0, 0x7f120d89
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2179,7 +2179,7 @@
const v3, 0x7f0803c1
- const v4, 0x7f120d9e
+ const v4, 0x7f120d99
invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2647,7 +2647,7 @@
const v2, 0x7f080259
- const v3, 0x7f120c44
+ const v3, 0x7f120c3f
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3406,7 +3406,7 @@
const v0, 0x7f080363
- const v1, 0x7f120d9b
+ const v1, 0x7f120d96
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3598,7 +3598,7 @@
if-nez v0, :cond_4
- const v0, 0x7f120da3
+ const v0, 0x7f120d9e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index 8cddf0578d..bf04d25ba3 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -710,7 +710,7 @@
invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V
- const v1, 0x7f120c6a
+ const v1, 0x7f120c65
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1116,12 +1116,12 @@
if-eqz p5, :cond_0
- const v2, 0x7f120da0
+ const v2, 0x7f120d9b
goto :goto_0
:cond_0
- const v2, 0x7f120d9f
+ const v2, 0x7f120d9a
:goto_0
sget-object v3, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
@@ -1277,7 +1277,7 @@
new-instance v4, Landroid/app/NotificationChannel;
- const v6, 0x7f120c92
+ const v6, 0x7f120c8d
invoke-virtual {p1, v6}, Landroid/app/Application;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index cece5a8397..9a9545dd3d 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -290,7 +290,7 @@
move-result-object v3
- const v0, 0x7f120d42
+ const v0, 0x7f120d3d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index 6f306e8e59..0da80a78dc 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -294,7 +294,7 @@
goto :goto_2
:cond_3
- const v1, 0x7f120c11
+ const v1, 0x7f120c0c
new-array v3, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
index 744a071fc5..8ddfe5204f 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -159,7 +159,7 @@
.method public getUserAgent()Ljava/lang/String;
.locals 1
- const-string v0, "Discord-Android/1066"
+ const-string v0, "Discord-Android/1068"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 3fa555b02f..153e65c396 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -739,7 +739,7 @@
goto :goto_0
:cond_1
- const p3, 0x7f120cf0
+ const p3, 0x7f120ceb
const/16 v2, 0xc
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
index c49764aa1c..86b7e76d41 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -177,7 +177,7 @@
move-result-object v6
- const v7, 0x7f120cd8
+ const v7, 0x7f120cd3
invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/StreamPreviewView.smali b/com.discord/smali/com/discord/views/StreamPreviewView.smali
index 70a5dfa51b..b16978314e 100644
--- a/com.discord/smali/com/discord/views/StreamPreviewView.smali
+++ b/com.discord/smali/com/discord/views/StreamPreviewView.smali
@@ -444,7 +444,7 @@
goto :goto_1
:cond_5
- const p1, 0x7f120b9c
+ const p1, 0x7f120b97
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
index 1967f59861..9dd122476c 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
@@ -84,9 +84,9 @@
if-eqz v1, :cond_0
- const v1, 0x7f120d12
+ const v1, 0x7f120d0d
- const v12, 0x7f120d12
+ const v12, 0x7f120d0d
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
index 507bc181ef..a45af7f040 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
@@ -75,7 +75,7 @@
const/4 v5, 0x0
- const v6, 0x7f120d4e
+ const v6, 0x7f120d49
invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
index 3255fd61f0..f04682dae0 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
@@ -59,7 +59,7 @@
const/4 v3, 0x0
- const v4, 0x7f120d4e
+ const v4, 0x7f120d49
invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Companion;->launch(Landroidx/fragment/app/Fragment;IZILcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index 9dd0881aad..2fbe32069e 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -398,7 +398,7 @@
move-result-object v4
- const p1, 0x7f120cdc
+ const p1, 0x7f120cd7
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -467,7 +467,7 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const p1, 0x7f120c00
+ const p1, 0x7f120bfb
const/4 v2, 0x1
@@ -485,7 +485,7 @@
move-result-object p1
- const v1, 0x7f120bfd
+ const v1, 0x7f120bf8
new-array v2, v2, [Ljava/lang/Object;
@@ -505,7 +505,7 @@
move-result-object p1
- const p3, 0x7f120bfc
+ const p3, 0x7f120bf7
new-instance v1, Le/a/k/a/q;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
index 05c126c376..3f227e7fee 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
@@ -97,7 +97,7 @@
iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
- const v1, 0x7f120bf4
+ const v1, 0x7f120bef
invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
index d662d92715..651e242fb4 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -356,11 +356,11 @@
const/4 v3, 0x1
- const v8, 0x7f120cd9
+ const v8, 0x7f120cd4
if-eqz v2, :cond_0
- const v2, 0x7f120cda
+ const v2, 0x7f120cd5
new-array v9, v3, [Ljava/lang/Object;
@@ -612,7 +612,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120da1
+ const p1, 0x7f120d9c
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
index 5e65aa5b4f..69a10f8f27 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -101,9 +101,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120d4e
+ const p6, 0x7f120d49
- const v6, 0x7f120d4e
+ const v6, 0x7f120d49
goto :goto_1
@@ -145,9 +145,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120d4e
+ const p6, 0x7f120d49
- const v6, 0x7f120d4e
+ const v6, 0x7f120d49
goto :goto_1
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
index 8893c7e267..888bb15a57 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -277,9 +277,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120d00
+ const v0, 0x7f120cfb
- const v6, 0x7f120d00
+ const v6, 0x7f120cfb
goto :goto_1
@@ -291,9 +291,9 @@
if-eqz v0, :cond_2
- const v0, 0x7f120d0c
+ const v0, 0x7f120d07
- const v7, 0x7f120d0c
+ const v7, 0x7f120d07
goto :goto_2
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
index f7ca8940a4..dba5f28a4c 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$1.smali
@@ -39,31 +39,49 @@
# virtual methods
.method public final onClick(Landroid/view/View;)V
- .locals 3
+ .locals 9
iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
invoke-static {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$ackPremiumGuildHint(Lcom/discord/widgets/channels/list/WidgetChannelsList;)V
- sget-object p1, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->Companion:Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;
+ sget-object v0, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->Companion:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
- iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->$guild:Lcom/discord/models/domain/ModelGuild;
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
- if-eqz v1, :cond_0
+ move-result-object v1
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+ const-string p1, "requireFragmentManager()"
- move-result-wide v1
+ invoke-static {v1, p1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->$guild:Lcom/discord/models/domain/ModelGuild;
+
+ if-eqz p1, :cond_0
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
+
+ move-result-wide v2
goto :goto_0
:cond_0
- const-wide/16 v1, 0x0
+ const-wide/16 v2, 0x0
:goto_0
- invoke-virtual {p1, v0, v1, v2}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;->show(Landroidx/fragment/app/Fragment;J)V
+ move-wide v3, v2
+
+ const-wide/16 v5, 0x0
+
+ const/16 v7, 0x8
+
+ const/4 v8, 0x0
+
+ const/4 v2, 0x1
+
+ invoke-static/range {v0 .. v8}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;->show$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;Landroidx/fragment/app/FragmentManager;ZJJILjava/lang/Object;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
index 8fb9db1c07..a328462a17 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
@@ -372,7 +372,7 @@
add-int/lit8 p1, p1, 0x1
- const v0, 0x7f120c70
+ const v0, 0x7f120c6b
invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
index 75c885830f..29b381605b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
@@ -340,7 +340,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120cda
+ const v0, 0x7f120cd5
const/4 v1, 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
index 843ce0fe51..b58f94dfc9 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
@@ -74,7 +74,7 @@
if-ne v0, v1, :cond_0
- const v0, 0x7f120c70
+ const v0, 0x7f120c6b
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
index ee057f59f9..64b4413df0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -567,7 +567,7 @@
iget-boolean v4, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->shouldShowFollow:Z
- const v5, 0x7f120c28
+ const v5, 0x7f120c23
if-eqz v4, :cond_c
@@ -624,7 +624,7 @@
move-result-object v1
- const v2, 0x7f120c29
+ const v2, 0x7f120c24
invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
index c7d07925b0..b51c235adc 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -675,7 +675,7 @@
:cond_0
if-nez p3, :cond_1
- const p1, 0x7f120d3f
+ const p1, 0x7f120d3a
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
index 03a9c9db54..a874d702d5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
@@ -128,7 +128,7 @@
:cond_2
iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
- const p2, 0x7f120d3f
+ const p2, 0x7f120d3a
invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
index b4e9f3b303..238961de2a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
@@ -1262,7 +1262,7 @@
invoke-virtual {v3, v1}, Landroid/view/View;->setVisibility(I)V
- const v3, 0x7f120b8b
+ const v3, 0x7f120b86
if-nez p2, :cond_7
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
index efeb79c3c0..3b015e91f0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
@@ -209,7 +209,7 @@
.end method
.method public onMessageAuthorClicked(Lcom/discord/models/domain/ModelMessage;J)V
- .locals 1
+ .locals 6
.param p1 # Lcom/discord/models/domain/ModelMessage;
.annotation build Landroidx/annotation/NonNull;
.end annotation
@@ -248,25 +248,31 @@
if-eqz p2, :cond_2
+ iget-object p2, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
+
+ invoke-virtual {p2}, Landroidx/fragment/app/Fragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+ move-result-object v0
+
+ const/4 v1, 0x0
+
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage$MessageReference;->getGuildId()Ljava/lang/Long;
move-result-object p2
invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
- move-result-wide p2
+ move-result-wide v2
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage$MessageReference;->getChannelId()Ljava/lang/Long;
move-result-object p1
- iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatList$1;->this$0:Lcom/discord/widgets/chat/list/WidgetChatList;
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
- invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+ move-result-wide v4
- move-result-object v0
-
- invoke-static {p2, p3, p1, v0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheet;->show(JLjava/lang/Long;Landroidx/fragment/app/FragmentManager;)V
+ invoke-static/range {v0 .. v5}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->show(Landroidx/fragment/app/FragmentManager;ZJJ)V
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
index 5f3c2595c5..888228ae91 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -976,7 +976,7 @@
goto :goto_6
:cond_8
- const v3, 0x7f120c74
+ const v3, 0x7f120c6f
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
index 9e6208e7df..67132530e6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -187,7 +187,7 @@
move-result-object v0
- const v1, 0x7f120d02
+ const v1, 0x7f120cfd
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
index bdba55ff7e..b001109155 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
@@ -71,12 +71,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f120c91
+ const p1, 0x7f120c8c
goto :goto_0
:cond_0
- const p1, 0x7f120c86
+ const p1, 0x7f120c81
:goto_0
iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;->this$0:Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
index 87fb3c05af..244eb6fb00 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
@@ -1982,13 +1982,13 @@
invoke-static {v4, v5}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f121564
+ const v5, 0x7f121567
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v5
- const v6, 0x7f120d41
+ const v6, 0x7f120d3c
invoke-virtual {v0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
index 4e83fc72fa..66f4a23d85 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
@@ -324,12 +324,12 @@
if-eqz v1, :cond_3
- const v1, 0x7f120d39
+ const v1, 0x7f120d34
goto :goto_1
:cond_3
- const v1, 0x7f120d38
+ const v1, 0x7f120d33
:goto_1
invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 3ab392a4e7..857af1ca67 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -492,7 +492,7 @@
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "14.0"
+ const-string v3, "15-alpha2"
aput-object v3, v1, v4
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
index 03e81d2271..f90773825d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
@@ -470,7 +470,7 @@
move-result-object p1
- const p2, 0x7f120c6a
+ const p2, 0x7f120c65
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
index e3c2882361..5bd66f5df2 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -985,7 +985,7 @@
invoke-static {v2, v3}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f120dbc
+ const v3, 0x7f120dba
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
index 5d3eeaa226..2d7a3ac9fa 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -1004,7 +1004,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120d43
+ const p1, 0x7f120d3e
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
index 47dc9a8810..827d8e821c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
@@ -652,7 +652,7 @@
move-result-object v0
- const v1, 0x7f120c69
+ const v1, 0x7f120c64
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -888,7 +888,7 @@
move-result-object v1
- const v2, 0x7f120c65
+ const v2, 0x7f120c60
invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
index 27994ce01c..2e2714325b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
@@ -42,7 +42,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f120b93
+ const v0, 0x7f120b8e
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
index 8ba5b4d69b..bf36ffa9ca 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
@@ -68,7 +68,7 @@
move-result-object v2
- const v3, 0x7f120c82
+ const v3, 0x7f120c7d
new-array v1, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2.smali
index 48da377e09..7704bd06fd 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2.smali
@@ -22,7 +22,7 @@
.field public static final NUM_ROWS_EMOJIS:I = 0x2
-.field public static final SHOW_NEW_GUILD_PROFILE:Z = false
+.field public static final SHOW_NEW_GUILD_PROFILE:Z = true
# instance fields
@@ -1911,6 +1911,12 @@
invoke-virtual {p0, v0, p4}, Lcom/discord/app/AppBottomSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
+ invoke-direct {p0}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->getBottomActionsLayout()Landroidx/constraintlayout/widget/ConstraintLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Landroidx/constraintlayout/widget/ConstraintLayout;->requestLayout()V
+
:goto_2
return-void
.end method
@@ -1960,7 +1966,7 @@
const v7, 0x7f100033
- const v9, 0x7f120d22
+ const v9, 0x7f120d1d
invoke-static {v4, v7, v9, v2, v6}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
@@ -4165,7 +4171,7 @@
if-eqz v2, :cond_0
- const v6, 0x7f120c04
+ const v6, 0x7f120bff
new-array v7, v4, [Ljava/lang/Object;
@@ -4187,7 +4193,7 @@
if-eqz v6, :cond_1
- const v7, 0x7f120c02
+ const v7, 0x7f120bfd
new-array v4, v4, [Ljava/lang/Object;
@@ -4211,7 +4217,7 @@
if-eqz v4, :cond_2
- const v6, 0x7f120c01
+ const v6, 0x7f120bfc
invoke-virtual {v4, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
index 64389b1359..d1c8dafe16 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
@@ -89,7 +89,7 @@
move-result-object v3
- const v4, 0x7f120d88
+ const v4, 0x7f120d83
invoke-virtual {p1, v4}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
index da25631010..972b6fb685 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
@@ -80,7 +80,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f120d8a
+ const p2, 0x7f120d85
invoke-virtual {v0, p2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
index 11f7ee558f..6219830dcd 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
@@ -377,7 +377,7 @@
move-result-object v2
- const v3, 0x7f120d89
+ const v3, 0x7f120d84
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -395,7 +395,7 @@
move-result-object v1
- const v2, 0x7f120d42
+ const v2, 0x7f120d3d
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
index 730ee286aa..de9b763891 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
@@ -82,7 +82,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120b8b
+ const p1, 0x7f120b86
:goto_0
invoke-virtual {v0, p1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index 9adbd5858a..95223dfba7 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -516,7 +516,7 @@
if-eqz p1, :cond_3
- const v0, 0x7f120bf4
+ const v0, 0x7f120bef
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -574,7 +574,7 @@
invoke-static {v0, v4, v3, v2, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v2, 0x7f120da1
+ const v2, 0x7f120d9c
invoke-virtual {v0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
index e8ff50f42c..fd95edea0d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -232,7 +232,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120d9c
+ const p1, 0x7f120d97
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index 5b15232cda..fe403d510e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -255,7 +255,7 @@
if-eqz v6, :cond_2
- const v6, 0x7f120bec
+ const v6, 0x7f120be7
new-array v7, v2, [Ljava/lang/Object;
@@ -438,7 +438,7 @@
if-nez v0, :cond_0
- const v0, 0x7f120d14
+ const v0, 0x7f120d0f
const/4 v1, 0x1
@@ -455,7 +455,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120d15
+ const p1, 0x7f120d10
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
index 52ce091e1a..4501f411cd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
@@ -219,7 +219,7 @@
move-result-object p1
- const p2, 0x7f120c43
+ const p2, 0x7f120c3e
invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->a(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
index eba263268f..d70a4c6cb8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
@@ -303,7 +303,7 @@
iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
- const v0, 0x7f120c64
+ const v0, 0x7f120c5f
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
index b7aa500a62..de592aad25 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
@@ -165,7 +165,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120c6e
+ const v0, 0x7f120c69
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index ea68721166..174844b86f 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -423,7 +423,7 @@
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f120cad
+ const v0, 0x7f120ca8
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
index 9266b5d617..dc5d1bb36b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
@@ -59,7 +59,7 @@
const/4 v5, 0x1
- const v6, 0x7f120d18
+ const v6, 0x7f120d13
invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForVoice(Landroidx/fragment/app/Fragment;JIZI)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
index 502338eb75..cdf02d6405 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
@@ -59,7 +59,7 @@
const/4 v5, 0x1
- const v6, 0x7f120d40
+ const v6, 0x7f120d3b
invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForText(Landroidx/fragment/app/Fragment;JIZI)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index 9a8572d34b..0ca5768d21 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -1477,7 +1477,7 @@
move-result-object v0
- const v1, 0x7f120d18
+ const v1, 0x7f120d13
const v2, 0x7f08024d
@@ -2830,7 +2830,7 @@
move-result-object v0
- const v1, 0x7f120d40
+ const v1, 0x7f120d3b
const v2, 0x7f080246
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index 39c9bca3f3..f829184b28 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -747,7 +747,7 @@
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 p1, 0x7f121537
+ const p1, 0x7f12153a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
index 56a3951963..e56efece32 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
@@ -530,7 +530,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120ce5
+ const v0, 0x7f120ce0
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -539,7 +539,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f120ce6
+ const v0, 0x7f120ce1
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -548,7 +548,7 @@
goto :goto_0
:cond_2
- const v0, 0x7f120ce8
+ const v0, 0x7f120ce3
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -557,7 +557,7 @@
goto :goto_0
:cond_3
- const v0, 0x7f120ce7
+ const v0, 0x7f120ce2
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 9aa3f79b20..bd813d58d1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1799,7 +1799,7 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const p1, 0x7f120c24
+ const p1, 0x7f120c1f
invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -1977,7 +1977,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 14.0 (1066)"
+ const-string v0, " - 15-alpha2 (1068)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index f0aadd9b9d..13881e1f17 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1700,7 +1700,7 @@
return p0
:pswitch_2
- const p0, 0x7f121568
+ const p0, 0x7f12156b
return p0
@@ -1715,7 +1715,7 @@
return p0
:pswitch_5
- const p0, 0x7f120c27
+ const p0, 0x7f120c22
return p0
@@ -1725,7 +1725,7 @@
return p0
:pswitch_7
- const p0, 0x7f120d17
+ const p0, 0x7f120d12
return p0
@@ -1740,17 +1740,17 @@
return p0
:pswitch_a
- const p0, 0x7f120bed
+ const p0, 0x7f120be8
return p0
:pswitch_b
- const p0, 0x7f121569
+ const p0, 0x7f12156c
return p0
:pswitch_c
- const p0, 0x7f120b8a
+ const p0, 0x7f120b85
return p0
@@ -1795,12 +1795,12 @@
return p0
:pswitch_15
- const p0, 0x7f120d16
+ const p0, 0x7f120d11
return p0
:pswitch_16
- const p0, 0x7f120b89
+ const p0, 0x7f120b84
return p0
@@ -1978,7 +1978,7 @@
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const v0, 0x7f120bef
+ const v0, 0x7f120bea
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index 68fa7eee6c..a3a1d8141a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -525,7 +525,7 @@
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120da4
+ const p1, 0x7f120d9f
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index cd8d57d035..4f71e561b4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -2272,7 +2272,7 @@
invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
- const v11, 0x7f120d8d
+ const v11, 0x7f120d88
invoke-virtual {v0, v11}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
index 6503da8996..4b9fa5f393 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
@@ -558,7 +558,7 @@
move-result-object v2
- const v3, 0x7f120c9b
+ const v3, 0x7f120c96
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -574,7 +574,7 @@
move-result-object v2
- const v3, 0x7f120c97
+ const v3, 0x7f120c92
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -609,7 +609,7 @@
move-result-object v2
- const v3, 0x7f120ca0
+ const v3, 0x7f120c9b
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -625,7 +625,7 @@
move-result-object v2
- const v3, 0x7f120c99
+ const v3, 0x7f120c94
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
index bb1d17bdca..8cae066a98 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
@@ -1685,7 +1685,7 @@
:goto_d
if-nez v2, :cond_10
- const v2, 0x7f120c96
+ const v2, 0x7f120c91
new-array v5, v4, [Ljava/lang/Object;
@@ -1718,7 +1718,7 @@
if-eqz p1, :cond_11
- const p1, 0x7f120c9a
+ const p1, 0x7f120c95
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1727,7 +1727,7 @@
goto :goto_e
:cond_11
- const p1, 0x7f120c97
+ const p1, 0x7f120c92
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
index 24b1c3f5bd..afa7618f68 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
@@ -290,7 +290,7 @@
const/4 v2, 0x1
- const v3, 0x7f120bf9
+ const v3, 0x7f120bf4
const/4 v4, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index 2119640321..9cfec801ff 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -5061,7 +5061,7 @@
invoke-static {v14, v1}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120cfc
+ const v1, 0x7f120cf7
invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
index b0585df0b6..fc9518572f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremiumSwitchPlan.smali
@@ -858,7 +858,7 @@
move-result-object p1
- const v0, 0x7f120cfc
+ const v0, 0x7f120cf7
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index 793cccf7b6..425ceacf18 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -523,7 +523,7 @@
if-eqz p2, :cond_1
- const p2, 0x7f120cfa
+ const p2, 0x7f120cf5
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -721,7 +721,7 @@
move-result-object p1
- const p3, 0x7f120d03
+ const p3, 0x7f120cfe
new-array v0, v0, [Ljava/lang/Object;
@@ -776,7 +776,7 @@
move-result-object p2
- const p3, 0x7f120d01
+ const p3, 0x7f120cfc
new-array v0, v0, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali b/com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
index bf38b9587a..a93135655a 100644
--- a/com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
+++ b/com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali
@@ -1345,7 +1345,7 @@
move-result-object v3
- const v5, 0x7f120c82
+ const v5, 0x7f120c7d
new-array v6, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
index 155a6545b1..e7ec5855a2 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
@@ -73,7 +73,7 @@
aput-object p1, v1, v2
- const p1, 0x7f120bea
+ const p1, 0x7f120be5
invoke-virtual {v0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
index aa78d975d9..d29859c35f 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -118,7 +118,7 @@
const v0, 0x7f0402a4
- const v1, 0x7f120d34
+ const v1, 0x7f120d2f
invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
index 71ba596372..09097510dd 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -94,7 +94,7 @@
const v3, 0x7f1000e9
- const v4, 0x7f120ceb
+ const v4, 0x7f120ce6
invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
index 2f981197b2..eade0f95ca 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
@@ -118,7 +118,7 @@
const v0, 0x7f0402a5
- const v1, 0x7f120d35
+ const v1, 0x7f120d30
invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index 4e685eeba8..3e10cf8d82 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -102,7 +102,7 @@
const v3, 0x7f1000ea
- const v4, 0x7f120cec
+ const v4, 0x7f120ce7
invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
index dcff8d0d03..c5137746cb 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
@@ -648,7 +648,7 @@
goto :goto_2
:cond_2
- const v1, 0x7f120be5
+ const v1, 0x7f120be0
:goto_2
invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
index d20e9916c9..5e0e4ad02d 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1.smali
@@ -73,12 +73,14 @@
.end method
.method public final invoke(IILcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;)V
- .locals 2
+ .locals 10
if-eqz p3, :cond_3
const/4 p2, 0x2
+ const-string v0, "requireFragmentManager()"
+
if-eq p1, p2, :cond_2
const/4 p2, 0x3
@@ -88,27 +90,43 @@
goto :goto_1
:cond_0
- sget-object p1, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->Companion:Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;
+ sget-object v1, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2;->Companion:Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;
- iget-object p2, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;->this$0:Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+ iget-object p1, p0, Lcom/discord/widgets/user/search/WidgetGlobalSearch$configureUI$1;->this$0:Lcom/discord/widgets/user/search/WidgetGlobalSearch;
+
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->requireFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+ move-result-object v2
+
+ invoke-static {v2, v0}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const/4 v3, 0x0
invoke-virtual {p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getGuild()Lcom/discord/models/domain/ModelGuild;
- move-result-object p3
+ move-result-object p1
- if-eqz p3, :cond_1
+ if-eqz p1, :cond_1
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelGuild;->getId()J
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-result-wide v0
+ move-result-wide p1
goto :goto_0
:cond_1
- const-wide/16 v0, 0x0
+ const-wide/16 p1, 0x0
:goto_0
- invoke-virtual {p1, p2, v0, v1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet$Companion;->show(Landroidx/fragment/app/Fragment;J)V
+ move-wide v4, p1
+
+ const-wide/16 v6, 0x0
+
+ const/16 v8, 0x8
+
+ const/4 v9, 0x0
+
+ invoke-static/range {v1 .. v9}, Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;->show$default(Lcom/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion;Landroidx/fragment/app/FragmentManager;ZJJILjava/lang/Object;)V
goto :goto_1
@@ -121,8 +139,6 @@
move-result-object p2
- const-string v0, "requireFragmentManager()"
-
invoke-static {p2, v0}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual {p3}, Lcom/discord/widgets/user/search/WidgetGlobalSearchGuildsModel$Item;->getId()J
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
index 658697b985..db8cdf62d3 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
@@ -113,7 +113,7 @@
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
- const v0, 0x7f120c82
+ const v0, 0x7f120c7d
new-array v1, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/e/a/a/e/a.smali b/com.discord/smali/e/a/a/e/a.smali
index fcb3dc46df..fbc388b919 100644
--- a/com.discord/smali/e/a/a/e/a.smali
+++ b/com.discord/smali/e/a/a/e/a.smali
@@ -327,7 +327,7 @@
check-cast v0, Lcom/discord/app/AppTextView;
- const v1, 0x7f120c5a
+ const v1, 0x7f120c55
const/4 v3, 0x1
diff --git a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
index a91a622412..ad57e63c16 100644
--- a/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f120cb5
+ const v0, 0x7f120cb0
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index 1fea66772d..f23cab25f6 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -545,7 +545,7 @@
goto :goto_3
:cond_5
- const v3, 0x7f120b8d
+ const v3, 0x7f120b88
:goto_3
invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
index 473583ab22..cf75f66584 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
@@ -815,7 +815,7 @@
goto :goto_1
:cond_1
- const v4, 0x7f120cd8
+ const v4, 0x7f120cd3
:goto_1
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
index c62ef828f9..4f7149fa71 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/model/CallModel$Companion.smali
@@ -432,7 +432,7 @@
new-instance p1, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader;
- const p2, 0x7f120d51
+ const p2, 0x7f120d4c
invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index 39dbfe9d81..860460223c 100644
--- a/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali_classes2/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -1092,7 +1092,7 @@
move-result-object p1
- const v0, 0x7f120d43
+ const v0, 0x7f120d3e
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali_classes2/com/google/android/material/R$string.smali b/com.discord/smali_classes2/com/google/android/material/R$string.smali
index e4095d3955..dfca93121c 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$string.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$string.smali
@@ -95,73 +95,73 @@
.field public static final icon_content_description:I = 0x7f120ab0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb6
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb7
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb8
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb9
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cba
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cb5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cbb
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cb6
-.field public static final mtrl_picker_cancel:I = 0x7f120cbc
+.field public static final mtrl_picker_cancel:I = 0x7f120cb7
-.field public static final mtrl_picker_confirm:I = 0x7f120cbd
+.field public static final mtrl_picker_confirm:I = 0x7f120cb8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cbe
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cb9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cbf
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cba
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cc0
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cbb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cc1
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cbc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cc2
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cbd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cc3
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cbe
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cc4
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cbf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cc5
+.field public static final mtrl_picker_invalid_range:I = 0x7f120cc0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc6
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cc7
+.field public static final mtrl_picker_out_of_range:I = 0x7f120cc2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc8
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc9
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cca
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120cc5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120ccb
+.field public static final mtrl_picker_range_header_title:I = 0x7f120cc6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ccc
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cc7
-.field public static final mtrl_picker_save:I = 0x7f120ccd
+.field public static final mtrl_picker_save:I = 0x7f120cc8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cce
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cc9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ccf
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cca
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120cd0
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ccb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cd1
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ccc
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120cd2
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ccd
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cd3
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cce
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cd4
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ccf
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd5
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd6
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd7
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd2
.field public static final password_toggle_content_description:I = 0x7f120e66
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
index bec6a43f23..583433ca4b 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -129,73 +129,73 @@
.field public static final icon_content_description:I = 0x7f120ab0
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb6
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120cb1
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb7
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120cb2
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb8
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120cb3
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb9
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120cb4
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cba
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120cb5
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cbb
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120cb6
-.field public static final mtrl_picker_cancel:I = 0x7f120cbc
+.field public static final mtrl_picker_cancel:I = 0x7f120cb7
-.field public static final mtrl_picker_confirm:I = 0x7f120cbd
+.field public static final mtrl_picker_confirm:I = 0x7f120cb8
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120cbe
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120cb9
-.field public static final mtrl_picker_date_header_title:I = 0x7f120cbf
+.field public static final mtrl_picker_date_header_title:I = 0x7f120cba
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cc0
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120cbb
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cc1
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120cbc
-.field public static final mtrl_picker_invalid_format:I = 0x7f120cc2
+.field public static final mtrl_picker_invalid_format:I = 0x7f120cbd
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cc3
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120cbe
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cc4
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120cbf
-.field public static final mtrl_picker_invalid_range:I = 0x7f120cc5
+.field public static final mtrl_picker_invalid_range:I = 0x7f120cc0
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc6
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120cc1
-.field public static final mtrl_picker_out_of_range:I = 0x7f120cc7
+.field public static final mtrl_picker_out_of_range:I = 0x7f120cc2
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc8
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120cc3
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc9
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120cc4
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120cca
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120cc5
-.field public static final mtrl_picker_range_header_title:I = 0x7f120ccb
+.field public static final mtrl_picker_range_header_title:I = 0x7f120cc6
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120ccc
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120cc7
-.field public static final mtrl_picker_save:I = 0x7f120ccd
+.field public static final mtrl_picker_save:I = 0x7f120cc8
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cce
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120cc9
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120ccf
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120cca
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120cd0
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120ccb
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120cd1
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120ccc
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120cd2
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120ccd
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cd3
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120cce
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120cd4
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120ccf
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd5
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120cd0
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd6
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120cd1
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd7
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120cd2
.field public static final password_toggle_content_description:I = 0x7f120e66