diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index b9a4522169..f1a69abec9 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1016.apk
+apkFileName: com.discord-1017.apk
compressionType: false
doNotCompress:
- arsc
@@ -184,5 +184,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1016'
- versionName: 10.1.6
+ versionCode: '1017'
+ versionName: 10.1.7
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 02d4e1f0c8..d503338cbf 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
-#Thu Jan 02 20:13:46 UTC 2020
-version_name=10.1.6
+#Tue Jan 07 00:48:08 UTC 2020
+version_name=10.1.7
package_name=com.discord
-build_id=649b9fd7-1c4d-41cb-91f6-65bb8d029ebf
-version_code=1016
+build_id=a3fea09d-875e-447b-9ed4-01ee14e24f13
+version_code=1017
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index 2963afc7e1..cbc2fbcb67 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/anim/mtrl_bottom_sheet_slide_in.xml b/com.discord/res/anim/mtrl_bottom_sheet_slide_in.xml
new file mode 100644
index 0000000000..a1796d6835
--- /dev/null
+++ b/com.discord/res/anim/mtrl_bottom_sheet_slide_in.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/anim/mtrl_bottom_sheet_slide_out.xml b/com.discord/res/anim/mtrl_bottom_sheet_slide_out.xml
new file mode 100644
index 0000000000..17ef9d9058
--- /dev/null
+++ b/com.discord/res/anim/mtrl_bottom_sheet_slide_out.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/anim/mtrl_card_lowers_interpolator.xml b/com.discord/res/anim/mtrl_card_lowers_interpolator.xml
new file mode 100644
index 0000000000..dd2d0288ae
--- /dev/null
+++ b/com.discord/res/anim/mtrl_card_lowers_interpolator.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/animator/mtrl_card_state_list_anim.xml b/com.discord/res/animator/mtrl_card_state_list_anim.xml
new file mode 100644
index 0000000000..deac7da12c
--- /dev/null
+++ b/com.discord/res/animator/mtrl_card_state_list_anim.xml
@@ -0,0 +1,14 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/animator/mtrl_extended_fab_change_size_motion_spec.xml b/com.discord/res/animator/mtrl_extended_fab_change_size_motion_spec.xml
new file mode 100644
index 0000000000..80c0619ece
--- /dev/null
+++ b/com.discord/res/animator/mtrl_extended_fab_change_size_motion_spec.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/animator/mtrl_extended_fab_hide_motion_spec.xml b/com.discord/res/animator/mtrl_extended_fab_hide_motion_spec.xml
new file mode 100644
index 0000000000..a0866e0e81
--- /dev/null
+++ b/com.discord/res/animator/mtrl_extended_fab_hide_motion_spec.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/animator/mtrl_extended_fab_show_motion_spec.xml b/com.discord/res/animator/mtrl_extended_fab_show_motion_spec.xml
new file mode 100644
index 0000000000..4b23d81e5f
--- /dev/null
+++ b/com.discord/res/animator/mtrl_extended_fab_show_motion_spec.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/animator/mtrl_extended_fab_state_list_animator.xml b/com.discord/res/animator/mtrl_extended_fab_state_list_animator.xml
new file mode 100644
index 0000000000..4a21fe4f83
--- /dev/null
+++ b/com.discord/res/animator/mtrl_extended_fab_state_list_animator.xml
@@ -0,0 +1,36 @@
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/checkbox_themeable_attribute_color.xml b/com.discord/res/color/checkbox_themeable_attribute_color.xml
new file mode 100644
index 0000000000..888cd76a23
--- /dev/null
+++ b/com.discord/res/color/checkbox_themeable_attribute_color.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/design_box_stroke_color.xml b/com.discord/res/color/design_box_stroke_color.xml
new file mode 100644
index 0000000000..5a16931fa4
--- /dev/null
+++ b/com.discord/res/color/design_box_stroke_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color-v23/design_tint_password_toggle.xml b/com.discord/res/color/design_icon_tint.xml
similarity index 100%
rename from com.discord/res/color-v23/design_tint_password_toggle.xml
rename to com.discord/res/color/design_icon_tint.xml
diff --git a/com.discord/res/color/design_tint_password_toggle.xml b/com.discord/res/color/design_tint_password_toggle.xml
deleted file mode 100644
index 9ff63393a9..0000000000
--- a/com.discord/res/color/design_tint_password_toggle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_background_disabled.xml b/com.discord/res/color/material_on_background_disabled.xml
new file mode 100644
index 0000000000..85f5519ea7
--- /dev/null
+++ b/com.discord/res/color/material_on_background_disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_background_emphasis_high_type.xml b/com.discord/res/color/material_on_background_emphasis_high_type.xml
new file mode 100644
index 0000000000..ec954243cb
--- /dev/null
+++ b/com.discord/res/color/material_on_background_emphasis_high_type.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_background_emphasis_medium.xml b/com.discord/res/color/material_on_background_emphasis_medium.xml
new file mode 100644
index 0000000000..e2a48a9e54
--- /dev/null
+++ b/com.discord/res/color/material_on_background_emphasis_medium.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_primary_disabled.xml b/com.discord/res/color/material_on_primary_disabled.xml
new file mode 100644
index 0000000000..0ec5a1e3ba
--- /dev/null
+++ b/com.discord/res/color/material_on_primary_disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_primary_emphasis_high_type.xml b/com.discord/res/color/material_on_primary_emphasis_high_type.xml
new file mode 100644
index 0000000000..a1ac527928
--- /dev/null
+++ b/com.discord/res/color/material_on_primary_emphasis_high_type.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_primary_emphasis_medium.xml b/com.discord/res/color/material_on_primary_emphasis_medium.xml
new file mode 100644
index 0000000000..b907d1bae3
--- /dev/null
+++ b/com.discord/res/color/material_on_primary_emphasis_medium.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_surface_disabled.xml b/com.discord/res/color/material_on_surface_disabled.xml
new file mode 100644
index 0000000000..dff3f1d79c
--- /dev/null
+++ b/com.discord/res/color/material_on_surface_disabled.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_surface_emphasis_high_type.xml b/com.discord/res/color/material_on_surface_emphasis_high_type.xml
new file mode 100644
index 0000000000..296e6fb9e5
--- /dev/null
+++ b/com.discord/res/color/material_on_surface_emphasis_high_type.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/material_on_surface_emphasis_medium.xml b/com.discord/res/color/material_on_surface_emphasis_medium.xml
new file mode 100644
index 0000000000..9b6a85dfbc
--- /dev/null
+++ b/com.discord/res/color/material_on_surface_emphasis_medium.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_bottom_nav_colored_item_tint.xml b/com.discord/res/color/mtrl_bottom_nav_colored_item_tint.xml
index 85a0699c2f..f75a3b6658 100644
--- a/com.discord/res/color/mtrl_bottom_nav_colored_item_tint.xml
+++ b/com.discord/res/color/mtrl_bottom_nav_colored_item_tint.xml
@@ -1,7 +1,6 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_bottom_nav_colored_ripple_color.xml b/com.discord/res/color/mtrl_bottom_nav_colored_ripple_color.xml
new file mode 100644
index 0000000000..1c855ee3a7
--- /dev/null
+++ b/com.discord/res/color/mtrl_bottom_nav_colored_ripple_color.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_bottom_nav_item_tint.xml b/com.discord/res/color/mtrl_bottom_nav_item_tint.xml
index 34260d0815..6b142f611f 100644
--- a/com.discord/res/color/mtrl_bottom_nav_item_tint.xml
+++ b/com.discord/res/color/mtrl_bottom_nav_item_tint.xml
@@ -1,7 +1,6 @@
-
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_bottom_nav_ripple_color.xml b/com.discord/res/color/mtrl_bottom_nav_ripple_color.xml
new file mode 100644
index 0000000000..711c8ffcf2
--- /dev/null
+++ b/com.discord/res/color/mtrl_bottom_nav_ripple_color.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_bg_color_selector.xml b/com.discord/res/color/mtrl_btn_bg_color_selector.xml
index 193926d4ef..ae67800a3b 100644
--- a/com.discord/res/color/mtrl_btn_bg_color_selector.xml
+++ b/com.discord/res/color/mtrl_btn_bg_color_selector.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_ripple_color.xml b/com.discord/res/color/mtrl_btn_ripple_color.xml
index 1df51bbe02..620a796196 100644
--- a/com.discord/res/color/mtrl_btn_ripple_color.xml
+++ b/com.discord/res/color/mtrl_btn_ripple_color.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_stroke_color_selector.xml b/com.discord/res/color/mtrl_btn_stroke_color_selector.xml
index 495a605f12..bd20d790c0 100644
--- a/com.discord/res/color/mtrl_btn_stroke_color_selector.xml
+++ b/com.discord/res/color/mtrl_btn_stroke_color_selector.xml
@@ -1,5 +1,6 @@
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_text_btn_bg_color_selector.xml b/com.discord/res/color/mtrl_btn_text_btn_bg_color_selector.xml
new file mode 100644
index 0000000000..b542ba36db
--- /dev/null
+++ b/com.discord/res/color/mtrl_btn_text_btn_bg_color_selector.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_text_btn_ripple_color.xml b/com.discord/res/color/mtrl_btn_text_btn_ripple_color.xml
index 04ca4bc852..a18b384d2e 100644
--- a/com.discord/res/color/mtrl_btn_text_btn_ripple_color.xml
+++ b/com.discord/res/color/mtrl_btn_text_btn_ripple_color.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_btn_text_color_selector.xml b/com.discord/res/color/mtrl_btn_text_color_selector.xml
index 6bb495a8ce..38c07b60c5 100644
--- a/com.discord/res/color/mtrl_btn_text_color_selector.xml
+++ b/com.discord/res/color/mtrl_btn_text_color_selector.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_calendar_item_stroke_color.xml b/com.discord/res/color/mtrl_calendar_item_stroke_color.xml
new file mode 100644
index 0000000000..214c05034e
--- /dev/null
+++ b/com.discord/res/color/mtrl_calendar_item_stroke_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_calendar_selected_range.xml b/com.discord/res/color/mtrl_calendar_selected_range.xml
new file mode 100644
index 0000000000..0bcdb4f03d
--- /dev/null
+++ b/com.discord/res/color/mtrl_calendar_selected_range.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_card_view_foreground.xml b/com.discord/res/color/mtrl_card_view_foreground.xml
new file mode 100644
index 0000000000..2274c2bcec
--- /dev/null
+++ b/com.discord/res/color/mtrl_card_view_foreground.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_card_view_ripple.xml b/com.discord/res/color/mtrl_card_view_ripple.xml
new file mode 100644
index 0000000000..d33edd93ff
--- /dev/null
+++ b/com.discord/res/color/mtrl_card_view_ripple.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_chip_background_color.xml b/com.discord/res/color/mtrl_chip_background_color.xml
index 163bf47870..e86ceba4f4 100644
--- a/com.discord/res/color/mtrl_chip_background_color.xml
+++ b/com.discord/res/color/mtrl_chip_background_color.xml
@@ -1,7 +1,8 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_chip_close_icon_tint.xml b/com.discord/res/color/mtrl_chip_close_icon_tint.xml
index 58084ffe04..f50111ca8f 100644
--- a/com.discord/res/color/mtrl_chip_close_icon_tint.xml
+++ b/com.discord/res/color/mtrl_chip_close_icon_tint.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_chip_ripple_color.xml b/com.discord/res/color/mtrl_chip_ripple_color.xml
index d3b646fa1f..40074d5280 100644
--- a/com.discord/res/color/mtrl_chip_ripple_color.xml
+++ b/com.discord/res/color/mtrl_chip_ripple_color.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_chip_surface_color.xml b/com.discord/res/color/mtrl_chip_surface_color.xml
new file mode 100644
index 0000000000..c2b6c9ed2b
--- /dev/null
+++ b/com.discord/res/color/mtrl_chip_surface_color.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_chip_text_color.xml b/com.discord/res/color/mtrl_chip_text_color.xml
index c388cefe23..262b1c26a2 100644
--- a/com.discord/res/color/mtrl_chip_text_color.xml
+++ b/com.discord/res/color/mtrl_chip_text_color.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_choice_chip_background_color.xml b/com.discord/res/color/mtrl_choice_chip_background_color.xml
new file mode 100644
index 0000000000..2a999952ab
--- /dev/null
+++ b/com.discord/res/color/mtrl_choice_chip_background_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_choice_chip_ripple_color.xml b/com.discord/res/color/mtrl_choice_chip_ripple_color.xml
new file mode 100644
index 0000000000..1d15729a05
--- /dev/null
+++ b/com.discord/res/color/mtrl_choice_chip_ripple_color.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_choice_chip_text_color.xml b/com.discord/res/color/mtrl_choice_chip_text_color.xml
new file mode 100644
index 0000000000..3c44c137dc
--- /dev/null
+++ b/com.discord/res/color/mtrl_choice_chip_text_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_error.xml b/com.discord/res/color/mtrl_error.xml
new file mode 100644
index 0000000000..d695e16ba3
--- /dev/null
+++ b/com.discord/res/color/mtrl_error.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_extended_fab_bg_color_selector.xml b/com.discord/res/color/mtrl_extended_fab_bg_color_selector.xml
new file mode 100644
index 0000000000..5ec2da2a5b
--- /dev/null
+++ b/com.discord/res/color/mtrl_extended_fab_bg_color_selector.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_extended_fab_ripple_color.xml b/com.discord/res/color/mtrl_extended_fab_ripple_color.xml
new file mode 100644
index 0000000000..5e068d55a1
--- /dev/null
+++ b/com.discord/res/color/mtrl_extended_fab_ripple_color.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_extended_fab_text_color_selector.xml b/com.discord/res/color/mtrl_extended_fab_text_color_selector.xml
new file mode 100644
index 0000000000..ed9be0ab50
--- /dev/null
+++ b/com.discord/res/color/mtrl_extended_fab_text_color_selector.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_fab_ripple_color.xml b/com.discord/res/color/mtrl_fab_ripple_color.xml
index 54b995d3d3..b8e179f430 100644
--- a/com.discord/res/color/mtrl_fab_ripple_color.xml
+++ b/com.discord/res/color/mtrl_fab_ripple_color.xml
@@ -1,9 +1,8 @@
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_filled_background_color.xml b/com.discord/res/color/mtrl_filled_background_color.xml
new file mode 100644
index 0000000000..1e8ffe0461
--- /dev/null
+++ b/com.discord/res/color/mtrl_filled_background_color.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_filled_icon_tint.xml b/com.discord/res/color/mtrl_filled_icon_tint.xml
new file mode 100644
index 0000000000..79a1b7305c
--- /dev/null
+++ b/com.discord/res/color/mtrl_filled_icon_tint.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_filled_stroke_color.xml b/com.discord/res/color/mtrl_filled_stroke_color.xml
new file mode 100644
index 0000000000..2926f05801
--- /dev/null
+++ b/com.discord/res/color/mtrl_filled_stroke_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_indicator_text_color.xml b/com.discord/res/color/mtrl_indicator_text_color.xml
new file mode 100644
index 0000000000..ac95cbd75e
--- /dev/null
+++ b/com.discord/res/color/mtrl_indicator_text_color.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_navigation_item_background_color.xml b/com.discord/res/color/mtrl_navigation_item_background_color.xml
new file mode 100644
index 0000000000..2b7072bf8c
--- /dev/null
+++ b/com.discord/res/color/mtrl_navigation_item_background_color.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_navigation_item_icon_tint.xml b/com.discord/res/color/mtrl_navigation_item_icon_tint.xml
new file mode 100644
index 0000000000..4ae4bfd8a3
--- /dev/null
+++ b/com.discord/res/color/mtrl_navigation_item_icon_tint.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_navigation_item_text_color.xml b/com.discord/res/color/mtrl_navigation_item_text_color.xml
new file mode 100644
index 0000000000..4ae4bfd8a3
--- /dev/null
+++ b/com.discord/res/color/mtrl_navigation_item_text_color.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_on_primary_text_btn_text_color_selector.xml b/com.discord/res/color/mtrl_on_primary_text_btn_text_color_selector.xml
new file mode 100644
index 0000000000..712a5e448d
--- /dev/null
+++ b/com.discord/res/color/mtrl_on_primary_text_btn_text_color_selector.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_outlined_icon_tint.xml b/com.discord/res/color/mtrl_outlined_icon_tint.xml
new file mode 100644
index 0000000000..6dea5b9a69
--- /dev/null
+++ b/com.discord/res/color/mtrl_outlined_icon_tint.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_outlined_stroke_color.xml b/com.discord/res/color/mtrl_outlined_stroke_color.xml
new file mode 100644
index 0000000000..a6374808d4
--- /dev/null
+++ b/com.discord/res/color/mtrl_outlined_stroke_color.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_popupmenu_overlay_color.xml b/com.discord/res/color/mtrl_popupmenu_overlay_color.xml
new file mode 100644
index 0000000000..87d0346659
--- /dev/null
+++ b/com.discord/res/color/mtrl_popupmenu_overlay_color.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_tabs_colored_ripple_color.xml b/com.discord/res/color/mtrl_tabs_colored_ripple_color.xml
index 438476f18f..1c855ee3a7 100644
--- a/com.discord/res/color/mtrl_tabs_colored_ripple_color.xml
+++ b/com.discord/res/color/mtrl_tabs_colored_ripple_color.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_tabs_icon_color_selector.xml b/com.discord/res/color/mtrl_tabs_icon_color_selector.xml
index ddda773967..43195f3841 100644
--- a/com.discord/res/color/mtrl_tabs_icon_color_selector.xml
+++ b/com.discord/res/color/mtrl_tabs_icon_color_selector.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_tabs_icon_color_selector_colored.xml b/com.discord/res/color/mtrl_tabs_icon_color_selector_colored.xml
index 92afd0e64b..41efbd8ed5 100644
--- a/com.discord/res/color/mtrl_tabs_icon_color_selector_colored.xml
+++ b/com.discord/res/color/mtrl_tabs_icon_color_selector_colored.xml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_tabs_ripple_color.xml b/com.discord/res/color/mtrl_tabs_ripple_color.xml
index f7af213d02..711c8ffcf2 100644
--- a/com.discord/res/color/mtrl_tabs_ripple_color.xml
+++ b/com.discord/res/color/mtrl_tabs_ripple_color.xml
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/mtrl_text_btn_text_color_selector.xml b/com.discord/res/color/mtrl_text_btn_text_color_selector.xml
index 6ca8cd75fc..06810ce9d4 100644
--- a/com.discord/res/color/mtrl_text_btn_text_color_selector.xml
+++ b/com.discord/res/color/mtrl_text_btn_text_color_selector.xml
@@ -1,6 +1,8 @@
-
-
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/test_mtrl_calendar_day.xml b/com.discord/res/color/test_mtrl_calendar_day.xml
new file mode 100644
index 0000000000..d1971d245f
--- /dev/null
+++ b/com.discord/res/color/test_mtrl_calendar_day.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/test_mtrl_calendar_day_selected.xml b/com.discord/res/color/test_mtrl_calendar_day_selected.xml
new file mode 100644
index 0000000000..e724cd3763
--- /dev/null
+++ b/com.discord/res/color/test_mtrl_calendar_day_selected.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/uikit_btn_bg_color_selector_red.xml b/com.discord/res/color/uikit_btn_bg_color_selector_red.xml
new file mode 100644
index 0000000000..9a9d4bcd2e
--- /dev/null
+++ b/com.discord/res/color/uikit_btn_bg_color_selector_red.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/uikit_btn_bg_color_selector_secondary_dark.xml b/com.discord/res/color/uikit_btn_bg_color_selector_secondary_dark.xml
new file mode 100644
index 0000000000..39bd11b5f9
--- /dev/null
+++ b/com.discord/res/color/uikit_btn_bg_color_selector_secondary_dark.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/color/uikit_btn_bg_color_selector_secondary_light.xml b/com.discord/res/color/uikit_btn_bg_color_selector_secondary_light.xml
new file mode 100644
index 0000000000..1ff4c6de12
--- /dev/null
+++ b/com.discord/res/color/uikit_btn_bg_color_selector_secondary_light.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml
new file mode 100644
index 0000000000..1880ea6862
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/ic_start_stream_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/img_auth_logo_x_samsung.xml b/com.discord/res/drawable-anydpi-v24/img_auth_logo_x_samsung.xml
deleted file mode 100644
index 29197aac22..0000000000
--- a/com.discord/res/drawable-anydpi-v24/img_auth_logo_x_samsung.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..666e1d0a12
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-hdpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-hdpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index 24439e1e45..0000000000
Binary files a/com.discord/res/drawable-hdpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png b/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..0f47aa984a
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-ldpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-ldpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index 52dc6484b6..0000000000
Binary files a/com.discord/res/drawable-ldpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..694779864a
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-mdpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-mdpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index 0f9a739dcd..0000000000
Binary files a/com.discord/res/drawable-mdpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable-v23/mtrl_popupmenu_background_dark.xml b/com.discord/res/drawable-v23/mtrl_popupmenu_background_dark.xml
new file mode 100644
index 0000000000..b62252ae20
--- /dev/null
+++ b/com.discord/res/drawable-v23/mtrl_popupmenu_background_dark.xml
@@ -0,0 +1,17 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..6346098e04
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-xhdpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index c7e8520591..0000000000
Binary files a/com.discord/res/drawable-xhdpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..055c6cfc18
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-xxhdpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-xxhdpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index e326d4868c..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png
index 9000ee3593..165dde0a42 100644
Binary files a/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png and b/com.discord/res/drawable-xxxhdpi/bg_cloud_pattern_light.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png
index fe1b048bf3..3795dd169d 100644
Binary files a/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png and b/com.discord/res/drawable-xxxhdpi/bg_nitro_classic.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png b/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png
new file mode 100644
index 0000000000..e29f399fb5
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_start_stream_24dp.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/img_auth_logo_x_samsung.png b/com.discord/res/drawable-xxxhdpi/img_auth_logo_x_samsung.png
deleted file mode 100644
index 60c239f30b..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/img_auth_logo_x_samsung.png and /dev/null differ
diff --git a/com.discord/res/drawable/button_red.xml b/com.discord/res/drawable/button_red.xml
deleted file mode 100644
index c10663a97e..0000000000
--- a/com.discord/res/drawable/button_red.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/button_status_green_500.xml b/com.discord/res/drawable/button_status_green_500.xml
deleted file mode 100644
index f7057739f7..0000000000
--- a/com.discord/res/drawable/button_status_green_500.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700.xml b/com.discord/res/drawable/drawable_button_primary_700.xml
deleted file mode 100644
index c73fcaeba7..0000000000
--- a/com.discord/res/drawable/drawable_button_primary_700.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700_pressed.xml b/com.discord/res/drawable/drawable_button_primary_700_pressed.xml
deleted file mode 100644
index 6071631add..0000000000
--- a/com.discord/res/drawable/drawable_button_primary_700_pressed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_purple.xml b/com.discord/res/drawable/drawable_button_purple.xml
deleted file mode 100644
index c2c1d6c748..0000000000
--- a/com.discord/res/drawable/drawable_button_purple.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_transparent_dark.xml b/com.discord/res/drawable/drawable_button_transparent_dark.xml
deleted file mode 100644
index c54037a24d..0000000000
--- a/com.discord/res/drawable/drawable_button_transparent_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_transparent_dark_neutral.xml b/com.discord/res/drawable/drawable_button_transparent_dark_neutral.xml
deleted file mode 100644
index fe9fb546ed..0000000000
--- a/com.discord/res/drawable/drawable_button_transparent_dark_neutral.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_transparent_dark_pressed.xml b/com.discord/res/drawable/drawable_button_transparent_dark_pressed.xml
deleted file mode 100644
index 1d5a7bce50..0000000000
--- a/com.discord/res/drawable/drawable_button_transparent_dark_pressed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_white.xml b/com.discord/res/drawable/drawable_button_white.xml
deleted file mode 100644
index 593224a2ae..0000000000
--- a/com.discord/res/drawable/drawable_button_white.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_white_neutral.xml b/com.discord/res/drawable/drawable_button_white_neutral.xml
deleted file mode 100644
index 9de9182ccc..0000000000
--- a/com.discord/res/drawable/drawable_button_white_neutral.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_white_pressed.xml b/com.discord/res/drawable/drawable_button_white_pressed.xml
deleted file mode 100644
index 7039cce9f9..0000000000
--- a/com.discord/res/drawable/drawable_button_white_pressed.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_primary_100_button_outline.xml b/com.discord/res/drawable/drawable_uikit_primary_100_button_outline.xml
deleted file mode 100644
index 5e709aeb8f..0000000000
--- a/com.discord/res/drawable/drawable_uikit_primary_100_button_outline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_red_button.xml b/com.discord/res/drawable/drawable_uikit_red_button.xml
deleted file mode 100644
index 4ff1b18ef1..0000000000
--- a/com.discord/res/drawable/drawable_uikit_red_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml b/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml
deleted file mode 100644
index 50b587242d..0000000000
--- a/com.discord/res/drawable/drawable_uikit_red_button_disabled.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_brand_button_outline.xml b/com.discord/res/drawable/drawable_uikit_status_brand_button_outline.xml
deleted file mode 100644
index c97373b08b..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_brand_button_outline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_500_a60.xml b/com.discord/res/drawable/drawable_uikit_status_green_500_a60.xml
deleted file mode 100644
index d67325765b..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_green_500_a60.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_500_button.xml b/com.discord/res/drawable/drawable_uikit_status_green_500_button.xml
deleted file mode 100644
index 3a7cc20257..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_green_500_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_green_button_outline.xml b/com.discord/res/drawable/drawable_uikit_status_green_button_outline.xml
deleted file mode 100644
index 9926c5be53..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_green_button_outline.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_primary_300_button_outline.xml b/com.discord/res/drawable/drawable_uikit_status_primary_300_button_outline.xml
deleted file mode 100644
index d33c1dd663..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_primary_300_button_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_uikit_status_red_button_outline.xml b/com.discord/res/drawable/drawable_uikit_status_red_button_outline.xml
deleted file mode 100644
index e6d5640458..0000000000
--- a/com.discord/res/drawable/drawable_uikit_status_red_button_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_calendar_black_24dp.xml b/com.discord/res/drawable/ic_calendar_black_24dp.xml
new file mode 100644
index 0000000000..8c0b89a7bf
--- /dev/null
+++ b/com.discord/res/drawable/ic_calendar_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_clear_black_24dp.xml b/com.discord/res/drawable/ic_clear_black_24dp.xml
new file mode 100644
index 0000000000..a3178532b8
--- /dev/null
+++ b/com.discord/res/drawable/ic_clear_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_edit_black_24dp.xml b/com.discord/res/drawable/ic_edit_black_24dp.xml
new file mode 100644
index 0000000000..d8b4a4055c
--- /dev/null
+++ b/com.discord/res/drawable/ic_edit_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_keyboard_arrow_left_black_24dp.xml b/com.discord/res/drawable/ic_keyboard_arrow_left_black_24dp.xml
new file mode 100644
index 0000000000..d6c0b5286c
--- /dev/null
+++ b/com.discord/res/drawable/ic_keyboard_arrow_left_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_keyboard_arrow_right_black_24dp.xml b/com.discord/res/drawable/ic_keyboard_arrow_right_black_24dp.xml
new file mode 100644
index 0000000000..a2e8a7808c
--- /dev/null
+++ b/com.discord/res/drawable/ic_keyboard_arrow_right_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_menu_arrow_down_black_24dp.xml b/com.discord/res/drawable/ic_menu_arrow_down_black_24dp.xml
new file mode 100644
index 0000000000..b18d25328a
--- /dev/null
+++ b/com.discord/res/drawable/ic_menu_arrow_down_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_menu_arrow_up_black_24dp.xml b/com.discord/res/drawable/ic_menu_arrow_up_black_24dp.xml
new file mode 100644
index 0000000000..233c7cf58c
--- /dev/null
+++ b/com.discord/res/drawable/ic_menu_arrow_up_black_24dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_mtrl_checked_circle.xml b/com.discord/res/drawable/ic_mtrl_checked_circle.xml
new file mode 100644
index 0000000000..82c5715832
--- /dev/null
+++ b/com.discord/res/drawable/ic_mtrl_checked_circle.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_stop_stream_24dp.xml b/com.discord/res/drawable/ic_stop_stream_24dp.xml
new file mode 100644
index 0000000000..a9cb4eedc9
--- /dev/null
+++ b/com.discord/res/drawable/ic_stop_stream_24dp.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/img_wumpus_game_launcher.xml b/com.discord/res/drawable/img_wumpus_game_launcher.xml
deleted file mode 100644
index a9ecd97bfc..0000000000
--- a/com.discord/res/drawable/img_wumpus_game_launcher.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_dialog_background.xml b/com.discord/res/drawable/mtrl_dialog_background.xml
new file mode 100644
index 0000000000..ea405b4448
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_dialog_background.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_dropdown_arrow.xml b/com.discord/res/drawable/mtrl_dropdown_arrow.xml
new file mode 100644
index 0000000000..4f8c83e9e7
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_dropdown_arrow.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_ic_arrow_drop_down.xml b/com.discord/res/drawable/mtrl_ic_arrow_drop_down.xml
new file mode 100644
index 0000000000..bf19d1ee7f
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_ic_arrow_drop_down.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_ic_arrow_drop_up.xml b/com.discord/res/drawable/mtrl_ic_arrow_drop_up.xml
new file mode 100644
index 0000000000..044eaf3a82
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_ic_arrow_drop_up.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_ic_cancel.xml b/com.discord/res/drawable/mtrl_ic_cancel.xml
new file mode 100644
index 0000000000..7b7c8609fd
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_ic_cancel.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_ic_error.xml b/com.discord/res/drawable/mtrl_ic_error.xml
new file mode 100644
index 0000000000..5f87ae509b
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_ic_error.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_popupmenu_background.xml b/com.discord/res/drawable/mtrl_popupmenu_background.xml
new file mode 100644
index 0000000000..3a8ca48293
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_popupmenu_background.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_popupmenu_background_dark.xml b/com.discord/res/drawable/mtrl_popupmenu_background_dark.xml
new file mode 100644
index 0000000000..3a8ca48293
--- /dev/null
+++ b/com.discord/res/drawable/mtrl_popupmenu_background_dark.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/mtrl_snackbar_background.xml b/com.discord/res/drawable/mtrl_snackbar_background.xml
deleted file mode 100644
index eae975e998..0000000000
--- a/com.discord/res/drawable/mtrl_snackbar_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable/drawable_button_primary_700_neutral.xml b/com.discord/res/drawable/test_custom_background.xml
similarity index 52%
rename from com.discord/res/drawable/drawable_button_primary_700_neutral.xml
rename to com.discord/res/drawable/test_custom_background.xml
index 063b1aa835..b51aa392d0 100644
--- a/com.discord/res/drawable/drawable_button_primary_700_neutral.xml
+++ b/com.discord/res/drawable/test_custom_background.xml
@@ -1,6 +1,5 @@
-
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout-land/mtrl_picker_header_dialog.xml b/com.discord/res/layout-land/mtrl_picker_header_dialog.xml
new file mode 100644
index 0000000000..e936c19b62
--- /dev/null
+++ b/com.discord/res/layout-land/mtrl_picker_header_dialog.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/mtrl_alert_dialog_actions.xml b/com.discord/res/layout-v22/mtrl_alert_dialog_actions.xml
new file mode 100644
index 0000000000..71be5faf9a
--- /dev/null
+++ b/com.discord/res/layout-v22/mtrl_alert_dialog_actions.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/view_edit_payment_info.xml b/com.discord/res/layout-v22/view_edit_payment_info.xml
index efe6096b6e..bc5e41cce3 100644
--- a/com.discord/res/layout-v22/view_edit_payment_info.xml
+++ b/com.discord/res/layout-v22/view_edit_payment_info.xml
@@ -19,8 +19,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_auth_login.xml b/com.discord/res/layout-v22/widget_auth_login.xml
index 8fb5cb46d5..8eafb47c90 100644
--- a/com.discord/res/layout-v22/widget_auth_login.xml
+++ b/com.discord/res/layout-v22/widget_auth_login.xml
@@ -24,7 +24,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/widget_auth_register.xml b/com.discord/res/layout-v22/widget_auth_register.xml
index ca90da0269..aed0e843e6 100644
--- a/com.discord/res/layout-v22/widget_auth_register.xml
+++ b/com.discord/res/layout-v22/widget_auth_register.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
index 484dd6d2af..cbd7319748 100644
--- a/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
+++ b/com.discord/res/layout-v22/widget_payment_source_edit_dialog.xml
@@ -2,7 +2,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout-v26/mtrl_calendar_month.xml b/com.discord/res/layout-v26/mtrl_calendar_month.xml
new file mode 100644
index 0000000000..2cc9b55fa3
--- /dev/null
+++ b/com.discord/res/layout-v26/mtrl_calendar_month.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout-w600dp/widget_guild_invite.xml b/com.discord/res/layout-w600dp/widget_guild_invite.xml
index 402ae44caa..3723d5a931 100644
--- a/com.discord/res/layout-w600dp/widget_guild_invite.xml
+++ b/com.discord/res/layout-w600dp/widget_guild_invite.xml
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/design_bottom_navigation_item.xml b/com.discord/res/layout/design_bottom_navigation_item.xml
index ffa872214b..a9f94d9b43 100644
--- a/com.discord/res/layout/design_bottom_navigation_item.xml
+++ b/com.discord/res/layout/design_bottom_navigation_item.xml
@@ -2,8 +2,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/design_navigation_item.xml b/com.discord/res/layout/design_navigation_item.xml
index 3dd4044c47..701d948795 100644
--- a/com.discord/res/layout/design_navigation_item.xml
+++ b/com.discord/res/layout/design_navigation_item.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/design_text_input_end_icon.xml b/com.discord/res/layout/design_text_input_end_icon.xml
new file mode 100644
index 0000000000..ad348ba1a7
--- /dev/null
+++ b/com.discord/res/layout/design_text_input_end_icon.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/design_text_input_password_icon.xml b/com.discord/res/layout/design_text_input_password_icon.xml
deleted file mode 100644
index 663c78d3f8..0000000000
--- a/com.discord/res/layout/design_text_input_password_icon.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/design_text_input_start_icon.xml b/com.discord/res/layout/design_text_input_start_icon.xml
new file mode 100644
index 0000000000..8873c7607e
--- /dev/null
+++ b/com.discord/res/layout/design_text_input_start_icon.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/dialog_simple_selector.xml b/com.discord/res/layout/dialog_simple_selector.xml
index 7ed50d2d71..17a7a2a84e 100644
--- a/com.discord/res/layout/dialog_simple_selector.xml
+++ b/com.discord/res/layout/dialog_simple_selector.xml
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/image_upload_dialog.xml b/com.discord/res/layout/image_upload_dialog.xml
index bd2287355b..fe85901b57 100644
--- a/com.discord/res/layout/image_upload_dialog.xml
+++ b/com.discord/res/layout/image_upload_dialog.xml
@@ -14,7 +14,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_unhandled_uri.xml b/com.discord/res/layout/layout_unhandled_uri.xml
index f21fa05185..73d5b79689 100644
--- a/com.discord/res/layout/layout_unhandled_uri.xml
+++ b/com.discord/res/layout/layout_unhandled_uri.xml
@@ -8,5 +8,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_dialog.xml b/com.discord/res/layout/mtrl_alert_dialog.xml
new file mode 100644
index 0000000000..3535850af7
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_dialog.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_dialog_actions.xml b/com.discord/res/layout/mtrl_alert_dialog_actions.xml
new file mode 100644
index 0000000000..6804c1737e
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_dialog_actions.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_dialog_title.xml b/com.discord/res/layout/mtrl_alert_dialog_title.xml
new file mode 100644
index 0000000000..cf9e456f43
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_dialog_title.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_select_dialog_item.xml b/com.discord/res/layout/mtrl_alert_select_dialog_item.xml
new file mode 100644
index 0000000000..bd2d94ed54
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_select_dialog_item.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_select_dialog_multichoice.xml b/com.discord/res/layout/mtrl_alert_select_dialog_multichoice.xml
new file mode 100644
index 0000000000..5ee8864b34
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_select_dialog_multichoice.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_alert_select_dialog_singlechoice.xml b/com.discord/res/layout/mtrl_alert_select_dialog_singlechoice.xml
new file mode 100644
index 0000000000..704ff48127
--- /dev/null
+++ b/com.discord/res/layout/mtrl_alert_select_dialog_singlechoice.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_day.xml b/com.discord/res/layout/mtrl_calendar_day.xml
new file mode 100644
index 0000000000..d75595f1b1
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_day.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_day_of_week.xml b/com.discord/res/layout/mtrl_calendar_day_of_week.xml
new file mode 100644
index 0000000000..30d0bd2e3b
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_day_of_week.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_days_of_week.xml b/com.discord/res/layout/mtrl_calendar_days_of_week.xml
new file mode 100644
index 0000000000..396713947a
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_days_of_week.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_horizontal.xml b/com.discord/res/layout/mtrl_calendar_horizontal.xml
new file mode 100644
index 0000000000..bec6634a3d
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_horizontal.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_month.xml b/com.discord/res/layout/mtrl_calendar_month.xml
new file mode 100644
index 0000000000..f0719b12b9
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_month.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_month_labeled.xml b/com.discord/res/layout/mtrl_calendar_month_labeled.xml
new file mode 100644
index 0000000000..4514752575
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_month_labeled.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_month_navigation.xml b/com.discord/res/layout/mtrl_calendar_month_navigation.xml
new file mode 100644
index 0000000000..74e773c3ba
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_month_navigation.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_months.xml b/com.discord/res/layout/mtrl_calendar_months.xml
new file mode 100644
index 0000000000..64467937e8
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_months.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_vertical.xml b/com.discord/res/layout/mtrl_calendar_vertical.xml
new file mode 100644
index 0000000000..a682c0e7a1
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_vertical.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_calendar_year.xml b/com.discord/res/layout/mtrl_calendar_year.xml
new file mode 100644
index 0000000000..704283e8d0
--- /dev/null
+++ b/com.discord/res/layout/mtrl_calendar_year.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_layout_snackbar_include.xml b/com.discord/res/layout/mtrl_layout_snackbar_include.xml
index 7b9b9b023d..b74c2297ee 100644
--- a/com.discord/res/layout/mtrl_layout_snackbar_include.xml
+++ b/com.discord/res/layout/mtrl_layout_snackbar_include.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_actions.xml b/com.discord/res/layout/mtrl_picker_actions.xml
new file mode 100644
index 0000000000..87e2ee1846
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_actions.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_dialog.xml b/com.discord/res/layout/mtrl_picker_dialog.xml
new file mode 100644
index 0000000000..319e7e28c5
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_dialog.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_fullscreen.xml b/com.discord/res/layout/mtrl_picker_fullscreen.xml
new file mode 100644
index 0000000000..866feb554b
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_fullscreen.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_header_dialog.xml b/com.discord/res/layout/mtrl_picker_header_dialog.xml
new file mode 100644
index 0000000000..67fb4733ce
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_header_dialog.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_header_fullscreen.xml b/com.discord/res/layout/mtrl_picker_header_fullscreen.xml
new file mode 100644
index 0000000000..42714e4771
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_header_fullscreen.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_header_selection_text.xml b/com.discord/res/layout/mtrl_picker_header_selection_text.xml
new file mode 100644
index 0000000000..32d9d0b888
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_header_selection_text.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_header_title_text.xml b/com.discord/res/layout/mtrl_picker_header_title_text.xml
new file mode 100644
index 0000000000..1643c66e48
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_header_title_text.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_header_toggle.xml b/com.discord/res/layout/mtrl_picker_header_toggle.xml
new file mode 100644
index 0000000000..79057396fb
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_header_toggle.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_text_input_date.xml b/com.discord/res/layout/mtrl_picker_text_input_date.xml
new file mode 100644
index 0000000000..a0da678505
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_text_input_date.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/mtrl_picker_text_input_date_range.xml b/com.discord/res/layout/mtrl_picker_text_input_date_range.xml
new file mode 100644
index 0000000000..b84b9d9a14
--- /dev/null
+++ b/com.discord/res/layout/mtrl_picker_text_input_date_range.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_method_list_add_item.xml b/com.discord/res/layout/payment_method_list_add_item.xml
index e8efda6979..8ad6bf164c 100644
--- a/com.discord/res/layout/payment_method_list_add_item.xml
+++ b/com.discord/res/layout/payment_method_list_add_item.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/payment_method_list_item.xml b/com.discord/res/layout/payment_method_list_item.xml
index 8a10253009..c1463f263a 100644
--- a/com.discord/res/layout/payment_method_list_item.xml
+++ b/com.discord/res/layout/payment_method_list_item.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
index 02776b212b..e2d21ff8f0 100644
--- a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
index d7bf529a79..7d38a46317 100644
--- a/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_cancel_dialog.xml
@@ -19,7 +19,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
index 4bb69c2834..c9313f97b7 100644
--- a/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_uncancel_dialog.xml
@@ -16,7 +16,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/premium_upsell_dialog.xml b/com.discord/res/layout/premium_upsell_dialog.xml
index e0731e8ad0..1095a02473 100644
--- a/com.discord/res/layout/premium_upsell_dialog.xml
+++ b/com.discord/res/layout/premium_upsell_dialog.xml
@@ -5,7 +5,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_action_chip.xml b/com.discord/res/layout/test_action_chip.xml
new file mode 100644
index 0000000000..42399268bc
--- /dev/null
+++ b/com.discord/res/layout/test_action_chip.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_design_checkbox.xml b/com.discord/res/layout/test_design_checkbox.xml
new file mode 100644
index 0000000000..69562fb62c
--- /dev/null
+++ b/com.discord/res/layout/test_design_checkbox.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_reflow_chipgroup.xml b/com.discord/res/layout/test_reflow_chipgroup.xml
new file mode 100644
index 0000000000..f2168d5a73
--- /dev/null
+++ b/com.discord/res/layout/test_reflow_chipgroup.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_toolbar.xml b/com.discord/res/layout/test_toolbar.xml
new file mode 100644
index 0000000000..ea6397cab8
--- /dev/null
+++ b/com.discord/res/layout/test_toolbar.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_toolbar_custom_background.xml b/com.discord/res/layout/test_toolbar_custom_background.xml
new file mode 100644
index 0000000000..0846f1d713
--- /dev/null
+++ b/com.discord/res/layout/test_toolbar_custom_background.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_toolbar_elevation.xml b/com.discord/res/layout/test_toolbar_elevation.xml
new file mode 100644
index 0000000000..ed16805df4
--- /dev/null
+++ b/com.discord/res/layout/test_toolbar_elevation.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/test_toolbar_surface.xml b/com.discord/res/layout/test_toolbar_surface.xml
new file mode 100644
index 0000000000..2a05c6b2e7
--- /dev/null
+++ b/com.discord/res/layout/test_toolbar_surface.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/text_view_with_line_height_from_appearance.xml b/com.discord/res/layout/text_view_with_line_height_from_appearance.xml
new file mode 100644
index 0000000000..1dff6bc1e6
--- /dev/null
+++ b/com.discord/res/layout/text_view_with_line_height_from_appearance.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/text_view_with_line_height_from_layout.xml b/com.discord/res/layout/text_view_with_line_height_from_layout.xml
new file mode 100644
index 0000000000..db2ff341ad
--- /dev/null
+++ b/com.discord/res/layout/text_view_with_line_height_from_layout.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/text_view_with_line_height_from_style.xml b/com.discord/res/layout/text_view_with_line_height_from_style.xml
new file mode 100644
index 0000000000..a14c80aefb
--- /dev/null
+++ b/com.discord/res/layout/text_view_with_line_height_from_style.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/text_view_with_theme_line_height.xml b/com.discord/res/layout/text_view_with_theme_line_height.xml
new file mode 100644
index 0000000000..32cb874a52
--- /dev/null
+++ b/com.discord/res/layout/text_view_with_theme_line_height.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/text_view_without_line_height.xml b/com.discord/res/layout/text_view_without_line_height.xml
new file mode 100644
index 0000000000..f288b45bfe
--- /dev/null
+++ b/com.discord/res/layout/text_view_without_line_height.xml
@@ -0,0 +1,3 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_active_subscription.xml b/com.discord/res/layout/view_active_subscription.xml
index 813f2ee477..371cfd2354 100644
--- a/com.discord/res/layout/view_active_subscription.xml
+++ b/com.discord/res/layout/view_active_subscription.xml
@@ -6,11 +6,11 @@
-
+
-
+
diff --git a/com.discord/res/layout/view_application_news.xml b/com.discord/res/layout/view_application_news.xml
index 57c53beafc..0fa07950c7 100644
--- a/com.discord/res/layout/view_application_news.xml
+++ b/com.discord/res/layout/view_application_news.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/com.discord/res/layout/view_boxed_button.xml b/com.discord/res/layout/view_boxed_button.xml
index 8455f42eb3..9316707a85 100644
--- a/com.discord/res/layout/view_boxed_button.xml
+++ b/com.discord/res/layout/view_boxed_button.xml
@@ -1,6 +1,9 @@
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_dialog_confirmation.xml b/com.discord/res/layout/view_dialog_confirmation.xml
index 6f5528dece..75afbb5012 100644
--- a/com.discord/res/layout/view_dialog_confirmation.xml
+++ b/com.discord/res/layout/view_dialog_confirmation.xml
@@ -7,7 +7,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_edit_payment_info.xml b/com.discord/res/layout/view_edit_payment_info.xml
index f8bbb0b86b..a88554fcb8 100644
--- a/com.discord/res/layout/view_edit_payment_info.xml
+++ b/com.discord/res/layout/view_edit_payment_info.xml
@@ -19,8 +19,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_gift_entitlement_list_item.xml b/com.discord/res/layout/view_gift_entitlement_list_item.xml
index fa0af0bad5..e21d7b36cc 100644
--- a/com.discord/res/layout/view_gift_entitlement_list_item.xml
+++ b/com.discord/res/layout/view_gift_entitlement_list_item.xml
@@ -6,12 +6,12 @@
-
+
-
+
diff --git a/com.discord/res/layout/view_guild_invite_bottom_sheet.xml b/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
index 1384d94152..a23ae41c4d 100644
--- a/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
+++ b/com.discord/res/layout/view_guild_invite_bottom_sheet.xml
@@ -16,6 +16,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_loading_button.xml b/com.discord/res/layout/view_loading_button.xml
index 4fd7a7ba26..1ab46d5ea2 100644
--- a/com.discord/res/layout/view_loading_button.xml
+++ b/com.discord/res/layout/view_loading_button.xml
@@ -1,6 +1,6 @@
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_marketing.xml b/com.discord/res/layout/view_premium_marketing.xml
index eacb0cd68a..db154cf468 100644
--- a/com.discord/res/layout/view_premium_marketing.xml
+++ b/com.discord/res/layout/view_premium_marketing.xml
@@ -15,5 +15,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_settings_tier_1.xml b/com.discord/res/layout/view_premium_settings_tier_1.xml
index 1fe3fc361b..11c3fbcf28 100644
--- a/com.discord/res/layout/view_premium_settings_tier_1.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_1.xml
@@ -1,6 +1,6 @@
+ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -9,7 +9,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_premium_settings_tier_2.xml b/com.discord/res/layout/view_premium_settings_tier_2.xml
index 21aead54ce..e754876249 100644
--- a/com.discord/res/layout/view_premium_settings_tier_2.xml
+++ b/com.discord/res/layout/view_premium_settings_tier_2.xml
@@ -1,13 +1,13 @@
+ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/view_settings_gifting_nitro.xml b/com.discord/res/layout/view_settings_gifting_nitro.xml
index 2af077bd7e..4f3294ddc6 100644
--- a/com.discord/res/layout/view_settings_gifting_nitro.xml
+++ b/com.discord/res/layout/view_settings_gifting_nitro.xml
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/view_settings_gifting_nitro_classic.xml b/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
index 6c21d42709..3bfd1b74ae 100644
--- a/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
+++ b/com.discord/res/layout/view_settings_gifting_nitro_classic.xml
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/view_steps.xml b/com.discord/res/layout/view_steps.xml
index 45178be5b1..83b1465f06 100644
--- a/com.discord/res/layout/view_steps.xml
+++ b/com.discord/res/layout/view_steps.xml
@@ -4,8 +4,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/voice_controls_view.xml b/com.discord/res/layout/voice_controls_view.xml
index e941383bca..6481746145 100644
--- a/com.discord/res/layout/voice_controls_view.xml
+++ b/com.discord/res/layout/voice_controls_view.xml
@@ -8,6 +8,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_accept_gift_dialog.xml b/com.discord/res/layout/widget_accept_gift_dialog.xml
index 08f1745727..d4e741912a 100644
--- a/com.discord/res/layout/widget_accept_gift_dialog.xml
+++ b/com.discord/res/layout/widget_accept_gift_dialog.xml
@@ -10,6 +10,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_add_friend_user_list_item.xml b/com.discord/res/layout/widget_add_friend_user_list_item.xml
index 01fa666e22..072f9ae74d 100644
--- a/com.discord/res/layout/widget_add_friend_user_list_item.xml
+++ b/com.discord/res/layout/widget_add_friend_user_list_item.xml
@@ -8,7 +8,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_captcha.xml b/com.discord/res/layout/widget_auth_captcha.xml
index 35b57df158..524d4bcab2 100644
--- a/com.discord/res/layout/widget_auth_captcha.xml
+++ b/com.discord/res/layout/widget_auth_captcha.xml
@@ -16,6 +16,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_landing.xml b/com.discord/res/layout/widget_auth_landing.xml
index 059b92c6b4..cb279cca72 100644
--- a/com.discord/res/layout/widget_auth_landing.xml
+++ b/com.discord/res/layout/widget_auth_landing.xml
@@ -9,9 +9,9 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_landing_samsung.xml b/com.discord/res/layout/widget_auth_landing_samsung.xml
deleted file mode 100644
index cade85f24b..0000000000
--- a/com.discord/res/layout/widget_auth_landing_samsung.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_login.xml b/com.discord/res/layout/widget_auth_login.xml
index 71f2e6a065..dfc1758979 100644
--- a/com.discord/res/layout/widget_auth_login.xml
+++ b/com.discord/res/layout/widget_auth_login.xml
@@ -24,7 +24,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_mfa_backup_codes.xml b/com.discord/res/layout/widget_auth_mfa_backup_codes.xml
index 87fd750e36..d85b65a8da 100644
--- a/com.discord/res/layout/widget_auth_mfa_backup_codes.xml
+++ b/com.discord/res/layout/widget_auth_mfa_backup_codes.xml
@@ -9,7 +9,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_mfa_info.xml b/com.discord/res/layout/widget_auth_mfa_info.xml
index 0aff3822ea..6dcae5fd74 100644
--- a/com.discord/res/layout/widget_auth_mfa_info.xml
+++ b/com.discord/res/layout/widget_auth_mfa_info.xml
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_auth_register.xml b/com.discord/res/layout/widget_auth_register.xml
index a2e72bbd9e..9b229c563c 100644
--- a/com.discord/res/layout/widget_auth_register.xml
+++ b/com.discord/res/layout/widget_auth_register.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/com.discord/res/layout/widget_auth_undelete_account.xml b/com.discord/res/layout/widget_auth_undelete_account.xml
index 7a59562ef5..0655aab03a 100644
--- a/com.discord/res/layout/widget_auth_undelete_account.xml
+++ b/com.discord/res/layout/widget_auth_undelete_account.xml
@@ -1,6 +1,6 @@
+ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/widget_ban_user.xml b/com.discord/res/layout/widget_ban_user.xml
index 2ae47c7d7a..1ebad17bcd 100644
--- a/com.discord/res/layout/widget_ban_user.xml
+++ b/com.discord/res/layout/widget_ban_user.xml
@@ -15,7 +15,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_cancel_premium_dialog.xml b/com.discord/res/layout/widget_cancel_premium_dialog.xml
index c8c01be00f..b0409f1129 100644
--- a/com.discord/res/layout/widget_cancel_premium_dialog.xml
+++ b/com.discord/res/layout/widget_cancel_premium_dialog.xml
@@ -16,7 +16,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_members_list.xml b/com.discord/res/layout/widget_channel_members_list.xml
index 0ccbfc5518..2585acecf9 100644
--- a/com.discord/res/layout/widget_channel_members_list.xml
+++ b/com.discord/res/layout/widget_channel_members_list.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_pinned_messages.xml b/com.discord/res/layout/widget_channel_pinned_messages.xml
index 9df1b65500..9e1a4d114d 100644
--- a/com.discord/res/layout/widget_channel_pinned_messages.xml
+++ b/com.discord/res/layout/widget_channel_pinned_messages.xml
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_settings_delete.xml b/com.discord/res/layout/widget_channel_settings_delete.xml
index 360e17ef17..201fadbbe6 100644
--- a/com.discord/res/layout/widget_channel_settings_delete.xml
+++ b/com.discord/res/layout/widget_channel_settings_delete.xml
@@ -6,7 +6,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channel_settings_permissions_add_member.xml b/com.discord/res/layout/widget_channel_settings_permissions_add_member.xml
index 0b2e64599c..f7a9d55b82 100644
--- a/com.discord/res/layout/widget_channel_settings_permissions_add_member.xml
+++ b/com.discord/res/layout/widget_channel_settings_permissions_add_member.xml
@@ -1,11 +1,11 @@
-
-
+
diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml
index cb6ee3e3fc..9667f0c61d 100644
--- a/com.discord/res/layout/widget_channels_list.xml
+++ b/com.discord/res/layout/widget_channels_list.xml
@@ -21,6 +21,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml b/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
index cd73be783c..2b0836dca8 100644
--- a/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
+++ b/com.discord/res/layout/widget_channels_list_actions_change_nickname.xml
@@ -9,7 +9,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_channels_list_actions_leave_server.xml b/com.discord/res/layout/widget_channels_list_actions_leave_server.xml
index 43a4da7902..b60e6a1ff0 100644
--- a/com.discord/res/layout/widget_channels_list_actions_leave_server.xml
+++ b/com.discord/res/layout/widget_channels_list_actions_leave_server.xml
@@ -5,7 +5,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_guard.xml b/com.discord/res/layout/widget_chat_input_guard.xml
index 7d8cf82b85..e9650981d6 100644
--- a/com.discord/res/layout/widget_chat_input_guard.xml
+++ b/com.discord/res/layout/widget_chat_input_guard.xml
@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_input_perm_req_files.xml b/com.discord/res/layout/widget_chat_input_perm_req_files.xml
index ca65e8e762..040e91e94c 100644
--- a/com.discord/res/layout/widget_chat_input_perm_req_files.xml
+++ b/com.discord/res/layout/widget_chat_input_perm_req_files.xml
@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_actions.xml b/com.discord/res/layout/widget_chat_list_actions.xml
index 3ec233f89f..67ade223b5 100644
--- a/com.discord/res/layout/widget_chat_list_actions.xml
+++ b/com.discord/res/layout/widget_chat_list_actions.xml
@@ -1,5 +1,5 @@
-
@@ -27,4 +27,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml b/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
index d7a0350687..d78f60c00b 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_gift.xml
@@ -14,9 +14,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml b/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
index d8514c6b7a..b94eed0611 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_invite.xml
@@ -12,9 +12,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_system.xml b/com.discord/res/layout/widget_chat_list_adapter_item_system.xml
index a270fe5ee7..6abbaf30bf 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_system.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_system.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_client_outdated.xml b/com.discord/res/layout/widget_client_outdated.xml
index e828a5e690..778305998d 100644
--- a/com.discord/res/layout/widget_client_outdated.xml
+++ b/com.discord/res/layout/widget_client_outdated.xml
@@ -11,6 +11,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_disable_delete_account_dialog.xml b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
index f5080fdb1f..fdede381cf 100644
--- a/com.discord/res/layout/widget_disable_delete_account_dialog.xml
+++ b/com.discord/res/layout/widget_disable_delete_account_dialog.xml
@@ -18,7 +18,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_enable_sms_backup_dialog.xml b/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
index a9ed83ea6d..3216ce9c59 100644
--- a/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
+++ b/com.discord/res/layout/widget_enable_sms_backup_dialog.xml
@@ -15,7 +15,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_add.xml b/com.discord/res/layout/widget_friends_add.xml
index eeadc67c38..94d3b00bc4 100644
--- a/com.discord/res/layout/widget_friends_add.xml
+++ b/com.discord/res/layout/widget_friends_add.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/com.discord/res/layout/widget_friends_list.xml b/com.discord/res/layout/widget_friends_list.xml
index 375bab77b3..ab567e0ac7 100644
--- a/com.discord/res/layout/widget_friends_list.xml
+++ b/com.discord/res/layout/widget_friends_list.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_empty.xml b/com.discord/res/layout/widget_friends_list_adapter_item_empty.xml
index 4b5747d102..110474b52b 100644
--- a/com.discord/res/layout/widget_friends_list_adapter_item_empty.xml
+++ b/com.discord/res/layout/widget_friends_list_adapter_item_empty.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/com.discord/res/layout/widget_friends_nearby.xml b/com.discord/res/layout/widget_friends_nearby.xml
index e016c9d4f9..e7dd692506 100644
--- a/com.discord/res/layout/widget_friends_nearby.xml
+++ b/com.discord/res/layout/widget_friends_nearby.xml
@@ -15,8 +15,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_global_search.xml b/com.discord/res/layout/widget_global_search.xml
index 31dab66066..cd6f8523db 100644
--- a/com.discord/res/layout/widget_global_search.xml
+++ b/com.discord/res/layout/widget_global_search.xml
@@ -1,11 +1,11 @@
-
-
+
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/widget_group_invite_friends.xml b/com.discord/res/layout/widget_group_invite_friends.xml
index 3945c5b063..ab2bccdd52 100644
--- a/com.discord/res/layout/widget_group_invite_friends.xml
+++ b/com.discord/res/layout/widget_group_invite_friends.xml
@@ -1,5 +1,5 @@
-
@@ -9,7 +9,7 @@
-
+
diff --git a/com.discord/res/layout/widget_guild_actions_sheet.xml b/com.discord/res/layout/widget_guild_actions_sheet.xml
index e127a8e1b8..ba9fb8370e 100644
--- a/com.discord/res/layout/widget_guild_actions_sheet.xml
+++ b/com.discord/res/layout/widget_guild_actions_sheet.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_guild_invite.xml b/com.discord/res/layout/widget_guild_invite.xml
index 9cd6c33592..812a0fb57e 100644
--- a/com.discord/res/layout/widget_guild_invite.xml
+++ b/com.discord/res/layout/widget_guild_invite.xml
@@ -9,8 +9,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/widget_guild_invite_share.xml b/com.discord/res/layout/widget_guild_invite_share.xml
index 14f1202541..b9b6cc04a6 100644
--- a/com.discord/res/layout/widget_guild_invite_share.xml
+++ b/com.discord/res/layout/widget_guild_invite_share.xml
@@ -23,7 +23,7 @@
-
+
diff --git a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
index 701aebadd4..ccaa44b26c 100644
--- a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/com.discord/res/layout/widget_guild_invite_share_item.xml b/com.discord/res/layout/widget_guild_invite_share_item.xml
index 2157b1caf3..84fd06000e 100644
--- a/com.discord/res/layout/widget_guild_invite_share_item.xml
+++ b/com.discord/res/layout/widget_guild_invite_share_item.xml
@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_profile_sheet.xml b/com.discord/res/layout/widget_guild_profile_sheet.xml
index f8735aa0cf..f0bbdbe3f0 100644
--- a/com.discord/res/layout/widget_guild_profile_sheet.xml
+++ b/com.discord/res/layout/widget_guild_profile_sheet.xml
@@ -28,7 +28,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guild_search.xml b/com.discord/res/layout/widget_guild_search.xml
index 4b88521cfd..4544d08ea2 100644
--- a/com.discord/res/layout/widget_guild_search.xml
+++ b/com.discord/res/layout/widget_guild_search.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_guild_transfer_ownership.xml b/com.discord/res/layout/widget_guild_transfer_ownership.xml
index f52d96b956..dfc780b606 100644
--- a/com.discord/res/layout/widget_guild_transfer_ownership.xml
+++ b/com.discord/res/layout/widget_guild_transfer_ownership.xml
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_guilds_list.xml b/com.discord/res/layout/widget_guilds_list.xml
index 2ab10ad519..aea5f7ca6a 100644
--- a/com.discord/res/layout/widget_guilds_list.xml
+++ b/com.discord/res/layout/widget_guilds_list.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_kick_user.xml b/com.discord/res/layout/widget_kick_user.xml
index 871b2515b7..8e6d91a550 100644
--- a/com.discord/res/layout/widget_kick_user.xml
+++ b/com.discord/res/layout/widget_kick_user.xml
@@ -11,7 +11,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_center.xml b/com.discord/res/layout/widget_main_panel_center.xml
index 53d66440d7..610ebc2f3d 100644
--- a/com.discord/res/layout/widget_main_panel_center.xml
+++ b/com.discord/res/layout/widget_main_panel_center.xml
@@ -1,5 +1,5 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_center_content.xml b/com.discord/res/layout/widget_main_panel_center_content.xml
index 9407e021b3..0591b01719 100644
--- a/com.discord/res/layout/widget_main_panel_center_content.xml
+++ b/com.discord/res/layout/widget_main_panel_center_content.xml
@@ -6,7 +6,8 @@
-
+
+
diff --git a/com.discord/res/layout/widget_main_panel_center_nsfw.xml b/com.discord/res/layout/widget_main_panel_center_nsfw.xml
index 74baa7e974..9507834087 100644
--- a/com.discord/res/layout/widget_main_panel_center_nsfw.xml
+++ b/com.discord/res/layout/widget_main_panel_center_nsfw.xml
@@ -12,10 +12,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_main_panel_loading.xml b/com.discord/res/layout/widget_main_panel_loading.xml
index a25cb60410..47cbac41b1 100644
--- a/com.discord/res/layout/widget_main_panel_loading.xml
+++ b/com.discord/res/layout/widget_main_panel_loading.xml
@@ -1,5 +1,5 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_notice_dialog.xml b/com.discord/res/layout/widget_notice_dialog.xml
index b1c8b588a0..a45cd2aa44 100644
--- a/com.discord/res/layout/widget_notice_dialog.xml
+++ b/com.discord/res/layout/widget_notice_dialog.xml
@@ -12,7 +12,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_notice_nux_overlay.xml b/com.discord/res/layout/widget_notice_nux_overlay.xml
index 1ca89a06cd..efffb73d18 100644
--- a/com.discord/res/layout/widget_notice_nux_overlay.xml
+++ b/com.discord/res/layout/widget_notice_nux_overlay.xml
@@ -6,8 +6,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_notice_nux_samsung_link.xml b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
index 91d9bb50af..305d4ec0cc 100644
--- a/com.discord/res/layout/widget_notice_nux_samsung_link.xml
+++ b/com.discord/res/layout/widget_notice_nux_samsung_link.xml
@@ -6,8 +6,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_nux_post_registration.xml b/com.discord/res/layout/widget_nux_post_registration.xml
index 515cf685b7..3ea3ce5e5d 100644
--- a/com.discord/res/layout/widget_nux_post_registration.xml
+++ b/com.discord/res/layout/widget_nux_post_registration.xml
@@ -20,7 +20,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_oauth_authorize.xml b/com.discord/res/layout/widget_oauth_authorize.xml
index 909a1bed7d..a51be9a51a 100644
--- a/com.discord/res/layout/widget_oauth_authorize.xml
+++ b/com.discord/res/layout/widget_oauth_authorize.xml
@@ -6,8 +6,8 @@
-
-
+
+
@@ -20,13 +20,13 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_payment_source_edit_dialog.xml b/com.discord/res/layout/widget_payment_source_edit_dialog.xml
index a2a2e26d4e..77b57a4da4 100644
--- a/com.discord/res/layout/widget_payment_source_edit_dialog.xml
+++ b/com.discord/res/layout/widget_payment_source_edit_dialog.xml
@@ -2,7 +2,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_premium_guild_transfer.xml b/com.discord/res/layout/widget_premium_guild_transfer.xml
index c4626593a7..1c80d46a12 100644
--- a/com.discord/res/layout/widget_premium_guild_transfer.xml
+++ b/com.discord/res/layout/widget_premium_guild_transfer.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/com.discord/res/layout/widget_private_call.xml b/com.discord/res/layout/widget_private_call.xml
index 13455059f7..e2456974de 100644
--- a/com.discord/res/layout/widget_private_call.xml
+++ b/com.discord/res/layout/widget_private_call.xml
@@ -18,7 +18,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_prune_users.xml b/com.discord/res/layout/widget_prune_users.xml
index 0776bb07d8..eab20e58e8 100644
--- a/com.discord/res/layout/widget_prune_users.xml
+++ b/com.discord/res/layout/widget_prune_users.xml
@@ -13,8 +13,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth_not_found.xml b/com.discord/res/layout/widget_remote_auth_not_found.xml
index 06c57503dc..9a344271c5 100644
--- a/com.discord/res/layout/widget_remote_auth_not_found.xml
+++ b/com.discord/res/layout/widget_remote_auth_not_found.xml
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth_pending_login.xml b/com.discord/res/layout/widget_remote_auth_pending_login.xml
index c5385241d3..102b4ef228 100644
--- a/com.discord/res/layout/widget_remote_auth_pending_login.xml
+++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml
@@ -3,10 +3,10 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
+
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_remote_auth_success.xml b/com.discord/res/layout/widget_remote_auth_success.xml
index 58a257c3c4..4479ca03a0 100644
--- a/com.discord/res/layout/widget_remote_auth_success.xml
+++ b/com.discord/res/layout/widget_remote_auth_success.xml
@@ -4,5 +4,5 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search.xml b/com.discord/res/layout/widget_search.xml
index d11611f3ad..eae7c3e368 100644
--- a/com.discord/res/layout/widget_search.xml
+++ b/com.discord/res/layout/widget_search.xml
@@ -1,10 +1,8 @@
-
+
-
-
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_results.xml b/com.discord/res/layout/widget_search_results.xml
index 049bc41a0d..5c47eb4247 100644
--- a/com.discord/res/layout/widget_search_results.xml
+++ b/com.discord/res/layout/widget_search_results.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_search_suggestions.xml b/com.discord/res/layout/widget_search_suggestions.xml
index e58be3343b..6ee967f828 100644
--- a/com.discord/res/layout/widget_search_suggestions.xml
+++ b/com.discord/res/layout/widget_search_suggestions.xml
@@ -1,3 +1,3 @@
-
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_boost_confirmation.xml b/com.discord/res/layout/widget_server_boost_confirmation.xml
index 990dab2962..06e3ebda3b 100644
--- a/com.discord/res/layout/widget_server_boost_confirmation.xml
+++ b/com.discord/res/layout/widget_server_boost_confirmation.xml
@@ -1,5 +1,5 @@
-
@@ -15,7 +15,7 @@
-
+
diff --git a/com.discord/res/layout/widget_server_boost_status.xml b/com.discord/res/layout/widget_server_boost_status.xml
index 50e29ba6f1..e33cf8d128 100644
--- a/com.discord/res/layout/widget_server_boost_status.xml
+++ b/com.discord/res/layout/widget_server_boost_status.xml
@@ -1,14 +1,14 @@
-
-
+
-
+
diff --git a/com.discord/res/layout/widget_server_delete_dialog.xml b/com.discord/res/layout/widget_server_delete_dialog.xml
index 2ef3b7c047..61d84ad135 100644
--- a/com.discord/res/layout/widget_server_delete_dialog.xml
+++ b/com.discord/res/layout/widget_server_delete_dialog.xml
@@ -12,7 +12,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_audit_log.xml b/com.discord/res/layout/widget_server_settings_audit_log.xml
index 87c068d61f..b8c03db36b 100644
--- a/com.discord/res/layout/widget_server_settings_audit_log.xml
+++ b/com.discord/res/layout/widget_server_settings_audit_log.xml
@@ -1,10 +1,10 @@
-
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/com.discord/res/layout/widget_server_settings_bans.xml b/com.discord/res/layout/widget_server_settings_bans.xml
index 4272e53032..20dfb07d9b 100644
--- a/com.discord/res/layout/widget_server_settings_bans.xml
+++ b/com.discord/res/layout/widget_server_settings_bans.xml
@@ -1,13 +1,13 @@
-
-
+
-
+
diff --git a/com.discord/res/layout/widget_server_settings_channels.xml b/com.discord/res/layout/widget_server_settings_channels.xml
index fdb5c0e421..59d5794453 100644
--- a/com.discord/res/layout/widget_server_settings_channels.xml
+++ b/com.discord/res/layout/widget_server_settings_channels.xml
@@ -1,11 +1,11 @@
-
-
+
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_confirm_disable_integration.xml b/com.discord/res/layout/widget_server_settings_confirm_disable_integration.xml
index 05ce384986..6e5b6a4ad7 100644
--- a/com.discord/res/layout/widget_server_settings_confirm_disable_integration.xml
+++ b/com.discord/res/layout/widget_server_settings_confirm_disable_integration.xml
@@ -6,7 +6,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_edit_role_color_picker.xml b/com.discord/res/layout/widget_server_settings_edit_role_color_picker.xml
index 03a206a004..e4b2d64b90 100644
--- a/com.discord/res/layout/widget_server_settings_edit_role_color_picker.xml
+++ b/com.discord/res/layout/widget_server_settings_edit_role_color_picker.xml
@@ -7,6 +7,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_emojis.xml b/com.discord/res/layout/widget_server_settings_emojis.xml
index e5dd31c17d..6212db6bd9 100644
--- a/com.discord/res/layout/widget_server_settings_emojis.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis.xml
@@ -1,11 +1,11 @@
-
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_emojis_header.xml b/com.discord/res/layout/widget_server_settings_emojis_header.xml
index 1bdc772285..b523f9ae98 100644
--- a/com.discord/res/layout/widget_server_settings_emojis_header.xml
+++ b/com.discord/res/layout/widget_server_settings_emojis_header.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_instant_invites.xml b/com.discord/res/layout/widget_server_settings_instant_invites.xml
index 66a80b2a7d..62d3055b3b 100644
--- a/com.discord/res/layout/widget_server_settings_instant_invites.xml
+++ b/com.discord/res/layout/widget_server_settings_instant_invites.xml
@@ -1,12 +1,12 @@
-
-
+
-
+
diff --git a/com.discord/res/layout/widget_server_settings_integrations.xml b/com.discord/res/layout/widget_server_settings_integrations.xml
index 4c8ddaacc6..9232291ce6 100644
--- a/com.discord/res/layout/widget_server_settings_integrations.xml
+++ b/com.discord/res/layout/widget_server_settings_integrations.xml
@@ -1,11 +1,11 @@
-
-
-
+
+
diff --git a/com.discord/res/layout/widget_server_settings_members.xml b/com.discord/res/layout/widget_server_settings_members.xml
index b7e03a177b..144a48e648 100644
--- a/com.discord/res/layout/widget_server_settings_members.xml
+++ b/com.discord/res/layout/widget_server_settings_members.xml
@@ -1,5 +1,5 @@
-
@@ -9,7 +9,7 @@
-
+
diff --git a/com.discord/res/layout/widget_server_settings_overview_region.xml b/com.discord/res/layout/widget_server_settings_overview_region.xml
index 0d3be2b490..f73819f957 100644
--- a/com.discord/res/layout/widget_server_settings_overview_region.xml
+++ b/com.discord/res/layout/widget_server_settings_overview_region.xml
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_server_settings_security.xml b/com.discord/res/layout/widget_server_settings_security.xml
index bb5169264e..d0c52a53dc 100644
--- a/com.discord/res/layout/widget_server_settings_security.xml
+++ b/com.discord/res/layout/widget_server_settings_security.xml
@@ -7,7 +7,7 @@
-
+
diff --git a/com.discord/res/layout/widget_server_settings_security_dialog.xml b/com.discord/res/layout/widget_server_settings_security_dialog.xml
index 9524383f93..a62f7da30d 100644
--- a/com.discord/res/layout/widget_server_settings_security_dialog.xml
+++ b/com.discord/res/layout/widget_server_settings_security_dialog.xml
@@ -6,7 +6,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_account.xml b/com.discord/res/layout/widget_settings_account.xml
index a9d70469cd..2562e67c49 100644
--- a/com.discord/res/layout/widget_settings_account.xml
+++ b/com.discord/res/layout/widget_settings_account.xml
@@ -7,8 +7,8 @@
-
-
+
+
@@ -23,8 +23,8 @@
-
-
+
+
@@ -43,7 +43,7 @@
-
+
diff --git a/com.discord/res/layout/widget_settings_account_backup_codes.xml b/com.discord/res/layout/widget_settings_account_backup_codes.xml
index e4c267ee20..6efce0f42c 100644
--- a/com.discord/res/layout/widget_settings_account_backup_codes.xml
+++ b/com.discord/res/layout/widget_settings_account_backup_codes.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/com.discord/res/layout/widget_settings_authorized_apps.xml b/com.discord/res/layout/widget_settings_authorized_apps.xml
index 676d01a511..3ef3c3e92f 100644
--- a/com.discord/res/layout/widget_settings_authorized_apps.xml
+++ b/com.discord/res/layout/widget_settings_authorized_apps.xml
@@ -1,5 +1,5 @@
-
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_boost.xml b/com.discord/res/layout/widget_settings_boost.xml
index fcbf20223a..ffcfbf2ae0 100644
--- a/com.discord/res/layout/widget_settings_boost.xml
+++ b/com.discord/res/layout/widget_settings_boost.xml
@@ -1,14 +1,14 @@
-
+
-
+
-
+
diff --git a/com.discord/res/layout/widget_settings_enable_mfa_success.xml b/com.discord/res/layout/widget_settings_enable_mfa_success.xml
index bb2d5d8745..30b82508f7 100644
--- a/com.discord/res/layout/widget_settings_enable_mfa_success.xml
+++ b/com.discord/res/layout/widget_settings_enable_mfa_success.xml
@@ -5,6 +5,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_gifting.xml b/com.discord/res/layout/widget_settings_gifting.xml
index 8f10ae61b7..5475370a82 100644
--- a/com.discord/res/layout/widget_settings_gifting.xml
+++ b/com.discord/res/layout/widget_settings_gifting.xml
@@ -1,16 +1,16 @@
-
-
+
-
+
-
+
diff --git a/com.discord/res/layout/widget_settings_payment_methods.xml b/com.discord/res/layout/widget_settings_payment_methods.xml
index 3b676c3382..b3e4906cc1 100644
--- a/com.discord/res/layout/widget_settings_payment_methods.xml
+++ b/com.discord/res/layout/widget_settings_payment_methods.xml
@@ -6,13 +6,13 @@
-
+
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_premium.xml b/com.discord/res/layout/widget_settings_premium.xml
index 35c23bf1c3..b9ac0f7d28 100644
--- a/com.discord/res/layout/widget_settings_premium.xml
+++ b/com.discord/res/layout/widget_settings_premium.xml
@@ -1,11 +1,11 @@
-
-
-
+
+
@@ -26,7 +26,7 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_privacy.xml b/com.discord/res/layout/widget_settings_privacy.xml
index ac60fe05a0..8801818c20 100644
--- a/com.discord/res/layout/widget_settings_privacy.xml
+++ b/com.discord/res/layout/widget_settings_privacy.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/com.discord/res/layout/widget_settings_privacy_defaults.xml b/com.discord/res/layout/widget_settings_privacy_defaults.xml
index 5486344d16..51c83eefaa 100644
--- a/com.discord/res/layout/widget_settings_privacy_defaults.xml
+++ b/com.discord/res/layout/widget_settings_privacy_defaults.xml
@@ -6,7 +6,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_voice.xml b/com.discord/res/layout/widget_settings_voice.xml
index c4538ad53c..ea8e2c52f9 100644
--- a/com.discord/res/layout/widget_settings_voice.xml
+++ b/com.discord/res/layout/widget_settings_voice.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/com.discord/res/layout/widget_spectate.xml b/com.discord/res/layout/widget_spectate.xml
index a688b1f5d1..3c05f4d413 100644
--- a/com.discord/res/layout/widget_spectate.xml
+++ b/com.discord/res/layout/widget_spectate.xml
@@ -8,6 +8,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_upgrade_premium_dialog.xml b/com.discord/res/layout/widget_upgrade_premium_dialog.xml
index 4ecf68be4b..4765716ad3 100644
--- a/com.discord/res/layout/widget_upgrade_premium_dialog.xml
+++ b/com.discord/res/layout/widget_upgrade_premium_dialog.xml
@@ -14,7 +14,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_urgent_message_dialog.xml b/com.discord/res/layout/widget_urgent_message_dialog.xml
index 74c12f3704..37818bc5a8 100644
--- a/com.discord/res/layout/widget_urgent_message_dialog.xml
+++ b/com.discord/res/layout/widget_urgent_message_dialog.xml
@@ -7,6 +7,6 @@
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_captcha_verify.xml b/com.discord/res/layout/widget_user_captcha_verify.xml
index d28bee5e9c..5c9496ea2a 100644
--- a/com.discord/res/layout/widget_user_captcha_verify.xml
+++ b/com.discord/res/layout/widget_user_captcha_verify.xml
@@ -13,10 +13,10 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_user_email_update.xml b/com.discord/res/layout/widget_user_email_update.xml
index 3c8be1ff6b..1a6b6d9dcc 100644
--- a/com.discord/res/layout/widget_user_email_update.xml
+++ b/com.discord/res/layout/widget_user_email_update.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/com.discord/res/layout/widget_user_email_verify.xml b/com.discord/res/layout/widget_user_email_verify.xml
index 6332ca30cc..5ccebe2591 100644
--- a/com.discord/res/layout/widget_user_email_verify.xml
+++ b/com.discord/res/layout/widget_user_email_verify.xml
@@ -12,10 +12,10 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_user_mutual_friends.xml b/com.discord/res/layout/widget_user_mutual_friends.xml
index 0348135d96..865f445a7a 100644
--- a/com.discord/res/layout/widget_user_mutual_friends.xml
+++ b/com.discord/res/layout/widget_user_mutual_friends.xml
@@ -1,8 +1,8 @@
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_mutual_guilds.xml b/com.discord/res/layout/widget_user_mutual_guilds.xml
index 5ecfff0a61..497e9b1f14 100644
--- a/com.discord/res/layout/widget_user_mutual_guilds.xml
+++ b/com.discord/res/layout/widget_user_mutual_guilds.xml
@@ -1,8 +1,8 @@
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_user_phone_add.xml b/com.discord/res/layout/widget_user_phone_add.xml
index 5a1a7d8609..81a8a36d12 100644
--- a/com.discord/res/layout/widget_user_phone_add.xml
+++ b/com.discord/res/layout/widget_user_phone_add.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/com.discord/res/layout/widget_user_sheet.xml b/com.discord/res/layout/widget_user_sheet.xml
index de9f14a715..5b7b97855c 100644
--- a/com.discord/res/layout/widget_user_sheet.xml
+++ b/com.discord/res/layout/widget_user_sheet.xml
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/com.discord/res/layout/widget_user_status_update.xml b/com.discord/res/layout/widget_user_status_update.xml
index 175e543eba..8ef6e0b34c 100644
--- a/com.discord/res/layout/widget_user_status_update.xml
+++ b/com.discord/res/layout/widget_user_status_update.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/widget_voice_actions.xml b/com.discord/res/layout/widget_voice_actions.xml
index 972872d49b..46f895632d 100644
--- a/com.discord/res/layout/widget_voice_actions.xml
+++ b/com.discord/res/layout/widget_voice_actions.xml
@@ -17,7 +17,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_voice_call_inline.xml b/com.discord/res/layout/widget_voice_call_inline.xml
index 45a020f6b6..a11daab8cc 100644
--- a/com.discord/res/layout/widget_voice_call_inline.xml
+++ b/com.discord/res/layout/widget_voice_call_inline.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 7db6d09b9a..485b0ed363 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -2927,7 +2927,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
За 24 часа
За 8 часа
Докато включа отново
- Неограничено
Изкл. на микрофона **%1$s**
Спри звука на членовете
Изкл. микрофон до $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index 58359f772f..fddfaecfa7 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -2899,7 +2899,6 @@ pouze mezi kanály, do kterých mají přístup oba uživatelé."
Na 24 hodin
Na 8 hodin
Dokud to zase nezapnu
- Bez omezení
Ztlumit **%1$s**
Vypnout členům mikrofon
Ztlumeno do $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index d61c50e87f..d809f5d40f 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -2883,7 +2883,6 @@ kanaler, både de og det medlem, de bevæger, har adgang til."
I 24 timer
I 8 timer
Indtil jeg slår det til igen
- På ubestemt tid
Gør **%1$s** stum
Gør medlemmer stumme
Gjort tavs indtil $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index 699ae42ac5..721809e90a 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -2896,7 +2896,6 @@ Mitglieder nur zwischen Kanälen verschieben, zu denen sie selbst und das Mitgli
Für 24 Stunden
Für 8 Stunden
Bis ich es wieder einschalte
- Dauerhaft
**%1$s** stummschalten
Mitglieder stummschalten
Bis $[**%1$s**](endTimeHook) stummgeschaltet
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index fd46dbdf35..4a64d1ffde 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -2920,7 +2920,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
Για 24 ώρες
Για 8 ώρες
Μέχρι να το ενεργοποιήσω ξανά
- "Επ' αόριστον"
Σίγαση **%1$s**
Σίγαση Μελών
Σε σίγαση έως: $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 42648dc995..7ce01ef98c 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -2886,7 +2886,6 @@ entre canales a los que dicho miembro y el miembro con este permiso tienen acces
Durante 24 horas
Durante 8 horas
Hasta que se vuelva a activar
- Indefinidamente
Silenciar a **%1$s**
Silenciar miembros
Silenciado hasta $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index b8b3aef190..bcf1ac0e4d 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -2931,7 +2931,6 @@ ainoastaan sellaisten kanavien välillä, joihin sekä hänellä että siirrett
24 tunniksi
8 tunniksi
Kunnes otan sen uudelleen käyttöön
- Toistaiseksi
Mykistä **%1$s**
Mykistä jäseniä
Mykistetty $[**%1$s**](endTimeHook) asti
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 8a62edb80c..e55bdf8ef0 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -2926,7 +2926,6 @@ en commençant leur message par @everyone ou @here."
Pendant 24 heures
Pendant 8 heures
"Jusqu'à ce que je le change"
- Indéfiniment
Rendre muet **%1$s**
Couper le micro de membres
"Muet jusqu'à $[**%1$s**](endTimeHook)"
diff --git a/com.discord/res/values-h360dp-land/dimens.xml b/com.discord/res/values-h360dp-land/dimens.xml
new file mode 100644
index 0000000000..46b985e9df
--- /dev/null
+++ b/com.discord/res/values-h360dp-land/dimens.xml
@@ -0,0 +1,12 @@
+
+
+ 4.0dip
+ 18.0dip
+ 40.0dip
+ 2.0dip
+ 2.0dip
+ 40.0dip
+ 20.0dip
+ 128.0dip
+ 4.0dip
+
diff --git a/com.discord/res/values-h480dp-land/dimens.xml b/com.discord/res/values-h480dp-land/dimens.xml
new file mode 100644
index 0000000000..32687735e6
--- /dev/null
+++ b/com.discord/res/values-h480dp-land/dimens.xml
@@ -0,0 +1,9 @@
+
+
+ 0.0dip
+ 22.0dip
+ 48.0dip
+ 48.0dip
+ 168.0dip
+ 0.0dip
+
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 1a3f57d17b..b2ef2bcfd3 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -2853,7 +2853,6 @@ onih kanala gdje oba člana imaju pristup."
Tijekom 24 sata
Tijekom 8 sati
Sve dok ne uključim ponovo
- Trajno
Isključi mikrofon **%1$s**
Utišavanje članova
Utišano do $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 02947289b4..aaff301ffc 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -2914,7 +2914,6 @@ ha az @everyone vagy @here előtagot használják."
24 órára
8 órára
Amíg vissza nem kapcsolom
- Korlátlanul
Némítás: **%1$s**
Tagok némítása
Némítva eddig: $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index e289ac9da2..0d7efdc162 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -2909,7 +2909,6 @@ tra canali ai quali sia loro che l'utente da spostare hanno accesso."
Per 24 ore
Per 8 ore
Finché non lo riattivo
- Indefinitamente
Silenzia **%1$s**
Silenzia membri
Silenziato fino a $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index 3bbcc13d71..59de3b853a 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -2954,7 +2954,6 @@ Discordについて詳しい情報が必要ですか?"
24時間
8時間
ミュート解除するまで
- 無期限
**%1$s**からの通知を無効にする
メンバーをミュート
$[**%1$s**](endTimeHook)までミュート
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index ab647fc600..15f2d7267b 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -2948,7 +2948,6 @@ Discord에 대해 더 알고 싶으신가요?"
24시간
8시간
다시 활성화할 때까지
- 무기한
**%1$s** 알림 끄기
멤버들의 마이크 음소거하기
$[**%1$s**](endTimeHook)까지 소리 꺼짐
diff --git a/com.discord/res/values-land/dimens.xml b/com.discord/res/values-land/dimens.xml
index 98e93dec87..75e78774c0 100644
--- a/com.discord/res/values-land/dimens.xml
+++ b/com.discord/res/values-land/dimens.xml
@@ -3,4 +3,18 @@
48.0dip
12.0dip
14.0dip
+ 24.0dip
+ 24.0dip
+ 20.0dip
+ 4.0dip
+ 96.0dip
+ 0.0dip
+ 0.0dip
+ 104.0dip
+ 68.0dip
+ 28.0dip
+ 64.0dip
+ 32.0dip
+ 24.0dip
+ 32.0dip
diff --git a/com.discord/res/values-land/integers.xml b/com.discord/res/values-land/integers.xml
new file mode 100644
index 0000000000..d0a4d7e943
--- /dev/null
+++ b/com.discord/res/values-land/integers.xml
@@ -0,0 +1,5 @@
+
+
+ 0
+ 6
+
diff --git a/com.discord/res/values-land/styles.xml b/com.discord/res/values-land/styles.xml
index 74cf0f5a96..982a2f766e 100644
--- a/com.discord/res/values-land/styles.xml
+++ b/com.discord/res/values-land/styles.xml
@@ -32,9 +32,6 @@
- wrap_content
- 1.0
-
+
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index 5ec18e3a4e..0e041dbe21 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -2916,7 +2916,6 @@ kanalus, kur jie abu, t. y. perkeliantis ir perkeliamas narys, turi prieigą."
24 valandoms
8 valandoms
Iki kol vėl įjungsiu
- Neribotam laikui
Nutildyti **%1$s**
Nutildyti Narius
Nutildyti iki $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-night/styles.xml b/com.discord/res/values-night/styles.xml
index e79e376045..37beb59558 100644
--- a/com.discord/res/values-night/styles.xml
+++ b/com.discord/res/values-night/styles.xml
@@ -7,5 +7,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index caa5506beb..9c2185b3a7 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -2882,7 +2882,6 @@ kanalen verplaatsen, waartoe zowel zij als het lid die ze verplaatsen toegang to
Gedurende 24 uur
Gedurende 8 uur
Tot ik hem weer inschakel
- Voor onbepaalde tijd
Demp **%1$s**
Microfoon van leden dempen
Gedempt tot $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index 1d7b1d9ada..28dab8f511 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -2831,7 +2831,6 @@ kanaler hvor både de og medlemmene de flytter, har tilgang."
I 24 timer
I 8 timer
Til jeg slår det på igjen
- Uendelig
Demp **%1$s**
Demp medlemmer
Dempet til $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 1a90f55815..1133fbd813 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -2939,7 +2939,6 @@ kanałów, do których mają dostęp przenoszeni oraz przenoszący."
Na 24 godziny
Na 8 godzin
Dopóki nie włączę z powrotem
- Bezterminowo
Wycisz **%1$s**
Wyciszanie członków
Wyciszono do $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index fe1d6ffeb1..c7d702f79e 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -2924,7 +2924,6 @@ entre canais que ambos tenham acesso."
Por 24 horas
Por 8 horas
Até eu ligá-las de novo
- Indefinidamente
Silenciar **%1$s**
Silenciar membros
Silenciado(a) até $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index 4a55a0f496..e9a2f0cd74 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -2888,7 +2888,6 @@ canalele la care atât ei cât și membrii mutați au acces."
24 de ore
8 ore
Până reactivez
- Pe o perioadă nedeterminată
Amuțește-l(o) pe **%1$s **
Amuțește membri (mute)
Amuțit până la $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index b62b5dc0a0..9323fd5362 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -2964,7 +2964,6 @@
На 24 часа
На 8 часов
До тех пор пока не включу
- На неопределённое время
Отключить звук **%1$s**
Отключать участникам микрофон
Заглушено до $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-small/dimens.xml b/com.discord/res/values-small/dimens.xml
new file mode 100644
index 0000000000..23644a6da9
--- /dev/null
+++ b/com.discord/res/values-small/dimens.xml
@@ -0,0 +1,5 @@
+
+
+ 24.0dip
+ 24.0dip
+
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index e75f3a2e87..6d1e0df4d7 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -2837,7 +2837,6 @@ kanaler både de och medlemmen de flyttar har tillgång till."
I 24 timmar
I 8 timmar
Tills jag sätter igång den igen
- På obestämd tid
Tysta **%1$s**
Tysta medlemmar
Tystad fram till $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-sw600dp/dimens.xml b/com.discord/res/values-sw600dp/dimens.xml
index 015a3ee054..8664055155 100644
--- a/com.discord/res/values-sw600dp/dimens.xml
+++ b/com.discord/res/values-sw600dp/dimens.xml
@@ -16,4 +16,6 @@
320.0dip
- @dimen/design_snackbar_padding_vertical
160.0dip
+ 64.0dip
+ 64.0dip
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index 1e109ebfdb..03fd1b57d6 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -2923,7 +2923,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
เป็นเวลา 24 ชั่วโมง
เป็นเวลา 8 ชั่วโมง
จนกว่าฉันจะเปิดแจ้งเตือน
- ไม่มีกำหนด
ปิดเสียง **%1$s**
ปิดเสียงสมาชิก
ปิดเสียงจนกระทั่ง $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index b7db7c8d2b..e2b93631c9 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -2911,7 +2911,6 @@ kanallara taşınabilir."
24 Saat
8 Saat
Ben tekrar açana kadar
- Süresiz olarak
**%1$s** kanalını sustur
Üyeleri Sustur
Susturma bitişi: $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index 9013f72782..1d1fc4e2a5 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -2939,7 +2939,6 @@ AFK. Це не впливає на браузери."
На 24 години
На 8 годин
До повторного ввімкнення
- На невизначений час
Заглушити **%1$s**
Вимикати повідомлення від членів
Вимкнути мікрофон до $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-v23/styles.xml b/com.discord/res/values-v23/styles.xml
index e03455ea29..cd8ccc84ff 100644
--- a/com.discord/res/values-v23/styles.xml
+++ b/com.discord/res/values-v23/styles.xml
@@ -1,5 +1,13 @@
+
+
+
+
+
+
diff --git a/com.discord/res/values-v28/dimens.xml b/com.discord/res/values-v28/dimens.xml
new file mode 100644
index 0000000000..72280e31fa
--- /dev/null
+++ b/com.discord/res/values-v28/dimens.xml
@@ -0,0 +1,11 @@
+
+
+ - 0.24
+ - 0.4
+ - 0.4
+ - 0.24
+ - 0.12
+ - 0.2
+ - 0.2
+ - 0.12
+
diff --git a/com.discord/res/values-v28/styles.xml b/com.discord/res/values-v28/styles.xml
index 7f5111a6db..a3c87c4f97 100644
--- a/com.discord/res/values-v28/styles.xml
+++ b/com.discord/res/values-v28/styles.xml
@@ -2,6 +2,17 @@
+
diff --git a/com.discord/res/values-v29/colors.xml b/com.discord/res/values-v29/colors.xml
new file mode 100644
index 0000000000..c071b5e3bd
--- /dev/null
+++ b/com.discord/res/values-v29/colors.xml
@@ -0,0 +1,4 @@
+
+
+ @color/transparent
+
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index e5abf77b5c..d786f1422b 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -2907,7 +2907,6 @@ qua lại giữa các kênh mà cả hai có quyền truy cập."
Trong vòng 24 Giờ
Trong vòng 8 Giờ
Cho đến khi bật lại
- Vô thời hạn
Tắt tiếng **%1$s**
Tắt tiếng thành viên
Tắt âm đến $[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-w360dp-port/dimens.xml b/com.discord/res/values-w360dp-port/dimens.xml
new file mode 100644
index 0000000000..fe536c644a
--- /dev/null
+++ b/com.discord/res/values-w360dp-port/dimens.xml
@@ -0,0 +1,11 @@
+
+
+ 4.0dip
+ 18.0dip
+ 40.0dip
+ 2.0dip
+ 2.0dip
+ 40.0dip
+ 40.0dip
+ 4.0dip
+
diff --git a/com.discord/res/values-w480dp-port/dimens.xml b/com.discord/res/values-w480dp-port/dimens.xml
new file mode 100644
index 0000000000..3dc70ce34b
--- /dev/null
+++ b/com.discord/res/values-w480dp-port/dimens.xml
@@ -0,0 +1,9 @@
+
+
+ 0.0dip
+ 22.0dip
+ 48.0dip
+ 48.0dip
+ 48.0dip
+ 0.0dip
+
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index 91b6fd92e0..353813267d 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -2933,7 +2933,6 @@
持续24小时
持续8小时
直到我再次开启
- 无限期
将 **%1$s**静音
静音成员
已静音至$[**%1$s**](endTimeHook)
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 72bc1144a3..731d6007a7 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -2934,7 +2934,6 @@
持續 24 小時
持續 8 小時
直到重新啟動
- 無限期
靜音 **%1$s**
讓成員靜音
持續靜音至 $[**%1$s**](endTimeHook) 為止
diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml
index 863f63c256..3666d24741 100644
--- a/com.discord/res/values/attrs.xml
+++ b/com.discord/res/values/attrs.xml
@@ -34,6 +34,7 @@
+
@@ -88,6 +89,11 @@
+
+
+
+
+
@@ -115,7 +121,13 @@
+
+
+
+
+
+
@@ -127,6 +139,15 @@
+
+
+
+
+
+
+
+
+
@@ -138,12 +159,23 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -178,6 +210,7 @@
+
@@ -238,6 +271,7 @@
+
@@ -248,9 +282,11 @@
+
+
@@ -263,6 +299,7 @@
+
@@ -271,6 +308,7 @@
+
@@ -304,24 +342,35 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -348,11 +397,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -397,6 +473,10 @@
+
+
+
+
@@ -453,18 +533,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -485,10 +596,16 @@
+
+
+
+
+
+
@@ -577,6 +694,7 @@
+
@@ -585,6 +703,7 @@
+
@@ -713,7 +832,9 @@
+
+
@@ -767,15 +888,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -973,17 +1107,20 @@
+
+
+
@@ -1026,10 +1163,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1038,6 +1194,7 @@
+
@@ -1050,6 +1207,7 @@
+
@@ -1096,6 +1254,7 @@
+
@@ -1173,6 +1332,7 @@
+
@@ -1236,6 +1396,11 @@
+
+
+
+
+
@@ -1273,6 +1438,7 @@
+
@@ -1287,14 +1453,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -1347,6 +1525,7 @@
+
@@ -1376,6 +1555,7 @@
+
@@ -1394,6 +1574,7 @@
+
@@ -1549,6 +1730,7 @@
+
@@ -1570,4 +1752,7 @@
+
+
+
diff --git a/com.discord/res/values/colors.xml b/com.discord/res/values/colors.xml
index 77d736230b..a918dd1acc 100644
--- a/com.discord/res/values/colors.xml
+++ b/com.discord/res/values/colors.xml
@@ -66,8 +66,32 @@
#ff36393e
#ff303337
#14000000
- #ff3f51b5
- #ff303f9f
+ #ff121212
+ #ffcf6679
+ #ffffffff
+ #ff000000
+ #ff000000
+ #ff000000
+ #ffffffff
+ #ffbb86fc
+ #ff000000
+ #ff3700b3
+ #ff03dac6
+ #ff03dac6
+ #ff121212
+ #ffffffff
+ #ffb00020
+ #ff000000
+ #ffffffff
+ #ffffffff
+ #ff000000
+ #ff000000
+ #ff6200ee
+ #ff3700b3
+ #ff3700b3
+ #ff03dac6
+ #ff018786
+ #ffffffff
@android:color/transparent
#14000000
#44000000
@@ -122,14 +146,15 @@
#ff424242
#ff303030
#ff212121
- #1f000000
#61000000
#00ffffff
#52000000
#6b000000
#1f000000
#0a000000
+ #00000000
#de000000
+ @color/black_alpha_60
@color/secondary_text_default_material_light
#ff9e9e9e
#ff424242
@@ -155,6 +180,7 @@
#4d72767d
#9972767d
#ff4f545c
+ #334f545c
#4d4f545c
#994f545c
#ff40444b
@@ -185,6 +211,7 @@
#ffa6adb6
#ff9099a4
#ff747f8d
+ #33747f8d
#ff4f5660
#ff2e3338
#ff23262a
@@ -241,6 +268,7 @@
#fff9b5b5
#fff36c6c
#fff04747
+ #33f04747
#99f04747
#ffea3d3d
#ffa33030
diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml
index c806741933..43f5cdc84b 100644
--- a/com.discord/res/values/dimens.xml
+++ b/com.discord/res/values/dimens.xml
@@ -78,8 +78,10 @@
16.0dip
20.0sp
20.0dip
+ 16.0dip
76.0dip
4.0dip
+ 16.0dip
64.0dip
200.0dip
4.0dip
@@ -132,6 +134,7 @@
30.0dip
24.0dip
10.0dip
+ 100.0dip
280.0dip
4.0dip
168.0dip
@@ -145,6 +148,7 @@
8.0dip
1.0dip
12.0sp
+ 8.0dip
16.0dip
64.0dip
0.5dip
@@ -163,6 +167,7 @@
8.0dip
8.0dip
128.0dip
+ - 1.0
0.0dip
6.0dip
0.0dip
@@ -223,8 +228,25 @@
16.0sp
20.0sp
20.0dip
+ - 0.38
+ - 0.87
+ - 0.6
+ 200.0px
+ 100.0px
16.0dip
+ 80.0dip
+ 24.0dip
+ 24.0dip
+ 80.0dip
+ 24.0dip
+ 4.0dip
+ 4.0dip
+ 4.0dip
+ 6.0dip
+ 10.0sp
+ 8.0dip
60.0dip
+ 16.0dip
5.0dip
8.0dip
0.0dip
@@ -251,26 +273,111 @@
8.0dip
14.0sp
0.0dip
+ 52.0dip
+ 8.0dip
+ 0.0dip
+ 12.0dip
+ 15.0dip
+ 32.0dip
+ 3.0dip
+ 1.0dip
+ 1.0dip
+ 36.0dip
+ 24.0dip
+ 16.0dip
+ 12.0dip
+ 4.0dip
+ 1.0dip
+ 120.0dip
+ 128.0dip
+ 32.0dip
+ 12.0dip
+ 8.0dip
+ 24.0dip
+ 0.0dip
+ 480.0dip
+ 2.0dip
+ 0.0dip
+ 4.0dip
+ 48.0dip
+ 4.0dip
+ 0.0dip
+ 104.0dip
+ 20.0dip
+ 24.0dip
+ 100.0dip
+ 16.0dip
+ 28.0dip
+ 68.0dip
+ 18.0dip
+ 52.0dip
+ 8.0dip
+ 8.0dip
+ 88.0dip
+ 8.0dip
+ 24.0dip
+ 4.0dip
+ 5.0dip
1.0dip
8.0dip
3.0dip
14.0sp
+ 8.0dip
+ 1.0dip
+ 8.0dip
+ 12.0dip
+ 24.0dip
+ 0.0dip
+ 0.0dip
+ 6.0dip
+ 20.0dip
+ 24.0dip
+ 24.0dip
+ 16.0dip
+ 48.0dip
+ 120.0dip
+ 20.0dip
+ 16.0dip
+ 12.0dip
+ 0.0dip
+ 2.0dip
+ 6.0dip
6.0dip
+ 48.0dip
2.0dip
6.0dip
+ - 0.48
+ - 0.48
+ - 0.16
+ - 0.48
+ 100.0dip
+ - 0.24
+ - 0.24
+ - 0.08
+ - 0.24
+ 48.0dip
0.0dip
22.0dip
14.0dip
+ 24.0dip
+ 8.0dip
+ 4.0dip
+ 0.0dip
+ 4.0dip
+ 4.0dip
+ - 0.5
4.0dip
+ - 0.8
8.0dip
- 3.0dip
+ 4.0dip
4.0dip
0.0dip
4.0dip
- 12.0dip
1.0dip
2.0dip
+ 4.0dip
16.0dip
+ 4.0dip
56.0dip
310.0dip
32.0dip
@@ -312,6 +419,7 @@
2.0dip
16.0dip
48.0dip
+ 52.0dip
16.0dip
2.0dip
16.0dip
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 491e5c6780..66f19e81ea 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -242,6 +242,7 @@
+
@@ -511,6 +512,8 @@
+
+
@@ -521,6 +524,7 @@
+
@@ -567,8 +571,8 @@
-
+
@@ -716,6 +720,7 @@
+
@@ -752,6 +757,7 @@
+
@@ -1022,8 +1028,8 @@
+
-
@@ -1125,8 +1131,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1454,9 +1484,8 @@
-
-
+
@@ -1886,12 +1915,15 @@
+
+
-
+
+
@@ -2128,6 +2160,7 @@
+
diff --git a/com.discord/res/values/integers.xml b/com.discord/res/values/integers.xml
index 7328ddd1cd..516536e1c0 100644
--- a/com.discord/res/values/integers.xml
+++ b/com.discord/res/values/integers.xml
@@ -11,8 +11,14 @@
300
12451000
320
+ 4
100
100
+ 1
+ 1
+ 3
+ 75
+ 120
100
250
200
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 2161f82cb9..ae0f755dbd 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -503,6 +503,22 @@
- %s times
- %s time
+
+ - %s days
+ - a day
+
+
+ - %s hours
+ - an hour
+
+
+ - %s minutes
+ - a minute
+
+
+ - %s seconds
+ - a second
+
- **%s** Members
- **1** Member
@@ -569,6 +585,10 @@
- No Members
- 1 Member
+
+ - %d new notifications
+ - %d new notification
+
- %s days
- 1 day
@@ -843,5 +863,5 @@
- %s People
- %s Person
- - false
+ - false
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 8497f83e06..c3cc2dbdd0 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -61,10 +61,13 @@
-
-
-
-
+
+
+
+
+
+
+
@@ -72,19 +75,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -118,1105 +126,1229 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1300,290 +1432,360 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1663,299 +1865,407 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2025,733 +2335,728 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2759,193 +3064,193 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2993,24 +3298,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -3021,70 +3326,70 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3093,58 +3398,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3157,23 +3462,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3199,2285 +3504,2337 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5489,17 +5846,23 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5560,494 +5923,532 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6214,91 +6615,96 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10291,4265 +10697,4316 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14557,31 +15014,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -14615,814 +15072,978 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index eceee9e789..6c580f8618 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -154,7 +154,7 @@
"You've maxed out your friend list. Welcome to the elite 1,000 friends club!"
"We need %1$s's four digit tag so we know which one they are."
Friend
- DiscordTag#0000
+ Username#0000
Nearby
Please turn on location services, Bluetooth, and WiFi (all the things!). Then reconnect to the internet to activate Nearby.
Please turn on Bluetooth and WiFi to activate Nearby.
@@ -167,7 +167,7 @@
Scanning the airwaves for friends. Make sure your future friends are on this screen and using nearby too!
Nearby connection was stopped.
Usernames are case sensitive and need a tag.
- Enter a DiscordTag#0000
+ Enter a Username#0000
Success! Your friend request to **%1$s** is being escorted by the most elite Discord samurai.
Add a Keybind
Keybinds are disabled while this panel is visible.
@@ -976,7 +976,8 @@ ONE MORE THING {fixed}
Message is at max length
%1$s characters remaining
Message is too long
- Character limit exceeded %1$d of %2$d
+ Characters entered %1$d of %2$d
+ Character limit exceeded %1$d of %2$d
%1$d / %2$d
Chat
Invite %1$s to Listen to %2$s
@@ -988,6 +989,7 @@ ONE MORE THING {fixed}
Chat Behavior
Chatters are members in your server who either send messages or speak in voice channels.
Checking For Updates
+ Chip text
Choose an application
Claim Account
Claim your account to keep all your servers and chats even after you close the browser.
@@ -998,6 +1000,7 @@ ONE MORE THING {fixed}
"Thanks! We've sent a confirmation link to **%1$s**. Please click the link to verify your account."
Clear attachments
Clear Role Permissions
+ Clear text
Clone Channel
A new channel will be created with the same permissions, user limit and bitrate as **%1$s**.
Close
@@ -1021,7 +1024,7 @@ ONE MORE THING {fixed}
Unable to sync cloud saves
OR
Collapse Category
- 649b9fd7-1c4d-41cb-91f6-65bb8d029ebf
+ a3fea09d-875e-447b-9ed4-01ee14e24f13
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -1065,9 +1068,9 @@ ONE MORE THING {fixed}
"Don't show me the warning again"
"We can't hear you!"
Check your phone!
- "You've got the key to log in on this computer. Please confirm that the avatar shown is you."
+ "If someone sent you this QR code, don't continue! This lets them login to your account."
Keep me signed in
- "It's me! Let me in."
+ Yes, log me in
Are you sure you want to block **%1$s**? Blocking this user will also remove them from your friends list.
Block %1$s?
Connect
@@ -1186,6 +1189,7 @@ ONE MORE THING {fixed}
Create a server
Create a new Server
Make a server, invite your friends, throw a party!
+ "%1$s's Server"
By creating a server, you will have access to **free** voice and text chat to use amongst your friends.
Your server is where your gaming group hangs out. Make one to start chatting with your friends for free.
"By creating a server, you agree to Discord's **[Community Guidelines](%1$s)**."
@@ -1460,6 +1464,7 @@ ONE MORE THING {fixed}
In order to verify your email address, you must first enter an email address.
Please enter your phone number. You will receive a text message with your verification code.
Enter a Phone Number
+ Error
"We've tracked the error and will get right on it."
Looks like the Activity Feed has crashed unexpectedly….
Reload
@@ -1485,6 +1490,7 @@ ONE MORE THING {fixed}
Recommended option for when you want that squeaky clean shine.
Scan media content from members without a role.
Recommended option for servers that use roles for trusted membership.
+ Show dropdown menu
com.google.android.material.transformation.FabTransformationScrimBehavior
com.google.android.material.transformation.FabTransformationSheetBehavior
Facebook
@@ -2523,6 +2529,11 @@ You've Boosted %1$s."
Hello. Beep. Boop. If you wanna invite friends to this server, click the server name in the top left and select %1$s. Beep!
Croatian
Hungarian
+ a few seconds
+ %1$s
+ %1$s
+ %1$s
+ %1$s
Interested in repping the HypeSquad at your local gaming event or are you coordinating a gaming event of your own? [Apply here!](%1$s)
HypeSquad Events
The universe needs people to lead the charge with confident optimism and tenacity. Without the brave, the HypeSquad would descend into chaos.
@@ -2645,6 +2656,7 @@ You've Boosted %1$s."
Before joining HypeSquad, we need to verify your email address.
Your House:
An error occurred loading %1$s
+ Dialog Icon
Image
Images
Attachment file type: %1$s
@@ -3130,25 +3142,60 @@ Want to know more about Discord?"
Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access.
Move To
User has been moved to the selected channel.
+ New notification
Remove %1$s
+ %1$d%2$s
+ Change to next month
+ Change to previous month
+ Current selection: %1$s
+ @android:string/cancel
+ @android:string/ok
+ %1$s
+ Select a Date
+ Selected date
+ Column of days: %1$s
+ Invalid format.
+ Example: %1$s
+ Use: %1$s
+ Invalid range.
+ Navigate to year %1$s
+ Out of range: %1$s
+ Start date – %1$s
+ %1$s – End date
+ %1$s – %2$s
+ Select a Date Range
+ Start date – End date
+ Save
+ Date
+ End date
+ Start date
+ d
+ m
+ y
+ Switch to calendar input mode
+ Tap to switch to selecting a day
+ Switch to text input mode
+ Tap to switch to selecting a year
Mute
Mute Category
Mute **%1$s**
+ Mute Channel
Mute Conversation
For 15 Minutes
For 1 Hour
For 24 Hours
For 8 Hours
Until I turn it back on
- Indefinitely
Mute **%1$s**
Mute Members
Muted until $[**%1$s**](endTimeHook)
+ Mute Server
Mute this category
Mute this channel
Mute this server
Mute this conversation
Mute duration
+ Muted until %1$s
Mutual Friends
Mutual Servers
%1$s
@@ -4012,7 +4059,7 @@ The changes to your subscription are reflected below:"
Something went wrong when trying to scan.
Rescan the QR code to continue the login process.
Invalid QR Code Found
- Almost there!
+ Are you trying to login on the computer?
Start chatting
Not me, start over
"You're in!"
@@ -4043,6 +4090,7 @@ The changes to your subscription are reflected below:"
Search for servers, channels or DMs
Select a result and press ENTER to jump to it
Unread Channels
+ Quote
submitted by %1$s
submitted via [facebook](%1$s)
submitted via [instagram](%1$s)
@@ -4657,6 +4705,7 @@ Server Insights is an experimental feature and is subject to change or removal i
%1$s just boosted the server **%2$s** times!
%1$s just boosted the server **%2$s** times! %3$s has achieved **%4$s**
%1$s is live! Now streaming %2$s. [Join Stream](onJoinStream)
+ %1$s is live. [Join Stream](https://discordapp.com)
%1$s is live. [Join Stream](onJoinStream)
%1$s is live in %2$s. [Join Stream](onJoinStream)
%1$s was live for %2$s in %3$s
@@ -4842,7 +4891,9 @@ You cannot take any moderation actions until you enable it."
Unmute
Unmute Category
Unmute **%1$s**
+ Unmute Channel
Unmute Conversation
+ Unmute Server
Unnamed
Unpin
Yeah, remove it please kthx.
diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml
index 16817e83cf..73f414d7f0 100644
--- a/com.discord/res/values/styles.xml
+++ b/com.discord/res/values/styles.xml
@@ -9,6 +9,10 @@
- @anim/design_bottom_sheet_slide_in
- @anim/design_bottom_sheet_slide_out
+
-
-
-
-
+
-
+
-
@@ -1033,6 +1029,28 @@
- @dimen/abc_dialog_padding_top_material
- ?dialogPreferredPadding
+
+
+
@@ -1109,6 +1127,39 @@
+
+
+
+
@@ -1173,6 +1224,7 @@
- @dimen/abc_dialog_min_width_major
- @dimen/abc_dialog_min_width_minor
+
+
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2884,6 +3353,11 @@
+
-
-
-
-
@@ -3048,19 +3510,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3068,8 +3565,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3118,6 +3747,14 @@
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -4182,14 +4786,20 @@
+
-
-
@@ -4425,41 +5046,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/xml/standalone_badge.xml b/com.discord/res/xml/standalone_badge.xml
new file mode 100644
index 0000000000..56fa974ed1
--- /dev/null
+++ b/com.discord/res/xml/standalone_badge.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/xml/standalone_badge_gravity_bottom_end.xml b/com.discord/res/xml/standalone_badge_gravity_bottom_end.xml
new file mode 100644
index 0000000000..088d0a8bac
--- /dev/null
+++ b/com.discord/res/xml/standalone_badge_gravity_bottom_end.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/xml/standalone_badge_gravity_bottom_start.xml b/com.discord/res/xml/standalone_badge_gravity_bottom_start.xml
new file mode 100644
index 0000000000..3662681d55
--- /dev/null
+++ b/com.discord/res/xml/standalone_badge_gravity_bottom_start.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/com.discord/res/xml/standalone_badge_gravity_top_start.xml b/com.discord/res/xml/standalone_badge_gravity_top_start.xml
new file mode 100644
index 0000000000..374c49f680
--- /dev/null
+++ b/com.discord/res/xml/standalone_badge_gravity_top_start.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/com.discord/smali/androidx/activity/R$attr.smali b/com.discord/smali/androidx/activity/R$attr.smali
index ba871b95d2..fcaf0e461d 100644
--- a/com.discord/smali/androidx/activity/R$attr.smali
+++ b/com.discord/smali/androidx/activity/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$color.smali b/com.discord/smali/androidx/activity/R$color.smali
index c49694d1c8..ad7e54622b 100644
--- a/com.discord/smali/androidx/activity/R$color.smali
+++ b/com.discord/smali/androidx/activity/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$dimen.smali b/com.discord/smali/androidx/activity/R$dimen.smali
index 8bc22f53b4..6793df33b8 100644
--- a/com.discord/smali/androidx/activity/R$dimen.smali
+++ b/com.discord/smali/androidx/activity/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 67ffbf1534..73586cb9ad 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index 5ad7099996..af7b84934a 100644
--- a/com.discord/smali/androidx/activity/R$id.smali
+++ b/com.discord/smali/androidx/activity/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$integer.smali b/com.discord/smali/androidx/activity/R$integer.smali
index 9d1290b767..d6e2231c0e 100644
--- a/com.discord/smali/androidx/activity/R$integer.smali
+++ b/com.discord/smali/androidx/activity/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$layout.smali b/com.discord/smali/androidx/activity/R$layout.smali
index ee261397ca..84aa0af231 100644
--- a/com.discord/smali/androidx/activity/R$layout.smali
+++ b/com.discord/smali/androidx/activity/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index 804aaa0707..37626d085e 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$style.smali b/com.discord/smali/androidx/activity/R$style.smali
index d48b14d11a..36cfccded9 100644
--- a/com.discord/smali/androidx/activity/R$style.smali
+++ b/com.discord/smali/androidx/activity/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$styleable.smali b/com.discord/smali/androidx/activity/R$styleable.smali
index d7869ca64c..c4650913af 100644
--- a/com.discord/smali/androidx/activity/R$styleable.smali
+++ b/com.discord/smali/androidx/activity/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali
index b260fe879e..399ac7fdd0 100644
--- a/com.discord/smali/androidx/appcompat/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/R$attr.smali
@@ -79,497 +79,497 @@
.field public static final actionProviderClass:I = 0x7f04001f
-.field public static final actionViewClass:I = 0x7f040020
+.field public static final actionViewClass:I = 0x7f040021
-.field public static final activityChooserViewStyle:I = 0x7f040025
+.field public static final activityChooserViewStyle:I = 0x7f040026
-.field public static final alertDialogButtonGroupStyle:I = 0x7f04002a
+.field public static final alertDialogButtonGroupStyle:I = 0x7f04002b
-.field public static final alertDialogCenterButtons:I = 0x7f04002b
+.field public static final alertDialogCenterButtons:I = 0x7f04002c
-.field public static final alertDialogStyle:I = 0x7f04002c
+.field public static final alertDialogStyle:I = 0x7f04002d
-.field public static final alertDialogTheme:I = 0x7f04002d
+.field public static final alertDialogTheme:I = 0x7f04002e
-.field public static final allowStacking:I = 0x7f040033
+.field public static final allowStacking:I = 0x7f040034
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final alphabeticModifiers:I = 0x7f040035
+.field public static final alphabeticModifiers:I = 0x7f040036
-.field public static final arrowHeadLength:I = 0x7f04003f
+.field public static final arrowHeadLength:I = 0x7f040042
-.field public static final arrowShaftLength:I = 0x7f040040
+.field public static final arrowShaftLength:I = 0x7f040043
-.field public static final autoCompleteTextViewStyle:I = 0x7f040047
+.field public static final autoCompleteTextViewStyle:I = 0x7f04004a
-.field public static final autoSizeMaxTextSize:I = 0x7f040048
+.field public static final autoSizeMaxTextSize:I = 0x7f04004b
-.field public static final autoSizeMinTextSize:I = 0x7f040049
+.field public static final autoSizeMinTextSize:I = 0x7f04004c
-.field public static final autoSizePresetSizes:I = 0x7f04004a
+.field public static final autoSizePresetSizes:I = 0x7f04004d
-.field public static final autoSizeStepGranularity:I = 0x7f04004b
+.field public static final autoSizeStepGranularity:I = 0x7f04004e
-.field public static final autoSizeTextType:I = 0x7f04004c
+.field public static final autoSizeTextType:I = 0x7f04004f
-.field public static final background:I = 0x7f04004e
+.field public static final background:I = 0x7f040051
-.field public static final backgroundSplit:I = 0x7f040050
+.field public static final backgroundSplit:I = 0x7f040059
-.field public static final backgroundStacked:I = 0x7f040051
+.field public static final backgroundStacked:I = 0x7f04005a
-.field public static final backgroundTint:I = 0x7f040052
+.field public static final backgroundTint:I = 0x7f04005b
-.field public static final backgroundTintMode:I = 0x7f040053
+.field public static final backgroundTintMode:I = 0x7f04005c
-.field public static final barLength:I = 0x7f040054
+.field public static final barLength:I = 0x7f040061
-.field public static final borderlessButtonStyle:I = 0x7f04006c
+.field public static final borderlessButtonStyle:I = 0x7f04007d
-.field public static final buttonBarButtonStyle:I = 0x7f04007b
+.field public static final buttonBarButtonStyle:I = 0x7f04008d
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f04007c
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f04008e
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f04007d
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f04008f
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f04007e
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040090
-.field public static final buttonBarStyle:I = 0x7f04007f
+.field public static final buttonBarStyle:I = 0x7f040091
-.field public static final buttonCompat:I = 0x7f040080
+.field public static final buttonCompat:I = 0x7f040092
-.field public static final buttonGravity:I = 0x7f040081
+.field public static final buttonGravity:I = 0x7f040093
-.field public static final buttonIconDimen:I = 0x7f040082
+.field public static final buttonIconDimen:I = 0x7f040094
-.field public static final buttonPanelSideLayout:I = 0x7f040083
+.field public static final buttonPanelSideLayout:I = 0x7f040095
-.field public static final buttonStyle:I = 0x7f040085
+.field public static final buttonStyle:I = 0x7f040097
-.field public static final buttonStyleSmall:I = 0x7f040086
+.field public static final buttonStyleSmall:I = 0x7f040098
-.field public static final buttonTint:I = 0x7f040087
+.field public static final buttonTint:I = 0x7f040099
-.field public static final buttonTintMode:I = 0x7f040088
+.field public static final buttonTintMode:I = 0x7f04009a
-.field public static final checkboxStyle:I = 0x7f04009d
+.field public static final checkboxStyle:I = 0x7f0400b0
-.field public static final checkedTextViewStyle:I = 0x7f0400a2
+.field public static final checkedTextViewStyle:I = 0x7f0400b7
-.field public static final closeIcon:I = 0x7f0400b6
+.field public static final closeIcon:I = 0x7f0400cd
-.field public static final closeItemLayout:I = 0x7f0400bd
+.field public static final closeItemLayout:I = 0x7f0400d4
-.field public static final collapseContentDescription:I = 0x7f0400be
+.field public static final collapseContentDescription:I = 0x7f0400d5
-.field public static final collapseIcon:I = 0x7f0400bf
+.field public static final collapseIcon:I = 0x7f0400d6
-.field public static final color:I = 0x7f0400c2
+.field public static final color:I = 0x7f0400d9
-.field public static final colorAccent:I = 0x7f0400c3
+.field public static final colorAccent:I = 0x7f0400da
-.field public static final colorBackgroundFloating:I = 0x7f0400c5
+.field public static final colorBackgroundFloating:I = 0x7f0400dc
-.field public static final colorButtonNormal:I = 0x7f0400ca
+.field public static final colorButtonNormal:I = 0x7f0400e1
-.field public static final colorControlActivated:I = 0x7f0400cb
+.field public static final colorControlActivated:I = 0x7f0400e3
-.field public static final colorControlHighlight:I = 0x7f0400cc
+.field public static final colorControlHighlight:I = 0x7f0400e4
-.field public static final colorControlNormal:I = 0x7f0400cd
+.field public static final colorControlNormal:I = 0x7f0400e5
-.field public static final colorError:I = 0x7f0400ce
+.field public static final colorError:I = 0x7f0400e6
-.field public static final colorPrimary:I = 0x7f0400d1
+.field public static final colorPrimary:I = 0x7f0400ef
-.field public static final colorPrimaryDark:I = 0x7f0400d4
+.field public static final colorPrimaryDark:I = 0x7f0400f2
-.field public static final colorSwitchThumbNormal:I = 0x7f0400d9
+.field public static final colorSwitchThumbNormal:I = 0x7f0400fb
-.field public static final commitIcon:I = 0x7f0400df
+.field public static final commitIcon:I = 0x7f040101
-.field public static final contentDescription:I = 0x7f0400e4
+.field public static final contentDescription:I = 0x7f040106
-.field public static final contentInsetEnd:I = 0x7f0400e5
+.field public static final contentInsetEnd:I = 0x7f040107
-.field public static final contentInsetEndWithActions:I = 0x7f0400e6
+.field public static final contentInsetEndWithActions:I = 0x7f040108
-.field public static final contentInsetLeft:I = 0x7f0400e7
+.field public static final contentInsetLeft:I = 0x7f040109
-.field public static final contentInsetRight:I = 0x7f0400e8
+.field public static final contentInsetRight:I = 0x7f04010a
-.field public static final contentInsetStart:I = 0x7f0400e9
+.field public static final contentInsetStart:I = 0x7f04010b
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400ea
+.field public static final contentInsetStartWithNavigation:I = 0x7f04010c
-.field public static final controlBackground:I = 0x7f0400f1
+.field public static final controlBackground:I = 0x7f040113
-.field public static final customNavigationLayout:I = 0x7f040106
+.field public static final customNavigationLayout:I = 0x7f040134
-.field public static final defaultQueryHint:I = 0x7f04011d
+.field public static final defaultQueryHint:I = 0x7f04014f
-.field public static final dialogCornerRadius:I = 0x7f040120
+.field public static final dialogCornerRadius:I = 0x7f040152
-.field public static final dialogPreferredPadding:I = 0x7f040125
+.field public static final dialogPreferredPadding:I = 0x7f040157
-.field public static final dialogTheme:I = 0x7f040126
+.field public static final dialogTheme:I = 0x7f040158
-.field public static final displayOptions:I = 0x7f040129
+.field public static final displayOptions:I = 0x7f04015b
-.field public static final divider:I = 0x7f04012a
+.field public static final divider:I = 0x7f04015c
-.field public static final dividerHorizontal:I = 0x7f04012e
+.field public static final dividerHorizontal:I = 0x7f040160
-.field public static final dividerPadding:I = 0x7f04012f
+.field public static final dividerPadding:I = 0x7f040161
-.field public static final dividerVertical:I = 0x7f040130
+.field public static final dividerVertical:I = 0x7f040162
-.field public static final drawableBottomCompat:I = 0x7f040131
+.field public static final drawableBottomCompat:I = 0x7f040163
-.field public static final drawableEndCompat:I = 0x7f040132
+.field public static final drawableEndCompat:I = 0x7f040164
-.field public static final drawableLeftCompat:I = 0x7f040133
+.field public static final drawableLeftCompat:I = 0x7f040165
-.field public static final drawableRightCompat:I = 0x7f040134
+.field public static final drawableRightCompat:I = 0x7f040166
-.field public static final drawableSize:I = 0x7f040135
+.field public static final drawableSize:I = 0x7f040167
-.field public static final drawableStartCompat:I = 0x7f040136
+.field public static final drawableStartCompat:I = 0x7f040168
-.field public static final drawableTint:I = 0x7f040137
+.field public static final drawableTint:I = 0x7f040169
-.field public static final drawableTintMode:I = 0x7f040138
+.field public static final drawableTintMode:I = 0x7f04016a
-.field public static final drawableTopCompat:I = 0x7f040139
+.field public static final drawableTopCompat:I = 0x7f04016b
-.field public static final drawerArrowStyle:I = 0x7f04013c
+.field public static final drawerArrowStyle:I = 0x7f04016e
-.field public static final dropDownListViewStyle:I = 0x7f04013e
+.field public static final dropDownListViewStyle:I = 0x7f040170
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04013f
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040171
-.field public static final editTextBackground:I = 0x7f040141
+.field public static final editTextBackground:I = 0x7f040173
-.field public static final editTextColor:I = 0x7f040142
+.field public static final editTextColor:I = 0x7f040174
-.field public static final editTextStyle:I = 0x7f040144
+.field public static final editTextStyle:I = 0x7f040176
-.field public static final elevation:I = 0x7f040145
+.field public static final elevation:I = 0x7f040177
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04014f
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04018e
-.field public static final firstBaselineToTopHeight:I = 0x7f040168
+.field public static final firstBaselineToTopHeight:I = 0x7f0401aa
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontFamily:I = 0x7f040175
+.field public static final fontFamily:I = 0x7f0401b7
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final gapBetweenBars:I = 0x7f040181
+.field public static final gapBetweenBars:I = 0x7f0401c3
-.field public static final goIcon:I = 0x7f040186
+.field public static final goIcon:I = 0x7f0401c8
-.field public static final height:I = 0x7f04018d
+.field public static final height:I = 0x7f0401cf
-.field public static final hideOnContentScroll:I = 0x7f040192
+.field public static final hideOnContentScroll:I = 0x7f0401d5
-.field public static final homeAsUpIndicator:I = 0x7f040199
+.field public static final homeAsUpIndicator:I = 0x7f0401dd
-.field public static final homeLayout:I = 0x7f04019a
+.field public static final homeLayout:I = 0x7f0401de
-.field public static final icon:I = 0x7f040216
+.field public static final icon:I = 0x7f04025a
-.field public static final iconTint:I = 0x7f04021d
+.field public static final iconTint:I = 0x7f040261
-.field public static final iconTintMode:I = 0x7f04021e
+.field public static final iconTintMode:I = 0x7f040262
-.field public static final iconifiedByDefault:I = 0x7f04021f
+.field public static final iconifiedByDefault:I = 0x7f040263
-.field public static final imageButtonStyle:I = 0x7f040222
+.field public static final imageButtonStyle:I = 0x7f040266
-.field public static final indeterminateProgressStyle:I = 0x7f04023c
+.field public static final indeterminateProgressStyle:I = 0x7f040280
-.field public static final initialActivityCount:I = 0x7f04023d
+.field public static final initialActivityCount:I = 0x7f040281
-.field public static final isLightTheme:I = 0x7f040240
+.field public static final isLightTheme:I = 0x7f040284
-.field public static final itemPadding:I = 0x7f040248
+.field public static final itemPadding:I = 0x7f04028f
-.field public static final lastBaselineToBottomHeight:I = 0x7f040254
+.field public static final lastBaselineToBottomHeight:I = 0x7f0402a5
-.field public static final layout:I = 0x7f040255
+.field public static final layout:I = 0x7f0402a6
-.field public static final lineHeight:I = 0x7f0402a2
+.field public static final lineHeight:I = 0x7f0402f5
-.field public static final listChoiceBackgroundIndicator:I = 0x7f0402a4
+.field public static final listChoiceBackgroundIndicator:I = 0x7f0402f7
-.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402a5
+.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402f8
-.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402a6
+.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402f9
-.field public static final listDividerAlertDialog:I = 0x7f0402a7
+.field public static final listDividerAlertDialog:I = 0x7f0402fa
-.field public static final listItemLayout:I = 0x7f0402a8
+.field public static final listItemLayout:I = 0x7f0402fb
-.field public static final listLayout:I = 0x7f0402a9
+.field public static final listLayout:I = 0x7f0402fc
-.field public static final listMenuViewStyle:I = 0x7f0402aa
+.field public static final listMenuViewStyle:I = 0x7f0402fd
-.field public static final listPopupWindowStyle:I = 0x7f0402ab
+.field public static final listPopupWindowStyle:I = 0x7f0402fe
-.field public static final listPreferredItemHeight:I = 0x7f0402ac
+.field public static final listPreferredItemHeight:I = 0x7f0402ff
-.field public static final listPreferredItemHeightLarge:I = 0x7f0402ad
+.field public static final listPreferredItemHeightLarge:I = 0x7f040300
-.field public static final listPreferredItemHeightSmall:I = 0x7f0402ae
+.field public static final listPreferredItemHeightSmall:I = 0x7f040301
-.field public static final listPreferredItemPaddingEnd:I = 0x7f0402af
+.field public static final listPreferredItemPaddingEnd:I = 0x7f040302
-.field public static final listPreferredItemPaddingLeft:I = 0x7f0402b0
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040303
-.field public static final listPreferredItemPaddingRight:I = 0x7f0402b1
+.field public static final listPreferredItemPaddingRight:I = 0x7f040304
-.field public static final listPreferredItemPaddingStart:I = 0x7f0402b2
+.field public static final listPreferredItemPaddingStart:I = 0x7f040305
-.field public static final logo:I = 0x7f0402b3
+.field public static final logo:I = 0x7f040306
-.field public static final logoDescription:I = 0x7f0402b4
+.field public static final logoDescription:I = 0x7f040307
-.field public static final maxButtonHeight:I = 0x7f0402c8
+.field public static final maxButtonHeight:I = 0x7f04032d
-.field public static final measureWithLargestChild:I = 0x7f0402ce
+.field public static final measureWithLargestChild:I = 0x7f040334
-.field public static final menu:I = 0x7f0402cf
+.field public static final menu:I = 0x7f040335
-.field public static final multiChoiceItemLayout:I = 0x7f0402d1
+.field public static final multiChoiceItemLayout:I = 0x7f040338
-.field public static final navigationContentDescription:I = 0x7f0402d2
+.field public static final navigationContentDescription:I = 0x7f040339
-.field public static final navigationIcon:I = 0x7f0402d3
+.field public static final navigationIcon:I = 0x7f04033a
-.field public static final navigationMode:I = 0x7f0402d4
+.field public static final navigationMode:I = 0x7f04033b
-.field public static final numericModifiers:I = 0x7f0402d9
+.field public static final numericModifiers:I = 0x7f040341
-.field public static final overlapAnchor:I = 0x7f0402dc
+.field public static final overlapAnchor:I = 0x7f040344
-.field public static final paddingBottomNoButtons:I = 0x7f0402e0
+.field public static final paddingBottomNoButtons:I = 0x7f040348
-.field public static final paddingEnd:I = 0x7f0402e1
+.field public static final paddingEnd:I = 0x7f040349
-.field public static final paddingStart:I = 0x7f0402e2
+.field public static final paddingStart:I = 0x7f04034a
-.field public static final paddingTopNoTitle:I = 0x7f0402e3
+.field public static final paddingTopNoTitle:I = 0x7f04034b
-.field public static final panelBackground:I = 0x7f0402e4
+.field public static final panelBackground:I = 0x7f04034c
-.field public static final panelMenuListTheme:I = 0x7f0402e5
+.field public static final panelMenuListTheme:I = 0x7f04034d
-.field public static final panelMenuListWidth:I = 0x7f0402e6
+.field public static final panelMenuListWidth:I = 0x7f04034e
-.field public static final popupMenuStyle:I = 0x7f0402ef
+.field public static final popupMenuStyle:I = 0x7f040358
-.field public static final popupTheme:I = 0x7f0402f0
+.field public static final popupTheme:I = 0x7f040359
-.field public static final popupWindowStyle:I = 0x7f0402f1
+.field public static final popupWindowStyle:I = 0x7f04035a
-.field public static final preserveIconSpacing:I = 0x7f0402fc
+.field public static final preserveIconSpacing:I = 0x7f040365
-.field public static final progressBarPadding:I = 0x7f040328
+.field public static final progressBarPadding:I = 0x7f040391
-.field public static final progressBarStyle:I = 0x7f040329
+.field public static final progressBarStyle:I = 0x7f040392
-.field public static final queryBackground:I = 0x7f04032c
+.field public static final queryBackground:I = 0x7f040395
-.field public static final queryHint:I = 0x7f04032d
+.field public static final queryHint:I = 0x7f040396
-.field public static final radioButtonStyle:I = 0x7f04032e
+.field public static final radioButtonStyle:I = 0x7f040397
-.field public static final ratingBarStyle:I = 0x7f040331
+.field public static final ratingBarStyle:I = 0x7f04039b
-.field public static final ratingBarStyleIndicator:I = 0x7f040332
+.field public static final ratingBarStyleIndicator:I = 0x7f04039c
-.field public static final ratingBarStyleSmall:I = 0x7f040333
+.field public static final ratingBarStyleSmall:I = 0x7f04039d
-.field public static final searchHintIcon:I = 0x7f04035a
+.field public static final searchHintIcon:I = 0x7f0403c4
-.field public static final searchIcon:I = 0x7f04035b
+.field public static final searchIcon:I = 0x7f0403c5
-.field public static final searchViewStyle:I = 0x7f04035c
+.field public static final searchViewStyle:I = 0x7f0403c6
-.field public static final seekBarStyle:I = 0x7f040360
+.field public static final seekBarStyle:I = 0x7f0403ca
-.field public static final selectableItemBackground:I = 0x7f040362
+.field public static final selectableItemBackground:I = 0x7f0403cc
-.field public static final selectableItemBackgroundBorderless:I = 0x7f040363
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0403cd
-.field public static final showAsAction:I = 0x7f040367
+.field public static final showAsAction:I = 0x7f0403d6
-.field public static final showDividers:I = 0x7f04036b
+.field public static final showDividers:I = 0x7f0403da
-.field public static final showText:I = 0x7f04036e
+.field public static final showText:I = 0x7f0403dd
-.field public static final showTitle:I = 0x7f04036f
+.field public static final showTitle:I = 0x7f0403de
-.field public static final singleChoiceItemLayout:I = 0x7f040370
+.field public static final singleChoiceItemLayout:I = 0x7f0403e0
-.field public static final spinBars:I = 0x7f040377
+.field public static final spinBars:I = 0x7f0403e7
-.field public static final spinnerDropDownItemStyle:I = 0x7f040378
+.field public static final spinnerDropDownItemStyle:I = 0x7f0403e8
-.field public static final spinnerStyle:I = 0x7f040379
+.field public static final spinnerStyle:I = 0x7f0403e9
-.field public static final splitTrack:I = 0x7f04037a
+.field public static final splitTrack:I = 0x7f0403ea
-.field public static final srcCompat:I = 0x7f04037c
+.field public static final srcCompat:I = 0x7f0403ec
-.field public static final state_above_anchor:I = 0x7f04037e
+.field public static final state_above_anchor:I = 0x7f0403f3
-.field public static final subMenuArrow:I = 0x7f04038a
+.field public static final subMenuArrow:I = 0x7f040400
-.field public static final submitBackground:I = 0x7f04038b
+.field public static final submitBackground:I = 0x7f040401
-.field public static final subtitle:I = 0x7f04038c
+.field public static final subtitle:I = 0x7f040402
-.field public static final subtitleTextAppearance:I = 0x7f04038d
+.field public static final subtitleTextAppearance:I = 0x7f040403
-.field public static final subtitleTextColor:I = 0x7f04038e
+.field public static final subtitleTextColor:I = 0x7f040404
-.field public static final subtitleTextStyle:I = 0x7f04038f
+.field public static final subtitleTextStyle:I = 0x7f040405
-.field public static final suggestionRowLayout:I = 0x7f040390
+.field public static final suggestionRowLayout:I = 0x7f040406
-.field public static final switchMinWidth:I = 0x7f040394
+.field public static final switchMinWidth:I = 0x7f04040a
-.field public static final switchPadding:I = 0x7f040395
+.field public static final switchPadding:I = 0x7f04040b
-.field public static final switchStyle:I = 0x7f040398
+.field public static final switchStyle:I = 0x7f04040e
-.field public static final switchTextAppearance:I = 0x7f040399
+.field public static final switchTextAppearance:I = 0x7f04040f
-.field public static final textAllCaps:I = 0x7f0403b9
+.field public static final textAllCaps:I = 0x7f04042f
-.field public static final textAppearanceLargePopupMenu:I = 0x7f0403c4
+.field public static final textAppearanceLargePopupMenu:I = 0x7f04043a
-.field public static final textAppearanceListItem:I = 0x7f0403c5
+.field public static final textAppearanceListItem:I = 0x7f04043c
-.field public static final textAppearanceListItemSecondary:I = 0x7f0403c6
+.field public static final textAppearanceListItemSecondary:I = 0x7f04043d
-.field public static final textAppearanceListItemSmall:I = 0x7f0403c7
+.field public static final textAppearanceListItemSmall:I = 0x7f04043e
-.field public static final textAppearancePopupMenuHeader:I = 0x7f0403c9
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040440
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0403ca
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040441
-.field public static final textAppearanceSearchResultTitle:I = 0x7f0403cb
+.field public static final textAppearanceSearchResultTitle:I = 0x7f040442
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f0403cc
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f040443
-.field public static final textColorAlertDialogListItem:I = 0x7f0403cf
+.field public static final textColorAlertDialogListItem:I = 0x7f040446
-.field public static final textColorSearchUrl:I = 0x7f0403d0
+.field public static final textColorSearchUrl:I = 0x7f040447
-.field public static final textLocale:I = 0x7f0403d3
+.field public static final textLocale:I = 0x7f04044a
-.field public static final theme:I = 0x7f0403d6
+.field public static final theme:I = 0x7f04044d
-.field public static final thickness:I = 0x7f040422
+.field public static final thickness:I = 0x7f04049a
-.field public static final thumbTextPadding:I = 0x7f040423
+.field public static final thumbTextPadding:I = 0x7f04049b
-.field public static final thumbTint:I = 0x7f040424
+.field public static final thumbTint:I = 0x7f04049c
-.field public static final thumbTintMode:I = 0x7f040425
+.field public static final thumbTintMode:I = 0x7f04049d
-.field public static final tickMark:I = 0x7f040426
+.field public static final tickMark:I = 0x7f04049e
-.field public static final tickMarkTint:I = 0x7f040427
+.field public static final tickMarkTint:I = 0x7f04049f
-.field public static final tickMarkTintMode:I = 0x7f040428
+.field public static final tickMarkTintMode:I = 0x7f0404a0
-.field public static final tint:I = 0x7f040429
+.field public static final tint:I = 0x7f0404a1
-.field public static final tintMode:I = 0x7f04042a
+.field public static final tintMode:I = 0x7f0404a2
-.field public static final title:I = 0x7f04042b
+.field public static final title:I = 0x7f0404a3
-.field public static final titleMargin:I = 0x7f04042d
+.field public static final titleMargin:I = 0x7f0404a5
-.field public static final titleMarginBottom:I = 0x7f04042e
+.field public static final titleMarginBottom:I = 0x7f0404a6
-.field public static final titleMarginEnd:I = 0x7f04042f
+.field public static final titleMarginEnd:I = 0x7f0404a7
-.field public static final titleMarginStart:I = 0x7f040430
+.field public static final titleMarginStart:I = 0x7f0404a8
-.field public static final titleMarginTop:I = 0x7f040431
+.field public static final titleMarginTop:I = 0x7f0404a9
-.field public static final titleMargins:I = 0x7f040432
+.field public static final titleMargins:I = 0x7f0404aa
-.field public static final titleTextAppearance:I = 0x7f040433
+.field public static final titleTextAppearance:I = 0x7f0404ab
-.field public static final titleTextColor:I = 0x7f040434
+.field public static final titleTextColor:I = 0x7f0404ac
-.field public static final titleTextStyle:I = 0x7f040435
+.field public static final titleTextStyle:I = 0x7f0404ad
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040438
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0404b0
-.field public static final toolbarStyle:I = 0x7f040439
+.field public static final toolbarStyle:I = 0x7f0404b1
-.field public static final tooltipForegroundColor:I = 0x7f04043a
+.field public static final tooltipForegroundColor:I = 0x7f0404b2
-.field public static final tooltipFrameBackground:I = 0x7f04043b
+.field public static final tooltipFrameBackground:I = 0x7f0404b3
-.field public static final tooltipText:I = 0x7f04043c
+.field public static final tooltipText:I = 0x7f0404b4
-.field public static final track:I = 0x7f04043d
+.field public static final track:I = 0x7f0404b5
-.field public static final trackTint:I = 0x7f04043e
+.field public static final trackTint:I = 0x7f0404b6
-.field public static final trackTintMode:I = 0x7f04043f
+.field public static final trackTintMode:I = 0x7f0404b7
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
-.field public static final viewInflaterClass:I = 0x7f04045d
+.field public static final viewInflaterClass:I = 0x7f0404d6
-.field public static final voiceIcon:I = 0x7f04045e
+.field public static final voiceIcon:I = 0x7f0404d7
-.field public static final windowActionBar:I = 0x7f040461
+.field public static final windowActionBar:I = 0x7f0404da
-.field public static final windowActionBarOverlay:I = 0x7f040462
+.field public static final windowActionBarOverlay:I = 0x7f0404db
-.field public static final windowActionModeOverlay:I = 0x7f040463
+.field public static final windowActionModeOverlay:I = 0x7f0404dc
-.field public static final windowFixedHeightMajor:I = 0x7f040464
+.field public static final windowFixedHeightMajor:I = 0x7f0404dd
-.field public static final windowFixedHeightMinor:I = 0x7f040465
+.field public static final windowFixedHeightMinor:I = 0x7f0404de
-.field public static final windowFixedWidthMajor:I = 0x7f040466
+.field public static final windowFixedWidthMajor:I = 0x7f0404df
-.field public static final windowFixedWidthMinor:I = 0x7f040467
+.field public static final windowFixedWidthMinor:I = 0x7f0404e0
-.field public static final windowMinWidthMajor:I = 0x7f040468
+.field public static final windowMinWidthMajor:I = 0x7f0404e1
-.field public static final windowMinWidthMinor:I = 0x7f040469
+.field public static final windowMinWidthMinor:I = 0x7f0404e2
-.field public static final windowNoTitle:I = 0x7f04046a
+.field public static final windowNoTitle:I = 0x7f0404e3
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$color.smali b/com.discord/smali/androidx/appcompat/R$color.smali
index 78b7defd48..b5dc26549f 100644
--- a/com.discord/smali/androidx/appcompat/R$color.smali
+++ b/com.discord/smali/androidx/appcompat/R$color.smali
@@ -91,97 +91,97 @@
.field public static final button_material_light:I = 0x7f060042
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060084
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006b
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060085
-.field public static final dim_foreground_material_dark:I = 0x7f06006c
+.field public static final dim_foreground_material_dark:I = 0x7f060086
-.field public static final dim_foreground_material_light:I = 0x7f06006d
+.field public static final dim_foreground_material_light:I = 0x7f060087
-.field public static final error_color_material_dark:I = 0x7f06006e
+.field public static final error_color_material_dark:I = 0x7f060088
-.field public static final error_color_material_light:I = 0x7f06006f
+.field public static final error_color_material_light:I = 0x7f060089
-.field public static final foreground_material_dark:I = 0x7f060074
+.field public static final foreground_material_dark:I = 0x7f06008e
-.field public static final foreground_material_light:I = 0x7f060075
+.field public static final foreground_material_light:I = 0x7f06008f
-.field public static final highlighted_text_material_dark:I = 0x7f060084
+.field public static final highlighted_text_material_dark:I = 0x7f06009e
-.field public static final highlighted_text_material_light:I = 0x7f060085
+.field public static final highlighted_text_material_light:I = 0x7f06009f
-.field public static final material_blue_grey_800:I = 0x7f06008c
+.field public static final material_blue_grey_800:I = 0x7f0600a6
-.field public static final material_blue_grey_900:I = 0x7f06008d
+.field public static final material_blue_grey_900:I = 0x7f0600a7
-.field public static final material_blue_grey_950:I = 0x7f06008e
+.field public static final material_blue_grey_950:I = 0x7f0600a8
-.field public static final material_deep_teal_200:I = 0x7f06008f
+.field public static final material_deep_teal_200:I = 0x7f0600a9
-.field public static final material_deep_teal_500:I = 0x7f060090
+.field public static final material_deep_teal_500:I = 0x7f0600aa
-.field public static final material_grey_100:I = 0x7f060091
+.field public static final material_grey_100:I = 0x7f0600ab
-.field public static final material_grey_300:I = 0x7f060092
+.field public static final material_grey_300:I = 0x7f0600ac
-.field public static final material_grey_50:I = 0x7f060093
+.field public static final material_grey_50:I = 0x7f0600ad
-.field public static final material_grey_600:I = 0x7f060094
+.field public static final material_grey_600:I = 0x7f0600ae
-.field public static final material_grey_800:I = 0x7f060095
+.field public static final material_grey_800:I = 0x7f0600af
-.field public static final material_grey_850:I = 0x7f060096
+.field public static final material_grey_850:I = 0x7f0600b0
-.field public static final material_grey_900:I = 0x7f060097
+.field public static final material_grey_900:I = 0x7f0600b1
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final primary_dark_material_dark:I = 0x7f0600dd
+.field public static final primary_dark_material_dark:I = 0x7f06011c
-.field public static final primary_dark_material_light:I = 0x7f0600de
+.field public static final primary_dark_material_light:I = 0x7f06011d
-.field public static final primary_material_dark:I = 0x7f0600ef
+.field public static final primary_material_dark:I = 0x7f06012f
-.field public static final primary_material_light:I = 0x7f0600f0
+.field public static final primary_material_light:I = 0x7f060130
-.field public static final primary_text_default_material_dark:I = 0x7f0600f1
+.field public static final primary_text_default_material_dark:I = 0x7f060131
-.field public static final primary_text_default_material_light:I = 0x7f0600f2
+.field public static final primary_text_default_material_light:I = 0x7f060132
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f3
+.field public static final primary_text_disabled_material_dark:I = 0x7f060133
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f4
+.field public static final primary_text_disabled_material_light:I = 0x7f060134
-.field public static final ripple_material_dark:I = 0x7f0600fd
+.field public static final ripple_material_dark:I = 0x7f06013d
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_dark:I = 0x7f0600ff
+.field public static final secondary_text_default_material_dark:I = 0x7f06013f
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
-.field public static final secondary_text_disabled_material_dark:I = 0x7f060101
+.field public static final secondary_text_disabled_material_dark:I = 0x7f060141
-.field public static final secondary_text_disabled_material_light:I = 0x7f060102
+.field public static final secondary_text_disabled_material_light:I = 0x7f060142
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f060133
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f060174
-.field public static final switch_thumb_disabled_material_light:I = 0x7f060134
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060175
-.field public static final switch_thumb_material_dark:I = 0x7f060135
+.field public static final switch_thumb_material_dark:I = 0x7f060176
-.field public static final switch_thumb_material_light:I = 0x7f060136
+.field public static final switch_thumb_material_light:I = 0x7f060177
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060137
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060178
-.field public static final switch_thumb_normal_material_light:I = 0x7f060138
+.field public static final switch_thumb_normal_material_light:I = 0x7f060179
-.field public static final tooltip_background_dark:I = 0x7f06013a
+.field public static final tooltip_background_dark:I = 0x7f06017d
-.field public static final tooltip_background_light:I = 0x7f06013b
+.field public static final tooltip_background_light:I = 0x7f06017e
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$dimen.smali b/com.discord/smali/androidx/appcompat/R$dimen.smali
index 7215a9609f..464f7d65da 100644
--- a/com.discord/smali/androidx/appcompat/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/R$dimen.smali
@@ -171,83 +171,83 @@
.field public static final abc_text_size_title_material_toolbar:I = 0x7f07004d
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b6
+.field public static final disabled_alpha_material_dark:I = 0x7f0700bb
-.field public static final disabled_alpha_material_light:I = 0x7f0700b7
+.field public static final disabled_alpha_material_light:I = 0x7f0700bc
-.field public static final highlight_alpha_material_colored:I = 0x7f0700cc
+.field public static final highlight_alpha_material_colored:I = 0x7f0700d1
-.field public static final highlight_alpha_material_dark:I = 0x7f0700cd
+.field public static final highlight_alpha_material_dark:I = 0x7f0700d2
-.field public static final highlight_alpha_material_light:I = 0x7f0700ce
+.field public static final highlight_alpha_material_light:I = 0x7f0700d3
-.field public static final hint_alpha_material_dark:I = 0x7f0700cf
+.field public static final hint_alpha_material_dark:I = 0x7f0700d4
-.field public static final hint_alpha_material_light:I = 0x7f0700d0
+.field public static final hint_alpha_material_light:I = 0x7f0700d5
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d1
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d6
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d2
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d7
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
-.field public static final tooltip_corner_radius:I = 0x7f070139
+.field public static final tooltip_corner_radius:I = 0x7f0701a5
-.field public static final tooltip_horizontal_padding:I = 0x7f07013a
+.field public static final tooltip_horizontal_padding:I = 0x7f0701a6
-.field public static final tooltip_margin:I = 0x7f07013b
+.field public static final tooltip_margin:I = 0x7f0701a7
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07013c
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f0701a8
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07013d
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a9
-.field public static final tooltip_vertical_padding:I = 0x7f07013e
+.field public static final tooltip_vertical_padding:I = 0x7f0701aa
-.field public static final tooltip_y_offset_non_touch:I = 0x7f07013f
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701ab
-.field public static final tooltip_y_offset_touch:I = 0x7f070140
+.field public static final tooltip_y_offset_touch:I = 0x7f0701ac
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index f96e48097f..31eb89e7c8 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -203,33 +203,33 @@
.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800aa
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
-.field public static final tooltip_frame_dark:I = 0x7f0804c7
+.field public static final tooltip_frame_dark:I = 0x7f0804c2
-.field public static final tooltip_frame_light:I = 0x7f0804c8
+.field public static final tooltip_frame_light:I = 0x7f0804c3
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index db830201d5..2d3a7d5881 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -15,289 +15,289 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_bar:I = 0x7f0a002e
+.field public static final action_bar:I = 0x7f0a0032
-.field public static final action_bar_activity_content:I = 0x7f0a002f
+.field public static final action_bar_activity_content:I = 0x7f0a0033
-.field public static final action_bar_container:I = 0x7f0a0030
+.field public static final action_bar_container:I = 0x7f0a0034
-.field public static final action_bar_root:I = 0x7f0a0031
+.field public static final action_bar_root:I = 0x7f0a0035
-.field public static final action_bar_spinner:I = 0x7f0a0032
+.field public static final action_bar_spinner:I = 0x7f0a0036
-.field public static final action_bar_subtitle:I = 0x7f0a0033
+.field public static final action_bar_subtitle:I = 0x7f0a0037
-.field public static final action_bar_title:I = 0x7f0a0035
+.field public static final action_bar_title:I = 0x7f0a0039
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_context_bar:I = 0x7f0a003a
+.field public static final action_context_bar:I = 0x7f0a003e
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_menu_divider:I = 0x7f0a003d
+.field public static final action_menu_divider:I = 0x7f0a0041
-.field public static final action_menu_presenter:I = 0x7f0a003e
+.field public static final action_menu_presenter:I = 0x7f0a0042
-.field public static final action_mode_bar:I = 0x7f0a003f
+.field public static final action_mode_bar:I = 0x7f0a0043
-.field public static final action_mode_bar_stub:I = 0x7f0a0040
+.field public static final action_mode_bar_stub:I = 0x7f0a0044
-.field public static final action_mode_close_button:I = 0x7f0a0041
+.field public static final action_mode_close_button:I = 0x7f0a0045
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final activity_chooser_view_content:I = 0x7f0a0051
+.field public static final activity_chooser_view_content:I = 0x7f0a0055
-.field public static final add:I = 0x7f0a0052
+.field public static final add:I = 0x7f0a0056
-.field public static final alertTitle:I = 0x7f0a0061
+.field public static final alertTitle:I = 0x7f0a0065
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final buttonPanel:I = 0x7f0a0107
+.field public static final buttonPanel:I = 0x7f0a010b
-.field public static final checkbox:I = 0x7f0a021a
+.field public static final checkbox:I = 0x7f0a021f
-.field public static final checked:I = 0x7f0a021c
+.field public static final checked:I = 0x7f0a0221
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final content:I = 0x7f0a023d
+.field public static final content:I = 0x7f0a0246
-.field public static final contentPanel:I = 0x7f0a023e
+.field public static final contentPanel:I = 0x7f0a0247
-.field public static final custom:I = 0x7f0a025b
+.field public static final custom:I = 0x7f0a0264
-.field public static final customPanel:I = 0x7f0a025c
+.field public static final customPanel:I = 0x7f0a0265
-.field public static final decor_content_parent:I = 0x7f0a0260
+.field public static final decor_content_parent:I = 0x7f0a026b
-.field public static final default_activity_button:I = 0x7f0a0261
+.field public static final default_activity_button:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final edit_query:I = 0x7f0a02b8
+.field public static final edit_query:I = 0x7f0a02c4
-.field public static final expand_activities_button:I = 0x7f0a02d7
+.field public static final expand_activities_button:I = 0x7f0a02e3
-.field public static final expanded_menu:I = 0x7f0a02d8
+.field public static final expanded_menu:I = 0x7f0a02e4
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final group_divider:I = 0x7f0a033d
+.field public static final group_divider:I = 0x7f0a034d
-.field public static final home:I = 0x7f0a03b2
+.field public static final home:I = 0x7f0a03c3
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final image:I = 0x7f0a03b9
+.field public static final image:I = 0x7f0a03ca
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final listMode:I = 0x7f0a0443
+.field public static final listMode:I = 0x7f0a0454
-.field public static final list_item:I = 0x7f0a0444
+.field public static final list_item:I = 0x7f0a0455
-.field public static final message:I = 0x7f0a04a9
+.field public static final message:I = 0x7f0a04ba
-.field public static final multiply:I = 0x7f0a04b1
+.field public static final multiply:I = 0x7f0a04da
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final off:I = 0x7f0a04fd
+.field public static final off:I = 0x7f0a0527
-.field public static final on:I = 0x7f0a04ff
+.field public static final on:I = 0x7f0a0529
-.field public static final parentPanel:I = 0x7f0a0511
+.field public static final parentPanel:I = 0x7f0a053b
-.field public static final progress_circular:I = 0x7f0a05a4
+.field public static final progress_circular:I = 0x7f0a05d0
-.field public static final progress_horizontal:I = 0x7f0a05a7
+.field public static final progress_horizontal:I = 0x7f0a05d3
-.field public static final radio:I = 0x7f0a05b6
+.field public static final radio:I = 0x7f0a05e2
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final screen:I = 0x7f0a0610
+.field public static final screen:I = 0x7f0a063d
-.field public static final scrollIndicatorDown:I = 0x7f0a0612
+.field public static final scrollIndicatorDown:I = 0x7f0a063f
-.field public static final scrollIndicatorUp:I = 0x7f0a0613
+.field public static final scrollIndicatorUp:I = 0x7f0a0640
-.field public static final scrollView:I = 0x7f0a0614
+.field public static final scrollView:I = 0x7f0a0641
-.field public static final search_badge:I = 0x7f0a0618
+.field public static final search_badge:I = 0x7f0a0645
-.field public static final search_bar:I = 0x7f0a0619
+.field public static final search_bar:I = 0x7f0a0646
-.field public static final search_button:I = 0x7f0a061a
+.field public static final search_button:I = 0x7f0a0647
-.field public static final search_close_btn:I = 0x7f0a061c
+.field public static final search_close_btn:I = 0x7f0a0649
-.field public static final search_edit_frame:I = 0x7f0a061d
+.field public static final search_edit_frame:I = 0x7f0a064a
-.field public static final search_go_btn:I = 0x7f0a0620
+.field public static final search_go_btn:I = 0x7f0a064d
-.field public static final search_mag_icon:I = 0x7f0a0622
+.field public static final search_mag_icon:I = 0x7f0a064f
-.field public static final search_plate:I = 0x7f0a0623
+.field public static final search_plate:I = 0x7f0a0650
-.field public static final search_src_text:I = 0x7f0a0626
+.field public static final search_src_text:I = 0x7f0a0653
-.field public static final search_voice_btn:I = 0x7f0a0632
+.field public static final search_voice_btn:I = 0x7f0a065f
-.field public static final select_dialog_listview:I = 0x7f0a0635
+.field public static final select_dialog_listview:I = 0x7f0a0662
-.field public static final shortcut:I = 0x7f0a077f
+.field public static final shortcut:I = 0x7f0a07ac
-.field public static final spacer:I = 0x7f0a078c
+.field public static final spacer:I = 0x7f0a07bb
-.field public static final split_action_bar:I = 0x7f0a0796
+.field public static final split_action_bar:I = 0x7f0a07c5
-.field public static final src_atop:I = 0x7f0a0799
+.field public static final src_atop:I = 0x7f0a07c8
-.field public static final src_in:I = 0x7f0a079a
+.field public static final src_in:I = 0x7f0a07c9
-.field public static final src_over:I = 0x7f0a079b
+.field public static final src_over:I = 0x7f0a07ca
-.field public static final submenuarrow:I = 0x7f0a07b9
+.field public static final submenuarrow:I = 0x7f0a07e8
-.field public static final submit_area:I = 0x7f0a07ba
+.field public static final submit_area:I = 0x7f0a07e9
-.field public static final tabMode:I = 0x7f0a07c6
+.field public static final tabMode:I = 0x7f0a07f5
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final textSpacerNoButtons:I = 0x7f0a07d6
+.field public static final textSpacerNoButtons:I = 0x7f0a0808
-.field public static final textSpacerNoTitle:I = 0x7f0a07d7
+.field public static final textSpacerNoTitle:I = 0x7f0a0809
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final titleDividerNoCustom:I = 0x7f0a07e4
+.field public static final titleDividerNoCustom:I = 0x7f0a0817
-.field public static final title_template:I = 0x7f0a07e5
+.field public static final title_template:I = 0x7f0a0818
-.field public static final topPanel:I = 0x7f0a07eb
+.field public static final topPanel:I = 0x7f0a081e
-.field public static final unchecked:I = 0x7f0a07fc
+.field public static final unchecked:I = 0x7f0a082f
-.field public static final uniform:I = 0x7f0a07ff
+.field public static final uniform:I = 0x7f0a0832
-.field public static final up:I = 0x7f0a0802
+.field public static final up:I = 0x7f0a0835
-.field public static final wrap_content:I = 0x7f0a08e2
+.field public static final wrap_content:I = 0x7f0a0916
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$integer.smali b/com.discord/smali/androidx/appcompat/R$integer.smali
index c53a61a261..b752354025 100644
--- a/com.discord/smali/androidx/appcompat/R$integer.smali
+++ b/com.discord/smali/androidx/appcompat/R$integer.smali
@@ -23,7 +23,7 @@
.field public static final config_tooltipAnimTime:I = 0x7f0b0006
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$layout.smali b/com.discord/smali/androidx/appcompat/R$layout.smali
index b924d1dc58..cec10db4c3 100644
--- a/com.discord/smali/androidx/appcompat/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/R$layout.smali
@@ -73,25 +73,25 @@
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
-.field public static final select_dialog_item_material:I = 0x7f0d007b
+.field public static final select_dialog_item_material:I = 0x7f0d0096
-.field public static final select_dialog_multichoice_material:I = 0x7f0d007c
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0097
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d007d
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0098
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0085
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a0
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index b95c7d4d71..bc92bdcf7f 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -69,9 +69,9 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final search_menu_title:I = 0x7f12109f
+.field public static final search_menu_title:I = 0x7f1210cf
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$style.smali b/com.discord/smali/androidx/appcompat/R$style.smali
index af35176ef0..a42d2f43cc 100644
--- a/com.discord/smali/androidx/appcompat/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/R$style.smali
@@ -39,679 +39,679 @@
.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130043
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130044
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130045
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130046
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130047
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130048
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130049
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f13004a
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f13004b
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f13004c
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004d
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004e
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004f
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130050
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130051
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f130052
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130053
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130054
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130055
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130056
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130057
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130058
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130059
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f13005a
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13005b
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f13005c
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005d
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005e
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005f
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130060
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130061
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130062
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130063
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130064
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130065
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130066
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130067
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130068
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130069
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13006a
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13006b
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13006c
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006d
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006e
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006f
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130074
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130075
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130076
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f130098
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130099
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f13009a
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f13009b
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f13009c
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13009d
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f13009e
-.field public static final Base_Theme_AppCompat:I = 0x7f130070
+.field public static final Base_Theme_AppCompat:I = 0x7f130077
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130078
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130079
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f13007d
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f13007a
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f13007b
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f13007c
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f13007e
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f13007f
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130080
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130084
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130081
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f130082
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130083
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300ae
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300af
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300b0
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300b3
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300b4
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300b5
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300b6
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300b7
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300b8
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300b9
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ba
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300bb
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300c0
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300bc
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300bd
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300be
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300bf
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300c2
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300c3
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300c4
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300c5
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300c6
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300c7
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300c8
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300c9
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300ca
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300cb
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300cc
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300cd
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300ce
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300cf
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300d5
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300d6
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300d0
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300d1
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300d2
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300d3
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300d4
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300d7
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300d8
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300d9
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300da
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300db
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300dc
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300dd
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300de
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300df
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300e0
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300e1
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300e2
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300e3
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300e4
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300e5
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300e6
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300e7
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300e8
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300e9
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300ea
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300eb
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300ec
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300ed
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300ee
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300ef
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300f0
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300f1
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300f2
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300f3
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300f4
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300f5
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300f6
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300f7
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300f8
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300f9
-.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300fa
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300fb
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ef
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300fc
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300f0
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300fd
-.field public static final Platform_AppCompat:I = 0x7f13013f
+.field public static final Platform_AppCompat:I = 0x7f13015e
-.field public static final Platform_AppCompat_Light:I = 0x7f130140
+.field public static final Platform_AppCompat_Light:I = 0x7f13015f
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130145
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130164
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130146
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130165
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130147
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130166
-.field public static final Platform_V21_AppCompat:I = 0x7f130148
+.field public static final Platform_V21_AppCompat:I = 0x7f130167
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f130149
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f130168
-.field public static final Platform_V25_AppCompat:I = 0x7f13014a
+.field public static final Platform_V25_AppCompat:I = 0x7f130169
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13014b
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13016a
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13014c
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13016b
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13016c
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13018b
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13016d
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13018c
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13016e
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13018d
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13016f
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13018e
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130170
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f13018f
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130171
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130190
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130172
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130191
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130173
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130192
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130174
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130193
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13017a
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f130199
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130175
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130194
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130176
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130195
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130177
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130196
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130178
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130197
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130179
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130198
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13017b
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13019a
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13017c
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13019b
-.field public static final TextAppearance_AppCompat:I = 0x7f130180
+.field public static final TextAppearance_AppCompat:I = 0x7f1301be
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f1301bf
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130182
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f1301c0
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130183
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f1301c1
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130184
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f1301c2
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130185
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f1301c3
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130186
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f1301c4
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130187
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f1301c5
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f130188
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f1301c6
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f130189
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f1301c7
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13018a
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f1301c8
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13018b
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f1301c9
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13018c
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f1301ca
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13018d
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f1301cb
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f13018e
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f1301cc
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13018f
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f1301cd
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130190
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f1301ce
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130191
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f1301cf
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130192
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f1301d0
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130193
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f1301d1
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130194
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f1301d2
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130195
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f1301d3
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130196
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f1301d4
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130197
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f1301d5
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f130198
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f1301d6
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130199
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f1301d7
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13019a
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f1301d8
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13019b
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f1301d9
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13019c
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f1301da
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13019d
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f1301db
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13019e
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f1301dc
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13019f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f1301dd
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301a0
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301de
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301a1
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301df
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301a2
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301e0
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301a3
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301e1
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301a4
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301e2
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301a5
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301e3
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301a6
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301e4
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301a7
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301e5
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301a8
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301e6
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301a9
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301e7
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301aa
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301e8
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301ab
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301e9
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ac
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ea
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301ad
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301eb
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ae
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ec
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301af
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301ed
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301d2
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130210
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301d3
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130211
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301d4
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130212
-.field public static final ThemeOverlay_AppCompat:I = 0x7f130205
+.field public static final ThemeOverlay_AppCompat:I = 0x7f13025f
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130206
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130260
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130207
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130261
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130208
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130262
-.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130209
+.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130263
-.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f13020a
+.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f130264
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f13020b
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f130265
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13020c
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130266
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f13020d
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f130267
-.field public static final Theme_AppCompat:I = 0x7f1301d5
+.field public static final Theme_AppCompat:I = 0x7f130213
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301d6
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f130214
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301d7
+.field public static final Theme_AppCompat_DayNight:I = 0x7f130215
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301d8
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f130216
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301d9
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f130217
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301dc
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f13021a
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301da
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f130218
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301db
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f130219
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301dd
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f13021b
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301de
+.field public static final Theme_AppCompat_Dialog:I = 0x7f13021c
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301e1
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f13021f
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301df
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f13021d
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301e0
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f13021e
-.field public static final Theme_AppCompat_Light:I = 0x7f1301e2
+.field public static final Theme_AppCompat_Light:I = 0x7f130220
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301e3
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f130221
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301e4
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f130222
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301e7
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130225
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301e5
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130223
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301e6
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130224
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301e8
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f130226
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301e9
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f130227
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130352
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302eb
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130353
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ec
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130354
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302ed
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f130355
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302ee
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f130356
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302ef
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f130357
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302f0
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f130358
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302f1
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f130359
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302f2
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13035a
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302f3
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f13035b
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302f4
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f13035c
-.field public static final Widget_AppCompat_Button:I = 0x7f1302f5
+.field public static final Widget_AppCompat_Button:I = 0x7f13035d
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302fb
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f130363
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302fc
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f130364
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302f6
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f13035e
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302f7
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f13035f
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302f8
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f130360
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302f9
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f130361
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302fa
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f130362
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302fd
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f130365
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302fe
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f130366
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302ff
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f130367
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130300
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130368
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130301
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130369
-.field public static final Widget_AppCompat_EditText:I = 0x7f130302
+.field public static final Widget_AppCompat_EditText:I = 0x7f13036a
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f130303
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f13036b
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f130304
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f13036c
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f130305
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f13036d
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f130306
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f13036e
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f130307
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f13036f
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130308
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130370
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130309
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130371
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f13030a
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f130372
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f13030b
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f130373
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f13030c
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f130374
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f13030d
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f130375
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f13030e
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f130376
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f13030f
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f130377
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130310
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130378
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130311
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130379
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f130312
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f13037a
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f130313
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f13037b
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f130314
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f13037c
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f130315
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f13037d
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f130316
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f13037e
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f130317
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f13037f
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130318
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130380
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130319
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130381
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f13031a
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f130382
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f13031b
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f130383
-.field public static final Widget_AppCompat_ListView:I = 0x7f13031c
+.field public static final Widget_AppCompat_ListView:I = 0x7f130384
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f13031d
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f130385
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f13031e
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f130386
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f13031f
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f130387
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130320
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130388
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130321
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130389
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f130322
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f13038a
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f130323
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f13038b
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f130324
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f13038c
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f130325
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f13038d
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f130326
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f13038e
-.field public static final Widget_AppCompat_SearchView:I = 0x7f130327
+.field public static final Widget_AppCompat_SearchView:I = 0x7f13038f
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130328
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130390
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f130329
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f130391
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f13032a
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f130392
-.field public static final Widget_AppCompat_Spinner:I = 0x7f13032b
+.field public static final Widget_AppCompat_Spinner:I = 0x7f130393
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f13032c
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f130394
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f13032d
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f130395
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f13032e
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f130396
-.field public static final Widget_AppCompat_TextView:I = 0x7f13032f
+.field public static final Widget_AppCompat_TextView:I = 0x7f130397
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130330
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130398
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f130331
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f130399
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f130332
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f13039a
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali
index c4a4033dc4..c4cd6f92ef 100644
--- a/com.discord/smali/androidx/appcompat/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/R$styleable.smali
@@ -1068,7 +1068,7 @@
new-array v6, v0, [I
- const v7, 0x7f040033
+ const v7, 0x7f040034
aput v7, v6, v2
@@ -1170,7 +1170,7 @@
new-array v4, v0, [I
- const v5, 0x7f04037e
+ const v5, 0x7f0403f3
aput v5, v4, v2
@@ -1258,63 +1258,63 @@
:array_0
.array-data 4
- 0x7f04004e
- 0x7f040050
0x7f040051
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f040106
- 0x7f040129
- 0x7f04012a
- 0x7f040145
- 0x7f04018d
- 0x7f040192
- 0x7f040199
- 0x7f04019a
- 0x7f040216
- 0x7f04023c
- 0x7f040248
- 0x7f0402b3
- 0x7f0402d4
- 0x7f0402f0
- 0x7f040328
- 0x7f040329
- 0x7f04038c
- 0x7f04038f
- 0x7f04042b
- 0x7f040435
+ 0x7f040059
+ 0x7f04005a
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040134
+ 0x7f04015b
+ 0x7f04015c
+ 0x7f040177
+ 0x7f0401cf
+ 0x7f0401d5
+ 0x7f0401dd
+ 0x7f0401de
+ 0x7f04025a
+ 0x7f040280
+ 0x7f04028f
+ 0x7f040306
+ 0x7f04033b
+ 0x7f040359
+ 0x7f040391
+ 0x7f040392
+ 0x7f040402
+ 0x7f040405
+ 0x7f0404a3
+ 0x7f0404ad
.end array-data
:array_1
.array-data 4
- 0x7f04004e
- 0x7f040050
- 0x7f0400bd
- 0x7f04018d
- 0x7f04038f
- 0x7f040435
+ 0x7f040051
+ 0x7f040059
+ 0x7f0400d4
+ 0x7f0401cf
+ 0x7f040405
+ 0x7f0404ad
.end array-data
:array_2
.array-data 4
- 0x7f04014f
- 0x7f04023d
+ 0x7f04018e
+ 0x7f040281
.end array-data
:array_3
.array-data 4
0x10100f2
- 0x7f040082
- 0x7f040083
- 0x7f0402a8
- 0x7f0402a9
- 0x7f0402d1
- 0x7f04036f
- 0x7f040370
+ 0x7f040094
+ 0x7f040095
+ 0x7f0402fb
+ 0x7f0402fc
+ 0x7f040338
+ 0x7f0403de
+ 0x7f0403e0
.end array-data
:array_4
@@ -1344,17 +1344,17 @@
:array_7
.array-data 4
0x1010119
- 0x7f04037c
- 0x7f040429
- 0x7f04042a
+ 0x7f0403ec
+ 0x7f0404a1
+ 0x7f0404a2
.end array-data
:array_8
.array-data 4
0x1010142
- 0x7f040426
- 0x7f040427
- 0x7f040428
+ 0x7f04049e
+ 0x7f04049f
+ 0x7f0404a0
.end array-data
:array_9
@@ -1371,26 +1371,26 @@
:array_a
.array-data 4
0x1010034
- 0x7f040048
- 0x7f040049
- 0x7f04004a
0x7f04004b
0x7f04004c
- 0x7f040131
- 0x7f040132
- 0x7f040133
- 0x7f040134
- 0x7f040136
- 0x7f040137
- 0x7f040138
- 0x7f040139
+ 0x7f04004d
+ 0x7f04004e
+ 0x7f04004f
+ 0x7f040163
+ 0x7f040164
+ 0x7f040165
+ 0x7f040166
0x7f040168
- 0x7f040175
- 0x7f04017d
- 0x7f040254
- 0x7f0402a2
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f040169
+ 0x7f04016a
+ 0x7f04016b
+ 0x7f0401aa
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f0402a5
+ 0x7f0402f5
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_b
@@ -1427,136 +1427,136 @@
0x7f04001c
0x7f04001d
0x7f04001e
- 0x7f040025
- 0x7f04002a
+ 0x7f040026
0x7f04002b
0x7f04002c
0x7f04002d
- 0x7f040047
- 0x7f04006c
- 0x7f04007b
- 0x7f04007c
+ 0x7f04002e
+ 0x7f04004a
0x7f04007d
- 0x7f04007e
- 0x7f04007f
- 0x7f040085
- 0x7f040086
- 0x7f04009d
- 0x7f0400a2
- 0x7f0400c3
- 0x7f0400c5
- 0x7f0400ca
- 0x7f0400cb
- 0x7f0400cc
- 0x7f0400cd
- 0x7f0400ce
- 0x7f0400d1
- 0x7f0400d4
- 0x7f0400d9
- 0x7f0400f1
- 0x7f040120
- 0x7f040125
- 0x7f040126
- 0x7f04012e
- 0x7f040130
- 0x7f04013e
- 0x7f04013f
- 0x7f040141
- 0x7f040142
- 0x7f040144
- 0x7f040199
- 0x7f040222
- 0x7f0402a4
- 0x7f0402a5
- 0x7f0402a6
- 0x7f0402a7
- 0x7f0402aa
- 0x7f0402ab
- 0x7f0402ac
- 0x7f0402ad
- 0x7f0402ae
- 0x7f0402af
- 0x7f0402b0
- 0x7f0402b1
- 0x7f0402b2
- 0x7f0402e4
- 0x7f0402e5
- 0x7f0402e6
- 0x7f0402ef
- 0x7f0402f1
- 0x7f04032e
- 0x7f040331
- 0x7f040332
- 0x7f040333
- 0x7f04035c
- 0x7f040360
- 0x7f040362
- 0x7f040363
- 0x7f040378
- 0x7f040379
- 0x7f040398
- 0x7f0403c4
- 0x7f0403c5
+ 0x7f04008d
+ 0x7f04008e
+ 0x7f04008f
+ 0x7f040090
+ 0x7f040091
+ 0x7f040097
+ 0x7f040098
+ 0x7f0400b0
+ 0x7f0400b7
+ 0x7f0400da
+ 0x7f0400dc
+ 0x7f0400e1
+ 0x7f0400e3
+ 0x7f0400e4
+ 0x7f0400e5
+ 0x7f0400e6
+ 0x7f0400ef
+ 0x7f0400f2
+ 0x7f0400fb
+ 0x7f040113
+ 0x7f040152
+ 0x7f040157
+ 0x7f040158
+ 0x7f040160
+ 0x7f040162
+ 0x7f040170
+ 0x7f040171
+ 0x7f040173
+ 0x7f040174
+ 0x7f040176
+ 0x7f0401dd
+ 0x7f040266
+ 0x7f0402f7
+ 0x7f0402f8
+ 0x7f0402f9
+ 0x7f0402fa
+ 0x7f0402fd
+ 0x7f0402fe
+ 0x7f0402ff
+ 0x7f040300
+ 0x7f040301
+ 0x7f040302
+ 0x7f040303
+ 0x7f040304
+ 0x7f040305
+ 0x7f04034c
+ 0x7f04034d
+ 0x7f04034e
+ 0x7f040358
+ 0x7f04035a
+ 0x7f040397
+ 0x7f04039b
+ 0x7f04039c
+ 0x7f04039d
0x7f0403c6
- 0x7f0403c7
- 0x7f0403c9
0x7f0403ca
- 0x7f0403cb
0x7f0403cc
- 0x7f0403cf
- 0x7f0403d0
- 0x7f040438
- 0x7f040439
+ 0x7f0403cd
+ 0x7f0403e8
+ 0x7f0403e9
+ 0x7f04040e
0x7f04043a
- 0x7f04043b
- 0x7f04045d
- 0x7f040461
- 0x7f040462
- 0x7f040463
- 0x7f040464
- 0x7f040465
- 0x7f040466
- 0x7f040467
- 0x7f040468
- 0x7f040469
- 0x7f04046a
+ 0x7f04043c
+ 0x7f04043d
+ 0x7f04043e
+ 0x7f040440
+ 0x7f040441
+ 0x7f040442
+ 0x7f040443
+ 0x7f040446
+ 0x7f040447
+ 0x7f0404b0
+ 0x7f0404b1
+ 0x7f0404b2
+ 0x7f0404b3
+ 0x7f0404d6
+ 0x7f0404da
+ 0x7f0404db
+ 0x7f0404dc
+ 0x7f0404dd
+ 0x7f0404de
+ 0x7f0404df
+ 0x7f0404e0
+ 0x7f0404e1
+ 0x7f0404e2
+ 0x7f0404e3
.end array-data
:array_c
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_d
.array-data 4
0x1010107
- 0x7f040080
- 0x7f040087
- 0x7f040088
+ 0x7f040092
+ 0x7f040099
+ 0x7f04009a
.end array-data
:array_e
.array-data 4
- 0x7f04003f
- 0x7f040040
- 0x7f040054
- 0x7f0400c2
- 0x7f040135
- 0x7f040181
- 0x7f040377
- 0x7f040422
+ 0x7f040042
+ 0x7f040043
+ 0x7f040061
+ 0x7f0400d9
+ 0x7f040167
+ 0x7f0401c3
+ 0x7f0403e7
+ 0x7f04049a
.end array-data
:array_f
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_10
@@ -1566,11 +1566,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_11
@@ -1602,10 +1602,10 @@
0x1010126
0x1010127
0x1010128
- 0x7f04012a
- 0x7f04012f
- 0x7f0402ce
- 0x7f04036b
+ 0x7f04015c
+ 0x7f040161
+ 0x7f040334
+ 0x7f0403da
.end array-data
:array_14
@@ -1649,14 +1649,14 @@
0x101026f
0x7f04000d
0x7f04001f
- 0x7f040020
- 0x7f040035
- 0x7f0400e4
- 0x7f04021d
- 0x7f04021e
- 0x7f0402d9
- 0x7f040367
- 0x7f04043c
+ 0x7f040021
+ 0x7f040036
+ 0x7f040106
+ 0x7f040261
+ 0x7f040262
+ 0x7f040341
+ 0x7f0403d6
+ 0x7f0404b4
.end array-data
:array_18
@@ -1668,21 +1668,21 @@
0x101012f
0x1010130
0x1010131
- 0x7f0402fc
- 0x7f04038a
+ 0x7f040365
+ 0x7f040400
.end array-data
:array_19
.array-data 4
0x1010176
0x10102c9
- 0x7f0402dc
+ 0x7f040344
.end array-data
:array_1a
.array-data 4
- 0x7f0402e0
- 0x7f0402e3
+ 0x7f040348
+ 0x7f04034b
.end array-data
:array_1b
@@ -1691,19 +1691,19 @@
0x101011f
0x1010220
0x1010264
- 0x7f0400b6
- 0x7f0400df
- 0x7f04011d
- 0x7f040186
- 0x7f04021f
- 0x7f040255
- 0x7f04032c
- 0x7f04032d
- 0x7f04035a
- 0x7f04035b
- 0x7f04038b
- 0x7f040390
- 0x7f04045e
+ 0x7f0400cd
+ 0x7f040101
+ 0x7f04014f
+ 0x7f0401c8
+ 0x7f040263
+ 0x7f0402a6
+ 0x7f040395
+ 0x7f040396
+ 0x7f0403c4
+ 0x7f0403c5
+ 0x7f040401
+ 0x7f040406
+ 0x7f0404d7
.end array-data
:array_1c
@@ -1712,7 +1712,7 @@
0x1010176
0x101017b
0x1010262
- 0x7f0402f0
+ 0x7f040359
.end array-data
:array_1d
@@ -1730,17 +1730,17 @@
0x1010124
0x1010125
0x1010142
- 0x7f04036e
- 0x7f04037a
- 0x7f040394
- 0x7f040395
- 0x7f040399
- 0x7f040423
- 0x7f040424
- 0x7f040425
- 0x7f04043d
- 0x7f04043e
- 0x7f04043f
+ 0x7f0403dd
+ 0x7f0403ea
+ 0x7f04040a
+ 0x7f04040b
+ 0x7f04040f
+ 0x7f04049b
+ 0x7f04049c
+ 0x7f04049d
+ 0x7f0404b5
+ 0x7f0404b6
+ 0x7f0404b7
.end array-data
:array_1f
@@ -1757,60 +1757,60 @@
0x1010164
0x10103ac
0x1010585
- 0x7f040175
- 0x7f04017d
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_20
.array-data 4
0x10100af
0x1010140
- 0x7f040081
- 0x7f0400be
- 0x7f0400bf
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f0402b3
- 0x7f0402b4
- 0x7f0402c8
- 0x7f0402cf
- 0x7f0402d2
- 0x7f0402d3
- 0x7f0402f0
- 0x7f04038c
- 0x7f04038d
- 0x7f04038e
- 0x7f04042b
- 0x7f04042d
- 0x7f04042e
- 0x7f04042f
- 0x7f040430
- 0x7f040431
- 0x7f040432
- 0x7f040433
- 0x7f040434
+ 0x7f040093
+ 0x7f0400d5
+ 0x7f0400d6
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040306
+ 0x7f040307
+ 0x7f04032d
+ 0x7f040335
+ 0x7f040339
+ 0x7f04033a
+ 0x7f040359
+ 0x7f040402
+ 0x7f040403
+ 0x7f040404
+ 0x7f0404a3
+ 0x7f0404a5
+ 0x7f0404a6
+ 0x7f0404a7
+ 0x7f0404a8
+ 0x7f0404a9
+ 0x7f0404aa
+ 0x7f0404ab
+ 0x7f0404ac
.end array-data
:array_21
.array-data 4
0x1010000
0x10100da
- 0x7f0402e1
- 0x7f0402e2
- 0x7f0403d6
+ 0x7f040349
+ 0x7f04034a
+ 0x7f04044d
.end array-data
:array_22
.array-data 4
0x10100d4
- 0x7f040052
- 0x7f040053
+ 0x7f04005b
+ 0x7f04005c
.end array-data
:array_23
diff --git a/com.discord/smali/androidx/appcompat/resources/R$attr.smali b/com.discord/smali/androidx/appcompat/resources/R$attr.smali
index 656a7de3ea..3e37aed9ea 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$attr.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$color.smali b/com.discord/smali/androidx/appcompat/resources/R$color.smali
index 6400e02bd6..d3d7e46af1 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$color.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$dimen.smali b/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
index 692bf8e558..051add68e8 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
index 3f90a70a2e..d1b76567f9 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
@@ -17,29 +17,29 @@
# static fields
.field public static final abc_vector_test:I = 0x7f08006f
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$id.smali b/com.discord/smali/androidx/appcompat/resources/R$id.smali
index fbac1039a1..0d7b5c2439 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$integer.smali b/com.discord/smali/androidx/appcompat/resources/R$integer.smali
index 72bca74e72..884e045691 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$integer.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$layout.smali b/com.discord/smali/androidx/appcompat/resources/R$layout.smali
index 058005467b..1f16cc1fe1 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$layout.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$string.smali b/com.discord/smali/androidx/appcompat/resources/R$string.smali
index f7998f96ab..6c52447fd3 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$style.smali b/com.discord/smali/androidx/appcompat/resources/R$style.smali
index b282b9c066..577f1c9c0a 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$style.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$styleable.smali b/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
index 86fe809fbf..e162e8d04d 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$styleable.smali
@@ -254,17 +254,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_4
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_5
@@ -274,11 +274,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_6
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
index 8abe890fa0..bbb5c887e4 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
index 89debbd315..8a1f48a2bd 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
index 90da0c2ed5..184ca4084c 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 82c8c1e825..fc0972e225 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 659dbb0af7..0f4f0686c7 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali b/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
index 067ad52c08..d688a6e3ce 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
index 8ec8eff85d..e635630012 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 3462fa01fa..477dc9c10c 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
index f4e53e38aa..33e3f9e5e9 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
index 2a7d0065b8..04a2a5eba8 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/browser/R$attr.smali b/com.discord/smali/androidx/browser/R$attr.smali
index f0936a6f42..910f4b27db 100644
--- a/com.discord/smali/androidx/browser/R$attr.smali
+++ b/com.discord/smali/androidx/browser/R$attr.smali
@@ -15,47 +15,47 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$color.smali b/com.discord/smali/androidx/browser/R$color.smali
index 6c7a518b67..04d65c086c 100644
--- a/com.discord/smali/androidx/browser/R$color.smali
+++ b/com.discord/smali/androidx/browser/R$color.smali
@@ -23,13 +23,13 @@
.field public static final browser_actions_title_color:I = 0x7f06003f
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$dimen.smali b/com.discord/smali/androidx/browser/R$dimen.smali
index 4a42d75eb7..46b5f3aab9 100644
--- a/com.discord/smali/androidx/browser/R$dimen.smali
+++ b/com.discord/smali/androidx/browser/R$dimen.smali
@@ -15,53 +15,53 @@
# static fields
-.field public static final browser_actions_context_menu_max_width:I = 0x7f070067
+.field public static final browser_actions_context_menu_max_width:I = 0x7f070069
-.field public static final browser_actions_context_menu_min_padding:I = 0x7f070068
+.field public static final browser_actions_context_menu_min_padding:I = 0x7f07006a
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index 19ab86bf91..53cd5e3c5a 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 0f1325ff13..fe612c2725 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -15,85 +15,85 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final browser_actions_header_text:I = 0x7f0a0102
+.field public static final browser_actions_header_text:I = 0x7f0a0106
-.field public static final browser_actions_menu_item_icon:I = 0x7f0a0103
+.field public static final browser_actions_menu_item_icon:I = 0x7f0a0107
-.field public static final browser_actions_menu_item_text:I = 0x7f0a0104
+.field public static final browser_actions_menu_item_text:I = 0x7f0a0108
-.field public static final browser_actions_menu_items:I = 0x7f0a0105
+.field public static final browser_actions_menu_items:I = 0x7f0a0109
-.field public static final browser_actions_menu_view:I = 0x7f0a0106
+.field public static final browser_actions_menu_view:I = 0x7f0a010a
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$integer.smali b/com.discord/smali/androidx/browser/R$integer.smali
index f7b8045253..27d65e459e 100644
--- a/com.discord/smali/androidx/browser/R$integer.smali
+++ b/com.discord/smali/androidx/browser/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$layout.smali b/com.discord/smali/androidx/browser/R$layout.smali
index d56136e253..c1ecda24e5 100644
--- a/com.discord/smali/androidx/browser/R$layout.smali
+++ b/com.discord/smali/androidx/browser/R$layout.smali
@@ -19,17 +19,17 @@
.field public static final browser_actions_context_menu_row:I = 0x7f0d001e
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index e2d3a0fce0..ba23dc6c3c 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$style.smali b/com.discord/smali/androidx/browser/R$style.smali
index 7855e0307b..a091dfc322 100644
--- a/com.discord/smali/androidx/browser/R$style.smali
+++ b/com.discord/smali/androidx/browser/R$style.smali
@@ -15,21 +15,21 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali
index cf6aa34c13..876708dfa8 100644
--- a/com.discord/smali/androidx/browser/R$styleable.smali
+++ b/com.discord/smali/androidx/browser/R$styleable.smali
@@ -178,34 +178,34 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_2
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_3
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_4
@@ -215,11 +215,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_5
diff --git a/com.discord/smali/androidx/cardview/R$attr.smali b/com.discord/smali/androidx/cardview/R$attr.smali
index 0d077cfd89..048961e2e1 100644
--- a/com.discord/smali/androidx/cardview/R$attr.smali
+++ b/com.discord/smali/androidx/cardview/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final cardBackgroundColor:I = 0x7f040091
+.field public static final cardBackgroundColor:I = 0x7f0400a3
-.field public static final cardCornerRadius:I = 0x7f040092
+.field public static final cardCornerRadius:I = 0x7f0400a4
-.field public static final cardElevation:I = 0x7f040093
+.field public static final cardElevation:I = 0x7f0400a5
-.field public static final cardMaxElevation:I = 0x7f040094
+.field public static final cardMaxElevation:I = 0x7f0400a7
-.field public static final cardPreventCornerOverlap:I = 0x7f040095
+.field public static final cardPreventCornerOverlap:I = 0x7f0400a8
-.field public static final cardUseCompatPadding:I = 0x7f040096
+.field public static final cardUseCompatPadding:I = 0x7f0400a9
-.field public static final cardViewStyle:I = 0x7f040097
+.field public static final cardViewStyle:I = 0x7f0400aa
-.field public static final contentPadding:I = 0x7f0400eb
+.field public static final contentPadding:I = 0x7f04010d
-.field public static final contentPaddingBottom:I = 0x7f0400ec
+.field public static final contentPaddingBottom:I = 0x7f04010e
-.field public static final contentPaddingLeft:I = 0x7f0400ed
+.field public static final contentPaddingLeft:I = 0x7f04010f
-.field public static final contentPaddingRight:I = 0x7f0400ee
+.field public static final contentPaddingRight:I = 0x7f040110
-.field public static final contentPaddingTop:I = 0x7f0400ef
+.field public static final contentPaddingTop:I = 0x7f040111
# direct methods
diff --git a/com.discord/smali/androidx/cardview/R$dimen.smali b/com.discord/smali/androidx/cardview/R$dimen.smali
index 3f7ac69c5e..f6d0e97438 100644
--- a/com.discord/smali/androidx/cardview/R$dimen.smali
+++ b/com.discord/smali/androidx/cardview/R$dimen.smali
@@ -15,11 +15,11 @@
# static fields
-.field public static final cardview_compat_inset_shadow:I = 0x7f07006c
+.field public static final cardview_compat_inset_shadow:I = 0x7f07006e
-.field public static final cardview_default_elevation:I = 0x7f07006d
+.field public static final cardview_default_elevation:I = 0x7f07006f
-.field public static final cardview_default_radius:I = 0x7f07006e
+.field public static final cardview_default_radius:I = 0x7f070070
# direct methods
diff --git a/com.discord/smali/androidx/cardview/R$style.smali b/com.discord/smali/androidx/cardview/R$style.smali
index 211eb95cb3..34e1bd7a6e 100644
--- a/com.discord/smali/androidx/cardview/R$style.smali
+++ b/com.discord/smali/androidx/cardview/R$style.smali
@@ -17,11 +17,11 @@
# static fields
.field public static final Base_CardView:I = 0x7f13003d
-.field public static final CardView:I = 0x7f1300f5
+.field public static final CardView:I = 0x7f130109
-.field public static final CardView_Dark:I = 0x7f1300f6
+.field public static final CardView_Dark:I = 0x7f13010a
-.field public static final CardView_Light:I = 0x7f1300f7
+.field public static final CardView_Light:I = 0x7f13010b
# direct methods
diff --git a/com.discord/smali/androidx/cardview/R$styleable.smali b/com.discord/smali/androidx/cardview/R$styleable.smali
index 48ec59dcfb..d8d9c8d912 100644
--- a/com.discord/smali/androidx/cardview/R$styleable.smali
+++ b/com.discord/smali/androidx/cardview/R$styleable.smali
@@ -62,17 +62,17 @@
.array-data 4
0x101013f
0x1010140
- 0x7f040091
- 0x7f040092
- 0x7f040093
- 0x7f040094
- 0x7f040095
- 0x7f040096
- 0x7f0400eb
- 0x7f0400ec
- 0x7f0400ed
- 0x7f0400ee
- 0x7f0400ef
+ 0x7f0400a3
+ 0x7f0400a4
+ 0x7f0400a5
+ 0x7f0400a7
+ 0x7f0400a8
+ 0x7f0400a9
+ 0x7f04010d
+ 0x7f04010e
+ 0x7f04010f
+ 0x7f040110
+ 0x7f040111
.end array-data
.end method
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
index 7c77835963..515f176975 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$attr.smali
@@ -15,119 +15,119 @@
# static fields
-.field public static final barrierAllowsGoneWidgets:I = 0x7f040055
+.field public static final barrierAllowsGoneWidgets:I = 0x7f040062
-.field public static final barrierDirection:I = 0x7f040056
+.field public static final barrierDirection:I = 0x7f040063
-.field public static final chainUseRtl:I = 0x7f040099
+.field public static final chainUseRtl:I = 0x7f0400ac
-.field public static final constraintSet:I = 0x7f0400e0
+.field public static final constraintSet:I = 0x7f040102
-.field public static final constraint_referenced_ids:I = 0x7f0400e1
+.field public static final constraint_referenced_ids:I = 0x7f040103
-.field public static final content:I = 0x7f0400e3
+.field public static final content:I = 0x7f040105
-.field public static final emptyVisibility:I = 0x7f040146
+.field public static final emptyVisibility:I = 0x7f04017a
-.field public static final layout_constrainedHeight:I = 0x7f04025d
+.field public static final layout_constrainedHeight:I = 0x7f0402ae
-.field public static final layout_constrainedWidth:I = 0x7f04025e
+.field public static final layout_constrainedWidth:I = 0x7f0402af
-.field public static final layout_constraintBaseline_creator:I = 0x7f04025f
+.field public static final layout_constraintBaseline_creator:I = 0x7f0402b0
-.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f040260
+.field public static final layout_constraintBaseline_toBaselineOf:I = 0x7f0402b1
-.field public static final layout_constraintBottom_creator:I = 0x7f040261
+.field public static final layout_constraintBottom_creator:I = 0x7f0402b2
-.field public static final layout_constraintBottom_toBottomOf:I = 0x7f040262
+.field public static final layout_constraintBottom_toBottomOf:I = 0x7f0402b3
-.field public static final layout_constraintBottom_toTopOf:I = 0x7f040263
+.field public static final layout_constraintBottom_toTopOf:I = 0x7f0402b4
-.field public static final layout_constraintCircle:I = 0x7f040264
+.field public static final layout_constraintCircle:I = 0x7f0402b5
-.field public static final layout_constraintCircleAngle:I = 0x7f040265
+.field public static final layout_constraintCircleAngle:I = 0x7f0402b6
-.field public static final layout_constraintCircleRadius:I = 0x7f040266
+.field public static final layout_constraintCircleRadius:I = 0x7f0402b7
-.field public static final layout_constraintDimensionRatio:I = 0x7f040267
+.field public static final layout_constraintDimensionRatio:I = 0x7f0402b8
-.field public static final layout_constraintEnd_toEndOf:I = 0x7f040268
+.field public static final layout_constraintEnd_toEndOf:I = 0x7f0402b9
-.field public static final layout_constraintEnd_toStartOf:I = 0x7f040269
+.field public static final layout_constraintEnd_toStartOf:I = 0x7f0402ba
-.field public static final layout_constraintGuide_begin:I = 0x7f04026a
+.field public static final layout_constraintGuide_begin:I = 0x7f0402bb
-.field public static final layout_constraintGuide_end:I = 0x7f04026b
+.field public static final layout_constraintGuide_end:I = 0x7f0402bc
-.field public static final layout_constraintGuide_percent:I = 0x7f04026c
+.field public static final layout_constraintGuide_percent:I = 0x7f0402bd
-.field public static final layout_constraintHeight_default:I = 0x7f04026d
+.field public static final layout_constraintHeight_default:I = 0x7f0402be
-.field public static final layout_constraintHeight_max:I = 0x7f04026e
+.field public static final layout_constraintHeight_max:I = 0x7f0402bf
-.field public static final layout_constraintHeight_min:I = 0x7f04026f
+.field public static final layout_constraintHeight_min:I = 0x7f0402c0
-.field public static final layout_constraintHeight_percent:I = 0x7f040270
+.field public static final layout_constraintHeight_percent:I = 0x7f0402c1
-.field public static final layout_constraintHorizontal_bias:I = 0x7f040271
+.field public static final layout_constraintHorizontal_bias:I = 0x7f0402c2
-.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f040272
+.field public static final layout_constraintHorizontal_chainStyle:I = 0x7f0402c3
-.field public static final layout_constraintHorizontal_weight:I = 0x7f040273
+.field public static final layout_constraintHorizontal_weight:I = 0x7f0402c4
-.field public static final layout_constraintLeft_creator:I = 0x7f040274
+.field public static final layout_constraintLeft_creator:I = 0x7f0402c5
-.field public static final layout_constraintLeft_toLeftOf:I = 0x7f040275
+.field public static final layout_constraintLeft_toLeftOf:I = 0x7f0402c6
-.field public static final layout_constraintLeft_toRightOf:I = 0x7f040276
+.field public static final layout_constraintLeft_toRightOf:I = 0x7f0402c7
-.field public static final layout_constraintRight_creator:I = 0x7f040277
+.field public static final layout_constraintRight_creator:I = 0x7f0402c8
-.field public static final layout_constraintRight_toLeftOf:I = 0x7f040278
+.field public static final layout_constraintRight_toLeftOf:I = 0x7f0402c9
-.field public static final layout_constraintRight_toRightOf:I = 0x7f040279
+.field public static final layout_constraintRight_toRightOf:I = 0x7f0402ca
-.field public static final layout_constraintStart_toEndOf:I = 0x7f04027a
+.field public static final layout_constraintStart_toEndOf:I = 0x7f0402cb
-.field public static final layout_constraintStart_toStartOf:I = 0x7f04027b
+.field public static final layout_constraintStart_toStartOf:I = 0x7f0402cc
-.field public static final layout_constraintTop_creator:I = 0x7f04027c
+.field public static final layout_constraintTop_creator:I = 0x7f0402cd
-.field public static final layout_constraintTop_toBottomOf:I = 0x7f04027d
+.field public static final layout_constraintTop_toBottomOf:I = 0x7f0402ce
-.field public static final layout_constraintTop_toTopOf:I = 0x7f04027e
+.field public static final layout_constraintTop_toTopOf:I = 0x7f0402cf
-.field public static final layout_constraintVertical_bias:I = 0x7f04027f
+.field public static final layout_constraintVertical_bias:I = 0x7f0402d0
-.field public static final layout_constraintVertical_chainStyle:I = 0x7f040280
+.field public static final layout_constraintVertical_chainStyle:I = 0x7f0402d1
-.field public static final layout_constraintVertical_weight:I = 0x7f040281
+.field public static final layout_constraintVertical_weight:I = 0x7f0402d2
-.field public static final layout_constraintWidth_default:I = 0x7f040282
+.field public static final layout_constraintWidth_default:I = 0x7f0402d3
-.field public static final layout_constraintWidth_max:I = 0x7f040283
+.field public static final layout_constraintWidth_max:I = 0x7f0402d4
-.field public static final layout_constraintWidth_min:I = 0x7f040284
+.field public static final layout_constraintWidth_min:I = 0x7f0402d5
-.field public static final layout_constraintWidth_percent:I = 0x7f040285
+.field public static final layout_constraintWidth_percent:I = 0x7f0402d6
-.field public static final layout_editor_absoluteX:I = 0x7f040287
+.field public static final layout_editor_absoluteX:I = 0x7f0402d8
-.field public static final layout_editor_absoluteY:I = 0x7f040288
+.field public static final layout_editor_absoluteY:I = 0x7f0402d9
-.field public static final layout_goneMarginBottom:I = 0x7f04028c
+.field public static final layout_goneMarginBottom:I = 0x7f0402dd
-.field public static final layout_goneMarginEnd:I = 0x7f04028d
+.field public static final layout_goneMarginEnd:I = 0x7f0402de
-.field public static final layout_goneMarginLeft:I = 0x7f04028e
+.field public static final layout_goneMarginLeft:I = 0x7f0402df
-.field public static final layout_goneMarginRight:I = 0x7f04028f
+.field public static final layout_goneMarginRight:I = 0x7f0402e0
-.field public static final layout_goneMarginStart:I = 0x7f040290
+.field public static final layout_goneMarginStart:I = 0x7f0402e1
-.field public static final layout_goneMarginTop:I = 0x7f040291
+.field public static final layout_goneMarginTop:I = 0x7f0402e2
-.field public static final layout_optimizationLevel:I = 0x7f040298
+.field public static final layout_optimizationLevel:I = 0x7f0402e9
# direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index 59b810a03f..884015b573 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -15,33 +15,33 @@
# static fields
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final gone:I = 0x7f0a033c
+.field public static final gone:I = 0x7f0a034c
-.field public static final invisible:I = 0x7f0a03d9
+.field public static final invisible:I = 0x7f0a03ea
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final packed:I = 0x7f0a050d
+.field public static final packed:I = 0x7f0a0537
-.field public static final parent:I = 0x7f0a0510
+.field public static final parent:I = 0x7f0a053a
-.field public static final percent:I = 0x7f0a0544
+.field public static final percent:I = 0x7f0a0570
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final spread:I = 0x7f0a0797
+.field public static final spread:I = 0x7f0a07c6
-.field public static final spread_inside:I = 0x7f0a0798
+.field public static final spread_inside:I = 0x7f0a07c7
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
-.field public static final wrap:I = 0x7f0a08e1
+.field public static final wrap:I = 0x7f0a0915
# direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
index de20cb0510..ef71695f07 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$styleable.smali
@@ -359,67 +359,67 @@
0x1010120
0x101013f
0x1010140
- 0x7f040055
- 0x7f040056
- 0x7f040099
- 0x7f0400e0
- 0x7f0400e1
- 0x7f04025d
- 0x7f04025e
- 0x7f04025f
- 0x7f040260
- 0x7f040261
- 0x7f040262
- 0x7f040263
- 0x7f040264
- 0x7f040265
- 0x7f040266
- 0x7f040267
- 0x7f040268
- 0x7f040269
- 0x7f04026a
- 0x7f04026b
- 0x7f04026c
- 0x7f04026d
- 0x7f04026e
- 0x7f04026f
- 0x7f040270
- 0x7f040271
- 0x7f040272
- 0x7f040273
- 0x7f040274
- 0x7f040275
- 0x7f040276
- 0x7f040277
- 0x7f040278
- 0x7f040279
- 0x7f04027a
- 0x7f04027b
- 0x7f04027c
- 0x7f04027d
- 0x7f04027e
- 0x7f04027f
- 0x7f040280
- 0x7f040281
- 0x7f040282
- 0x7f040283
- 0x7f040284
- 0x7f040285
- 0x7f040287
- 0x7f040288
- 0x7f04028c
- 0x7f04028d
- 0x7f04028e
- 0x7f04028f
- 0x7f040290
- 0x7f040291
- 0x7f040298
+ 0x7f040062
+ 0x7f040063
+ 0x7f0400ac
+ 0x7f040102
+ 0x7f040103
+ 0x7f0402ae
+ 0x7f0402af
+ 0x7f0402b0
+ 0x7f0402b1
+ 0x7f0402b2
+ 0x7f0402b3
+ 0x7f0402b4
+ 0x7f0402b5
+ 0x7f0402b6
+ 0x7f0402b7
+ 0x7f0402b8
+ 0x7f0402b9
+ 0x7f0402ba
+ 0x7f0402bb
+ 0x7f0402bc
+ 0x7f0402bd
+ 0x7f0402be
+ 0x7f0402bf
+ 0x7f0402c0
+ 0x7f0402c1
+ 0x7f0402c2
+ 0x7f0402c3
+ 0x7f0402c4
+ 0x7f0402c5
+ 0x7f0402c6
+ 0x7f0402c7
+ 0x7f0402c8
+ 0x7f0402c9
+ 0x7f0402ca
+ 0x7f0402cb
+ 0x7f0402cc
+ 0x7f0402cd
+ 0x7f0402ce
+ 0x7f0402cf
+ 0x7f0402d0
+ 0x7f0402d1
+ 0x7f0402d2
+ 0x7f0402d3
+ 0x7f0402d4
+ 0x7f0402d5
+ 0x7f0402d6
+ 0x7f0402d8
+ 0x7f0402d9
+ 0x7f0402dd
+ 0x7f0402de
+ 0x7f0402df
+ 0x7f0402e0
+ 0x7f0402e1
+ 0x7f0402e2
+ 0x7f0402e9
.end array-data
:array_1
.array-data 4
- 0x7f0400e3
- 0x7f040146
+ 0x7f040105
+ 0x7f04017a
.end array-data
:array_2
@@ -451,59 +451,59 @@
0x10103b6
0x10103fa
0x1010440
- 0x7f040055
- 0x7f040056
- 0x7f040099
- 0x7f0400e1
- 0x7f04025d
- 0x7f04025e
- 0x7f04025f
- 0x7f040260
- 0x7f040261
- 0x7f040262
- 0x7f040263
- 0x7f040264
- 0x7f040265
- 0x7f040266
- 0x7f040267
- 0x7f040268
- 0x7f040269
- 0x7f04026a
- 0x7f04026b
- 0x7f04026c
- 0x7f04026d
- 0x7f04026e
- 0x7f04026f
- 0x7f040270
- 0x7f040271
- 0x7f040272
- 0x7f040273
- 0x7f040274
- 0x7f040275
- 0x7f040276
- 0x7f040277
- 0x7f040278
- 0x7f040279
- 0x7f04027a
- 0x7f04027b
- 0x7f04027c
- 0x7f04027d
- 0x7f04027e
- 0x7f04027f
- 0x7f040280
- 0x7f040281
- 0x7f040282
- 0x7f040283
- 0x7f040284
- 0x7f040285
- 0x7f040287
- 0x7f040288
- 0x7f04028c
- 0x7f04028d
- 0x7f04028e
- 0x7f04028f
- 0x7f040290
- 0x7f040291
+ 0x7f040062
+ 0x7f040063
+ 0x7f0400ac
+ 0x7f040103
+ 0x7f0402ae
+ 0x7f0402af
+ 0x7f0402b0
+ 0x7f0402b1
+ 0x7f0402b2
+ 0x7f0402b3
+ 0x7f0402b4
+ 0x7f0402b5
+ 0x7f0402b6
+ 0x7f0402b7
+ 0x7f0402b8
+ 0x7f0402b9
+ 0x7f0402ba
+ 0x7f0402bb
+ 0x7f0402bc
+ 0x7f0402bd
+ 0x7f0402be
+ 0x7f0402bf
+ 0x7f0402c0
+ 0x7f0402c1
+ 0x7f0402c2
+ 0x7f0402c3
+ 0x7f0402c4
+ 0x7f0402c5
+ 0x7f0402c6
+ 0x7f0402c7
+ 0x7f0402c8
+ 0x7f0402c9
+ 0x7f0402ca
+ 0x7f0402cb
+ 0x7f0402cc
+ 0x7f0402cd
+ 0x7f0402ce
+ 0x7f0402cf
+ 0x7f0402d0
+ 0x7f0402d1
+ 0x7f0402d2
+ 0x7f0402d3
+ 0x7f0402d4
+ 0x7f0402d5
+ 0x7f0402d6
+ 0x7f0402d8
+ 0x7f0402d9
+ 0x7f0402dd
+ 0x7f0402de
+ 0x7f0402df
+ 0x7f0402e0
+ 0x7f0402e1
+ 0x7f0402e2
.end array-data
.end method
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
index dd3ee0fbc1..a18597b12e 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali
@@ -15,47 +15,47 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$color.smali b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
index a6acdb6ee1..e510fe180b 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$color.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
index 366c7a9309..cab6c0e638 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 8b99493c01..53fb385b76 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 411fe4954e..c2d647b2dc 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$id.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
@@ -15,75 +15,153 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final action_image:I = 0x7f0a003c
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final action_text:I = 0x7f0a0042
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final actions:I = 0x7f0a0043
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final async:I = 0x7f0a0088
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final bottom:I = 0x7f0a0100
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final end:I = 0x7f0a02d1
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final forever:I = 0x7f0a0306
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final icon:I = 0x7f0a03b4
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final info:I = 0x7f0a03cb
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final italic:I = 0x7f0a03f8
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final left:I = 0x7f0a043e
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final line1:I = 0x7f0a0440
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final line3:I = 0x7f0a0441
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final none:I = 0x7f0a04cd
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final normal:I = 0x7f0a04ce
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final right:I = 0x7f0a05e0
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final start:I = 0x7f0a079e
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final text:I = 0x7f0a07d4
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final text2:I = 0x7f0a07d5
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final time:I = 0x7f0a07e2
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final title:I = 0x7f0a07e3
+.field public static final action_container:I = 0x7f0a003d
-.field public static final top:I = 0x7f0a07ea
+.field public static final action_divider:I = 0x7f0a003f
+
+.field public static final action_image:I = 0x7f0a0040
+
+.field public static final action_text:I = 0x7f0a0046
+
+.field public static final actions:I = 0x7f0a0047
+
+.field public static final async:I = 0x7f0a008c
+
+.field public static final blocking:I = 0x7f0a00da
+
+.field public static final bottom:I = 0x7f0a0104
+
+.field public static final chronometer:I = 0x7f0a0226
+
+.field public static final dialog_button:I = 0x7f0a0272
+
+.field public static final end:I = 0x7f0a02dd
+
+.field public static final forever:I = 0x7f0a0315
+
+.field public static final icon:I = 0x7f0a03c5
+
+.field public static final icon_group:I = 0x7f0a03c7
+
+.field public static final info:I = 0x7f0a03dc
+
+.field public static final italic:I = 0x7f0a0409
+
+.field public static final left:I = 0x7f0a044f
+
+.field public static final line1:I = 0x7f0a0451
+
+.field public static final line3:I = 0x7f0a0452
+
+.field public static final none:I = 0x7f0a04f7
+
+.field public static final normal:I = 0x7f0a04f8
+
+.field public static final notification_background:I = 0x7f0a0502
+
+.field public static final notification_main_column:I = 0x7f0a0503
+
+.field public static final notification_main_column_container:I = 0x7f0a0504
+
+.field public static final right:I = 0x7f0a060c
+
+.field public static final right_icon:I = 0x7f0a060d
+
+.field public static final right_side:I = 0x7f0a060e
+
+.field public static final start:I = 0x7f0a07cd
+
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
+
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
+
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
+
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
+
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
+
+.field public static final tag_transition_group:I = 0x7f0a07fb
+
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
+
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
+
+.field public static final text:I = 0x7f0a0805
+
+.field public static final text2:I = 0x7f0a0806
+
+.field public static final time:I = 0x7f0a0815
+
+.field public static final title:I = 0x7f0a0816
+
+.field public static final top:I = 0x7f0a081d
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$integer.smali b/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
index d1085fb959..4925c78bc4 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
index d8f0acaf7e..d584e1ae3c 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$layout.smali
@@ -15,17 +15,19 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
+
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index 93fb4b333d..65b69ea9ea 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$style.smali b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
index 276b8f2469..a4e2263048 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$style.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$style.smali
@@ -15,21 +15,21 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
index 550dcf9360..cf53458655 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali
@@ -178,34 +178,34 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_2
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_3
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_4
@@ -215,11 +215,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_5
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
index ea7cc392f6..3b014e96b1 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$Behavior.smali
@@ -595,6 +595,9 @@
}
.end annotation
+ .annotation runtime Ljava/lang/Deprecated;
+ .end annotation
+
if-nez p8, :cond_0
invoke-virtual/range {p0 .. p7}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onNestedScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIII)V
@@ -603,6 +606,55 @@
return-void
.end method
+.method public onNestedScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIIII[I)V
+ .locals 2
+ .param p1 # Landroidx/coordinatorlayout/widget/CoordinatorLayout;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p3 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p9 # [I
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroidx/coordinatorlayout/widget/CoordinatorLayout;",
+ "TV;",
+ "Landroid/view/View;",
+ "IIIII[I)V"
+ }
+ .end annotation
+
+ const/4 v0, 0x0
+
+ aget v1, p9, v0
+
+ add-int/2addr v1, p6
+
+ aput v1, p9, v0
+
+ const/4 v0, 0x1
+
+ aget v1, p9, v0
+
+ add-int/2addr v1, p7
+
+ aput v1, p9, v0
+
+ invoke-virtual/range {p0 .. p8}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onNestedScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIIII)V
+
+ return-void
+.end method
+
.method public onNestedScrollAccepted(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;Landroid/view/View;I)V
.locals 0
.param p1 # Landroidx/coordinatorlayout/widget/CoordinatorLayout;
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
index 5e00911268..b3b903ccde 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout$DispatchChangeEvent.smali
@@ -9,7 +9,7 @@
# annotations
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
index 5f48a8a23c..5e0d2799e9 100644
--- a/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/widget/CoordinatorLayout.smali
@@ -4,6 +4,7 @@
# interfaces
.implements Landroidx/core/view/NestedScrollingParent2;
+.implements Landroidx/core/view/NestedScrollingParent3;
# annotations
@@ -84,6 +85,8 @@
# instance fields
.field public mApplyWindowInsetsListener:Landroidx/core/view/OnApplyWindowInsetsListener;
+.field public final mBehaviorConsumed:[I
+
.field public mBehaviorTouchView:Landroid/view/View;
.field public final mChildDag:Landroidx/coordinatorlayout/widget/DirectedAcyclicGraph;
@@ -122,6 +125,8 @@
.field public mNestedScrollingTarget:Landroid/view/View;
+.field public final mNestedScrollingV2ConsumedCompat:[I
+
.field public mOnHierarchyChangeListener:Landroid/view/ViewGroup$OnHierarchyChangeListener;
.field public mOnPreDrawListener:Landroidx/coordinatorlayout/widget/CoordinatorLayout$OnPreDrawListener;
@@ -140,8 +145,6 @@
.end annotation
.end field
-.field public final mTempIntPair:[I
-
.field public final mTempList1:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -253,7 +256,7 @@
.end method
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;I)V
- .locals 3
+ .locals 9
.param p1 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
@@ -295,9 +298,13 @@
const/4 v0, 0x2
+ new-array v1, v0, [I
+
+ iput-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
+
new-array v0, v0, [I
- iput-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
+ iput-object v0, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mNestedScrollingV2ConsumedCompat:[I
new-instance v0, Landroidx/core/view/NestedScrollingParentHelper;
@@ -309,13 +316,13 @@
if-nez p3, :cond_0
- sget-object p3, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout:[I
+ sget-object v1, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout:[I
- sget v1, Landroidx/coordinatorlayout/R$style;->Widget_Support_CoordinatorLayout:I
+ sget v2, Landroidx/coordinatorlayout/R$style;->Widget_Support_CoordinatorLayout:I
- invoke-virtual {p1, p2, p3, v0, v1}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
+ invoke-virtual {p1, p2, v1, v0, v2}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
- move-result-object p2
+ move-result-object v1
goto :goto_0
@@ -324,26 +331,71 @@
invoke-virtual {p1, p2, v1, p3, v0}, Landroid/content/Context;->obtainStyledAttributes(Landroid/util/AttributeSet;[III)Landroid/content/res/TypedArray;
- move-result-object p2
+ move-result-object v1
:goto_0
- sget p3, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout_keylines:I
+ sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
- invoke-virtual {p2, p3, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
+ const/16 v3, 0x1d
- move-result p3
+ if-lt v2, v3, :cond_2
- if-eqz p3, :cond_1
+ if-nez p3, :cond_1
+
+ sget-object v4, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout:[I
+
+ const/4 v7, 0x0
+
+ sget v8, Landroidx/coordinatorlayout/R$style;->Widget_Support_CoordinatorLayout:I
+
+ move-object v2, p0
+
+ move-object v3, p1
+
+ move-object v5, p2
+
+ move-object v6, v1
+
+ invoke-virtual/range {v2 .. v8}, Landroid/view/ViewGroup;->saveAttributeDataForStyleable(Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+
+ goto :goto_1
+
+ :cond_1
+ sget-object v4, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout:[I
+
+ const/4 v8, 0x0
+
+ move-object v2, p0
+
+ move-object v3, p1
+
+ move-object v5, p2
+
+ move-object v6, v1
+
+ move v7, p3
+
+ invoke-virtual/range {v2 .. v8}, Landroid/view/ViewGroup;->saveAttributeDataForStyleable(Landroid/content/Context;[ILandroid/util/AttributeSet;Landroid/content/res/TypedArray;II)V
+
+ :cond_2
+ :goto_1
+ sget p2, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout_keylines:I
+
+ invoke-virtual {v1, p2, v0}, Landroid/content/res/TypedArray;->getResourceId(II)I
+
+ move-result p2
+
+ if-eqz p2, :cond_3
invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object p1
- invoke-virtual {p1, p3}, Landroid/content/res/Resources;->getIntArray(I)[I
+ invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getIntArray(I)[I
- move-result-object p3
+ move-result-object p2
- iput-object p3, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
+ iput-object p2, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
invoke-virtual {p1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics;
@@ -351,16 +403,16 @@
iget p1, p1, Landroid/util/DisplayMetrics;->density:F
+ iget-object p2, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
+
+ array-length p2, p2
+
+ :goto_2
+ if-ge v0, p2, :cond_3
+
iget-object p3, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
- array-length p3, p3
-
- :goto_1
- if-ge v0, p3, :cond_1
-
- iget-object v1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mKeylines:[I
-
- aget v2, v1, v0
+ aget v2, p3, v0
int-to-float v2, v2
@@ -368,22 +420,22 @@
float-to-int v2, v2
- aput v2, v1, v0
+ aput v2, p3, v0
add-int/lit8 v0, v0, 0x1
- goto :goto_1
+ goto :goto_2
- :cond_1
+ :cond_3
sget p1, Landroidx/coordinatorlayout/R$styleable;->CoordinatorLayout_statusBarBackground:I
- invoke-virtual {p2, p1}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
+ invoke-virtual {v1, p1}, Landroid/content/res/TypedArray;->getDrawable(I)Landroid/graphics/drawable/Drawable;
move-result-object p1
iput-object p1, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mStatusBarBackground:Landroid/graphics/drawable/Drawable;
- invoke-virtual {p2}, Landroid/content/res/TypedArray;->recycle()V
+ invoke-virtual {v1}, Landroid/content/res/TypedArray;->recycle()V
invoke-direct {p0}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->setupForInsets()V
@@ -393,6 +445,17 @@
invoke-super {p0, p1}, Landroid/view/ViewGroup;->setOnHierarchyChangeListener(Landroid/view/ViewGroup$OnHierarchyChangeListener;)V
+ invoke-static {p0}, Landroidx/core/view/ViewCompat;->getImportantForAccessibility(Landroid/view/View;)I
+
+ move-result p1
+
+ if-nez p1, :cond_4
+
+ const/4 p1, 0x1
+
+ invoke-static {p0, p1}, Landroidx/core/view/ViewCompat;->setImportantForAccessibility(Landroid/view/View;I)V
+
+ :cond_4
return-void
.end method
@@ -1510,7 +1573,7 @@
.end method
.method public static parseBehavior(Landroid/content/Context;Landroid/util/AttributeSet;Ljava/lang/String;)Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
- .locals 4
+ .locals 5
invoke-static {p2}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
@@ -1615,19 +1678,21 @@
const/4 v2, 0x1
+ const/4 v3, 0x0
+
if-nez v1, :cond_5
invoke-virtual {p0}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
move-result-object v1
- invoke-virtual {v1, p2}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
+ invoke-static {p2, v3, v1}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
move-result-object v1
- sget-object v3, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->CONSTRUCTOR_PARAMS:[Ljava/lang/Class;
+ sget-object v4, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->CONSTRUCTOR_PARAMS:[Ljava/lang/Class;
- invoke-virtual {v1, v3}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+ invoke-virtual {v1, v4}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
move-result-object v1
@@ -1640,8 +1705,6 @@
new-array v0, v0, [Ljava/lang/Object;
- const/4 v3, 0x0
-
aput-object p0, v0, v3
aput-object p1, v0, v2
@@ -2994,7 +3057,7 @@
.locals 1
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -3130,11 +3193,7 @@
invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v1, " could not be instantiated. Did you forget"
-
- invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v1, " a default constructor?"
+ const-string v1, " could not be instantiated. Did you forget a default constructor?"
invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -4678,12 +4737,12 @@
if-eqz v1, :cond_4
- iget-object v6, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
-
- aput v10, v6, v14
+ iget-object v6, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
aput v10, v6, v10
+ aput v10, v6, v14
+
move-object v0, v1
move-object/from16 v1, p0
@@ -4698,7 +4757,7 @@
invoke-virtual/range {v0 .. v7}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onNestedPreScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;II[II)V
- iget-object v0, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
+ iget-object v0, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
if-lez p2, :cond_2
@@ -4718,7 +4777,7 @@
move-result v0
:goto_1
- iget-object v1, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mTempIntPair:[I
+ iget-object v1, v8, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
if-lez p3, :cond_3
@@ -4786,24 +4845,62 @@
.end method
.method public onNestedScroll(Landroid/view/View;IIIII)V
- .locals 14
+ .locals 8
- move-object v9, p0
+ iget-object v7, p0, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mNestedScrollingV2ConsumedCompat:[I
- invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
+ const/4 v6, 0x0
- move-result v10
+ move-object v0, p0
+
+ move-object v1, p1
+
+ move v2, p2
+
+ move v3, p3
+
+ move v4, p4
+
+ move v5, p5
+
+ invoke-virtual/range {v0 .. v7}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onNestedScroll(Landroid/view/View;IIIII[I)V
+
+ return-void
+.end method
+
+.method public onNestedScroll(Landroid/view/View;IIIII[I)V
+ .locals 17
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p7 # [I
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ move-object/from16 v10, p0
+
+ invoke-virtual/range {p0 .. p0}, Landroid/view/ViewGroup;->getChildCount()I
+
+ move-result v11
+
+ const/4 v12, 0x0
const/4 v0, 0x0
- const/4 v11, 0x0
+ const/4 v13, 0x0
+
+ const/4 v14, 0x0
+
+ const/4 v15, 0x0
:goto_0
- const/4 v12, 0x1
+ const/4 v9, 0x1
- if-ge v11, v10, :cond_3
+ if-ge v13, v11, :cond_5
- invoke-virtual {p0, v11}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+ invoke-virtual {v10, v13}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
move-result-object v2
@@ -4815,9 +4912,7 @@
if-ne v1, v3, :cond_0
- move/from16 v13, p6
-
- goto :goto_1
+ goto :goto_3
:cond_0
invoke-virtual {v2}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
@@ -4826,28 +4921,34 @@
check-cast v1, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;
- move/from16 v13, p6
+ move/from16 v8, p6
- invoke-virtual {v1, v13}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->isNestedScrollAccepted(I)Z
+ invoke-virtual {v1, v8}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->isNestedScrollAccepted(I)Z
move-result v3
if-nez v3, :cond_1
- goto :goto_1
+ goto :goto_3
:cond_1
invoke-virtual {v1}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$LayoutParams;->getBehavior()Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;
move-result-object v1
- if-eqz v1, :cond_2
+ if-eqz v1, :cond_4
+
+ iget-object v7, v10, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
+
+ aput v12, v7, v12
+
+ aput v12, v7, v9
move-object v0, v1
- move-object v1, p0
+ move-object/from16 v1, p0
- move-object v3, p1
+ move-object/from16 v3, p1
move/from16 v4, p2
@@ -4855,26 +4956,94 @@
move/from16 v6, p4
+ move-object/from16 v16, v7
+
move/from16 v7, p5
move/from16 v8, p6
- invoke-virtual/range {v0 .. v8}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onNestedScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIIII)V
+ move-object/from16 v9, v16
+
+ invoke-virtual/range {v0 .. v9}, Landroidx/coordinatorlayout/widget/CoordinatorLayout$Behavior;->onNestedScroll(Landroidx/coordinatorlayout/widget/CoordinatorLayout;Landroid/view/View;Landroid/view/View;IIIII[I)V
+
+ iget-object v0, v10, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
+
+ if-lez p4, :cond_2
+
+ aget v0, v0, v12
+
+ invoke-static {v14, v0}, Ljava/lang/Math;->max(II)I
+
+ move-result v0
+
+ goto :goto_1
+
+ :cond_2
+ aget v0, v0, v12
+
+ invoke-static {v14, v0}, Ljava/lang/Math;->min(II)I
+
+ move-result v0
+
+ :goto_1
+ if-lez p5, :cond_3
+
+ iget-object v1, v10, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
+
+ const/4 v2, 0x1
+
+ aget v1, v1, v2
+
+ invoke-static {v15, v1}, Ljava/lang/Math;->max(II)I
+
+ move-result v1
+
+ goto :goto_2
+
+ :cond_3
+ const/4 v2, 0x1
+
+ iget-object v1, v10, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->mBehaviorConsumed:[I
+
+ aget v1, v1, v2
+
+ invoke-static {v15, v1}, Ljava/lang/Math;->min(II)I
+
+ move-result v1
+
+ :goto_2
+ move v14, v0
+
+ move v15, v1
const/4 v0, 0x1
- :cond_2
- :goto_1
- add-int/lit8 v11, v11, 0x1
+ :cond_4
+ :goto_3
+ add-int/lit8 v13, v13, 0x1
goto :goto_0
- :cond_3
- if-eqz v0, :cond_4
+ :cond_5
+ const/4 v2, 0x1
- invoke-virtual {p0, v12}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onChildViewsChanged(I)V
+ aget v1, p7, v12
- :cond_4
+ add-int/2addr v1, v14
+
+ aput v1, p7, v12
+
+ aget v1, p7, v2
+
+ add-int/2addr v1, v15
+
+ aput v1, p7, v2
+
+ if-eqz v0, :cond_6
+
+ invoke-virtual {v10, v2}, Landroidx/coordinatorlayout/widget/CoordinatorLayout;->onChildViewsChanged(I)V
+
+ :cond_6
return-void
.end method
diff --git a/com.discord/smali/androidx/core/R$attr.smali b/com.discord/smali/androidx/core/R$attr.smali
index 6879a20544..aaf1e22ec9 100644
--- a/com.discord/smali/androidx/core/R$attr.smali
+++ b/com.discord/smali/androidx/core/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/core/R$color.smali b/com.discord/smali/androidx/core/R$color.smali
index a225c1919a..7f14871df4 100644
--- a/com.discord/smali/androidx/core/R$color.smali
+++ b/com.discord/smali/androidx/core/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/core/R$dimen.smali b/com.discord/smali/androidx/core/R$dimen.smali
index fdbebd0178..9904e909db 100644
--- a/com.discord/smali/androidx/core/R$dimen.smali
+++ b/com.discord/smali/androidx/core/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index f4c3dc9866..481409a99d 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index fe514edac2..204e857b17 100644
--- a/com.discord/smali/androidx/core/R$id.smali
+++ b/com.discord/smali/androidx/core/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/core/R$integer.smali b/com.discord/smali/androidx/core/R$integer.smali
index d5c64f631c..d1614f99d4 100644
--- a/com.discord/smali/androidx/core/R$integer.smali
+++ b/com.discord/smali/androidx/core/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/core/R$layout.smali b/com.discord/smali/androidx/core/R$layout.smali
index bd4b803665..f43dc804cc 100644
--- a/com.discord/smali/androidx/core/R$layout.smali
+++ b/com.discord/smali/androidx/core/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index f3f7b009b1..a22f13f75c 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/core/R$style.smali b/com.discord/smali/androidx/core/R$style.smali
index 9f0ce5e111..f4f5846af0 100644
--- a/com.discord/smali/androidx/core/R$style.smali
+++ b/com.discord/smali/androidx/core/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali
index eb81995d13..eb62fafdea 100644
--- a/com.discord/smali/androidx/core/R$styleable.smali
+++ b/com.discord/smali/androidx/core/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/core/ktx/R$attr.smali b/com.discord/smali/androidx/core/ktx/R$attr.smali
index 9ce6ba3b2d..81440f05b0 100644
--- a/com.discord/smali/androidx/core/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/core/ktx/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$color.smali b/com.discord/smali/androidx/core/ktx/R$color.smali
index eb74f33300..a861cd2421 100644
--- a/com.discord/smali/androidx/core/ktx/R$color.smali
+++ b/com.discord/smali/androidx/core/ktx/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$dimen.smali b/com.discord/smali/androidx/core/ktx/R$dimen.smali
index a338f469c6..cbe36311e4 100644
--- a/com.discord/smali/androidx/core/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/core/ktx/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali
index 8462bd2dff..557187091e 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$id.smali b/com.discord/smali/androidx/core/ktx/R$id.smali
index 9894426a2b..5ed40072c8 100644
--- a/com.discord/smali/androidx/core/ktx/R$id.smali
+++ b/com.discord/smali/androidx/core/ktx/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$integer.smali b/com.discord/smali/androidx/core/ktx/R$integer.smali
index b427d1c7bc..f91ea40bcf 100644
--- a/com.discord/smali/androidx/core/ktx/R$integer.smali
+++ b/com.discord/smali/androidx/core/ktx/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$layout.smali b/com.discord/smali/androidx/core/ktx/R$layout.smali
index 2d8554d288..8cc23984b5 100644
--- a/com.discord/smali/androidx/core/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/core/ktx/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$string.smali b/com.discord/smali/androidx/core/ktx/R$string.smali
index c231573afa..7bbfe5414b 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$style.smali b/com.discord/smali/androidx/core/ktx/R$style.smali
index 2c14a48599..61f97d49a5 100644
--- a/com.discord/smali/androidx/core/ktx/R$style.smali
+++ b/com.discord/smali/androidx/core/ktx/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$styleable.smali b/com.discord/smali/androidx/core/ktx/R$styleable.smali
index 424a78647e..3ce0ef5b4e 100644
--- a/com.discord/smali/androidx/core/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali
index ed78c9f81b..7124e2465d 100644
--- a/com.discord/smali/androidx/customview/R$attr.smali
+++ b/com.discord/smali/androidx/customview/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$color.smali b/com.discord/smali/androidx/customview/R$color.smali
index f28593937b..fe2515fec9 100644
--- a/com.discord/smali/androidx/customview/R$color.smali
+++ b/com.discord/smali/androidx/customview/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$dimen.smali b/com.discord/smali/androidx/customview/R$dimen.smali
index 41c4fe3d42..cb953fc599 100644
--- a/com.discord/smali/androidx/customview/R$dimen.smali
+++ b/com.discord/smali/androidx/customview/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index dc0248cbf6..c1c1c105dd 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index d0b3e2cd78..1a1ede2719 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$integer.smali b/com.discord/smali/androidx/customview/R$integer.smali
index ed2eb7e605..e8b20f0841 100644
--- a/com.discord/smali/androidx/customview/R$integer.smali
+++ b/com.discord/smali/androidx/customview/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$layout.smali b/com.discord/smali/androidx/customview/R$layout.smali
index f24ecab366..4178c37e4d 100644
--- a/com.discord/smali/androidx/customview/R$layout.smali
+++ b/com.discord/smali/androidx/customview/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 95d4036450..e4d4eee865 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$style.smali b/com.discord/smali/androidx/customview/R$style.smali
index 14396d277f..15e252f78c 100644
--- a/com.discord/smali/androidx/customview/R$style.smali
+++ b/com.discord/smali/androidx/customview/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali
index d4dc3733bc..7478f38a92 100644
--- a/com.discord/smali/androidx/customview/R$styleable.smali
+++ b/com.discord/smali/androidx/customview/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali
index 9d6ac44532..845edf51ed 100644
--- a/com.discord/smali/androidx/drawerlayout/R$attr.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$attr.smali
@@ -15,33 +15,33 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final drawerLayoutStyle:I = 0x7f04013d
+.field public static final drawerLayoutStyle:I = 0x7f04016f
-.field public static final elevation:I = 0x7f040145
+.field public static final elevation:I = 0x7f040177
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$color.smali b/com.discord/smali/androidx/drawerlayout/R$color.smali
index 4fb6a212fb..0570e7c30c 100644
--- a/com.discord/smali/androidx/drawerlayout/R$color.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$dimen.smali b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
index b568462a20..8133ba88be 100644
--- a/com.discord/smali/androidx/drawerlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$dimen.smali
@@ -15,51 +15,51 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final def_drawer_elevation:I = 0x7f070083
+.field public static final def_drawer_elevation:I = 0x7f070085
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index 1acae8a652..7dc590a880 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index 38782dbb02..08f56a0ead 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$integer.smali b/com.discord/smali/androidx/drawerlayout/R$integer.smali
index eebc6794ab..706a954656 100644
--- a/com.discord/smali/androidx/drawerlayout/R$integer.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$layout.smali b/com.discord/smali/androidx/drawerlayout/R$layout.smali
index 1b3fc9968d..2d7bd7184e 100644
--- a/com.discord/smali/androidx/drawerlayout/R$layout.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index 59050d3586..01a537d889 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$style.smali b/com.discord/smali/androidx/drawerlayout/R$style.smali
index 2af61e8a91..88a0849fee 100644
--- a/com.discord/smali/androidx/drawerlayout/R$style.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
index 6229c85d3c..be66bae951 100644
--- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali
@@ -114,7 +114,7 @@
const/4 v1, 0x0
- const v2, 0x7f040145
+ const v2, 0x7f040177
aput v2, v0, v1
@@ -158,17 +158,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -178,11 +178,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/dynamicanimation/R$attr.smali b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
index 5eab9b0e56..aba973295a 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$attr.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$color.smali b/com.discord/smali/androidx/dynamicanimation/R$color.smali
index 0700e2ffbd..fa5961eef2 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$color.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
index 6554f8279e..bce3f28a73 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index 00f9d8cb0f..509616dcf7 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index de1ebc56cc..16a769e4f6 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$id.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$integer.smali b/com.discord/smali/androidx/dynamicanimation/R$integer.smali
index 91cf69b53b..18fa09d1ba 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$integer.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$layout.smali b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
index 6b037654dd..176f76d82a 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$layout.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index c6719d36fd..f6b412bfb4 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$style.smali b/com.discord/smali/androidx/dynamicanimation/R$style.smali
index 31b9688829..e525c10698 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$style.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
index f854388773..7fc74b66ea 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/fragment/R$attr.smali b/com.discord/smali/androidx/fragment/R$attr.smali
index 77a5ddd6c6..c1e78e34a2 100644
--- a/com.discord/smali/androidx/fragment/R$attr.smali
+++ b/com.discord/smali/androidx/fragment/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$color.smali b/com.discord/smali/androidx/fragment/R$color.smali
index 8c175d8aef..fcdf06fe06 100644
--- a/com.discord/smali/androidx/fragment/R$color.smali
+++ b/com.discord/smali/androidx/fragment/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$dimen.smali b/com.discord/smali/androidx/fragment/R$dimen.smali
index 9bc08c357d..01ed9f9fc1 100644
--- a/com.discord/smali/androidx/fragment/R$dimen.smali
+++ b/com.discord/smali/androidx/fragment/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index e18b090b64..81efd06bc9 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index fa93ecdb42..028b05358c 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$integer.smali b/com.discord/smali/androidx/fragment/R$integer.smali
index f8a5a51c78..89fe9af82d 100644
--- a/com.discord/smali/androidx/fragment/R$integer.smali
+++ b/com.discord/smali/androidx/fragment/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$layout.smali b/com.discord/smali/androidx/fragment/R$layout.smali
index cf83a3e02f..50570bcb3a 100644
--- a/com.discord/smali/androidx/fragment/R$layout.smali
+++ b/com.discord/smali/androidx/fragment/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index ebecd51813..96f36e9b86 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$style.smali b/com.discord/smali/androidx/fragment/R$style.smali
index d2e26bd14f..e90bd5448d 100644
--- a/com.discord/smali/androidx/fragment/R$style.smali
+++ b/com.discord/smali/androidx/fragment/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali
index 72419c4bd2..ae29f409ca 100644
--- a/com.discord/smali/androidx/fragment/R$styleable.smali
+++ b/com.discord/smali/androidx/fragment/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
index 99b844b572..edf9958c08 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali
@@ -15,47 +15,47 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$color.smali b/com.discord/smali/androidx/legacy/coreui/R$color.smali
index c7ee41cd25..4fb3b81f77 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
index 90c9ca729d..4d578ca6ae 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index 0e0d4c7673..e5b93bcac4 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$id.smali b/com.discord/smali/androidx/legacy/coreui/R$id.smali
index d299f2f9f1..925b4b4f11 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$id.smali
@@ -15,75 +15,75 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$integer.smali b/com.discord/smali/androidx/legacy/coreui/R$integer.smali
index 6ad3e742ea..a1c8c9ba1d 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$layout.smali b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
index 06ef7b7002..f7d1a87266 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index 2779f7d939..8071b9ba38 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$style.smali b/com.discord/smali/androidx/legacy/coreui/R$style.smali
index 6404779511..48d982e2fd 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$style.smali
@@ -15,21 +15,21 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
index aec3dca992..da9554151b 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali
@@ -178,34 +178,34 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_2
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_3
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_4
@@ -215,11 +215,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_5
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
index a68204a5c0..51a9719f5f 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$color.smali b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
index e46ba5748e..5b2193cf29 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$color.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
index 517b0f38f4..2a74599f68 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index cb9f03b2c2..42a95427c2 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$id.smali b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
index c72621b0fd..3b4b1e6773 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$integer.smali b/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
index e75161fd9b..fbfc3c82bd 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
index 8a971ac35f..5f26bb2e92 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index cfe2d2ab7c..22ef72d25d 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$style.smali b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
index 092876b1e2..f20e9cc3ce 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$style.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
index 5b3b27fbc1..6415a8f8cb 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/legacy/v4/R$attr.smali b/com.discord/smali/androidx/legacy/v4/R$attr.smali
index 6c8eaf4351..12cea3e3ea 100644
--- a/com.discord/smali/androidx/legacy/v4/R$attr.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$attr.smali
@@ -15,47 +15,47 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$color.smali b/com.discord/smali/androidx/legacy/v4/R$color.smali
index caa1e4345c..215b3f7850 100644
--- a/com.discord/smali/androidx/legacy/v4/R$color.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$color.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b4
+.field public static final notification_material_background_media_default_color:I = 0x7f0600f2
-.field public static final primary_text_default_material_dark:I = 0x7f0600f1
+.field public static final primary_text_default_material_dark:I = 0x7f060131
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_dark:I = 0x7f0600ff
+.field public static final secondary_text_default_material_dark:I = 0x7f06013f
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$dimen.smali b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
index f4d816315d..502930e9e4 100644
--- a/com.discord/smali/androidx/legacy/v4/R$dimen.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$dimen.smali
@@ -15,57 +15,57 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
-.field public static final subtitle_corner_radius:I = 0x7f070132
+.field public static final subtitle_corner_radius:I = 0x7f07019d
-.field public static final subtitle_outline_width:I = 0x7f070133
+.field public static final subtitle_outline_width:I = 0x7f07019e
-.field public static final subtitle_shadow_offset:I = 0x7f070134
+.field public static final subtitle_shadow_offset:I = 0x7f07019f
-.field public static final subtitle_shadow_radius:I = 0x7f070135
+.field public static final subtitle_shadow_radius:I = 0x7f0701a0
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index 50d3eb9ac3..1cb5f6e61d 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$id.smali b/com.discord/smali/androidx/legacy/v4/R$id.smali
index 27cdfc9ba6..d9d2a8dd29 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -15,85 +15,85 @@
# static fields
-.field public static final action0:I = 0x7f0a002d
+.field public static final action0:I = 0x7f0a0031
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final cancel_action:I = 0x7f0a0112
+.field public static final cancel_action:I = 0x7f0a0117
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final end_padder:I = 0x7f0a02d2
+.field public static final end_padder:I = 0x7f0a02de
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final media_actions:I = 0x7f0a0463
+.field public static final media_actions:I = 0x7f0a0474
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final status_bar_latest_event_content:I = 0x7f0a07a2
+.field public static final status_bar_latest_event_content:I = 0x7f0a07d1
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$integer.smali b/com.discord/smali/androidx/legacy/v4/R$integer.smali
index 33181b86a4..715ee8eaa1 100644
--- a/com.discord/smali/androidx/legacy/v4/R$integer.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$integer.smali
@@ -17,7 +17,7 @@
# static fields
.field public static final cancel_button_image_alpha:I = 0x7f0b0005
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$layout.smali b/com.discord/smali/androidx/legacy/v4/R$layout.smali
index c801485680..cd6a49f0f4 100644
--- a/com.discord/smali/androidx/legacy/v4/R$layout.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$layout.smali
@@ -15,35 +15,35 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_media_action:I = 0x7f0d004d
+.field public static final notification_media_action:I = 0x7f0d0068
-.field public static final notification_media_cancel_action:I = 0x7f0d004e
+.field public static final notification_media_cancel_action:I = 0x7f0d0069
-.field public static final notification_template_big_media:I = 0x7f0d0050
+.field public static final notification_template_big_media:I = 0x7f0d006b
-.field public static final notification_template_big_media_custom:I = 0x7f0d0051
+.field public static final notification_template_big_media_custom:I = 0x7f0d006c
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0052
+.field public static final notification_template_big_media_narrow:I = 0x7f0d006d
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0053
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d006e
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_lines_media:I = 0x7f0d0056
+.field public static final notification_template_lines_media:I = 0x7f0d0071
-.field public static final notification_template_media:I = 0x7f0d0057
+.field public static final notification_template_media:I = 0x7f0d0072
-.field public static final notification_template_media_custom:I = 0x7f0d0058
+.field public static final notification_template_media_custom:I = 0x7f0d0073
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index 8f8a600073..9a8e97faf6 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$style.smali b/com.discord/smali/androidx/legacy/v4/R$style.smali
index 5e3338a3d0..265009f5f9 100644
--- a/com.discord/smali/androidx/legacy/v4/R$style.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$style.smali
@@ -15,31 +15,31 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f1301b2
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f1301f0
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f1301b4
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f1301f2
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f1301b5
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f1301f3
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f1301b7
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f1301f5
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f1301b9
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f1301f7
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$styleable.smali b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
index 166fb41cf0..563228cec4 100644
--- a/com.discord/smali/androidx/legacy/v4/R$styleable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$styleable.smali
@@ -178,34 +178,34 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_2
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_3
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_4
@@ -215,11 +215,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_5
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
index 940ef16b53..e097e281ae 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali
@@ -15,47 +15,47 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
index 0c32814726..03dfe8a111 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
index b676c41573..5fb3d8d6a5 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
index 26e1391f59..226791d5c3 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
index d586ef0631..3bc6c61ac0 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$id.smali
@@ -15,75 +15,75 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali b/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
index 8bce17001e..adc00ad83a 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
index 274cdc337b..beb5bd4b94 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index c7e6b59493..b4673a0cc7 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
index 0bf4c980d9..b9fc01aa5a 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$style.smali
@@ -15,21 +15,21 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
index 06e94c321c..3729cd4513 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali
@@ -178,34 +178,34 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_2
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_3
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_4
@@ -215,11 +215,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_5
diff --git a/com.discord/smali/androidx/loader/R$attr.smali b/com.discord/smali/androidx/loader/R$attr.smali
index 25c8f3e55e..bef2f8e849 100644
--- a/com.discord/smali/androidx/loader/R$attr.smali
+++ b/com.discord/smali/androidx/loader/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$color.smali b/com.discord/smali/androidx/loader/R$color.smali
index ac8dac707d..ee98b77db8 100644
--- a/com.discord/smali/androidx/loader/R$color.smali
+++ b/com.discord/smali/androidx/loader/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$dimen.smali b/com.discord/smali/androidx/loader/R$dimen.smali
index 848384ba1b..8411ad461b 100644
--- a/com.discord/smali/androidx/loader/R$dimen.smali
+++ b/com.discord/smali/androidx/loader/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index 2d9dd9e5c0..0bd4968d03 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index 86deea6d28..3ce93cb339 100644
--- a/com.discord/smali/androidx/loader/R$id.smali
+++ b/com.discord/smali/androidx/loader/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$integer.smali b/com.discord/smali/androidx/loader/R$integer.smali
index f2430e8683..4d151b871f 100644
--- a/com.discord/smali/androidx/loader/R$integer.smali
+++ b/com.discord/smali/androidx/loader/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$layout.smali b/com.discord/smali/androidx/loader/R$layout.smali
index 79e299d4df..62ef2d07dd 100644
--- a/com.discord/smali/androidx/loader/R$layout.smali
+++ b/com.discord/smali/androidx/loader/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index 1db592be86..8aff2ecf21 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$style.smali b/com.discord/smali/androidx/loader/R$style.smali
index 628026f97a..06613559a6 100644
--- a/com.discord/smali/androidx/loader/R$style.smali
+++ b/com.discord/smali/androidx/loader/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali
index e2645c33b6..41b7668960 100644
--- a/com.discord/smali/androidx/loader/R$styleable.smali
+++ b/com.discord/smali/androidx/loader/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/media/R$attr.smali b/com.discord/smali/androidx/media/R$attr.smali
index 7bfd37085a..74db2b71cf 100644
--- a/com.discord/smali/androidx/media/R$attr.smali
+++ b/com.discord/smali/androidx/media/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/media/R$color.smali b/com.discord/smali/androidx/media/R$color.smali
index c7cb391bd2..98ef4b1511 100644
--- a/com.discord/smali/androidx/media/R$color.smali
+++ b/com.discord/smali/androidx/media/R$color.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final notification_material_background_media_default_color:I = 0x7f0600b4
+.field public static final notification_material_background_media_default_color:I = 0x7f0600f2
-.field public static final primary_text_default_material_dark:I = 0x7f0600f1
+.field public static final primary_text_default_material_dark:I = 0x7f060131
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_dark:I = 0x7f0600ff
+.field public static final secondary_text_default_material_dark:I = 0x7f06013f
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/media/R$dimen.smali b/com.discord/smali/androidx/media/R$dimen.smali
index 5a96d6486b..91971eea06 100644
--- a/com.discord/smali/androidx/media/R$dimen.smali
+++ b/com.discord/smali/androidx/media/R$dimen.smali
@@ -15,57 +15,57 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
-.field public static final subtitle_corner_radius:I = 0x7f070132
+.field public static final subtitle_corner_radius:I = 0x7f07019d
-.field public static final subtitle_outline_width:I = 0x7f070133
+.field public static final subtitle_outline_width:I = 0x7f07019e
-.field public static final subtitle_shadow_offset:I = 0x7f070134
+.field public static final subtitle_shadow_offset:I = 0x7f07019f
-.field public static final subtitle_shadow_radius:I = 0x7f070135
+.field public static final subtitle_shadow_radius:I = 0x7f0701a0
# direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 97984e08e6..bc798056c6 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index daa563fb8d..e4b897a9ac 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -15,71 +15,71 @@
# static fields
-.field public static final action0:I = 0x7f0a002d
+.field public static final action0:I = 0x7f0a0031
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final cancel_action:I = 0x7f0a0112
+.field public static final cancel_action:I = 0x7f0a0117
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final end_padder:I = 0x7f0a02d2
+.field public static final end_padder:I = 0x7f0a02de
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final media_actions:I = 0x7f0a0463
+.field public static final media_actions:I = 0x7f0a0474
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final status_bar_latest_event_content:I = 0x7f0a07a2
+.field public static final status_bar_latest_event_content:I = 0x7f0a07d1
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/media/R$integer.smali b/com.discord/smali/androidx/media/R$integer.smali
index 94c0349a1a..e0ec0cf043 100644
--- a/com.discord/smali/androidx/media/R$integer.smali
+++ b/com.discord/smali/androidx/media/R$integer.smali
@@ -17,7 +17,7 @@
# static fields
.field public static final cancel_button_image_alpha:I = 0x7f0b0005
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/media/R$layout.smali b/com.discord/smali/androidx/media/R$layout.smali
index 52ebc3d006..dd109743c4 100644
--- a/com.discord/smali/androidx/media/R$layout.smali
+++ b/com.discord/smali/androidx/media/R$layout.smali
@@ -15,35 +15,35 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_media_action:I = 0x7f0d004d
+.field public static final notification_media_action:I = 0x7f0d0068
-.field public static final notification_media_cancel_action:I = 0x7f0d004e
+.field public static final notification_media_cancel_action:I = 0x7f0d0069
-.field public static final notification_template_big_media:I = 0x7f0d0050
+.field public static final notification_template_big_media:I = 0x7f0d006b
-.field public static final notification_template_big_media_custom:I = 0x7f0d0051
+.field public static final notification_template_big_media_custom:I = 0x7f0d006c
-.field public static final notification_template_big_media_narrow:I = 0x7f0d0052
+.field public static final notification_template_big_media_narrow:I = 0x7f0d006d
-.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d0053
+.field public static final notification_template_big_media_narrow_custom:I = 0x7f0d006e
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_lines_media:I = 0x7f0d0056
+.field public static final notification_template_lines_media:I = 0x7f0d0071
-.field public static final notification_template_media:I = 0x7f0d0057
+.field public static final notification_template_media:I = 0x7f0d0072
-.field public static final notification_template_media_custom:I = 0x7f0d0058
+.field public static final notification_template_media_custom:I = 0x7f0d0073
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 3a06f45314..20e7ec650c 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/media/R$style.smali b/com.discord/smali/androidx/media/R$style.smali
index 236a481f68..169fa0a4b1 100644
--- a/com.discord/smali/androidx/media/R$style.smali
+++ b/com.discord/smali/androidx/media/R$style.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f1301b2
+.field public static final TextAppearance_Compat_Notification_Info_Media:I = 0x7f1301f0
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f1301b4
+.field public static final TextAppearance_Compat_Notification_Line2_Media:I = 0x7f1301f2
-.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f1301b5
+.field public static final TextAppearance_Compat_Notification_Media:I = 0x7f1301f3
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f1301b7
+.field public static final TextAppearance_Compat_Notification_Time_Media:I = 0x7f1301f5
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f1301b9
+.field public static final TextAppearance_Compat_Notification_Title_Media:I = 0x7f1301f7
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/media/R$styleable.smali b/com.discord/smali/androidx/media/R$styleable.smali
index 1418db3369..7b0a931591 100644
--- a/com.discord/smali/androidx/media/R$styleable.smali
+++ b/com.discord/smali/androidx/media/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/preference/R$attr.smali b/com.discord/smali/androidx/preference/R$attr.smali
index 7317607a2d..ec8cb60428 100644
--- a/com.discord/smali/androidx/preference/R$attr.smali
+++ b/com.discord/smali/androidx/preference/R$attr.smali
@@ -79,647 +79,647 @@
.field public static final actionProviderClass:I = 0x7f04001f
-.field public static final actionViewClass:I = 0x7f040020
+.field public static final actionViewClass:I = 0x7f040021
-.field public static final activityChooserViewStyle:I = 0x7f040025
+.field public static final activityChooserViewStyle:I = 0x7f040026
-.field public static final adjustable:I = 0x7f040029
+.field public static final adjustable:I = 0x7f04002a
-.field public static final alertDialogButtonGroupStyle:I = 0x7f04002a
+.field public static final alertDialogButtonGroupStyle:I = 0x7f04002b
-.field public static final alertDialogCenterButtons:I = 0x7f04002b
+.field public static final alertDialogCenterButtons:I = 0x7f04002c
-.field public static final alertDialogStyle:I = 0x7f04002c
+.field public static final alertDialogStyle:I = 0x7f04002d
-.field public static final alertDialogTheme:I = 0x7f04002d
+.field public static final alertDialogTheme:I = 0x7f04002e
-.field public static final allowDividerAbove:I = 0x7f040030
+.field public static final allowDividerAbove:I = 0x7f040031
-.field public static final allowDividerAfterLastItem:I = 0x7f040031
+.field public static final allowDividerAfterLastItem:I = 0x7f040032
-.field public static final allowDividerBelow:I = 0x7f040032
+.field public static final allowDividerBelow:I = 0x7f040033
-.field public static final allowStacking:I = 0x7f040033
+.field public static final allowStacking:I = 0x7f040034
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final alphabeticModifiers:I = 0x7f040035
+.field public static final alphabeticModifiers:I = 0x7f040036
-.field public static final arrowHeadLength:I = 0x7f04003f
+.field public static final arrowHeadLength:I = 0x7f040042
-.field public static final arrowShaftLength:I = 0x7f040040
+.field public static final arrowShaftLength:I = 0x7f040043
-.field public static final autoCompleteTextViewStyle:I = 0x7f040047
+.field public static final autoCompleteTextViewStyle:I = 0x7f04004a
-.field public static final autoSizeMaxTextSize:I = 0x7f040048
+.field public static final autoSizeMaxTextSize:I = 0x7f04004b
-.field public static final autoSizeMinTextSize:I = 0x7f040049
+.field public static final autoSizeMinTextSize:I = 0x7f04004c
-.field public static final autoSizePresetSizes:I = 0x7f04004a
+.field public static final autoSizePresetSizes:I = 0x7f04004d
-.field public static final autoSizeStepGranularity:I = 0x7f04004b
+.field public static final autoSizeStepGranularity:I = 0x7f04004e
-.field public static final autoSizeTextType:I = 0x7f04004c
+.field public static final autoSizeTextType:I = 0x7f04004f
-.field public static final background:I = 0x7f04004e
+.field public static final background:I = 0x7f040051
-.field public static final backgroundSplit:I = 0x7f040050
+.field public static final backgroundSplit:I = 0x7f040059
-.field public static final backgroundStacked:I = 0x7f040051
+.field public static final backgroundStacked:I = 0x7f04005a
-.field public static final backgroundTint:I = 0x7f040052
+.field public static final backgroundTint:I = 0x7f04005b
-.field public static final backgroundTintMode:I = 0x7f040053
+.field public static final backgroundTintMode:I = 0x7f04005c
-.field public static final barLength:I = 0x7f040054
+.field public static final barLength:I = 0x7f040061
-.field public static final borderlessButtonStyle:I = 0x7f04006c
+.field public static final borderlessButtonStyle:I = 0x7f04007d
-.field public static final buttonBarButtonStyle:I = 0x7f04007b
+.field public static final buttonBarButtonStyle:I = 0x7f04008d
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f04007c
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f04008e
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f04007d
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f04008f
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f04007e
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040090
-.field public static final buttonBarStyle:I = 0x7f04007f
+.field public static final buttonBarStyle:I = 0x7f040091
-.field public static final buttonCompat:I = 0x7f040080
+.field public static final buttonCompat:I = 0x7f040092
-.field public static final buttonGravity:I = 0x7f040081
+.field public static final buttonGravity:I = 0x7f040093
-.field public static final buttonIconDimen:I = 0x7f040082
+.field public static final buttonIconDimen:I = 0x7f040094
-.field public static final buttonPanelSideLayout:I = 0x7f040083
+.field public static final buttonPanelSideLayout:I = 0x7f040095
-.field public static final buttonStyle:I = 0x7f040085
+.field public static final buttonStyle:I = 0x7f040097
-.field public static final buttonStyleSmall:I = 0x7f040086
+.field public static final buttonStyleSmall:I = 0x7f040098
-.field public static final buttonTint:I = 0x7f040087
+.field public static final buttonTint:I = 0x7f040099
-.field public static final buttonTintMode:I = 0x7f040088
+.field public static final buttonTintMode:I = 0x7f04009a
-.field public static final checkBoxPreferenceStyle:I = 0x7f04009c
+.field public static final checkBoxPreferenceStyle:I = 0x7f0400af
-.field public static final checkboxStyle:I = 0x7f04009d
+.field public static final checkboxStyle:I = 0x7f0400b0
-.field public static final checkedTextViewStyle:I = 0x7f0400a2
+.field public static final checkedTextViewStyle:I = 0x7f0400b7
-.field public static final closeIcon:I = 0x7f0400b6
+.field public static final closeIcon:I = 0x7f0400cd
-.field public static final closeItemLayout:I = 0x7f0400bd
+.field public static final closeItemLayout:I = 0x7f0400d4
-.field public static final collapseContentDescription:I = 0x7f0400be
+.field public static final collapseContentDescription:I = 0x7f0400d5
-.field public static final collapseIcon:I = 0x7f0400bf
+.field public static final collapseIcon:I = 0x7f0400d6
-.field public static final color:I = 0x7f0400c2
+.field public static final color:I = 0x7f0400d9
-.field public static final colorAccent:I = 0x7f0400c3
+.field public static final colorAccent:I = 0x7f0400da
-.field public static final colorBackgroundFloating:I = 0x7f0400c5
+.field public static final colorBackgroundFloating:I = 0x7f0400dc
-.field public static final colorButtonNormal:I = 0x7f0400ca
+.field public static final colorButtonNormal:I = 0x7f0400e1
-.field public static final colorControlActivated:I = 0x7f0400cb
+.field public static final colorControlActivated:I = 0x7f0400e3
-.field public static final colorControlHighlight:I = 0x7f0400cc
+.field public static final colorControlHighlight:I = 0x7f0400e4
-.field public static final colorControlNormal:I = 0x7f0400cd
+.field public static final colorControlNormal:I = 0x7f0400e5
-.field public static final colorError:I = 0x7f0400ce
+.field public static final colorError:I = 0x7f0400e6
-.field public static final colorPrimary:I = 0x7f0400d1
+.field public static final colorPrimary:I = 0x7f0400ef
-.field public static final colorPrimaryDark:I = 0x7f0400d4
+.field public static final colorPrimaryDark:I = 0x7f0400f2
-.field public static final colorSwitchThumbNormal:I = 0x7f0400d9
+.field public static final colorSwitchThumbNormal:I = 0x7f0400fb
-.field public static final commitIcon:I = 0x7f0400df
+.field public static final commitIcon:I = 0x7f040101
-.field public static final contentDescription:I = 0x7f0400e4
+.field public static final contentDescription:I = 0x7f040106
-.field public static final contentInsetEnd:I = 0x7f0400e5
+.field public static final contentInsetEnd:I = 0x7f040107
-.field public static final contentInsetEndWithActions:I = 0x7f0400e6
+.field public static final contentInsetEndWithActions:I = 0x7f040108
-.field public static final contentInsetLeft:I = 0x7f0400e7
+.field public static final contentInsetLeft:I = 0x7f040109
-.field public static final contentInsetRight:I = 0x7f0400e8
+.field public static final contentInsetRight:I = 0x7f04010a
-.field public static final contentInsetStart:I = 0x7f0400e9
+.field public static final contentInsetStart:I = 0x7f04010b
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400ea
+.field public static final contentInsetStartWithNavigation:I = 0x7f04010c
-.field public static final controlBackground:I = 0x7f0400f1
+.field public static final controlBackground:I = 0x7f040113
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final customNavigationLayout:I = 0x7f040106
+.field public static final customNavigationLayout:I = 0x7f040134
-.field public static final defaultQueryHint:I = 0x7f04011d
+.field public static final defaultQueryHint:I = 0x7f04014f
-.field public static final defaultValue:I = 0x7f04011e
+.field public static final defaultValue:I = 0x7f040150
-.field public static final dependency:I = 0x7f04011f
+.field public static final dependency:I = 0x7f040151
-.field public static final dialogCornerRadius:I = 0x7f040120
+.field public static final dialogCornerRadius:I = 0x7f040152
-.field public static final dialogIcon:I = 0x7f040121
+.field public static final dialogIcon:I = 0x7f040153
-.field public static final dialogLayout:I = 0x7f040122
+.field public static final dialogLayout:I = 0x7f040154
-.field public static final dialogMessage:I = 0x7f040123
+.field public static final dialogMessage:I = 0x7f040155
-.field public static final dialogPreferenceStyle:I = 0x7f040124
+.field public static final dialogPreferenceStyle:I = 0x7f040156
-.field public static final dialogPreferredPadding:I = 0x7f040125
+.field public static final dialogPreferredPadding:I = 0x7f040157
-.field public static final dialogTheme:I = 0x7f040126
+.field public static final dialogTheme:I = 0x7f040158
-.field public static final dialogTitle:I = 0x7f040127
+.field public static final dialogTitle:I = 0x7f040159
-.field public static final disableDependentsState:I = 0x7f040128
+.field public static final disableDependentsState:I = 0x7f04015a
-.field public static final displayOptions:I = 0x7f040129
+.field public static final displayOptions:I = 0x7f04015b
-.field public static final divider:I = 0x7f04012a
+.field public static final divider:I = 0x7f04015c
-.field public static final dividerHorizontal:I = 0x7f04012e
+.field public static final dividerHorizontal:I = 0x7f040160
-.field public static final dividerPadding:I = 0x7f04012f
+.field public static final dividerPadding:I = 0x7f040161
-.field public static final dividerVertical:I = 0x7f040130
+.field public static final dividerVertical:I = 0x7f040162
-.field public static final drawableBottomCompat:I = 0x7f040131
+.field public static final drawableBottomCompat:I = 0x7f040163
-.field public static final drawableEndCompat:I = 0x7f040132
+.field public static final drawableEndCompat:I = 0x7f040164
-.field public static final drawableLeftCompat:I = 0x7f040133
+.field public static final drawableLeftCompat:I = 0x7f040165
-.field public static final drawableRightCompat:I = 0x7f040134
+.field public static final drawableRightCompat:I = 0x7f040166
-.field public static final drawableSize:I = 0x7f040135
+.field public static final drawableSize:I = 0x7f040167
-.field public static final drawableStartCompat:I = 0x7f040136
+.field public static final drawableStartCompat:I = 0x7f040168
-.field public static final drawableTint:I = 0x7f040137
+.field public static final drawableTint:I = 0x7f040169
-.field public static final drawableTintMode:I = 0x7f040138
+.field public static final drawableTintMode:I = 0x7f04016a
-.field public static final drawableTopCompat:I = 0x7f040139
+.field public static final drawableTopCompat:I = 0x7f04016b
-.field public static final drawerArrowStyle:I = 0x7f04013c
+.field public static final drawerArrowStyle:I = 0x7f04016e
-.field public static final dropDownListViewStyle:I = 0x7f04013e
+.field public static final dropDownListViewStyle:I = 0x7f040170
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04013f
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040171
-.field public static final dropdownPreferenceStyle:I = 0x7f040140
+.field public static final dropdownPreferenceStyle:I = 0x7f040172
-.field public static final editTextBackground:I = 0x7f040141
+.field public static final editTextBackground:I = 0x7f040173
-.field public static final editTextColor:I = 0x7f040142
+.field public static final editTextColor:I = 0x7f040174
-.field public static final editTextPreferenceStyle:I = 0x7f040143
+.field public static final editTextPreferenceStyle:I = 0x7f040175
-.field public static final editTextStyle:I = 0x7f040144
+.field public static final editTextStyle:I = 0x7f040176
-.field public static final elevation:I = 0x7f040145
+.field public static final elevation:I = 0x7f040177
-.field public static final enableCopying:I = 0x7f040147
+.field public static final enableCopying:I = 0x7f04017b
-.field public static final enabled:I = 0x7f040148
+.field public static final enabled:I = 0x7f04017c
-.field public static final entries:I = 0x7f04014b
+.field public static final entries:I = 0x7f040186
-.field public static final entryValues:I = 0x7f04014c
+.field public static final entryValues:I = 0x7f040187
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04014f
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04018e
-.field public static final fastScrollEnabled:I = 0x7f040161
+.field public static final fastScrollEnabled:I = 0x7f0401a3
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f040162
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f0401a4
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f040163
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f0401a5
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040164
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f0401a6
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040165
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f0401a7
-.field public static final firstBaselineToTopHeight:I = 0x7f040168
+.field public static final firstBaselineToTopHeight:I = 0x7f0401aa
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontFamily:I = 0x7f040175
+.field public static final fontFamily:I = 0x7f0401b7
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final fragment:I = 0x7f040180
+.field public static final fragment:I = 0x7f0401c2
-.field public static final gapBetweenBars:I = 0x7f040181
+.field public static final gapBetweenBars:I = 0x7f0401c3
-.field public static final goIcon:I = 0x7f040186
+.field public static final goIcon:I = 0x7f0401c8
-.field public static final height:I = 0x7f04018d
+.field public static final height:I = 0x7f0401cf
-.field public static final hideOnContentScroll:I = 0x7f040192
+.field public static final hideOnContentScroll:I = 0x7f0401d5
-.field public static final homeAsUpIndicator:I = 0x7f040199
+.field public static final homeAsUpIndicator:I = 0x7f0401dd
-.field public static final homeLayout:I = 0x7f04019a
+.field public static final homeLayout:I = 0x7f0401de
-.field public static final icon:I = 0x7f040216
+.field public static final icon:I = 0x7f04025a
-.field public static final iconSpaceReserved:I = 0x7f04021b
+.field public static final iconSpaceReserved:I = 0x7f04025f
-.field public static final iconTint:I = 0x7f04021d
+.field public static final iconTint:I = 0x7f040261
-.field public static final iconTintMode:I = 0x7f04021e
+.field public static final iconTintMode:I = 0x7f040262
-.field public static final iconifiedByDefault:I = 0x7f04021f
+.field public static final iconifiedByDefault:I = 0x7f040263
-.field public static final imageButtonStyle:I = 0x7f040222
+.field public static final imageButtonStyle:I = 0x7f040266
-.field public static final indeterminateProgressStyle:I = 0x7f04023c
+.field public static final indeterminateProgressStyle:I = 0x7f040280
-.field public static final initialActivityCount:I = 0x7f04023d
+.field public static final initialActivityCount:I = 0x7f040281
-.field public static final initialExpandedChildrenCount:I = 0x7f04023e
+.field public static final initialExpandedChildrenCount:I = 0x7f040282
-.field public static final isLightTheme:I = 0x7f040240
+.field public static final isLightTheme:I = 0x7f040284
-.field public static final isPreferenceVisible:I = 0x7f040241
+.field public static final isPreferenceVisible:I = 0x7f040286
-.field public static final itemPadding:I = 0x7f040248
+.field public static final itemPadding:I = 0x7f04028f
-.field public static final key:I = 0x7f04024f
+.field public static final key:I = 0x7f0402a0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final lastBaselineToBottomHeight:I = 0x7f040254
+.field public static final lastBaselineToBottomHeight:I = 0x7f0402a5
-.field public static final layout:I = 0x7f040255
+.field public static final layout:I = 0x7f0402a6
-.field public static final layoutManager:I = 0x7f040256
+.field public static final layoutManager:I = 0x7f0402a7
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final lineHeight:I = 0x7f0402a2
+.field public static final lineHeight:I = 0x7f0402f5
-.field public static final listChoiceBackgroundIndicator:I = 0x7f0402a4
+.field public static final listChoiceBackgroundIndicator:I = 0x7f0402f7
-.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402a5
+.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402f8
-.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402a6
+.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402f9
-.field public static final listDividerAlertDialog:I = 0x7f0402a7
+.field public static final listDividerAlertDialog:I = 0x7f0402fa
-.field public static final listItemLayout:I = 0x7f0402a8
+.field public static final listItemLayout:I = 0x7f0402fb
-.field public static final listLayout:I = 0x7f0402a9
+.field public static final listLayout:I = 0x7f0402fc
-.field public static final listMenuViewStyle:I = 0x7f0402aa
+.field public static final listMenuViewStyle:I = 0x7f0402fd
-.field public static final listPopupWindowStyle:I = 0x7f0402ab
+.field public static final listPopupWindowStyle:I = 0x7f0402fe
-.field public static final listPreferredItemHeight:I = 0x7f0402ac
+.field public static final listPreferredItemHeight:I = 0x7f0402ff
-.field public static final listPreferredItemHeightLarge:I = 0x7f0402ad
+.field public static final listPreferredItemHeightLarge:I = 0x7f040300
-.field public static final listPreferredItemHeightSmall:I = 0x7f0402ae
+.field public static final listPreferredItemHeightSmall:I = 0x7f040301
-.field public static final listPreferredItemPaddingEnd:I = 0x7f0402af
+.field public static final listPreferredItemPaddingEnd:I = 0x7f040302
-.field public static final listPreferredItemPaddingLeft:I = 0x7f0402b0
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040303
-.field public static final listPreferredItemPaddingRight:I = 0x7f0402b1
+.field public static final listPreferredItemPaddingRight:I = 0x7f040304
-.field public static final listPreferredItemPaddingStart:I = 0x7f0402b2
+.field public static final listPreferredItemPaddingStart:I = 0x7f040305
-.field public static final logo:I = 0x7f0402b3
+.field public static final logo:I = 0x7f040306
-.field public static final logoDescription:I = 0x7f0402b4
+.field public static final logoDescription:I = 0x7f040307
-.field public static final maxButtonHeight:I = 0x7f0402c8
+.field public static final maxButtonHeight:I = 0x7f04032d
-.field public static final maxHeight:I = 0x7f0402c9
+.field public static final maxHeight:I = 0x7f04032f
-.field public static final maxWidth:I = 0x7f0402cc
+.field public static final maxWidth:I = 0x7f040332
-.field public static final measureWithLargestChild:I = 0x7f0402ce
+.field public static final measureWithLargestChild:I = 0x7f040334
-.field public static final menu:I = 0x7f0402cf
+.field public static final menu:I = 0x7f040335
-.field public static final min:I = 0x7f0402d0
+.field public static final min:I = 0x7f040336
-.field public static final multiChoiceItemLayout:I = 0x7f0402d1
+.field public static final multiChoiceItemLayout:I = 0x7f040338
-.field public static final navigationContentDescription:I = 0x7f0402d2
+.field public static final navigationContentDescription:I = 0x7f040339
-.field public static final navigationIcon:I = 0x7f0402d3
+.field public static final navigationIcon:I = 0x7f04033a
-.field public static final navigationMode:I = 0x7f0402d4
+.field public static final navigationMode:I = 0x7f04033b
-.field public static final negativeButtonText:I = 0x7f0402d6
+.field public static final negativeButtonText:I = 0x7f04033d
-.field public static final numericModifiers:I = 0x7f0402d9
+.field public static final numericModifiers:I = 0x7f040341
-.field public static final order:I = 0x7f0402da
+.field public static final order:I = 0x7f040342
-.field public static final orderingFromXml:I = 0x7f0402db
+.field public static final orderingFromXml:I = 0x7f040343
-.field public static final overlapAnchor:I = 0x7f0402dc
+.field public static final overlapAnchor:I = 0x7f040344
-.field public static final paddingBottomNoButtons:I = 0x7f0402e0
+.field public static final paddingBottomNoButtons:I = 0x7f040348
-.field public static final paddingEnd:I = 0x7f0402e1
+.field public static final paddingEnd:I = 0x7f040349
-.field public static final paddingStart:I = 0x7f0402e2
+.field public static final paddingStart:I = 0x7f04034a
-.field public static final paddingTopNoTitle:I = 0x7f0402e3
+.field public static final paddingTopNoTitle:I = 0x7f04034b
-.field public static final panelBackground:I = 0x7f0402e4
+.field public static final panelBackground:I = 0x7f04034c
-.field public static final panelMenuListTheme:I = 0x7f0402e5
+.field public static final panelMenuListTheme:I = 0x7f04034d
-.field public static final panelMenuListWidth:I = 0x7f0402e6
+.field public static final panelMenuListWidth:I = 0x7f04034e
-.field public static final persistent:I = 0x7f0402ec
+.field public static final persistent:I = 0x7f040354
-.field public static final popupMenuStyle:I = 0x7f0402ef
+.field public static final popupMenuStyle:I = 0x7f040358
-.field public static final popupTheme:I = 0x7f0402f0
+.field public static final popupTheme:I = 0x7f040359
-.field public static final popupWindowStyle:I = 0x7f0402f1
+.field public static final popupWindowStyle:I = 0x7f04035a
-.field public static final positiveButtonText:I = 0x7f0402f2
+.field public static final positiveButtonText:I = 0x7f04035b
-.field public static final preferenceCategoryStyle:I = 0x7f0402f3
+.field public static final preferenceCategoryStyle:I = 0x7f04035c
-.field public static final preferenceCategoryTitleTextAppearance:I = 0x7f0402f4
+.field public static final preferenceCategoryTitleTextAppearance:I = 0x7f04035d
-.field public static final preferenceFragmentCompatStyle:I = 0x7f0402f5
+.field public static final preferenceFragmentCompatStyle:I = 0x7f04035e
-.field public static final preferenceFragmentListStyle:I = 0x7f0402f6
+.field public static final preferenceFragmentListStyle:I = 0x7f04035f
-.field public static final preferenceFragmentStyle:I = 0x7f0402f7
+.field public static final preferenceFragmentStyle:I = 0x7f040360
-.field public static final preferenceInformationStyle:I = 0x7f0402f8
+.field public static final preferenceInformationStyle:I = 0x7f040361
-.field public static final preferenceScreenStyle:I = 0x7f0402f9
+.field public static final preferenceScreenStyle:I = 0x7f040362
-.field public static final preferenceStyle:I = 0x7f0402fa
+.field public static final preferenceStyle:I = 0x7f040363
-.field public static final preferenceTheme:I = 0x7f0402fb
+.field public static final preferenceTheme:I = 0x7f040364
-.field public static final preserveIconSpacing:I = 0x7f0402fc
+.field public static final preserveIconSpacing:I = 0x7f040365
-.field public static final progressBarPadding:I = 0x7f040328
+.field public static final progressBarPadding:I = 0x7f040391
-.field public static final progressBarStyle:I = 0x7f040329
+.field public static final progressBarStyle:I = 0x7f040392
-.field public static final queryBackground:I = 0x7f04032c
+.field public static final queryBackground:I = 0x7f040395
-.field public static final queryHint:I = 0x7f04032d
+.field public static final queryHint:I = 0x7f040396
-.field public static final radioButtonStyle:I = 0x7f04032e
+.field public static final radioButtonStyle:I = 0x7f040397
-.field public static final ratingBarStyle:I = 0x7f040331
+.field public static final ratingBarStyle:I = 0x7f04039b
-.field public static final ratingBarStyleIndicator:I = 0x7f040332
+.field public static final ratingBarStyleIndicator:I = 0x7f04039c
-.field public static final ratingBarStyleSmall:I = 0x7f040333
+.field public static final ratingBarStyleSmall:I = 0x7f04039d
-.field public static final reverseLayout:I = 0x7f040337
+.field public static final reverseLayout:I = 0x7f0403a1
-.field public static final searchHintIcon:I = 0x7f04035a
+.field public static final searchHintIcon:I = 0x7f0403c4
-.field public static final searchIcon:I = 0x7f04035b
+.field public static final searchIcon:I = 0x7f0403c5
-.field public static final searchViewStyle:I = 0x7f04035c
+.field public static final searchViewStyle:I = 0x7f0403c6
-.field public static final seekBarIncrement:I = 0x7f04035e
+.field public static final seekBarIncrement:I = 0x7f0403c8
-.field public static final seekBarPreferenceStyle:I = 0x7f04035f
+.field public static final seekBarPreferenceStyle:I = 0x7f0403c9
-.field public static final seekBarStyle:I = 0x7f040360
+.field public static final seekBarStyle:I = 0x7f0403ca
-.field public static final selectable:I = 0x7f040361
+.field public static final selectable:I = 0x7f0403cb
-.field public static final selectableItemBackground:I = 0x7f040362
+.field public static final selectableItemBackground:I = 0x7f0403cc
-.field public static final selectableItemBackgroundBorderless:I = 0x7f040363
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0403cd
-.field public static final shouldDisableView:I = 0x7f040365
+.field public static final shouldDisableView:I = 0x7f0403d4
-.field public static final showAsAction:I = 0x7f040367
+.field public static final showAsAction:I = 0x7f0403d6
-.field public static final showDividers:I = 0x7f04036b
+.field public static final showDividers:I = 0x7f0403da
-.field public static final showSeekBarValue:I = 0x7f04036d
+.field public static final showSeekBarValue:I = 0x7f0403dc
-.field public static final showText:I = 0x7f04036e
+.field public static final showText:I = 0x7f0403dd
-.field public static final showTitle:I = 0x7f04036f
+.field public static final showTitle:I = 0x7f0403de
-.field public static final singleChoiceItemLayout:I = 0x7f040370
+.field public static final singleChoiceItemLayout:I = 0x7f0403e0
-.field public static final singleLineTitle:I = 0x7f040372
+.field public static final singleLineTitle:I = 0x7f0403e2
-.field public static final spanCount:I = 0x7f040376
+.field public static final spanCount:I = 0x7f0403e6
-.field public static final spinBars:I = 0x7f040377
+.field public static final spinBars:I = 0x7f0403e7
-.field public static final spinnerDropDownItemStyle:I = 0x7f040378
+.field public static final spinnerDropDownItemStyle:I = 0x7f0403e8
-.field public static final spinnerStyle:I = 0x7f040379
+.field public static final spinnerStyle:I = 0x7f0403e9
-.field public static final splitTrack:I = 0x7f04037a
+.field public static final splitTrack:I = 0x7f0403ea
-.field public static final srcCompat:I = 0x7f04037c
+.field public static final srcCompat:I = 0x7f0403ec
-.field public static final stackFromEnd:I = 0x7f04037d
+.field public static final stackFromEnd:I = 0x7f0403ed
-.field public static final state_above_anchor:I = 0x7f04037e
+.field public static final state_above_anchor:I = 0x7f0403f3
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final subMenuArrow:I = 0x7f04038a
+.field public static final subMenuArrow:I = 0x7f040400
-.field public static final submitBackground:I = 0x7f04038b
+.field public static final submitBackground:I = 0x7f040401
-.field public static final subtitle:I = 0x7f04038c
+.field public static final subtitle:I = 0x7f040402
-.field public static final subtitleTextAppearance:I = 0x7f04038d
+.field public static final subtitleTextAppearance:I = 0x7f040403
-.field public static final subtitleTextColor:I = 0x7f04038e
+.field public static final subtitleTextColor:I = 0x7f040404
-.field public static final subtitleTextStyle:I = 0x7f04038f
+.field public static final subtitleTextStyle:I = 0x7f040405
-.field public static final suggestionRowLayout:I = 0x7f040390
+.field public static final suggestionRowLayout:I = 0x7f040406
-.field public static final summary:I = 0x7f040391
+.field public static final summary:I = 0x7f040407
-.field public static final summaryOff:I = 0x7f040392
+.field public static final summaryOff:I = 0x7f040408
-.field public static final summaryOn:I = 0x7f040393
+.field public static final summaryOn:I = 0x7f040409
-.field public static final switchMinWidth:I = 0x7f040394
+.field public static final switchMinWidth:I = 0x7f04040a
-.field public static final switchPadding:I = 0x7f040395
+.field public static final switchPadding:I = 0x7f04040b
-.field public static final switchPreferenceCompatStyle:I = 0x7f040396
+.field public static final switchPreferenceCompatStyle:I = 0x7f04040c
-.field public static final switchPreferenceStyle:I = 0x7f040397
+.field public static final switchPreferenceStyle:I = 0x7f04040d
-.field public static final switchStyle:I = 0x7f040398
+.field public static final switchStyle:I = 0x7f04040e
-.field public static final switchTextAppearance:I = 0x7f040399
+.field public static final switchTextAppearance:I = 0x7f04040f
-.field public static final switchTextOff:I = 0x7f04039a
+.field public static final switchTextOff:I = 0x7f040410
-.field public static final switchTextOn:I = 0x7f04039b
+.field public static final switchTextOn:I = 0x7f040411
-.field public static final textAllCaps:I = 0x7f0403b9
+.field public static final textAllCaps:I = 0x7f04042f
-.field public static final textAppearanceLargePopupMenu:I = 0x7f0403c4
+.field public static final textAppearanceLargePopupMenu:I = 0x7f04043a
-.field public static final textAppearanceListItem:I = 0x7f0403c5
+.field public static final textAppearanceListItem:I = 0x7f04043c
-.field public static final textAppearanceListItemSecondary:I = 0x7f0403c6
+.field public static final textAppearanceListItemSecondary:I = 0x7f04043d
-.field public static final textAppearanceListItemSmall:I = 0x7f0403c7
+.field public static final textAppearanceListItemSmall:I = 0x7f04043e
-.field public static final textAppearancePopupMenuHeader:I = 0x7f0403c9
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040440
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0403ca
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040441
-.field public static final textAppearanceSearchResultTitle:I = 0x7f0403cb
+.field public static final textAppearanceSearchResultTitle:I = 0x7f040442
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f0403cc
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f040443
-.field public static final textColorAlertDialogListItem:I = 0x7f0403cf
+.field public static final textColorAlertDialogListItem:I = 0x7f040446
-.field public static final textColorSearchUrl:I = 0x7f0403d0
+.field public static final textColorSearchUrl:I = 0x7f040447
-.field public static final textLocale:I = 0x7f0403d3
+.field public static final textLocale:I = 0x7f04044a
-.field public static final theme:I = 0x7f0403d6
+.field public static final theme:I = 0x7f04044d
-.field public static final thickness:I = 0x7f040422
+.field public static final thickness:I = 0x7f04049a
-.field public static final thumbTextPadding:I = 0x7f040423
+.field public static final thumbTextPadding:I = 0x7f04049b
-.field public static final thumbTint:I = 0x7f040424
+.field public static final thumbTint:I = 0x7f04049c
-.field public static final thumbTintMode:I = 0x7f040425
+.field public static final thumbTintMode:I = 0x7f04049d
-.field public static final tickMark:I = 0x7f040426
+.field public static final tickMark:I = 0x7f04049e
-.field public static final tickMarkTint:I = 0x7f040427
+.field public static final tickMarkTint:I = 0x7f04049f
-.field public static final tickMarkTintMode:I = 0x7f040428
+.field public static final tickMarkTintMode:I = 0x7f0404a0
-.field public static final tint:I = 0x7f040429
+.field public static final tint:I = 0x7f0404a1
-.field public static final tintMode:I = 0x7f04042a
+.field public static final tintMode:I = 0x7f0404a2
-.field public static final title:I = 0x7f04042b
+.field public static final title:I = 0x7f0404a3
-.field public static final titleMargin:I = 0x7f04042d
+.field public static final titleMargin:I = 0x7f0404a5
-.field public static final titleMarginBottom:I = 0x7f04042e
+.field public static final titleMarginBottom:I = 0x7f0404a6
-.field public static final titleMarginEnd:I = 0x7f04042f
+.field public static final titleMarginEnd:I = 0x7f0404a7
-.field public static final titleMarginStart:I = 0x7f040430
+.field public static final titleMarginStart:I = 0x7f0404a8
-.field public static final titleMarginTop:I = 0x7f040431
+.field public static final titleMarginTop:I = 0x7f0404a9
-.field public static final titleMargins:I = 0x7f040432
+.field public static final titleMargins:I = 0x7f0404aa
-.field public static final titleTextAppearance:I = 0x7f040433
+.field public static final titleTextAppearance:I = 0x7f0404ab
-.field public static final titleTextColor:I = 0x7f040434
+.field public static final titleTextColor:I = 0x7f0404ac
-.field public static final titleTextStyle:I = 0x7f040435
+.field public static final titleTextStyle:I = 0x7f0404ad
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040438
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0404b0
-.field public static final toolbarStyle:I = 0x7f040439
+.field public static final toolbarStyle:I = 0x7f0404b1
-.field public static final tooltipForegroundColor:I = 0x7f04043a
+.field public static final tooltipForegroundColor:I = 0x7f0404b2
-.field public static final tooltipFrameBackground:I = 0x7f04043b
+.field public static final tooltipFrameBackground:I = 0x7f0404b3
-.field public static final tooltipText:I = 0x7f04043c
+.field public static final tooltipText:I = 0x7f0404b4
-.field public static final track:I = 0x7f04043d
+.field public static final track:I = 0x7f0404b5
-.field public static final trackTint:I = 0x7f04043e
+.field public static final trackTint:I = 0x7f0404b6
-.field public static final trackTintMode:I = 0x7f04043f
+.field public static final trackTintMode:I = 0x7f0404b7
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
-.field public static final updatesContinuously:I = 0x7f040454
+.field public static final updatesContinuously:I = 0x7f0404cc
-.field public static final useSimpleSummaryProvider:I = 0x7f040456
+.field public static final useSimpleSummaryProvider:I = 0x7f0404cf
-.field public static final viewInflaterClass:I = 0x7f04045d
+.field public static final viewInflaterClass:I = 0x7f0404d6
-.field public static final voiceIcon:I = 0x7f04045e
+.field public static final voiceIcon:I = 0x7f0404d7
-.field public static final widgetLayout:I = 0x7f040460
+.field public static final widgetLayout:I = 0x7f0404d9
-.field public static final windowActionBar:I = 0x7f040461
+.field public static final windowActionBar:I = 0x7f0404da
-.field public static final windowActionBarOverlay:I = 0x7f040462
+.field public static final windowActionBarOverlay:I = 0x7f0404db
-.field public static final windowActionModeOverlay:I = 0x7f040463
+.field public static final windowActionModeOverlay:I = 0x7f0404dc
-.field public static final windowFixedHeightMajor:I = 0x7f040464
+.field public static final windowFixedHeightMajor:I = 0x7f0404dd
-.field public static final windowFixedHeightMinor:I = 0x7f040465
+.field public static final windowFixedHeightMinor:I = 0x7f0404de
-.field public static final windowFixedWidthMajor:I = 0x7f040466
+.field public static final windowFixedWidthMajor:I = 0x7f0404df
-.field public static final windowFixedWidthMinor:I = 0x7f040467
+.field public static final windowFixedWidthMinor:I = 0x7f0404e0
-.field public static final windowMinWidthMajor:I = 0x7f040468
+.field public static final windowMinWidthMajor:I = 0x7f0404e1
-.field public static final windowMinWidthMinor:I = 0x7f040469
+.field public static final windowMinWidthMinor:I = 0x7f0404e2
-.field public static final windowNoTitle:I = 0x7f04046a
+.field public static final windowNoTitle:I = 0x7f0404e3
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$color.smali b/com.discord/smali/androidx/preference/R$color.smali
index 850de3ebc4..f5fb1aa4d3 100644
--- a/com.discord/smali/androidx/preference/R$color.smali
+++ b/com.discord/smali/androidx/preference/R$color.smali
@@ -91,99 +91,99 @@
.field public static final button_material_light:I = 0x7f060042
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060084
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006b
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060085
-.field public static final dim_foreground_material_dark:I = 0x7f06006c
+.field public static final dim_foreground_material_dark:I = 0x7f060086
-.field public static final dim_foreground_material_light:I = 0x7f06006d
+.field public static final dim_foreground_material_light:I = 0x7f060087
-.field public static final error_color_material_dark:I = 0x7f06006e
+.field public static final error_color_material_dark:I = 0x7f060088
-.field public static final error_color_material_light:I = 0x7f06006f
+.field public static final error_color_material_light:I = 0x7f060089
-.field public static final foreground_material_dark:I = 0x7f060074
+.field public static final foreground_material_dark:I = 0x7f06008e
-.field public static final foreground_material_light:I = 0x7f060075
+.field public static final foreground_material_light:I = 0x7f06008f
-.field public static final highlighted_text_material_dark:I = 0x7f060084
+.field public static final highlighted_text_material_dark:I = 0x7f06009e
-.field public static final highlighted_text_material_light:I = 0x7f060085
+.field public static final highlighted_text_material_light:I = 0x7f06009f
-.field public static final material_blue_grey_800:I = 0x7f06008c
+.field public static final material_blue_grey_800:I = 0x7f0600a6
-.field public static final material_blue_grey_900:I = 0x7f06008d
+.field public static final material_blue_grey_900:I = 0x7f0600a7
-.field public static final material_blue_grey_950:I = 0x7f06008e
+.field public static final material_blue_grey_950:I = 0x7f0600a8
-.field public static final material_deep_teal_200:I = 0x7f06008f
+.field public static final material_deep_teal_200:I = 0x7f0600a9
-.field public static final material_deep_teal_500:I = 0x7f060090
+.field public static final material_deep_teal_500:I = 0x7f0600aa
-.field public static final material_grey_100:I = 0x7f060091
+.field public static final material_grey_100:I = 0x7f0600ab
-.field public static final material_grey_300:I = 0x7f060092
+.field public static final material_grey_300:I = 0x7f0600ac
-.field public static final material_grey_50:I = 0x7f060093
+.field public static final material_grey_50:I = 0x7f0600ad
-.field public static final material_grey_600:I = 0x7f060094
+.field public static final material_grey_600:I = 0x7f0600ae
-.field public static final material_grey_800:I = 0x7f060095
+.field public static final material_grey_800:I = 0x7f0600af
-.field public static final material_grey_850:I = 0x7f060096
+.field public static final material_grey_850:I = 0x7f0600b0
-.field public static final material_grey_900:I = 0x7f060097
+.field public static final material_grey_900:I = 0x7f0600b1
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final preference_fallback_accent_color:I = 0x7f0600b6
+.field public static final preference_fallback_accent_color:I = 0x7f0600f4
-.field public static final primary_dark_material_dark:I = 0x7f0600dd
+.field public static final primary_dark_material_dark:I = 0x7f06011c
-.field public static final primary_dark_material_light:I = 0x7f0600de
+.field public static final primary_dark_material_light:I = 0x7f06011d
-.field public static final primary_material_dark:I = 0x7f0600ef
+.field public static final primary_material_dark:I = 0x7f06012f
-.field public static final primary_material_light:I = 0x7f0600f0
+.field public static final primary_material_light:I = 0x7f060130
-.field public static final primary_text_default_material_dark:I = 0x7f0600f1
+.field public static final primary_text_default_material_dark:I = 0x7f060131
-.field public static final primary_text_default_material_light:I = 0x7f0600f2
+.field public static final primary_text_default_material_light:I = 0x7f060132
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f3
+.field public static final primary_text_disabled_material_dark:I = 0x7f060133
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f4
+.field public static final primary_text_disabled_material_light:I = 0x7f060134
-.field public static final ripple_material_dark:I = 0x7f0600fd
+.field public static final ripple_material_dark:I = 0x7f06013d
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_dark:I = 0x7f0600ff
+.field public static final secondary_text_default_material_dark:I = 0x7f06013f
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
-.field public static final secondary_text_disabled_material_dark:I = 0x7f060101
+.field public static final secondary_text_disabled_material_dark:I = 0x7f060141
-.field public static final secondary_text_disabled_material_light:I = 0x7f060102
+.field public static final secondary_text_disabled_material_light:I = 0x7f060142
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f060133
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f060174
-.field public static final switch_thumb_disabled_material_light:I = 0x7f060134
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060175
-.field public static final switch_thumb_material_dark:I = 0x7f060135
+.field public static final switch_thumb_material_dark:I = 0x7f060176
-.field public static final switch_thumb_material_light:I = 0x7f060136
+.field public static final switch_thumb_material_light:I = 0x7f060177
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060137
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060178
-.field public static final switch_thumb_normal_material_light:I = 0x7f060138
+.field public static final switch_thumb_normal_material_light:I = 0x7f060179
-.field public static final tooltip_background_dark:I = 0x7f06013a
+.field public static final tooltip_background_dark:I = 0x7f06017d
-.field public static final tooltip_background_light:I = 0x7f06013b
+.field public static final tooltip_background_light:I = 0x7f06017e
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$dimen.smali b/com.discord/smali/androidx/preference/R$dimen.smali
index b780808d2d..cb2230295f 100644
--- a/com.discord/smali/androidx/preference/R$dimen.smali
+++ b/com.discord/smali/androidx/preference/R$dimen.smali
@@ -171,105 +171,105 @@
.field public static final abc_text_size_title_material_toolbar:I = 0x7f07004d
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b6
+.field public static final disabled_alpha_material_dark:I = 0x7f0700bb
-.field public static final disabled_alpha_material_light:I = 0x7f0700b7
+.field public static final disabled_alpha_material_light:I = 0x7f0700bc
-.field public static final fastscroll_default_thickness:I = 0x7f0700be
+.field public static final fastscroll_default_thickness:I = 0x7f0700c3
-.field public static final fastscroll_margin:I = 0x7f0700bf
+.field public static final fastscroll_margin:I = 0x7f0700c4
-.field public static final fastscroll_minimum_range:I = 0x7f0700c0
+.field public static final fastscroll_minimum_range:I = 0x7f0700c5
-.field public static final highlight_alpha_material_colored:I = 0x7f0700cc
+.field public static final highlight_alpha_material_colored:I = 0x7f0700d1
-.field public static final highlight_alpha_material_dark:I = 0x7f0700cd
+.field public static final highlight_alpha_material_dark:I = 0x7f0700d2
-.field public static final highlight_alpha_material_light:I = 0x7f0700ce
+.field public static final highlight_alpha_material_light:I = 0x7f0700d3
-.field public static final hint_alpha_material_dark:I = 0x7f0700cf
+.field public static final hint_alpha_material_dark:I = 0x7f0700d4
-.field public static final hint_alpha_material_light:I = 0x7f0700d0
+.field public static final hint_alpha_material_light:I = 0x7f0700d5
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d1
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d6
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d2
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d7
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d4
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d9
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d5
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700da
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d6
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700db
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
-.field public static final preference_dropdown_padding_start:I = 0x7f070125
+.field public static final preference_dropdown_padding_start:I = 0x7f070190
-.field public static final preference_icon_minWidth:I = 0x7f070126
+.field public static final preference_icon_minWidth:I = 0x7f070191
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070127
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f070192
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070128
+.field public static final preference_seekbar_padding_vertical:I = 0x7f070193
-.field public static final preference_seekbar_value_minWidth:I = 0x7f070129
+.field public static final preference_seekbar_value_minWidth:I = 0x7f070194
-.field public static final tooltip_corner_radius:I = 0x7f070139
+.field public static final tooltip_corner_radius:I = 0x7f0701a5
-.field public static final tooltip_horizontal_padding:I = 0x7f07013a
+.field public static final tooltip_horizontal_padding:I = 0x7f0701a6
-.field public static final tooltip_margin:I = 0x7f07013b
+.field public static final tooltip_margin:I = 0x7f0701a7
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07013c
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f0701a8
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07013d
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a9
-.field public static final tooltip_vertical_padding:I = 0x7f07013e
+.field public static final tooltip_vertical_padding:I = 0x7f0701aa
-.field public static final tooltip_y_offset_non_touch:I = 0x7f07013f
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701ab
-.field public static final tooltip_y_offset_touch:I = 0x7f070140
+.field public static final tooltip_y_offset_touch:I = 0x7f0701ac
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali
index 86c68c838a..50dc5f1bea 100644
--- a/com.discord/smali/androidx/preference/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/R$drawable.smali
@@ -203,37 +203,37 @@
.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800aa
-.field public static final ic_arrow_down_24dp:I = 0x7f0801ee
+.field public static final ic_arrow_down_24dp:I = 0x7f0801d9
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
-.field public static final preference_list_divider_material:I = 0x7f0804ba
+.field public static final preference_list_divider_material:I = 0x7f0804b4
-.field public static final tooltip_frame_dark:I = 0x7f0804c7
+.field public static final tooltip_frame_dark:I = 0x7f0804c2
-.field public static final tooltip_frame_light:I = 0x7f0804c8
+.field public static final tooltip_frame_light:I = 0x7f0804c3
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index a0bd851319..8156d58eb9 100644
--- a/com.discord/smali/androidx/preference/R$id.smali
+++ b/com.discord/smali/androidx/preference/R$id.smali
@@ -15,315 +15,315 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_bar:I = 0x7f0a002e
+.field public static final action_bar:I = 0x7f0a0032
-.field public static final action_bar_activity_content:I = 0x7f0a002f
+.field public static final action_bar_activity_content:I = 0x7f0a0033
-.field public static final action_bar_container:I = 0x7f0a0030
+.field public static final action_bar_container:I = 0x7f0a0034
-.field public static final action_bar_root:I = 0x7f0a0031
+.field public static final action_bar_root:I = 0x7f0a0035
-.field public static final action_bar_spinner:I = 0x7f0a0032
+.field public static final action_bar_spinner:I = 0x7f0a0036
-.field public static final action_bar_subtitle:I = 0x7f0a0033
+.field public static final action_bar_subtitle:I = 0x7f0a0037
-.field public static final action_bar_title:I = 0x7f0a0035
+.field public static final action_bar_title:I = 0x7f0a0039
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_context_bar:I = 0x7f0a003a
+.field public static final action_context_bar:I = 0x7f0a003e
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_menu_divider:I = 0x7f0a003d
+.field public static final action_menu_divider:I = 0x7f0a0041
-.field public static final action_menu_presenter:I = 0x7f0a003e
+.field public static final action_menu_presenter:I = 0x7f0a0042
-.field public static final action_mode_bar:I = 0x7f0a003f
+.field public static final action_mode_bar:I = 0x7f0a0043
-.field public static final action_mode_bar_stub:I = 0x7f0a0040
+.field public static final action_mode_bar_stub:I = 0x7f0a0044
-.field public static final action_mode_close_button:I = 0x7f0a0041
+.field public static final action_mode_close_button:I = 0x7f0a0045
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final activity_chooser_view_content:I = 0x7f0a0051
+.field public static final activity_chooser_view_content:I = 0x7f0a0055
-.field public static final add:I = 0x7f0a0052
+.field public static final add:I = 0x7f0a0056
-.field public static final alertTitle:I = 0x7f0a0061
+.field public static final alertTitle:I = 0x7f0a0065
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final buttonPanel:I = 0x7f0a0107
+.field public static final buttonPanel:I = 0x7f0a010b
-.field public static final checkbox:I = 0x7f0a021a
+.field public static final checkbox:I = 0x7f0a021f
-.field public static final checked:I = 0x7f0a021c
+.field public static final checked:I = 0x7f0a0221
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final content:I = 0x7f0a023d
+.field public static final content:I = 0x7f0a0246
-.field public static final contentPanel:I = 0x7f0a023e
+.field public static final contentPanel:I = 0x7f0a0247
-.field public static final custom:I = 0x7f0a025b
+.field public static final custom:I = 0x7f0a0264
-.field public static final customPanel:I = 0x7f0a025c
+.field public static final customPanel:I = 0x7f0a0265
-.field public static final decor_content_parent:I = 0x7f0a0260
+.field public static final decor_content_parent:I = 0x7f0a026b
-.field public static final default_activity_button:I = 0x7f0a0261
+.field public static final default_activity_button:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final edit_query:I = 0x7f0a02b8
+.field public static final edit_query:I = 0x7f0a02c4
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final expand_activities_button:I = 0x7f0a02d7
+.field public static final expand_activities_button:I = 0x7f0a02e3
-.field public static final expanded_menu:I = 0x7f0a02d8
+.field public static final expanded_menu:I = 0x7f0a02e4
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final group_divider:I = 0x7f0a033d
+.field public static final group_divider:I = 0x7f0a034d
-.field public static final home:I = 0x7f0a03b2
+.field public static final home:I = 0x7f0a03c3
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_frame:I = 0x7f0a03b5
+.field public static final icon_frame:I = 0x7f0a03c6
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final image:I = 0x7f0a03b9
+.field public static final image:I = 0x7f0a03ca
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0430
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0441
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final listMode:I = 0x7f0a0443
+.field public static final listMode:I = 0x7f0a0454
-.field public static final list_item:I = 0x7f0a0444
+.field public static final list_item:I = 0x7f0a0455
-.field public static final message:I = 0x7f0a04a9
+.field public static final message:I = 0x7f0a04ba
-.field public static final multiply:I = 0x7f0a04b1
+.field public static final multiply:I = 0x7f0a04da
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final off:I = 0x7f0a04fd
+.field public static final off:I = 0x7f0a0527
-.field public static final on:I = 0x7f0a04ff
+.field public static final on:I = 0x7f0a0529
-.field public static final parentPanel:I = 0x7f0a0511
+.field public static final parentPanel:I = 0x7f0a053b
-.field public static final progress_circular:I = 0x7f0a05a4
+.field public static final progress_circular:I = 0x7f0a05d0
-.field public static final progress_horizontal:I = 0x7f0a05a7
+.field public static final progress_horizontal:I = 0x7f0a05d3
-.field public static final radio:I = 0x7f0a05b6
+.field public static final radio:I = 0x7f0a05e2
-.field public static final recycler_view:I = 0x7f0a05bc
+.field public static final recycler_view:I = 0x7f0a05e8
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final screen:I = 0x7f0a0610
+.field public static final screen:I = 0x7f0a063d
-.field public static final scrollIndicatorDown:I = 0x7f0a0612
+.field public static final scrollIndicatorDown:I = 0x7f0a063f
-.field public static final scrollIndicatorUp:I = 0x7f0a0613
+.field public static final scrollIndicatorUp:I = 0x7f0a0640
-.field public static final scrollView:I = 0x7f0a0614
+.field public static final scrollView:I = 0x7f0a0641
-.field public static final search_badge:I = 0x7f0a0618
+.field public static final search_badge:I = 0x7f0a0645
-.field public static final search_bar:I = 0x7f0a0619
+.field public static final search_bar:I = 0x7f0a0646
-.field public static final search_button:I = 0x7f0a061a
+.field public static final search_button:I = 0x7f0a0647
-.field public static final search_close_btn:I = 0x7f0a061c
+.field public static final search_close_btn:I = 0x7f0a0649
-.field public static final search_edit_frame:I = 0x7f0a061d
+.field public static final search_edit_frame:I = 0x7f0a064a
-.field public static final search_go_btn:I = 0x7f0a0620
+.field public static final search_go_btn:I = 0x7f0a064d
-.field public static final search_mag_icon:I = 0x7f0a0622
+.field public static final search_mag_icon:I = 0x7f0a064f
-.field public static final search_plate:I = 0x7f0a0623
+.field public static final search_plate:I = 0x7f0a0650
-.field public static final search_src_text:I = 0x7f0a0626
+.field public static final search_src_text:I = 0x7f0a0653
-.field public static final search_voice_btn:I = 0x7f0a0632
+.field public static final search_voice_btn:I = 0x7f0a065f
-.field public static final seekbar:I = 0x7f0a0633
+.field public static final seekbar:I = 0x7f0a0660
-.field public static final seekbar_value:I = 0x7f0a0634
+.field public static final seekbar_value:I = 0x7f0a0661
-.field public static final select_dialog_listview:I = 0x7f0a0635
+.field public static final select_dialog_listview:I = 0x7f0a0662
-.field public static final shortcut:I = 0x7f0a077f
+.field public static final shortcut:I = 0x7f0a07ac
-.field public static final spacer:I = 0x7f0a078c
+.field public static final spacer:I = 0x7f0a07bb
-.field public static final spinner:I = 0x7f0a0795
+.field public static final spinner:I = 0x7f0a07c4
-.field public static final split_action_bar:I = 0x7f0a0796
+.field public static final split_action_bar:I = 0x7f0a07c5
-.field public static final src_atop:I = 0x7f0a0799
+.field public static final src_atop:I = 0x7f0a07c8
-.field public static final src_in:I = 0x7f0a079a
+.field public static final src_in:I = 0x7f0a07c9
-.field public static final src_over:I = 0x7f0a079b
+.field public static final src_over:I = 0x7f0a07ca
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final submenuarrow:I = 0x7f0a07b9
+.field public static final submenuarrow:I = 0x7f0a07e8
-.field public static final submit_area:I = 0x7f0a07ba
+.field public static final submit_area:I = 0x7f0a07e9
-.field public static final switchWidget:I = 0x7f0a07c4
+.field public static final switchWidget:I = 0x7f0a07f3
-.field public static final tabMode:I = 0x7f0a07c6
+.field public static final tabMode:I = 0x7f0a07f5
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final textSpacerNoButtons:I = 0x7f0a07d6
+.field public static final textSpacerNoButtons:I = 0x7f0a0808
-.field public static final textSpacerNoTitle:I = 0x7f0a07d7
+.field public static final textSpacerNoTitle:I = 0x7f0a0809
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final titleDividerNoCustom:I = 0x7f0a07e4
+.field public static final titleDividerNoCustom:I = 0x7f0a0817
-.field public static final title_template:I = 0x7f0a07e5
+.field public static final title_template:I = 0x7f0a0818
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
-.field public static final topPanel:I = 0x7f0a07eb
+.field public static final topPanel:I = 0x7f0a081e
-.field public static final unchecked:I = 0x7f0a07fc
+.field public static final unchecked:I = 0x7f0a082f
-.field public static final uniform:I = 0x7f0a07ff
+.field public static final uniform:I = 0x7f0a0832
-.field public static final up:I = 0x7f0a0802
+.field public static final up:I = 0x7f0a0835
-.field public static final wrap_content:I = 0x7f0a08e2
+.field public static final wrap_content:I = 0x7f0a0916
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$integer.smali b/com.discord/smali/androidx/preference/R$integer.smali
index 0441759909..d251d8a04e 100644
--- a/com.discord/smali/androidx/preference/R$integer.smali
+++ b/com.discord/smali/androidx/preference/R$integer.smali
@@ -23,7 +23,7 @@
.field public static final config_tooltipAnimTime:I = 0x7f0b0006
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$layout.smali b/com.discord/smali/androidx/preference/R$layout.smali
index 01ef553649..4a044aac5d 100644
--- a/com.discord/smali/androidx/preference/R$layout.smali
+++ b/com.discord/smali/androidx/preference/R$layout.smali
@@ -73,61 +73,61 @@
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final expand_button:I = 0x7f0d0037
+.field public static final expand_button:I = 0x7f0d0038
-.field public static final image_frame:I = 0x7f0d0040
+.field public static final image_frame:I = 0x7f0d0041
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
-.field public static final preference:I = 0x7f0d0065
+.field public static final preference:I = 0x7f0d0080
-.field public static final preference_category:I = 0x7f0d0066
+.field public static final preference_category:I = 0x7f0d0081
-.field public static final preference_category_material:I = 0x7f0d0067
+.field public static final preference_category_material:I = 0x7f0d0082
-.field public static final preference_dialog_edittext:I = 0x7f0d0068
+.field public static final preference_dialog_edittext:I = 0x7f0d0083
-.field public static final preference_dropdown:I = 0x7f0d0069
+.field public static final preference_dropdown:I = 0x7f0d0084
-.field public static final preference_dropdown_material:I = 0x7f0d006a
+.field public static final preference_dropdown_material:I = 0x7f0d0085
-.field public static final preference_information:I = 0x7f0d006b
+.field public static final preference_information:I = 0x7f0d0086
-.field public static final preference_information_material:I = 0x7f0d006c
+.field public static final preference_information_material:I = 0x7f0d0087
-.field public static final preference_list_fragment:I = 0x7f0d006d
+.field public static final preference_list_fragment:I = 0x7f0d0088
-.field public static final preference_material:I = 0x7f0d006e
+.field public static final preference_material:I = 0x7f0d0089
-.field public static final preference_recyclerview:I = 0x7f0d006f
+.field public static final preference_recyclerview:I = 0x7f0d008a
-.field public static final preference_widget_checkbox:I = 0x7f0d0070
+.field public static final preference_widget_checkbox:I = 0x7f0d008b
-.field public static final preference_widget_seekbar:I = 0x7f0d0071
+.field public static final preference_widget_seekbar:I = 0x7f0d008c
-.field public static final preference_widget_seekbar_material:I = 0x7f0d0072
+.field public static final preference_widget_seekbar_material:I = 0x7f0d008d
-.field public static final preference_widget_switch:I = 0x7f0d0073
+.field public static final preference_widget_switch:I = 0x7f0d008e
-.field public static final preference_widget_switch_compat:I = 0x7f0d0074
+.field public static final preference_widget_switch_compat:I = 0x7f0d008f
-.field public static final select_dialog_item_material:I = 0x7f0d007b
+.field public static final select_dialog_item_material:I = 0x7f0d0096
-.field public static final select_dialog_multichoice_material:I = 0x7f0d007c
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0097
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d007d
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0098
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0085
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a0
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index a381954f51..d3c5acfd35 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120464
+.field public static final copy:I = 0x7f120467
-.field public static final expand_button_title:I = 0x7f1205a6
+.field public static final expand_button_title:I = 0x7f1205ab
-.field public static final not_set:I = 0x7f120c84
+.field public static final not_set:I = 0x7f120cb3
-.field public static final preference_copied:I = 0x7f120deb
+.field public static final preference_copied:I = 0x7f120e1a
-.field public static final search_menu_title:I = 0x7f12109f
+.field public static final search_menu_title:I = 0x7f1210cf
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
-.field public static final summary_collapsed_preference_list:I = 0x7f1211a4
+.field public static final summary_collapsed_preference_list:I = 0x7f1211d4
-.field public static final v7_preference_off:I = 0x7f1213af
+.field public static final v7_preference_off:I = 0x7f1213e2
-.field public static final v7_preference_on:I = 0x7f1213b0
+.field public static final v7_preference_on:I = 0x7f1213e3
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$style.smali b/com.discord/smali/androidx/preference/R$style.smali
index 6e5e4ffdf9..12077bf515 100644
--- a/com.discord/smali/androidx/preference/R$style.smali
+++ b/com.discord/smali/androidx/preference/R$style.smali
@@ -39,743 +39,743 @@
.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130043
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130044
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130045
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130046
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130047
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130048
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130049
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f13004a
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f13004b
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f13004c
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004d
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004e
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004f
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130050
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130051
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f130052
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130053
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130054
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130055
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130056
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130057
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130058
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130059
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f13005a
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13005b
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f13005c
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005d
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005e
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005f
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130060
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130061
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130062
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130063
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130064
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130065
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130066
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130067
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130068
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130069
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13006a
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13006b
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13006c
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006d
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006e
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006f
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130074
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130075
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130076
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f130098
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130099
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f13009a
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f13009b
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f13009c
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13009d
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f13009e
-.field public static final Base_Theme_AppCompat:I = 0x7f130070
+.field public static final Base_Theme_AppCompat:I = 0x7f130077
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130078
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130079
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f13007d
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f13007a
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f13007b
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f13007c
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f13007e
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f13007f
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130080
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130084
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130081
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f130082
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130083
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300ae
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300af
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300b0
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300b3
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300b4
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300b5
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300b6
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300b7
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300b8
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300b9
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ba
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300bb
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300c0
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300bc
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300bd
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300be
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300bf
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300c2
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300c3
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300c4
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300c5
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300c6
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300c7
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300c8
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300c9
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300ca
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300cb
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300cc
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300cd
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300ce
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300cf
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300d5
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300d6
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300d0
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300d1
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300d2
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300d3
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300d4
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300d7
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300d8
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300d9
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300da
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300db
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300dc
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300dd
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300de
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300df
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300e0
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300e1
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300e2
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300e3
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300e4
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300e5
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300e6
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300e7
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300e8
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300e9
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300ea
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300eb
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300ec
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300ed
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300ee
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300ef
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300f0
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300f1
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300f2
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300f3
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300f4
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300f5
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300f6
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300f7
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300f8
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300f9
-.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300fa
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300fb
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ef
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300fc
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300f0
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300fd
-.field public static final Platform_AppCompat:I = 0x7f13013f
+.field public static final Platform_AppCompat:I = 0x7f13015e
-.field public static final Platform_AppCompat_Light:I = 0x7f130140
+.field public static final Platform_AppCompat_Light:I = 0x7f13015f
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130145
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130164
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130146
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130165
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130147
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130166
-.field public static final Platform_V21_AppCompat:I = 0x7f130148
+.field public static final Platform_V21_AppCompat:I = 0x7f130167
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f130149
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f130168
-.field public static final Platform_V25_AppCompat:I = 0x7f13014a
+.field public static final Platform_V25_AppCompat:I = 0x7f130169
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13014b
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13016a
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13014c
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13016b
-.field public static final Preference:I = 0x7f13014d
+.field public static final Preference:I = 0x7f13016c
-.field public static final PreferenceCategoryTitleTextStyle:I = 0x7f130163
+.field public static final PreferenceCategoryTitleTextStyle:I = 0x7f130182
-.field public static final PreferenceFragment:I = 0x7f130164
+.field public static final PreferenceFragment:I = 0x7f130183
-.field public static final PreferenceFragmentList:I = 0x7f130166
+.field public static final PreferenceFragmentList:I = 0x7f130185
-.field public static final PreferenceFragmentList_Material:I = 0x7f130167
+.field public static final PreferenceFragmentList_Material:I = 0x7f130186
-.field public static final PreferenceFragment_Material:I = 0x7f130165
+.field public static final PreferenceFragment_Material:I = 0x7f130184
-.field public static final PreferenceSummaryTextStyle:I = 0x7f130168
+.field public static final PreferenceSummaryTextStyle:I = 0x7f130187
-.field public static final PreferenceThemeOverlay:I = 0x7f130169
+.field public static final PreferenceThemeOverlay:I = 0x7f130188
-.field public static final PreferenceThemeOverlay_v14:I = 0x7f13016a
+.field public static final PreferenceThemeOverlay_v14:I = 0x7f130189
-.field public static final PreferenceThemeOverlay_v14_Material:I = 0x7f13016b
+.field public static final PreferenceThemeOverlay_v14_Material:I = 0x7f13018a
-.field public static final Preference_Category:I = 0x7f13014e
+.field public static final Preference_Category:I = 0x7f13016d
-.field public static final Preference_Category_Material:I = 0x7f13014f
+.field public static final Preference_Category_Material:I = 0x7f13016e
-.field public static final Preference_CheckBoxPreference:I = 0x7f130150
+.field public static final Preference_CheckBoxPreference:I = 0x7f13016f
-.field public static final Preference_CheckBoxPreference_Material:I = 0x7f130151
+.field public static final Preference_CheckBoxPreference_Material:I = 0x7f130170
-.field public static final Preference_DialogPreference:I = 0x7f130152
+.field public static final Preference_DialogPreference:I = 0x7f130171
-.field public static final Preference_DialogPreference_EditTextPreference:I = 0x7f130153
+.field public static final Preference_DialogPreference_EditTextPreference:I = 0x7f130172
-.field public static final Preference_DialogPreference_EditTextPreference_Material:I = 0x7f130154
+.field public static final Preference_DialogPreference_EditTextPreference_Material:I = 0x7f130173
-.field public static final Preference_DialogPreference_Material:I = 0x7f130155
+.field public static final Preference_DialogPreference_Material:I = 0x7f130174
-.field public static final Preference_DropDown:I = 0x7f130156
+.field public static final Preference_DropDown:I = 0x7f130175
-.field public static final Preference_DropDown_Material:I = 0x7f130157
+.field public static final Preference_DropDown_Material:I = 0x7f130176
-.field public static final Preference_Information:I = 0x7f130158
+.field public static final Preference_Information:I = 0x7f130177
-.field public static final Preference_Information_Material:I = 0x7f130159
+.field public static final Preference_Information_Material:I = 0x7f130178
-.field public static final Preference_Material:I = 0x7f13015a
+.field public static final Preference_Material:I = 0x7f130179
-.field public static final Preference_PreferenceScreen:I = 0x7f13015b
+.field public static final Preference_PreferenceScreen:I = 0x7f13017a
-.field public static final Preference_PreferenceScreen_Material:I = 0x7f13015c
+.field public static final Preference_PreferenceScreen_Material:I = 0x7f13017b
-.field public static final Preference_SeekBarPreference:I = 0x7f13015d
+.field public static final Preference_SeekBarPreference:I = 0x7f13017c
-.field public static final Preference_SeekBarPreference_Material:I = 0x7f13015e
+.field public static final Preference_SeekBarPreference_Material:I = 0x7f13017d
-.field public static final Preference_SwitchPreference:I = 0x7f13015f
+.field public static final Preference_SwitchPreference:I = 0x7f13017e
-.field public static final Preference_SwitchPreferenceCompat:I = 0x7f130161
+.field public static final Preference_SwitchPreferenceCompat:I = 0x7f130180
-.field public static final Preference_SwitchPreferenceCompat_Material:I = 0x7f130162
+.field public static final Preference_SwitchPreferenceCompat_Material:I = 0x7f130181
-.field public static final Preference_SwitchPreference_Material:I = 0x7f130160
+.field public static final Preference_SwitchPreference_Material:I = 0x7f13017f
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13016c
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13018b
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13016d
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13018c
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13016e
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13018d
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13016f
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13018e
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130170
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f13018f
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130171
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130190
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130172
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130191
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130173
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130192
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130174
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130193
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13017a
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f130199
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130175
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130194
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130176
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130195
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130177
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130196
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130178
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130197
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130179
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130198
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13017b
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13019a
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13017c
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13019b
-.field public static final TextAppearance_AppCompat:I = 0x7f130180
+.field public static final TextAppearance_AppCompat:I = 0x7f1301be
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f1301bf
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130182
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f1301c0
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130183
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f1301c1
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130184
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f1301c2
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130185
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f1301c3
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130186
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f1301c4
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130187
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f1301c5
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f130188
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f1301c6
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f130189
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f1301c7
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13018a
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f1301c8
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13018b
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f1301c9
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13018c
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f1301ca
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13018d
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f1301cb
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f13018e
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f1301cc
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13018f
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f1301cd
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130190
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f1301ce
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130191
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f1301cf
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130192
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f1301d0
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130193
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f1301d1
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130194
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f1301d2
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130195
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f1301d3
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130196
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f1301d4
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130197
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f1301d5
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f130198
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f1301d6
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130199
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f1301d7
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13019a
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f1301d8
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13019b
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f1301d9
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13019c
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f1301da
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13019d
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f1301db
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13019e
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f1301dc
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13019f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f1301dd
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301a0
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301de
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301a1
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301df
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301a2
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301e0
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301a3
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301e1
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301a4
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301e2
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301a5
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301e3
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301a6
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301e4
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301a7
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301e5
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301a8
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301e6
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301a9
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301e7
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301aa
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301e8
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301ab
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301e9
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ac
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ea
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301ad
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301eb
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ae
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ec
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301af
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301ed
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301d2
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130210
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301d3
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130211
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301d4
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130212
-.field public static final ThemeOverlay_AppCompat:I = 0x7f130205
+.field public static final ThemeOverlay_AppCompat:I = 0x7f13025f
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130206
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130260
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130207
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130261
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130208
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130262
-.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130209
+.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130263
-.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f13020a
+.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f130264
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f13020b
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f130265
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13020c
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130266
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f13020d
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f130267
-.field public static final Theme_AppCompat:I = 0x7f1301d5
+.field public static final Theme_AppCompat:I = 0x7f130213
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301d6
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f130214
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301d7
+.field public static final Theme_AppCompat_DayNight:I = 0x7f130215
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301d8
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f130216
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301d9
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f130217
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301dc
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f13021a
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301da
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f130218
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301db
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f130219
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301dd
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f13021b
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301de
+.field public static final Theme_AppCompat_Dialog:I = 0x7f13021c
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301e1
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f13021f
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301df
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f13021d
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301e0
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f13021e
-.field public static final Theme_AppCompat_Light:I = 0x7f1301e2
+.field public static final Theme_AppCompat_Light:I = 0x7f130220
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301e3
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f130221
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301e4
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f130222
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301e7
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130225
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301e5
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130223
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301e6
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130224
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301e8
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f130226
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301e9
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f130227
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130352
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302eb
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130353
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ec
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130354
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302ed
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f130355
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302ee
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f130356
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302ef
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f130357
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302f0
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f130358
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302f1
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f130359
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302f2
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13035a
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302f3
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f13035b
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302f4
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f13035c
-.field public static final Widget_AppCompat_Button:I = 0x7f1302f5
+.field public static final Widget_AppCompat_Button:I = 0x7f13035d
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302fb
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f130363
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302fc
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f130364
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302f6
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f13035e
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302f7
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f13035f
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302f8
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f130360
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302f9
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f130361
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302fa
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f130362
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302fd
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f130365
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302fe
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f130366
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302ff
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f130367
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130300
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130368
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130301
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130369
-.field public static final Widget_AppCompat_EditText:I = 0x7f130302
+.field public static final Widget_AppCompat_EditText:I = 0x7f13036a
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f130303
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f13036b
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f130304
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f13036c
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f130305
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f13036d
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f130306
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f13036e
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f130307
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f13036f
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130308
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130370
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130309
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130371
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f13030a
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f130372
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f13030b
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f130373
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f13030c
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f130374
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f13030d
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f130375
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f13030e
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f130376
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f13030f
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f130377
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130310
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130378
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130311
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130379
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f130312
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f13037a
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f130313
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f13037b
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f130314
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f13037c
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f130315
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f13037d
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f130316
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f13037e
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f130317
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f13037f
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130318
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130380
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130319
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130381
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f13031a
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f130382
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f13031b
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f130383
-.field public static final Widget_AppCompat_ListView:I = 0x7f13031c
+.field public static final Widget_AppCompat_ListView:I = 0x7f130384
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f13031d
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f130385
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f13031e
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f130386
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f13031f
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f130387
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130320
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130388
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130321
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130389
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f130322
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f13038a
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f130323
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f13038b
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f130324
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f13038c
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f130325
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f13038d
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f130326
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f13038e
-.field public static final Widget_AppCompat_SearchView:I = 0x7f130327
+.field public static final Widget_AppCompat_SearchView:I = 0x7f13038f
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130328
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130390
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f130329
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f130391
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f13032a
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f130392
-.field public static final Widget_AppCompat_Spinner:I = 0x7f13032b
+.field public static final Widget_AppCompat_Spinner:I = 0x7f130393
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f13032c
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f130394
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f13032d
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f130395
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f13032e
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f130396
-.field public static final Widget_AppCompat_TextView:I = 0x7f13032f
+.field public static final Widget_AppCompat_TextView:I = 0x7f130397
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130330
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130398
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f130331
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f130399
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f130332
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f13039a
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$styleable.smali b/com.discord/smali/androidx/preference/R$styleable.smali
index 2db1290924..3a7e222d37 100644
--- a/com.discord/smali/androidx/preference/R$styleable.smali
+++ b/com.discord/smali/androidx/preference/R$styleable.smali
@@ -1400,7 +1400,7 @@
new-array v7, v0, [I
- const v8, 0x7f040033
+ const v8, 0x7f040034
aput v8, v7, v2
@@ -1454,7 +1454,7 @@
new-array v4, v0, [I
- const v9, 0x7f040456
+ const v9, 0x7f0404cf
aput v9, v4, v2
@@ -1548,7 +1548,7 @@
new-array v9, v0, [I
- const v11, 0x7f04037e
+ const v11, 0x7f0403f3
aput v11, v9, v2
@@ -1696,63 +1696,63 @@
:array_0
.array-data 4
- 0x7f04004e
- 0x7f040050
0x7f040051
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f040106
- 0x7f040129
- 0x7f04012a
- 0x7f040145
- 0x7f04018d
- 0x7f040192
- 0x7f040199
- 0x7f04019a
- 0x7f040216
- 0x7f04023c
- 0x7f040248
- 0x7f0402b3
- 0x7f0402d4
- 0x7f0402f0
- 0x7f040328
- 0x7f040329
- 0x7f04038c
- 0x7f04038f
- 0x7f04042b
- 0x7f040435
+ 0x7f040059
+ 0x7f04005a
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040134
+ 0x7f04015b
+ 0x7f04015c
+ 0x7f040177
+ 0x7f0401cf
+ 0x7f0401d5
+ 0x7f0401dd
+ 0x7f0401de
+ 0x7f04025a
+ 0x7f040280
+ 0x7f04028f
+ 0x7f040306
+ 0x7f04033b
+ 0x7f040359
+ 0x7f040391
+ 0x7f040392
+ 0x7f040402
+ 0x7f040405
+ 0x7f0404a3
+ 0x7f0404ad
.end array-data
:array_1
.array-data 4
- 0x7f04004e
- 0x7f040050
- 0x7f0400bd
- 0x7f04018d
- 0x7f04038f
- 0x7f040435
+ 0x7f040051
+ 0x7f040059
+ 0x7f0400d4
+ 0x7f0401cf
+ 0x7f040405
+ 0x7f0404ad
.end array-data
:array_2
.array-data 4
- 0x7f04014f
- 0x7f04023d
+ 0x7f04018e
+ 0x7f040281
.end array-data
:array_3
.array-data 4
0x10100f2
- 0x7f040082
- 0x7f040083
- 0x7f0402a8
- 0x7f0402a9
- 0x7f0402d1
- 0x7f04036f
- 0x7f040370
+ 0x7f040094
+ 0x7f040095
+ 0x7f0402fb
+ 0x7f0402fc
+ 0x7f040338
+ 0x7f0403de
+ 0x7f0403e0
.end array-data
:array_4
@@ -1782,17 +1782,17 @@
:array_7
.array-data 4
0x1010119
- 0x7f04037c
- 0x7f040429
- 0x7f04042a
+ 0x7f0403ec
+ 0x7f0404a1
+ 0x7f0404a2
.end array-data
:array_8
.array-data 4
0x1010142
- 0x7f040426
- 0x7f040427
- 0x7f040428
+ 0x7f04049e
+ 0x7f04049f
+ 0x7f0404a0
.end array-data
:array_9
@@ -1809,26 +1809,26 @@
:array_a
.array-data 4
0x1010034
- 0x7f040048
- 0x7f040049
- 0x7f04004a
0x7f04004b
0x7f04004c
- 0x7f040131
- 0x7f040132
- 0x7f040133
- 0x7f040134
- 0x7f040136
- 0x7f040137
- 0x7f040138
- 0x7f040139
+ 0x7f04004d
+ 0x7f04004e
+ 0x7f04004f
+ 0x7f040163
+ 0x7f040164
+ 0x7f040165
+ 0x7f040166
0x7f040168
- 0x7f040175
- 0x7f04017d
- 0x7f040254
- 0x7f0402a2
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f040169
+ 0x7f04016a
+ 0x7f04016b
+ 0x7f0401aa
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f0402a5
+ 0x7f0402f5
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_b
@@ -1865,105 +1865,105 @@
0x7f04001c
0x7f04001d
0x7f04001e
- 0x7f040025
- 0x7f04002a
+ 0x7f040026
0x7f04002b
0x7f04002c
0x7f04002d
- 0x7f040047
- 0x7f04006c
- 0x7f04007b
- 0x7f04007c
+ 0x7f04002e
+ 0x7f04004a
0x7f04007d
- 0x7f04007e
- 0x7f04007f
- 0x7f040085
- 0x7f040086
- 0x7f04009d
- 0x7f0400a2
- 0x7f0400c3
- 0x7f0400c5
- 0x7f0400ca
- 0x7f0400cb
- 0x7f0400cc
- 0x7f0400cd
- 0x7f0400ce
- 0x7f0400d1
- 0x7f0400d4
- 0x7f0400d9
- 0x7f0400f1
- 0x7f040120
- 0x7f040125
- 0x7f040126
- 0x7f04012e
- 0x7f040130
- 0x7f04013e
- 0x7f04013f
- 0x7f040141
- 0x7f040142
- 0x7f040144
- 0x7f040199
- 0x7f040222
- 0x7f0402a4
- 0x7f0402a5
- 0x7f0402a6
- 0x7f0402a7
- 0x7f0402aa
- 0x7f0402ab
- 0x7f0402ac
- 0x7f0402ad
- 0x7f0402ae
- 0x7f0402af
- 0x7f0402b0
- 0x7f0402b1
- 0x7f0402b2
- 0x7f0402e4
- 0x7f0402e5
- 0x7f0402e6
- 0x7f0402ef
- 0x7f0402f1
- 0x7f04032e
- 0x7f040331
- 0x7f040332
- 0x7f040333
- 0x7f04035c
- 0x7f040360
- 0x7f040362
- 0x7f040363
- 0x7f040378
- 0x7f040379
- 0x7f040398
- 0x7f0403c4
- 0x7f0403c5
+ 0x7f04008d
+ 0x7f04008e
+ 0x7f04008f
+ 0x7f040090
+ 0x7f040091
+ 0x7f040097
+ 0x7f040098
+ 0x7f0400b0
+ 0x7f0400b7
+ 0x7f0400da
+ 0x7f0400dc
+ 0x7f0400e1
+ 0x7f0400e3
+ 0x7f0400e4
+ 0x7f0400e5
+ 0x7f0400e6
+ 0x7f0400ef
+ 0x7f0400f2
+ 0x7f0400fb
+ 0x7f040113
+ 0x7f040152
+ 0x7f040157
+ 0x7f040158
+ 0x7f040160
+ 0x7f040162
+ 0x7f040170
+ 0x7f040171
+ 0x7f040173
+ 0x7f040174
+ 0x7f040176
+ 0x7f0401dd
+ 0x7f040266
+ 0x7f0402f7
+ 0x7f0402f8
+ 0x7f0402f9
+ 0x7f0402fa
+ 0x7f0402fd
+ 0x7f0402fe
+ 0x7f0402ff
+ 0x7f040300
+ 0x7f040301
+ 0x7f040302
+ 0x7f040303
+ 0x7f040304
+ 0x7f040305
+ 0x7f04034c
+ 0x7f04034d
+ 0x7f04034e
+ 0x7f040358
+ 0x7f04035a
+ 0x7f040397
+ 0x7f04039b
+ 0x7f04039c
+ 0x7f04039d
0x7f0403c6
- 0x7f0403c7
- 0x7f0403c9
0x7f0403ca
- 0x7f0403cb
0x7f0403cc
- 0x7f0403cf
- 0x7f0403d0
- 0x7f040438
- 0x7f040439
+ 0x7f0403cd
+ 0x7f0403e8
+ 0x7f0403e9
+ 0x7f04040e
0x7f04043a
- 0x7f04043b
- 0x7f04045d
- 0x7f040461
- 0x7f040462
- 0x7f040463
- 0x7f040464
- 0x7f040465
- 0x7f040466
- 0x7f040467
- 0x7f040468
- 0x7f040469
- 0x7f04046a
+ 0x7f04043c
+ 0x7f04043d
+ 0x7f04043e
+ 0x7f040440
+ 0x7f040441
+ 0x7f040442
+ 0x7f040443
+ 0x7f040446
+ 0x7f040447
+ 0x7f0404b0
+ 0x7f0404b1
+ 0x7f0404b2
+ 0x7f0404b3
+ 0x7f0404d6
+ 0x7f0404da
+ 0x7f0404db
+ 0x7f0404dc
+ 0x7f0404dd
+ 0x7f0404de
+ 0x7f0404df
+ 0x7f0404e0
+ 0x7f0404e1
+ 0x7f0404e2
+ 0x7f0404e3
.end array-data
:array_c
.array-data 4
0x101030e
- 0x7f040362
+ 0x7f0403cc
.end array-data
:array_d
@@ -1971,41 +1971,41 @@
0x10101ef
0x10101f0
0x10101f1
- 0x7f040128
- 0x7f040392
- 0x7f040393
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
.end array-data
:array_e
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_f
.array-data 4
0x1010107
- 0x7f040080
- 0x7f040087
- 0x7f040088
+ 0x7f040092
+ 0x7f040099
+ 0x7f04009a
.end array-data
:array_10
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_11
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_12
@@ -2016,34 +2016,34 @@
0x10101f5
0x10101f6
0x10101f7
- 0x7f040121
- 0x7f040122
- 0x7f040123
- 0x7f040127
- 0x7f0402d6
- 0x7f0402f2
+ 0x7f040153
+ 0x7f040154
+ 0x7f040155
+ 0x7f040159
+ 0x7f04033d
+ 0x7f04035b
.end array-data
:array_13
.array-data 4
- 0x7f04003f
- 0x7f040040
- 0x7f040054
- 0x7f0400c2
- 0x7f040135
- 0x7f040181
- 0x7f040377
- 0x7f040422
+ 0x7f040042
+ 0x7f040043
+ 0x7f040061
+ 0x7f0400d9
+ 0x7f040167
+ 0x7f0401c3
+ 0x7f0403e7
+ 0x7f04049a
.end array-data
:array_14
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_15
@@ -2053,11 +2053,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_16
@@ -2089,10 +2089,10 @@
0x1010126
0x1010127
0x1010128
- 0x7f04012a
- 0x7f04012f
- 0x7f0402ce
- 0x7f04036b
+ 0x7f04015c
+ 0x7f040161
+ 0x7f040334
+ 0x7f0403da
.end array-data
:array_19
@@ -2113,9 +2113,9 @@
.array-data 4
0x10100b2
0x10101f8
- 0x7f04014b
- 0x7f04014c
- 0x7f040456
+ 0x7f040186
+ 0x7f040187
+ 0x7f0404cf
.end array-data
:array_1c
@@ -2145,14 +2145,14 @@
0x101026f
0x7f04000d
0x7f04001f
- 0x7f040020
- 0x7f040035
- 0x7f0400e4
- 0x7f04021d
- 0x7f04021e
- 0x7f0402d9
- 0x7f040367
- 0x7f04043c
+ 0x7f040021
+ 0x7f040036
+ 0x7f040106
+ 0x7f040261
+ 0x7f040262
+ 0x7f040341
+ 0x7f0403d6
+ 0x7f0404b4
.end array-data
:array_1e
@@ -2164,23 +2164,23 @@
0x101012f
0x1010130
0x1010131
- 0x7f0402fc
- 0x7f04038a
+ 0x7f040365
+ 0x7f040400
.end array-data
:array_1f
.array-data 4
0x10100b2
0x10101f8
- 0x7f04014b
- 0x7f04014c
+ 0x7f040186
+ 0x7f040187
.end array-data
:array_20
.array-data 4
0x1010176
0x10102c9
- 0x7f0402dc
+ 0x7f040344
.end array-data
:array_21
@@ -2201,26 +2201,26 @@
0x10102e3
0x101055c
0x1010561
- 0x7f040030
- 0x7f040032
- 0x7f04011e
- 0x7f04011f
- 0x7f040147
- 0x7f040148
- 0x7f040180
- 0x7f040216
- 0x7f04021b
- 0x7f040241
- 0x7f04024f
- 0x7f040255
- 0x7f0402da
- 0x7f0402ec
- 0x7f040361
- 0x7f040365
- 0x7f040372
- 0x7f040391
- 0x7f04042b
- 0x7f040460
+ 0x7f040031
+ 0x7f040033
+ 0x7f040150
+ 0x7f040151
+ 0x7f04017b
+ 0x7f04017c
+ 0x7f0401c2
+ 0x7f04025a
+ 0x7f04025f
+ 0x7f040286
+ 0x7f0402a0
+ 0x7f0402a6
+ 0x7f040342
+ 0x7f040354
+ 0x7f0403cb
+ 0x7f0403d4
+ 0x7f0403e2
+ 0x7f040407
+ 0x7f0404a3
+ 0x7f0404d9
.end array-data
:array_22
@@ -2228,7 +2228,7 @@
0x10100f2
0x1010129
0x101012a
- 0x7f040031
+ 0x7f040032
.end array-data
:array_23
@@ -2236,48 +2236,48 @@
0x10100f2
0x1010129
0x101012a
- 0x7f040031
+ 0x7f040032
.end array-data
:array_24
.array-data 4
0x10101e7
- 0x7f04023e
- 0x7f0402db
+ 0x7f040282
+ 0x7f040343
.end array-data
:array_25
.array-data 4
0x101011f
0x1010120
- 0x7f0402c9
- 0x7f0402cc
+ 0x7f04032f
+ 0x7f040332
.end array-data
:array_26
.array-data 4
- 0x7f04009c
- 0x7f040124
- 0x7f040140
- 0x7f040143
- 0x7f0402f3
- 0x7f0402f4
- 0x7f0402f5
- 0x7f0402f6
- 0x7f0402f7
- 0x7f0402f8
- 0x7f0402f9
- 0x7f0402fa
- 0x7f0402fb
+ 0x7f0400af
+ 0x7f040156
+ 0x7f040172
+ 0x7f040175
+ 0x7f04035c
+ 0x7f04035d
+ 0x7f04035e
0x7f04035f
- 0x7f040396
- 0x7f040397
+ 0x7f040360
+ 0x7f040361
+ 0x7f040362
+ 0x7f040363
+ 0x7f040364
+ 0x7f0403c9
+ 0x7f04040c
+ 0x7f04040d
.end array-data
:array_27
.array-data 4
- 0x7f0402e0
- 0x7f0402e3
+ 0x7f040348
+ 0x7f04034b
.end array-data
:array_28
@@ -2285,15 +2285,15 @@
0x10100c4
0x10100eb
0x10100f1
- 0x7f040161
- 0x7f040162
- 0x7f040163
- 0x7f040164
- 0x7f040165
- 0x7f040256
- 0x7f040337
- 0x7f040376
- 0x7f04037d
+ 0x7f0401a3
+ 0x7f0401a4
+ 0x7f0401a5
+ 0x7f0401a6
+ 0x7f0401a7
+ 0x7f0402a7
+ 0x7f0403a1
+ 0x7f0403e6
+ 0x7f0403ed
.end array-data
:array_29
@@ -2302,30 +2302,30 @@
0x101011f
0x1010220
0x1010264
- 0x7f0400b6
- 0x7f0400df
- 0x7f04011d
- 0x7f040186
- 0x7f04021f
- 0x7f040255
- 0x7f04032c
- 0x7f04032d
- 0x7f04035a
- 0x7f04035b
- 0x7f04038b
- 0x7f040390
- 0x7f04045e
+ 0x7f0400cd
+ 0x7f040101
+ 0x7f04014f
+ 0x7f0401c8
+ 0x7f040263
+ 0x7f0402a6
+ 0x7f040395
+ 0x7f040396
+ 0x7f0403c4
+ 0x7f0403c5
+ 0x7f040401
+ 0x7f040406
+ 0x7f0404d7
.end array-data
:array_2a
.array-data 4
0x10100f2
0x1010136
- 0x7f040029
- 0x7f0402d0
- 0x7f04035e
- 0x7f04036d
- 0x7f040454
+ 0x7f04002a
+ 0x7f040336
+ 0x7f0403c8
+ 0x7f0403dc
+ 0x7f0404cc
.end array-data
:array_2b
@@ -2334,7 +2334,7 @@
0x1010176
0x101017b
0x1010262
- 0x7f0402f0
+ 0x7f040359
.end array-data
:array_2c
@@ -2352,17 +2352,17 @@
0x1010124
0x1010125
0x1010142
- 0x7f04036e
- 0x7f04037a
- 0x7f040394
- 0x7f040395
- 0x7f040399
- 0x7f040423
- 0x7f040424
- 0x7f040425
- 0x7f04043d
- 0x7f04043e
- 0x7f04043f
+ 0x7f0403dd
+ 0x7f0403ea
+ 0x7f04040a
+ 0x7f04040b
+ 0x7f04040f
+ 0x7f04049b
+ 0x7f04049c
+ 0x7f04049d
+ 0x7f0404b5
+ 0x7f0404b6
+ 0x7f0404b7
.end array-data
:array_2e
@@ -2372,11 +2372,11 @@
0x10101f1
0x101036b
0x101036c
- 0x7f040128
- 0x7f040392
- 0x7f040393
- 0x7f04039a
- 0x7f04039b
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
+ 0x7f040410
+ 0x7f040411
.end array-data
:array_2f
@@ -2386,11 +2386,11 @@
0x10101f1
0x101036b
0x101036c
- 0x7f040128
- 0x7f040392
- 0x7f040393
- 0x7f04039a
- 0x7f04039b
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
+ 0x7f040410
+ 0x7f040411
.end array-data
:array_30
@@ -2407,60 +2407,60 @@
0x1010164
0x10103ac
0x1010585
- 0x7f040175
- 0x7f04017d
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_31
.array-data 4
0x10100af
0x1010140
- 0x7f040081
- 0x7f0400be
- 0x7f0400bf
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f0402b3
- 0x7f0402b4
- 0x7f0402c8
- 0x7f0402cf
- 0x7f0402d2
- 0x7f0402d3
- 0x7f0402f0
- 0x7f04038c
- 0x7f04038d
- 0x7f04038e
- 0x7f04042b
- 0x7f04042d
- 0x7f04042e
- 0x7f04042f
- 0x7f040430
- 0x7f040431
- 0x7f040432
- 0x7f040433
- 0x7f040434
+ 0x7f040093
+ 0x7f0400d5
+ 0x7f0400d6
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040306
+ 0x7f040307
+ 0x7f04032d
+ 0x7f040335
+ 0x7f040339
+ 0x7f04033a
+ 0x7f040359
+ 0x7f040402
+ 0x7f040403
+ 0x7f040404
+ 0x7f0404a3
+ 0x7f0404a5
+ 0x7f0404a6
+ 0x7f0404a7
+ 0x7f0404a8
+ 0x7f0404a9
+ 0x7f0404aa
+ 0x7f0404ab
+ 0x7f0404ac
.end array-data
:array_32
.array-data 4
0x1010000
0x10100da
- 0x7f0402e1
- 0x7f0402e2
- 0x7f0403d6
+ 0x7f040349
+ 0x7f04034a
+ 0x7f04044d
.end array-data
:array_33
.array-data 4
0x10100d4
- 0x7f040052
- 0x7f040053
+ 0x7f04005b
+ 0x7f04005c
.end array-data
:array_34
diff --git a/com.discord/smali/androidx/preference/ktx/R$attr.smali b/com.discord/smali/androidx/preference/ktx/R$attr.smali
index 5c6862c9b0..45e4d60598 100644
--- a/com.discord/smali/androidx/preference/ktx/R$attr.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$attr.smali
@@ -79,647 +79,647 @@
.field public static final actionProviderClass:I = 0x7f04001f
-.field public static final actionViewClass:I = 0x7f040020
+.field public static final actionViewClass:I = 0x7f040021
-.field public static final activityChooserViewStyle:I = 0x7f040025
+.field public static final activityChooserViewStyle:I = 0x7f040026
-.field public static final adjustable:I = 0x7f040029
+.field public static final adjustable:I = 0x7f04002a
-.field public static final alertDialogButtonGroupStyle:I = 0x7f04002a
+.field public static final alertDialogButtonGroupStyle:I = 0x7f04002b
-.field public static final alertDialogCenterButtons:I = 0x7f04002b
+.field public static final alertDialogCenterButtons:I = 0x7f04002c
-.field public static final alertDialogStyle:I = 0x7f04002c
+.field public static final alertDialogStyle:I = 0x7f04002d
-.field public static final alertDialogTheme:I = 0x7f04002d
+.field public static final alertDialogTheme:I = 0x7f04002e
-.field public static final allowDividerAbove:I = 0x7f040030
+.field public static final allowDividerAbove:I = 0x7f040031
-.field public static final allowDividerAfterLastItem:I = 0x7f040031
+.field public static final allowDividerAfterLastItem:I = 0x7f040032
-.field public static final allowDividerBelow:I = 0x7f040032
+.field public static final allowDividerBelow:I = 0x7f040033
-.field public static final allowStacking:I = 0x7f040033
+.field public static final allowStacking:I = 0x7f040034
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final alphabeticModifiers:I = 0x7f040035
+.field public static final alphabeticModifiers:I = 0x7f040036
-.field public static final arrowHeadLength:I = 0x7f04003f
+.field public static final arrowHeadLength:I = 0x7f040042
-.field public static final arrowShaftLength:I = 0x7f040040
+.field public static final arrowShaftLength:I = 0x7f040043
-.field public static final autoCompleteTextViewStyle:I = 0x7f040047
+.field public static final autoCompleteTextViewStyle:I = 0x7f04004a
-.field public static final autoSizeMaxTextSize:I = 0x7f040048
+.field public static final autoSizeMaxTextSize:I = 0x7f04004b
-.field public static final autoSizeMinTextSize:I = 0x7f040049
+.field public static final autoSizeMinTextSize:I = 0x7f04004c
-.field public static final autoSizePresetSizes:I = 0x7f04004a
+.field public static final autoSizePresetSizes:I = 0x7f04004d
-.field public static final autoSizeStepGranularity:I = 0x7f04004b
+.field public static final autoSizeStepGranularity:I = 0x7f04004e
-.field public static final autoSizeTextType:I = 0x7f04004c
+.field public static final autoSizeTextType:I = 0x7f04004f
-.field public static final background:I = 0x7f04004e
+.field public static final background:I = 0x7f040051
-.field public static final backgroundSplit:I = 0x7f040050
+.field public static final backgroundSplit:I = 0x7f040059
-.field public static final backgroundStacked:I = 0x7f040051
+.field public static final backgroundStacked:I = 0x7f04005a
-.field public static final backgroundTint:I = 0x7f040052
+.field public static final backgroundTint:I = 0x7f04005b
-.field public static final backgroundTintMode:I = 0x7f040053
+.field public static final backgroundTintMode:I = 0x7f04005c
-.field public static final barLength:I = 0x7f040054
+.field public static final barLength:I = 0x7f040061
-.field public static final borderlessButtonStyle:I = 0x7f04006c
+.field public static final borderlessButtonStyle:I = 0x7f04007d
-.field public static final buttonBarButtonStyle:I = 0x7f04007b
+.field public static final buttonBarButtonStyle:I = 0x7f04008d
-.field public static final buttonBarNegativeButtonStyle:I = 0x7f04007c
+.field public static final buttonBarNegativeButtonStyle:I = 0x7f04008e
-.field public static final buttonBarNeutralButtonStyle:I = 0x7f04007d
+.field public static final buttonBarNeutralButtonStyle:I = 0x7f04008f
-.field public static final buttonBarPositiveButtonStyle:I = 0x7f04007e
+.field public static final buttonBarPositiveButtonStyle:I = 0x7f040090
-.field public static final buttonBarStyle:I = 0x7f04007f
+.field public static final buttonBarStyle:I = 0x7f040091
-.field public static final buttonCompat:I = 0x7f040080
+.field public static final buttonCompat:I = 0x7f040092
-.field public static final buttonGravity:I = 0x7f040081
+.field public static final buttonGravity:I = 0x7f040093
-.field public static final buttonIconDimen:I = 0x7f040082
+.field public static final buttonIconDimen:I = 0x7f040094
-.field public static final buttonPanelSideLayout:I = 0x7f040083
+.field public static final buttonPanelSideLayout:I = 0x7f040095
-.field public static final buttonStyle:I = 0x7f040085
+.field public static final buttonStyle:I = 0x7f040097
-.field public static final buttonStyleSmall:I = 0x7f040086
+.field public static final buttonStyleSmall:I = 0x7f040098
-.field public static final buttonTint:I = 0x7f040087
+.field public static final buttonTint:I = 0x7f040099
-.field public static final buttonTintMode:I = 0x7f040088
+.field public static final buttonTintMode:I = 0x7f04009a
-.field public static final checkBoxPreferenceStyle:I = 0x7f04009c
+.field public static final checkBoxPreferenceStyle:I = 0x7f0400af
-.field public static final checkboxStyle:I = 0x7f04009d
+.field public static final checkboxStyle:I = 0x7f0400b0
-.field public static final checkedTextViewStyle:I = 0x7f0400a2
+.field public static final checkedTextViewStyle:I = 0x7f0400b7
-.field public static final closeIcon:I = 0x7f0400b6
+.field public static final closeIcon:I = 0x7f0400cd
-.field public static final closeItemLayout:I = 0x7f0400bd
+.field public static final closeItemLayout:I = 0x7f0400d4
-.field public static final collapseContentDescription:I = 0x7f0400be
+.field public static final collapseContentDescription:I = 0x7f0400d5
-.field public static final collapseIcon:I = 0x7f0400bf
+.field public static final collapseIcon:I = 0x7f0400d6
-.field public static final color:I = 0x7f0400c2
+.field public static final color:I = 0x7f0400d9
-.field public static final colorAccent:I = 0x7f0400c3
+.field public static final colorAccent:I = 0x7f0400da
-.field public static final colorBackgroundFloating:I = 0x7f0400c5
+.field public static final colorBackgroundFloating:I = 0x7f0400dc
-.field public static final colorButtonNormal:I = 0x7f0400ca
+.field public static final colorButtonNormal:I = 0x7f0400e1
-.field public static final colorControlActivated:I = 0x7f0400cb
+.field public static final colorControlActivated:I = 0x7f0400e3
-.field public static final colorControlHighlight:I = 0x7f0400cc
+.field public static final colorControlHighlight:I = 0x7f0400e4
-.field public static final colorControlNormal:I = 0x7f0400cd
+.field public static final colorControlNormal:I = 0x7f0400e5
-.field public static final colorError:I = 0x7f0400ce
+.field public static final colorError:I = 0x7f0400e6
-.field public static final colorPrimary:I = 0x7f0400d1
+.field public static final colorPrimary:I = 0x7f0400ef
-.field public static final colorPrimaryDark:I = 0x7f0400d4
+.field public static final colorPrimaryDark:I = 0x7f0400f2
-.field public static final colorSwitchThumbNormal:I = 0x7f0400d9
+.field public static final colorSwitchThumbNormal:I = 0x7f0400fb
-.field public static final commitIcon:I = 0x7f0400df
+.field public static final commitIcon:I = 0x7f040101
-.field public static final contentDescription:I = 0x7f0400e4
+.field public static final contentDescription:I = 0x7f040106
-.field public static final contentInsetEnd:I = 0x7f0400e5
+.field public static final contentInsetEnd:I = 0x7f040107
-.field public static final contentInsetEndWithActions:I = 0x7f0400e6
+.field public static final contentInsetEndWithActions:I = 0x7f040108
-.field public static final contentInsetLeft:I = 0x7f0400e7
+.field public static final contentInsetLeft:I = 0x7f040109
-.field public static final contentInsetRight:I = 0x7f0400e8
+.field public static final contentInsetRight:I = 0x7f04010a
-.field public static final contentInsetStart:I = 0x7f0400e9
+.field public static final contentInsetStart:I = 0x7f04010b
-.field public static final contentInsetStartWithNavigation:I = 0x7f0400ea
+.field public static final contentInsetStartWithNavigation:I = 0x7f04010c
-.field public static final controlBackground:I = 0x7f0400f1
+.field public static final controlBackground:I = 0x7f040113
-.field public static final coordinatorLayoutStyle:I = 0x7f0400f2
+.field public static final coordinatorLayoutStyle:I = 0x7f040114
-.field public static final customNavigationLayout:I = 0x7f040106
+.field public static final customNavigationLayout:I = 0x7f040134
-.field public static final defaultQueryHint:I = 0x7f04011d
+.field public static final defaultQueryHint:I = 0x7f04014f
-.field public static final defaultValue:I = 0x7f04011e
+.field public static final defaultValue:I = 0x7f040150
-.field public static final dependency:I = 0x7f04011f
+.field public static final dependency:I = 0x7f040151
-.field public static final dialogCornerRadius:I = 0x7f040120
+.field public static final dialogCornerRadius:I = 0x7f040152
-.field public static final dialogIcon:I = 0x7f040121
+.field public static final dialogIcon:I = 0x7f040153
-.field public static final dialogLayout:I = 0x7f040122
+.field public static final dialogLayout:I = 0x7f040154
-.field public static final dialogMessage:I = 0x7f040123
+.field public static final dialogMessage:I = 0x7f040155
-.field public static final dialogPreferenceStyle:I = 0x7f040124
+.field public static final dialogPreferenceStyle:I = 0x7f040156
-.field public static final dialogPreferredPadding:I = 0x7f040125
+.field public static final dialogPreferredPadding:I = 0x7f040157
-.field public static final dialogTheme:I = 0x7f040126
+.field public static final dialogTheme:I = 0x7f040158
-.field public static final dialogTitle:I = 0x7f040127
+.field public static final dialogTitle:I = 0x7f040159
-.field public static final disableDependentsState:I = 0x7f040128
+.field public static final disableDependentsState:I = 0x7f04015a
-.field public static final displayOptions:I = 0x7f040129
+.field public static final displayOptions:I = 0x7f04015b
-.field public static final divider:I = 0x7f04012a
+.field public static final divider:I = 0x7f04015c
-.field public static final dividerHorizontal:I = 0x7f04012e
+.field public static final dividerHorizontal:I = 0x7f040160
-.field public static final dividerPadding:I = 0x7f04012f
+.field public static final dividerPadding:I = 0x7f040161
-.field public static final dividerVertical:I = 0x7f040130
+.field public static final dividerVertical:I = 0x7f040162
-.field public static final drawableBottomCompat:I = 0x7f040131
+.field public static final drawableBottomCompat:I = 0x7f040163
-.field public static final drawableEndCompat:I = 0x7f040132
+.field public static final drawableEndCompat:I = 0x7f040164
-.field public static final drawableLeftCompat:I = 0x7f040133
+.field public static final drawableLeftCompat:I = 0x7f040165
-.field public static final drawableRightCompat:I = 0x7f040134
+.field public static final drawableRightCompat:I = 0x7f040166
-.field public static final drawableSize:I = 0x7f040135
+.field public static final drawableSize:I = 0x7f040167
-.field public static final drawableStartCompat:I = 0x7f040136
+.field public static final drawableStartCompat:I = 0x7f040168
-.field public static final drawableTint:I = 0x7f040137
+.field public static final drawableTint:I = 0x7f040169
-.field public static final drawableTintMode:I = 0x7f040138
+.field public static final drawableTintMode:I = 0x7f04016a
-.field public static final drawableTopCompat:I = 0x7f040139
+.field public static final drawableTopCompat:I = 0x7f04016b
-.field public static final drawerArrowStyle:I = 0x7f04013c
+.field public static final drawerArrowStyle:I = 0x7f04016e
-.field public static final dropDownListViewStyle:I = 0x7f04013e
+.field public static final dropDownListViewStyle:I = 0x7f040170
-.field public static final dropdownListPreferredItemHeight:I = 0x7f04013f
+.field public static final dropdownListPreferredItemHeight:I = 0x7f040171
-.field public static final dropdownPreferenceStyle:I = 0x7f040140
+.field public static final dropdownPreferenceStyle:I = 0x7f040172
-.field public static final editTextBackground:I = 0x7f040141
+.field public static final editTextBackground:I = 0x7f040173
-.field public static final editTextColor:I = 0x7f040142
+.field public static final editTextColor:I = 0x7f040174
-.field public static final editTextPreferenceStyle:I = 0x7f040143
+.field public static final editTextPreferenceStyle:I = 0x7f040175
-.field public static final editTextStyle:I = 0x7f040144
+.field public static final editTextStyle:I = 0x7f040176
-.field public static final elevation:I = 0x7f040145
+.field public static final elevation:I = 0x7f040177
-.field public static final enableCopying:I = 0x7f040147
+.field public static final enableCopying:I = 0x7f04017b
-.field public static final enabled:I = 0x7f040148
+.field public static final enabled:I = 0x7f04017c
-.field public static final entries:I = 0x7f04014b
+.field public static final entries:I = 0x7f040186
-.field public static final entryValues:I = 0x7f04014c
+.field public static final entryValues:I = 0x7f040187
-.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04014f
+.field public static final expandActivityOverflowButtonDrawable:I = 0x7f04018e
-.field public static final fastScrollEnabled:I = 0x7f040161
+.field public static final fastScrollEnabled:I = 0x7f0401a3
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f040162
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f0401a4
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f040163
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f0401a5
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040164
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f0401a6
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040165
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f0401a7
-.field public static final firstBaselineToTopHeight:I = 0x7f040168
+.field public static final firstBaselineToTopHeight:I = 0x7f0401aa
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontFamily:I = 0x7f040175
+.field public static final fontFamily:I = 0x7f0401b7
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final fragment:I = 0x7f040180
+.field public static final fragment:I = 0x7f0401c2
-.field public static final gapBetweenBars:I = 0x7f040181
+.field public static final gapBetweenBars:I = 0x7f0401c3
-.field public static final goIcon:I = 0x7f040186
+.field public static final goIcon:I = 0x7f0401c8
-.field public static final height:I = 0x7f04018d
+.field public static final height:I = 0x7f0401cf
-.field public static final hideOnContentScroll:I = 0x7f040192
+.field public static final hideOnContentScroll:I = 0x7f0401d5
-.field public static final homeAsUpIndicator:I = 0x7f040199
+.field public static final homeAsUpIndicator:I = 0x7f0401dd
-.field public static final homeLayout:I = 0x7f04019a
+.field public static final homeLayout:I = 0x7f0401de
-.field public static final icon:I = 0x7f040216
+.field public static final icon:I = 0x7f04025a
-.field public static final iconSpaceReserved:I = 0x7f04021b
+.field public static final iconSpaceReserved:I = 0x7f04025f
-.field public static final iconTint:I = 0x7f04021d
+.field public static final iconTint:I = 0x7f040261
-.field public static final iconTintMode:I = 0x7f04021e
+.field public static final iconTintMode:I = 0x7f040262
-.field public static final iconifiedByDefault:I = 0x7f04021f
+.field public static final iconifiedByDefault:I = 0x7f040263
-.field public static final imageButtonStyle:I = 0x7f040222
+.field public static final imageButtonStyle:I = 0x7f040266
-.field public static final indeterminateProgressStyle:I = 0x7f04023c
+.field public static final indeterminateProgressStyle:I = 0x7f040280
-.field public static final initialActivityCount:I = 0x7f04023d
+.field public static final initialActivityCount:I = 0x7f040281
-.field public static final initialExpandedChildrenCount:I = 0x7f04023e
+.field public static final initialExpandedChildrenCount:I = 0x7f040282
-.field public static final isLightTheme:I = 0x7f040240
+.field public static final isLightTheme:I = 0x7f040284
-.field public static final isPreferenceVisible:I = 0x7f040241
+.field public static final isPreferenceVisible:I = 0x7f040286
-.field public static final itemPadding:I = 0x7f040248
+.field public static final itemPadding:I = 0x7f04028f
-.field public static final key:I = 0x7f04024f
+.field public static final key:I = 0x7f0402a0
-.field public static final keylines:I = 0x7f040250
+.field public static final keylines:I = 0x7f0402a1
-.field public static final lastBaselineToBottomHeight:I = 0x7f040254
+.field public static final lastBaselineToBottomHeight:I = 0x7f0402a5
-.field public static final layout:I = 0x7f040255
+.field public static final layout:I = 0x7f0402a6
-.field public static final layoutManager:I = 0x7f040256
+.field public static final layoutManager:I = 0x7f0402a7
-.field public static final layout_anchor:I = 0x7f040258
+.field public static final layout_anchor:I = 0x7f0402a9
-.field public static final layout_anchorGravity:I = 0x7f040259
+.field public static final layout_anchorGravity:I = 0x7f0402aa
-.field public static final layout_behavior:I = 0x7f04025a
+.field public static final layout_behavior:I = 0x7f0402ab
-.field public static final layout_dodgeInsetEdges:I = 0x7f040286
+.field public static final layout_dodgeInsetEdges:I = 0x7f0402d7
-.field public static final layout_insetEdge:I = 0x7f040292
+.field public static final layout_insetEdge:I = 0x7f0402e3
-.field public static final layout_keyline:I = 0x7f040293
+.field public static final layout_keyline:I = 0x7f0402e4
-.field public static final lineHeight:I = 0x7f0402a2
+.field public static final lineHeight:I = 0x7f0402f5
-.field public static final listChoiceBackgroundIndicator:I = 0x7f0402a4
+.field public static final listChoiceBackgroundIndicator:I = 0x7f0402f7
-.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402a5
+.field public static final listChoiceIndicatorMultipleAnimated:I = 0x7f0402f8
-.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402a6
+.field public static final listChoiceIndicatorSingleAnimated:I = 0x7f0402f9
-.field public static final listDividerAlertDialog:I = 0x7f0402a7
+.field public static final listDividerAlertDialog:I = 0x7f0402fa
-.field public static final listItemLayout:I = 0x7f0402a8
+.field public static final listItemLayout:I = 0x7f0402fb
-.field public static final listLayout:I = 0x7f0402a9
+.field public static final listLayout:I = 0x7f0402fc
-.field public static final listMenuViewStyle:I = 0x7f0402aa
+.field public static final listMenuViewStyle:I = 0x7f0402fd
-.field public static final listPopupWindowStyle:I = 0x7f0402ab
+.field public static final listPopupWindowStyle:I = 0x7f0402fe
-.field public static final listPreferredItemHeight:I = 0x7f0402ac
+.field public static final listPreferredItemHeight:I = 0x7f0402ff
-.field public static final listPreferredItemHeightLarge:I = 0x7f0402ad
+.field public static final listPreferredItemHeightLarge:I = 0x7f040300
-.field public static final listPreferredItemHeightSmall:I = 0x7f0402ae
+.field public static final listPreferredItemHeightSmall:I = 0x7f040301
-.field public static final listPreferredItemPaddingEnd:I = 0x7f0402af
+.field public static final listPreferredItemPaddingEnd:I = 0x7f040302
-.field public static final listPreferredItemPaddingLeft:I = 0x7f0402b0
+.field public static final listPreferredItemPaddingLeft:I = 0x7f040303
-.field public static final listPreferredItemPaddingRight:I = 0x7f0402b1
+.field public static final listPreferredItemPaddingRight:I = 0x7f040304
-.field public static final listPreferredItemPaddingStart:I = 0x7f0402b2
+.field public static final listPreferredItemPaddingStart:I = 0x7f040305
-.field public static final logo:I = 0x7f0402b3
+.field public static final logo:I = 0x7f040306
-.field public static final logoDescription:I = 0x7f0402b4
+.field public static final logoDescription:I = 0x7f040307
-.field public static final maxButtonHeight:I = 0x7f0402c8
+.field public static final maxButtonHeight:I = 0x7f04032d
-.field public static final maxHeight:I = 0x7f0402c9
+.field public static final maxHeight:I = 0x7f04032f
-.field public static final maxWidth:I = 0x7f0402cc
+.field public static final maxWidth:I = 0x7f040332
-.field public static final measureWithLargestChild:I = 0x7f0402ce
+.field public static final measureWithLargestChild:I = 0x7f040334
-.field public static final menu:I = 0x7f0402cf
+.field public static final menu:I = 0x7f040335
-.field public static final min:I = 0x7f0402d0
+.field public static final min:I = 0x7f040336
-.field public static final multiChoiceItemLayout:I = 0x7f0402d1
+.field public static final multiChoiceItemLayout:I = 0x7f040338
-.field public static final navigationContentDescription:I = 0x7f0402d2
+.field public static final navigationContentDescription:I = 0x7f040339
-.field public static final navigationIcon:I = 0x7f0402d3
+.field public static final navigationIcon:I = 0x7f04033a
-.field public static final navigationMode:I = 0x7f0402d4
+.field public static final navigationMode:I = 0x7f04033b
-.field public static final negativeButtonText:I = 0x7f0402d6
+.field public static final negativeButtonText:I = 0x7f04033d
-.field public static final numericModifiers:I = 0x7f0402d9
+.field public static final numericModifiers:I = 0x7f040341
-.field public static final order:I = 0x7f0402da
+.field public static final order:I = 0x7f040342
-.field public static final orderingFromXml:I = 0x7f0402db
+.field public static final orderingFromXml:I = 0x7f040343
-.field public static final overlapAnchor:I = 0x7f0402dc
+.field public static final overlapAnchor:I = 0x7f040344
-.field public static final paddingBottomNoButtons:I = 0x7f0402e0
+.field public static final paddingBottomNoButtons:I = 0x7f040348
-.field public static final paddingEnd:I = 0x7f0402e1
+.field public static final paddingEnd:I = 0x7f040349
-.field public static final paddingStart:I = 0x7f0402e2
+.field public static final paddingStart:I = 0x7f04034a
-.field public static final paddingTopNoTitle:I = 0x7f0402e3
+.field public static final paddingTopNoTitle:I = 0x7f04034b
-.field public static final panelBackground:I = 0x7f0402e4
+.field public static final panelBackground:I = 0x7f04034c
-.field public static final panelMenuListTheme:I = 0x7f0402e5
+.field public static final panelMenuListTheme:I = 0x7f04034d
-.field public static final panelMenuListWidth:I = 0x7f0402e6
+.field public static final panelMenuListWidth:I = 0x7f04034e
-.field public static final persistent:I = 0x7f0402ec
+.field public static final persistent:I = 0x7f040354
-.field public static final popupMenuStyle:I = 0x7f0402ef
+.field public static final popupMenuStyle:I = 0x7f040358
-.field public static final popupTheme:I = 0x7f0402f0
+.field public static final popupTheme:I = 0x7f040359
-.field public static final popupWindowStyle:I = 0x7f0402f1
+.field public static final popupWindowStyle:I = 0x7f04035a
-.field public static final positiveButtonText:I = 0x7f0402f2
+.field public static final positiveButtonText:I = 0x7f04035b
-.field public static final preferenceCategoryStyle:I = 0x7f0402f3
+.field public static final preferenceCategoryStyle:I = 0x7f04035c
-.field public static final preferenceCategoryTitleTextAppearance:I = 0x7f0402f4
+.field public static final preferenceCategoryTitleTextAppearance:I = 0x7f04035d
-.field public static final preferenceFragmentCompatStyle:I = 0x7f0402f5
+.field public static final preferenceFragmentCompatStyle:I = 0x7f04035e
-.field public static final preferenceFragmentListStyle:I = 0x7f0402f6
+.field public static final preferenceFragmentListStyle:I = 0x7f04035f
-.field public static final preferenceFragmentStyle:I = 0x7f0402f7
+.field public static final preferenceFragmentStyle:I = 0x7f040360
-.field public static final preferenceInformationStyle:I = 0x7f0402f8
+.field public static final preferenceInformationStyle:I = 0x7f040361
-.field public static final preferenceScreenStyle:I = 0x7f0402f9
+.field public static final preferenceScreenStyle:I = 0x7f040362
-.field public static final preferenceStyle:I = 0x7f0402fa
+.field public static final preferenceStyle:I = 0x7f040363
-.field public static final preferenceTheme:I = 0x7f0402fb
+.field public static final preferenceTheme:I = 0x7f040364
-.field public static final preserveIconSpacing:I = 0x7f0402fc
+.field public static final preserveIconSpacing:I = 0x7f040365
-.field public static final progressBarPadding:I = 0x7f040328
+.field public static final progressBarPadding:I = 0x7f040391
-.field public static final progressBarStyle:I = 0x7f040329
+.field public static final progressBarStyle:I = 0x7f040392
-.field public static final queryBackground:I = 0x7f04032c
+.field public static final queryBackground:I = 0x7f040395
-.field public static final queryHint:I = 0x7f04032d
+.field public static final queryHint:I = 0x7f040396
-.field public static final radioButtonStyle:I = 0x7f04032e
+.field public static final radioButtonStyle:I = 0x7f040397
-.field public static final ratingBarStyle:I = 0x7f040331
+.field public static final ratingBarStyle:I = 0x7f04039b
-.field public static final ratingBarStyleIndicator:I = 0x7f040332
+.field public static final ratingBarStyleIndicator:I = 0x7f04039c
-.field public static final ratingBarStyleSmall:I = 0x7f040333
+.field public static final ratingBarStyleSmall:I = 0x7f04039d
-.field public static final reverseLayout:I = 0x7f040337
+.field public static final reverseLayout:I = 0x7f0403a1
-.field public static final searchHintIcon:I = 0x7f04035a
+.field public static final searchHintIcon:I = 0x7f0403c4
-.field public static final searchIcon:I = 0x7f04035b
+.field public static final searchIcon:I = 0x7f0403c5
-.field public static final searchViewStyle:I = 0x7f04035c
+.field public static final searchViewStyle:I = 0x7f0403c6
-.field public static final seekBarIncrement:I = 0x7f04035e
+.field public static final seekBarIncrement:I = 0x7f0403c8
-.field public static final seekBarPreferenceStyle:I = 0x7f04035f
+.field public static final seekBarPreferenceStyle:I = 0x7f0403c9
-.field public static final seekBarStyle:I = 0x7f040360
+.field public static final seekBarStyle:I = 0x7f0403ca
-.field public static final selectable:I = 0x7f040361
+.field public static final selectable:I = 0x7f0403cb
-.field public static final selectableItemBackground:I = 0x7f040362
+.field public static final selectableItemBackground:I = 0x7f0403cc
-.field public static final selectableItemBackgroundBorderless:I = 0x7f040363
+.field public static final selectableItemBackgroundBorderless:I = 0x7f0403cd
-.field public static final shouldDisableView:I = 0x7f040365
+.field public static final shouldDisableView:I = 0x7f0403d4
-.field public static final showAsAction:I = 0x7f040367
+.field public static final showAsAction:I = 0x7f0403d6
-.field public static final showDividers:I = 0x7f04036b
+.field public static final showDividers:I = 0x7f0403da
-.field public static final showSeekBarValue:I = 0x7f04036d
+.field public static final showSeekBarValue:I = 0x7f0403dc
-.field public static final showText:I = 0x7f04036e
+.field public static final showText:I = 0x7f0403dd
-.field public static final showTitle:I = 0x7f04036f
+.field public static final showTitle:I = 0x7f0403de
-.field public static final singleChoiceItemLayout:I = 0x7f040370
+.field public static final singleChoiceItemLayout:I = 0x7f0403e0
-.field public static final singleLineTitle:I = 0x7f040372
+.field public static final singleLineTitle:I = 0x7f0403e2
-.field public static final spanCount:I = 0x7f040376
+.field public static final spanCount:I = 0x7f0403e6
-.field public static final spinBars:I = 0x7f040377
+.field public static final spinBars:I = 0x7f0403e7
-.field public static final spinnerDropDownItemStyle:I = 0x7f040378
+.field public static final spinnerDropDownItemStyle:I = 0x7f0403e8
-.field public static final spinnerStyle:I = 0x7f040379
+.field public static final spinnerStyle:I = 0x7f0403e9
-.field public static final splitTrack:I = 0x7f04037a
+.field public static final splitTrack:I = 0x7f0403ea
-.field public static final srcCompat:I = 0x7f04037c
+.field public static final srcCompat:I = 0x7f0403ec
-.field public static final stackFromEnd:I = 0x7f04037d
+.field public static final stackFromEnd:I = 0x7f0403ed
-.field public static final state_above_anchor:I = 0x7f04037e
+.field public static final state_above_anchor:I = 0x7f0403f3
-.field public static final statusBarBackground:I = 0x7f040383
+.field public static final statusBarBackground:I = 0x7f0403f9
-.field public static final subMenuArrow:I = 0x7f04038a
+.field public static final subMenuArrow:I = 0x7f040400
-.field public static final submitBackground:I = 0x7f04038b
+.field public static final submitBackground:I = 0x7f040401
-.field public static final subtitle:I = 0x7f04038c
+.field public static final subtitle:I = 0x7f040402
-.field public static final subtitleTextAppearance:I = 0x7f04038d
+.field public static final subtitleTextAppearance:I = 0x7f040403
-.field public static final subtitleTextColor:I = 0x7f04038e
+.field public static final subtitleTextColor:I = 0x7f040404
-.field public static final subtitleTextStyle:I = 0x7f04038f
+.field public static final subtitleTextStyle:I = 0x7f040405
-.field public static final suggestionRowLayout:I = 0x7f040390
+.field public static final suggestionRowLayout:I = 0x7f040406
-.field public static final summary:I = 0x7f040391
+.field public static final summary:I = 0x7f040407
-.field public static final summaryOff:I = 0x7f040392
+.field public static final summaryOff:I = 0x7f040408
-.field public static final summaryOn:I = 0x7f040393
+.field public static final summaryOn:I = 0x7f040409
-.field public static final switchMinWidth:I = 0x7f040394
+.field public static final switchMinWidth:I = 0x7f04040a
-.field public static final switchPadding:I = 0x7f040395
+.field public static final switchPadding:I = 0x7f04040b
-.field public static final switchPreferenceCompatStyle:I = 0x7f040396
+.field public static final switchPreferenceCompatStyle:I = 0x7f04040c
-.field public static final switchPreferenceStyle:I = 0x7f040397
+.field public static final switchPreferenceStyle:I = 0x7f04040d
-.field public static final switchStyle:I = 0x7f040398
+.field public static final switchStyle:I = 0x7f04040e
-.field public static final switchTextAppearance:I = 0x7f040399
+.field public static final switchTextAppearance:I = 0x7f04040f
-.field public static final switchTextOff:I = 0x7f04039a
+.field public static final switchTextOff:I = 0x7f040410
-.field public static final switchTextOn:I = 0x7f04039b
+.field public static final switchTextOn:I = 0x7f040411
-.field public static final textAllCaps:I = 0x7f0403b9
+.field public static final textAllCaps:I = 0x7f04042f
-.field public static final textAppearanceLargePopupMenu:I = 0x7f0403c4
+.field public static final textAppearanceLargePopupMenu:I = 0x7f04043a
-.field public static final textAppearanceListItem:I = 0x7f0403c5
+.field public static final textAppearanceListItem:I = 0x7f04043c
-.field public static final textAppearanceListItemSecondary:I = 0x7f0403c6
+.field public static final textAppearanceListItemSecondary:I = 0x7f04043d
-.field public static final textAppearanceListItemSmall:I = 0x7f0403c7
+.field public static final textAppearanceListItemSmall:I = 0x7f04043e
-.field public static final textAppearancePopupMenuHeader:I = 0x7f0403c9
+.field public static final textAppearancePopupMenuHeader:I = 0x7f040440
-.field public static final textAppearanceSearchResultSubtitle:I = 0x7f0403ca
+.field public static final textAppearanceSearchResultSubtitle:I = 0x7f040441
-.field public static final textAppearanceSearchResultTitle:I = 0x7f0403cb
+.field public static final textAppearanceSearchResultTitle:I = 0x7f040442
-.field public static final textAppearanceSmallPopupMenu:I = 0x7f0403cc
+.field public static final textAppearanceSmallPopupMenu:I = 0x7f040443
-.field public static final textColorAlertDialogListItem:I = 0x7f0403cf
+.field public static final textColorAlertDialogListItem:I = 0x7f040446
-.field public static final textColorSearchUrl:I = 0x7f0403d0
+.field public static final textColorSearchUrl:I = 0x7f040447
-.field public static final textLocale:I = 0x7f0403d3
+.field public static final textLocale:I = 0x7f04044a
-.field public static final theme:I = 0x7f0403d6
+.field public static final theme:I = 0x7f04044d
-.field public static final thickness:I = 0x7f040422
+.field public static final thickness:I = 0x7f04049a
-.field public static final thumbTextPadding:I = 0x7f040423
+.field public static final thumbTextPadding:I = 0x7f04049b
-.field public static final thumbTint:I = 0x7f040424
+.field public static final thumbTint:I = 0x7f04049c
-.field public static final thumbTintMode:I = 0x7f040425
+.field public static final thumbTintMode:I = 0x7f04049d
-.field public static final tickMark:I = 0x7f040426
+.field public static final tickMark:I = 0x7f04049e
-.field public static final tickMarkTint:I = 0x7f040427
+.field public static final tickMarkTint:I = 0x7f04049f
-.field public static final tickMarkTintMode:I = 0x7f040428
+.field public static final tickMarkTintMode:I = 0x7f0404a0
-.field public static final tint:I = 0x7f040429
+.field public static final tint:I = 0x7f0404a1
-.field public static final tintMode:I = 0x7f04042a
+.field public static final tintMode:I = 0x7f0404a2
-.field public static final title:I = 0x7f04042b
+.field public static final title:I = 0x7f0404a3
-.field public static final titleMargin:I = 0x7f04042d
+.field public static final titleMargin:I = 0x7f0404a5
-.field public static final titleMarginBottom:I = 0x7f04042e
+.field public static final titleMarginBottom:I = 0x7f0404a6
-.field public static final titleMarginEnd:I = 0x7f04042f
+.field public static final titleMarginEnd:I = 0x7f0404a7
-.field public static final titleMarginStart:I = 0x7f040430
+.field public static final titleMarginStart:I = 0x7f0404a8
-.field public static final titleMarginTop:I = 0x7f040431
+.field public static final titleMarginTop:I = 0x7f0404a9
-.field public static final titleMargins:I = 0x7f040432
+.field public static final titleMargins:I = 0x7f0404aa
-.field public static final titleTextAppearance:I = 0x7f040433
+.field public static final titleTextAppearance:I = 0x7f0404ab
-.field public static final titleTextColor:I = 0x7f040434
+.field public static final titleTextColor:I = 0x7f0404ac
-.field public static final titleTextStyle:I = 0x7f040435
+.field public static final titleTextStyle:I = 0x7f0404ad
-.field public static final toolbarNavigationButtonStyle:I = 0x7f040438
+.field public static final toolbarNavigationButtonStyle:I = 0x7f0404b0
-.field public static final toolbarStyle:I = 0x7f040439
+.field public static final toolbarStyle:I = 0x7f0404b1
-.field public static final tooltipForegroundColor:I = 0x7f04043a
+.field public static final tooltipForegroundColor:I = 0x7f0404b2
-.field public static final tooltipFrameBackground:I = 0x7f04043b
+.field public static final tooltipFrameBackground:I = 0x7f0404b3
-.field public static final tooltipText:I = 0x7f04043c
+.field public static final tooltipText:I = 0x7f0404b4
-.field public static final track:I = 0x7f04043d
+.field public static final track:I = 0x7f0404b5
-.field public static final trackTint:I = 0x7f04043e
+.field public static final trackTint:I = 0x7f0404b6
-.field public static final trackTintMode:I = 0x7f04043f
+.field public static final trackTintMode:I = 0x7f0404b7
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
-.field public static final updatesContinuously:I = 0x7f040454
+.field public static final updatesContinuously:I = 0x7f0404cc
-.field public static final useSimpleSummaryProvider:I = 0x7f040456
+.field public static final useSimpleSummaryProvider:I = 0x7f0404cf
-.field public static final viewInflaterClass:I = 0x7f04045d
+.field public static final viewInflaterClass:I = 0x7f0404d6
-.field public static final voiceIcon:I = 0x7f04045e
+.field public static final voiceIcon:I = 0x7f0404d7
-.field public static final widgetLayout:I = 0x7f040460
+.field public static final widgetLayout:I = 0x7f0404d9
-.field public static final windowActionBar:I = 0x7f040461
+.field public static final windowActionBar:I = 0x7f0404da
-.field public static final windowActionBarOverlay:I = 0x7f040462
+.field public static final windowActionBarOverlay:I = 0x7f0404db
-.field public static final windowActionModeOverlay:I = 0x7f040463
+.field public static final windowActionModeOverlay:I = 0x7f0404dc
-.field public static final windowFixedHeightMajor:I = 0x7f040464
+.field public static final windowFixedHeightMajor:I = 0x7f0404dd
-.field public static final windowFixedHeightMinor:I = 0x7f040465
+.field public static final windowFixedHeightMinor:I = 0x7f0404de
-.field public static final windowFixedWidthMajor:I = 0x7f040466
+.field public static final windowFixedWidthMajor:I = 0x7f0404df
-.field public static final windowFixedWidthMinor:I = 0x7f040467
+.field public static final windowFixedWidthMinor:I = 0x7f0404e0
-.field public static final windowMinWidthMajor:I = 0x7f040468
+.field public static final windowMinWidthMajor:I = 0x7f0404e1
-.field public static final windowMinWidthMinor:I = 0x7f040469
+.field public static final windowMinWidthMinor:I = 0x7f0404e2
-.field public static final windowNoTitle:I = 0x7f04046a
+.field public static final windowNoTitle:I = 0x7f0404e3
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$color.smali b/com.discord/smali/androidx/preference/ktx/R$color.smali
index 6feb4ad91e..dc0c99d589 100644
--- a/com.discord/smali/androidx/preference/ktx/R$color.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$color.smali
@@ -91,99 +91,99 @@
.field public static final button_material_light:I = 0x7f060042
-.field public static final dim_foreground_disabled_material_dark:I = 0x7f06006a
+.field public static final dim_foreground_disabled_material_dark:I = 0x7f060084
-.field public static final dim_foreground_disabled_material_light:I = 0x7f06006b
+.field public static final dim_foreground_disabled_material_light:I = 0x7f060085
-.field public static final dim_foreground_material_dark:I = 0x7f06006c
+.field public static final dim_foreground_material_dark:I = 0x7f060086
-.field public static final dim_foreground_material_light:I = 0x7f06006d
+.field public static final dim_foreground_material_light:I = 0x7f060087
-.field public static final error_color_material_dark:I = 0x7f06006e
+.field public static final error_color_material_dark:I = 0x7f060088
-.field public static final error_color_material_light:I = 0x7f06006f
+.field public static final error_color_material_light:I = 0x7f060089
-.field public static final foreground_material_dark:I = 0x7f060074
+.field public static final foreground_material_dark:I = 0x7f06008e
-.field public static final foreground_material_light:I = 0x7f060075
+.field public static final foreground_material_light:I = 0x7f06008f
-.field public static final highlighted_text_material_dark:I = 0x7f060084
+.field public static final highlighted_text_material_dark:I = 0x7f06009e
-.field public static final highlighted_text_material_light:I = 0x7f060085
+.field public static final highlighted_text_material_light:I = 0x7f06009f
-.field public static final material_blue_grey_800:I = 0x7f06008c
+.field public static final material_blue_grey_800:I = 0x7f0600a6
-.field public static final material_blue_grey_900:I = 0x7f06008d
+.field public static final material_blue_grey_900:I = 0x7f0600a7
-.field public static final material_blue_grey_950:I = 0x7f06008e
+.field public static final material_blue_grey_950:I = 0x7f0600a8
-.field public static final material_deep_teal_200:I = 0x7f06008f
+.field public static final material_deep_teal_200:I = 0x7f0600a9
-.field public static final material_deep_teal_500:I = 0x7f060090
+.field public static final material_deep_teal_500:I = 0x7f0600aa
-.field public static final material_grey_100:I = 0x7f060091
+.field public static final material_grey_100:I = 0x7f0600ab
-.field public static final material_grey_300:I = 0x7f060092
+.field public static final material_grey_300:I = 0x7f0600ac
-.field public static final material_grey_50:I = 0x7f060093
+.field public static final material_grey_50:I = 0x7f0600ad
-.field public static final material_grey_600:I = 0x7f060094
+.field public static final material_grey_600:I = 0x7f0600ae
-.field public static final material_grey_800:I = 0x7f060095
+.field public static final material_grey_800:I = 0x7f0600af
-.field public static final material_grey_850:I = 0x7f060096
+.field public static final material_grey_850:I = 0x7f0600b0
-.field public static final material_grey_900:I = 0x7f060097
+.field public static final material_grey_900:I = 0x7f0600b1
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final preference_fallback_accent_color:I = 0x7f0600b6
+.field public static final preference_fallback_accent_color:I = 0x7f0600f4
-.field public static final primary_dark_material_dark:I = 0x7f0600dd
+.field public static final primary_dark_material_dark:I = 0x7f06011c
-.field public static final primary_dark_material_light:I = 0x7f0600de
+.field public static final primary_dark_material_light:I = 0x7f06011d
-.field public static final primary_material_dark:I = 0x7f0600ef
+.field public static final primary_material_dark:I = 0x7f06012f
-.field public static final primary_material_light:I = 0x7f0600f0
+.field public static final primary_material_light:I = 0x7f060130
-.field public static final primary_text_default_material_dark:I = 0x7f0600f1
+.field public static final primary_text_default_material_dark:I = 0x7f060131
-.field public static final primary_text_default_material_light:I = 0x7f0600f2
+.field public static final primary_text_default_material_light:I = 0x7f060132
-.field public static final primary_text_disabled_material_dark:I = 0x7f0600f3
+.field public static final primary_text_disabled_material_dark:I = 0x7f060133
-.field public static final primary_text_disabled_material_light:I = 0x7f0600f4
+.field public static final primary_text_disabled_material_light:I = 0x7f060134
-.field public static final ripple_material_dark:I = 0x7f0600fd
+.field public static final ripple_material_dark:I = 0x7f06013d
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_dark:I = 0x7f0600ff
+.field public static final secondary_text_default_material_dark:I = 0x7f06013f
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
-.field public static final secondary_text_disabled_material_dark:I = 0x7f060101
+.field public static final secondary_text_disabled_material_dark:I = 0x7f060141
-.field public static final secondary_text_disabled_material_light:I = 0x7f060102
+.field public static final secondary_text_disabled_material_light:I = 0x7f060142
-.field public static final switch_thumb_disabled_material_dark:I = 0x7f060133
+.field public static final switch_thumb_disabled_material_dark:I = 0x7f060174
-.field public static final switch_thumb_disabled_material_light:I = 0x7f060134
+.field public static final switch_thumb_disabled_material_light:I = 0x7f060175
-.field public static final switch_thumb_material_dark:I = 0x7f060135
+.field public static final switch_thumb_material_dark:I = 0x7f060176
-.field public static final switch_thumb_material_light:I = 0x7f060136
+.field public static final switch_thumb_material_light:I = 0x7f060177
-.field public static final switch_thumb_normal_material_dark:I = 0x7f060137
+.field public static final switch_thumb_normal_material_dark:I = 0x7f060178
-.field public static final switch_thumb_normal_material_light:I = 0x7f060138
+.field public static final switch_thumb_normal_material_light:I = 0x7f060179
-.field public static final tooltip_background_dark:I = 0x7f06013a
+.field public static final tooltip_background_dark:I = 0x7f06017d
-.field public static final tooltip_background_light:I = 0x7f06013b
+.field public static final tooltip_background_light:I = 0x7f06017e
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$dimen.smali b/com.discord/smali/androidx/preference/ktx/R$dimen.smali
index 7e3bde7566..45fac5e5ec 100644
--- a/com.discord/smali/androidx/preference/ktx/R$dimen.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$dimen.smali
@@ -171,105 +171,105 @@
.field public static final abc_text_size_title_material_toolbar:I = 0x7f07004d
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final disabled_alpha_material_dark:I = 0x7f0700b6
+.field public static final disabled_alpha_material_dark:I = 0x7f0700bb
-.field public static final disabled_alpha_material_light:I = 0x7f0700b7
+.field public static final disabled_alpha_material_light:I = 0x7f0700bc
-.field public static final fastscroll_default_thickness:I = 0x7f0700be
+.field public static final fastscroll_default_thickness:I = 0x7f0700c3
-.field public static final fastscroll_margin:I = 0x7f0700bf
+.field public static final fastscroll_margin:I = 0x7f0700c4
-.field public static final fastscroll_minimum_range:I = 0x7f0700c0
+.field public static final fastscroll_minimum_range:I = 0x7f0700c5
-.field public static final highlight_alpha_material_colored:I = 0x7f0700cc
+.field public static final highlight_alpha_material_colored:I = 0x7f0700d1
-.field public static final highlight_alpha_material_dark:I = 0x7f0700cd
+.field public static final highlight_alpha_material_dark:I = 0x7f0700d2
-.field public static final highlight_alpha_material_light:I = 0x7f0700ce
+.field public static final highlight_alpha_material_light:I = 0x7f0700d3
-.field public static final hint_alpha_material_dark:I = 0x7f0700cf
+.field public static final hint_alpha_material_dark:I = 0x7f0700d4
-.field public static final hint_alpha_material_light:I = 0x7f0700d0
+.field public static final hint_alpha_material_light:I = 0x7f0700d5
-.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d1
+.field public static final hint_pressed_alpha_material_dark:I = 0x7f0700d6
-.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d2
+.field public static final hint_pressed_alpha_material_light:I = 0x7f0700d7
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d4
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d9
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d5
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700da
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d6
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700db
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
-.field public static final preference_dropdown_padding_start:I = 0x7f070125
+.field public static final preference_dropdown_padding_start:I = 0x7f070190
-.field public static final preference_icon_minWidth:I = 0x7f070126
+.field public static final preference_icon_minWidth:I = 0x7f070191
-.field public static final preference_seekbar_padding_horizontal:I = 0x7f070127
+.field public static final preference_seekbar_padding_horizontal:I = 0x7f070192
-.field public static final preference_seekbar_padding_vertical:I = 0x7f070128
+.field public static final preference_seekbar_padding_vertical:I = 0x7f070193
-.field public static final preference_seekbar_value_minWidth:I = 0x7f070129
+.field public static final preference_seekbar_value_minWidth:I = 0x7f070194
-.field public static final tooltip_corner_radius:I = 0x7f070139
+.field public static final tooltip_corner_radius:I = 0x7f0701a5
-.field public static final tooltip_horizontal_padding:I = 0x7f07013a
+.field public static final tooltip_horizontal_padding:I = 0x7f0701a6
-.field public static final tooltip_margin:I = 0x7f07013b
+.field public static final tooltip_margin:I = 0x7f0701a7
-.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f07013c
+.field public static final tooltip_precise_anchor_extra_offset:I = 0x7f0701a8
-.field public static final tooltip_precise_anchor_threshold:I = 0x7f07013d
+.field public static final tooltip_precise_anchor_threshold:I = 0x7f0701a9
-.field public static final tooltip_vertical_padding:I = 0x7f07013e
+.field public static final tooltip_vertical_padding:I = 0x7f0701aa
-.field public static final tooltip_y_offset_non_touch:I = 0x7f07013f
+.field public static final tooltip_y_offset_non_touch:I = 0x7f0701ab
-.field public static final tooltip_y_offset_touch:I = 0x7f070140
+.field public static final tooltip_y_offset_touch:I = 0x7f0701ac
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
index 1286bcb55c..9f2aab28fe 100644
--- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
@@ -203,37 +203,37 @@
.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800aa
-.field public static final ic_arrow_down_24dp:I = 0x7f0801ee
+.field public static final ic_arrow_down_24dp:I = 0x7f0801d9
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
-.field public static final preference_list_divider_material:I = 0x7f0804ba
+.field public static final preference_list_divider_material:I = 0x7f0804b4
-.field public static final tooltip_frame_dark:I = 0x7f0804c7
+.field public static final tooltip_frame_dark:I = 0x7f0804c2
-.field public static final tooltip_frame_light:I = 0x7f0804c8
+.field public static final tooltip_frame_light:I = 0x7f0804c3
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$id.smali b/com.discord/smali/androidx/preference/ktx/R$id.smali
index d8f492e34b..372e031b6e 100644
--- a/com.discord/smali/androidx/preference/ktx/R$id.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$id.smali
@@ -15,315 +15,315 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_bar:I = 0x7f0a002e
+.field public static final action_bar:I = 0x7f0a0032
-.field public static final action_bar_activity_content:I = 0x7f0a002f
+.field public static final action_bar_activity_content:I = 0x7f0a0033
-.field public static final action_bar_container:I = 0x7f0a0030
+.field public static final action_bar_container:I = 0x7f0a0034
-.field public static final action_bar_root:I = 0x7f0a0031
+.field public static final action_bar_root:I = 0x7f0a0035
-.field public static final action_bar_spinner:I = 0x7f0a0032
+.field public static final action_bar_spinner:I = 0x7f0a0036
-.field public static final action_bar_subtitle:I = 0x7f0a0033
+.field public static final action_bar_subtitle:I = 0x7f0a0037
-.field public static final action_bar_title:I = 0x7f0a0035
+.field public static final action_bar_title:I = 0x7f0a0039
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_context_bar:I = 0x7f0a003a
+.field public static final action_context_bar:I = 0x7f0a003e
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_menu_divider:I = 0x7f0a003d
+.field public static final action_menu_divider:I = 0x7f0a0041
-.field public static final action_menu_presenter:I = 0x7f0a003e
+.field public static final action_menu_presenter:I = 0x7f0a0042
-.field public static final action_mode_bar:I = 0x7f0a003f
+.field public static final action_mode_bar:I = 0x7f0a0043
-.field public static final action_mode_bar_stub:I = 0x7f0a0040
+.field public static final action_mode_bar_stub:I = 0x7f0a0044
-.field public static final action_mode_close_button:I = 0x7f0a0041
+.field public static final action_mode_close_button:I = 0x7f0a0045
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final activity_chooser_view_content:I = 0x7f0a0051
+.field public static final activity_chooser_view_content:I = 0x7f0a0055
-.field public static final add:I = 0x7f0a0052
+.field public static final add:I = 0x7f0a0056
-.field public static final alertTitle:I = 0x7f0a0061
+.field public static final alertTitle:I = 0x7f0a0065
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final bottom:I = 0x7f0a0100
+.field public static final bottom:I = 0x7f0a0104
-.field public static final buttonPanel:I = 0x7f0a0107
+.field public static final buttonPanel:I = 0x7f0a010b
-.field public static final checkbox:I = 0x7f0a021a
+.field public static final checkbox:I = 0x7f0a021f
-.field public static final checked:I = 0x7f0a021c
+.field public static final checked:I = 0x7f0a0221
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final content:I = 0x7f0a023d
+.field public static final content:I = 0x7f0a0246
-.field public static final contentPanel:I = 0x7f0a023e
+.field public static final contentPanel:I = 0x7f0a0247
-.field public static final custom:I = 0x7f0a025b
+.field public static final custom:I = 0x7f0a0264
-.field public static final customPanel:I = 0x7f0a025c
+.field public static final customPanel:I = 0x7f0a0265
-.field public static final decor_content_parent:I = 0x7f0a0260
+.field public static final decor_content_parent:I = 0x7f0a026b
-.field public static final default_activity_button:I = 0x7f0a0261
+.field public static final default_activity_button:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final edit_query:I = 0x7f0a02b8
+.field public static final edit_query:I = 0x7f0a02c4
-.field public static final end:I = 0x7f0a02d1
+.field public static final end:I = 0x7f0a02dd
-.field public static final expand_activities_button:I = 0x7f0a02d7
+.field public static final expand_activities_button:I = 0x7f0a02e3
-.field public static final expanded_menu:I = 0x7f0a02d8
+.field public static final expanded_menu:I = 0x7f0a02e4
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final group_divider:I = 0x7f0a033d
+.field public static final group_divider:I = 0x7f0a034d
-.field public static final home:I = 0x7f0a03b2
+.field public static final home:I = 0x7f0a03c3
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_frame:I = 0x7f0a03b5
+.field public static final icon_frame:I = 0x7f0a03c6
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final image:I = 0x7f0a03b9
+.field public static final image:I = 0x7f0a03ca
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0430
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0441
-.field public static final left:I = 0x7f0a043e
+.field public static final left:I = 0x7f0a044f
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final listMode:I = 0x7f0a0443
+.field public static final listMode:I = 0x7f0a0454
-.field public static final list_item:I = 0x7f0a0444
+.field public static final list_item:I = 0x7f0a0455
-.field public static final message:I = 0x7f0a04a9
+.field public static final message:I = 0x7f0a04ba
-.field public static final multiply:I = 0x7f0a04b1
+.field public static final multiply:I = 0x7f0a04da
-.field public static final none:I = 0x7f0a04cd
+.field public static final none:I = 0x7f0a04f7
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final off:I = 0x7f0a04fd
+.field public static final off:I = 0x7f0a0527
-.field public static final on:I = 0x7f0a04ff
+.field public static final on:I = 0x7f0a0529
-.field public static final parentPanel:I = 0x7f0a0511
+.field public static final parentPanel:I = 0x7f0a053b
-.field public static final progress_circular:I = 0x7f0a05a4
+.field public static final progress_circular:I = 0x7f0a05d0
-.field public static final progress_horizontal:I = 0x7f0a05a7
+.field public static final progress_horizontal:I = 0x7f0a05d3
-.field public static final radio:I = 0x7f0a05b6
+.field public static final radio:I = 0x7f0a05e2
-.field public static final recycler_view:I = 0x7f0a05bc
+.field public static final recycler_view:I = 0x7f0a05e8
-.field public static final right:I = 0x7f0a05e0
+.field public static final right:I = 0x7f0a060c
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final screen:I = 0x7f0a0610
+.field public static final screen:I = 0x7f0a063d
-.field public static final scrollIndicatorDown:I = 0x7f0a0612
+.field public static final scrollIndicatorDown:I = 0x7f0a063f
-.field public static final scrollIndicatorUp:I = 0x7f0a0613
+.field public static final scrollIndicatorUp:I = 0x7f0a0640
-.field public static final scrollView:I = 0x7f0a0614
+.field public static final scrollView:I = 0x7f0a0641
-.field public static final search_badge:I = 0x7f0a0618
+.field public static final search_badge:I = 0x7f0a0645
-.field public static final search_bar:I = 0x7f0a0619
+.field public static final search_bar:I = 0x7f0a0646
-.field public static final search_button:I = 0x7f0a061a
+.field public static final search_button:I = 0x7f0a0647
-.field public static final search_close_btn:I = 0x7f0a061c
+.field public static final search_close_btn:I = 0x7f0a0649
-.field public static final search_edit_frame:I = 0x7f0a061d
+.field public static final search_edit_frame:I = 0x7f0a064a
-.field public static final search_go_btn:I = 0x7f0a0620
+.field public static final search_go_btn:I = 0x7f0a064d
-.field public static final search_mag_icon:I = 0x7f0a0622
+.field public static final search_mag_icon:I = 0x7f0a064f
-.field public static final search_plate:I = 0x7f0a0623
+.field public static final search_plate:I = 0x7f0a0650
-.field public static final search_src_text:I = 0x7f0a0626
+.field public static final search_src_text:I = 0x7f0a0653
-.field public static final search_voice_btn:I = 0x7f0a0632
+.field public static final search_voice_btn:I = 0x7f0a065f
-.field public static final seekbar:I = 0x7f0a0633
+.field public static final seekbar:I = 0x7f0a0660
-.field public static final seekbar_value:I = 0x7f0a0634
+.field public static final seekbar_value:I = 0x7f0a0661
-.field public static final select_dialog_listview:I = 0x7f0a0635
+.field public static final select_dialog_listview:I = 0x7f0a0662
-.field public static final shortcut:I = 0x7f0a077f
+.field public static final shortcut:I = 0x7f0a07ac
-.field public static final spacer:I = 0x7f0a078c
+.field public static final spacer:I = 0x7f0a07bb
-.field public static final spinner:I = 0x7f0a0795
+.field public static final spinner:I = 0x7f0a07c4
-.field public static final split_action_bar:I = 0x7f0a0796
+.field public static final split_action_bar:I = 0x7f0a07c5
-.field public static final src_atop:I = 0x7f0a0799
+.field public static final src_atop:I = 0x7f0a07c8
-.field public static final src_in:I = 0x7f0a079a
+.field public static final src_in:I = 0x7f0a07c9
-.field public static final src_over:I = 0x7f0a079b
+.field public static final src_over:I = 0x7f0a07ca
-.field public static final start:I = 0x7f0a079e
+.field public static final start:I = 0x7f0a07cd
-.field public static final submenuarrow:I = 0x7f0a07b9
+.field public static final submenuarrow:I = 0x7f0a07e8
-.field public static final submit_area:I = 0x7f0a07ba
+.field public static final submit_area:I = 0x7f0a07e9
-.field public static final switchWidget:I = 0x7f0a07c4
+.field public static final switchWidget:I = 0x7f0a07f3
-.field public static final tabMode:I = 0x7f0a07c6
+.field public static final tabMode:I = 0x7f0a07f5
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final textSpacerNoButtons:I = 0x7f0a07d6
+.field public static final textSpacerNoButtons:I = 0x7f0a0808
-.field public static final textSpacerNoTitle:I = 0x7f0a07d7
+.field public static final textSpacerNoTitle:I = 0x7f0a0809
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final titleDividerNoCustom:I = 0x7f0a07e4
+.field public static final titleDividerNoCustom:I = 0x7f0a0817
-.field public static final title_template:I = 0x7f0a07e5
+.field public static final title_template:I = 0x7f0a0818
-.field public static final top:I = 0x7f0a07ea
+.field public static final top:I = 0x7f0a081d
-.field public static final topPanel:I = 0x7f0a07eb
+.field public static final topPanel:I = 0x7f0a081e
-.field public static final unchecked:I = 0x7f0a07fc
+.field public static final unchecked:I = 0x7f0a082f
-.field public static final uniform:I = 0x7f0a07ff
+.field public static final uniform:I = 0x7f0a0832
-.field public static final up:I = 0x7f0a0802
+.field public static final up:I = 0x7f0a0835
-.field public static final wrap_content:I = 0x7f0a08e2
+.field public static final wrap_content:I = 0x7f0a0916
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$integer.smali b/com.discord/smali/androidx/preference/ktx/R$integer.smali
index 865507b5ae..82582c3e30 100644
--- a/com.discord/smali/androidx/preference/ktx/R$integer.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$integer.smali
@@ -23,7 +23,7 @@
.field public static final config_tooltipAnimTime:I = 0x7f0b0006
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$layout.smali b/com.discord/smali/androidx/preference/ktx/R$layout.smali
index 54dbff381d..b5f481db6e 100644
--- a/com.discord/smali/androidx/preference/ktx/R$layout.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$layout.smali
@@ -73,61 +73,61 @@
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final expand_button:I = 0x7f0d0037
+.field public static final expand_button:I = 0x7f0d0038
-.field public static final image_frame:I = 0x7f0d0040
+.field public static final image_frame:I = 0x7f0d0041
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
-.field public static final preference:I = 0x7f0d0065
+.field public static final preference:I = 0x7f0d0080
-.field public static final preference_category:I = 0x7f0d0066
+.field public static final preference_category:I = 0x7f0d0081
-.field public static final preference_category_material:I = 0x7f0d0067
+.field public static final preference_category_material:I = 0x7f0d0082
-.field public static final preference_dialog_edittext:I = 0x7f0d0068
+.field public static final preference_dialog_edittext:I = 0x7f0d0083
-.field public static final preference_dropdown:I = 0x7f0d0069
+.field public static final preference_dropdown:I = 0x7f0d0084
-.field public static final preference_dropdown_material:I = 0x7f0d006a
+.field public static final preference_dropdown_material:I = 0x7f0d0085
-.field public static final preference_information:I = 0x7f0d006b
+.field public static final preference_information:I = 0x7f0d0086
-.field public static final preference_information_material:I = 0x7f0d006c
+.field public static final preference_information_material:I = 0x7f0d0087
-.field public static final preference_list_fragment:I = 0x7f0d006d
+.field public static final preference_list_fragment:I = 0x7f0d0088
-.field public static final preference_material:I = 0x7f0d006e
+.field public static final preference_material:I = 0x7f0d0089
-.field public static final preference_recyclerview:I = 0x7f0d006f
+.field public static final preference_recyclerview:I = 0x7f0d008a
-.field public static final preference_widget_checkbox:I = 0x7f0d0070
+.field public static final preference_widget_checkbox:I = 0x7f0d008b
-.field public static final preference_widget_seekbar:I = 0x7f0d0071
+.field public static final preference_widget_seekbar:I = 0x7f0d008c
-.field public static final preference_widget_seekbar_material:I = 0x7f0d0072
+.field public static final preference_widget_seekbar_material:I = 0x7f0d008d
-.field public static final preference_widget_switch:I = 0x7f0d0073
+.field public static final preference_widget_switch:I = 0x7f0d008e
-.field public static final preference_widget_switch_compat:I = 0x7f0d0074
+.field public static final preference_widget_switch_compat:I = 0x7f0d008f
-.field public static final select_dialog_item_material:I = 0x7f0d007b
+.field public static final select_dialog_item_material:I = 0x7f0d0096
-.field public static final select_dialog_multichoice_material:I = 0x7f0d007c
+.field public static final select_dialog_multichoice_material:I = 0x7f0d0097
-.field public static final select_dialog_singlechoice_material:I = 0x7f0d007d
+.field public static final select_dialog_singlechoice_material:I = 0x7f0d0098
-.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d0085
+.field public static final support_simple_spinner_dropdown_item:I = 0x7f0d00a0
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index b9890bbc65..95639db92c 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120464
+.field public static final copy:I = 0x7f120467
-.field public static final expand_button_title:I = 0x7f1205a6
+.field public static final expand_button_title:I = 0x7f1205ab
-.field public static final not_set:I = 0x7f120c84
+.field public static final not_set:I = 0x7f120cb3
-.field public static final preference_copied:I = 0x7f120deb
+.field public static final preference_copied:I = 0x7f120e1a
-.field public static final search_menu_title:I = 0x7f12109f
+.field public static final search_menu_title:I = 0x7f1210cf
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
-.field public static final summary_collapsed_preference_list:I = 0x7f1211a4
+.field public static final summary_collapsed_preference_list:I = 0x7f1211d4
-.field public static final v7_preference_off:I = 0x7f1213af
+.field public static final v7_preference_off:I = 0x7f1213e2
-.field public static final v7_preference_on:I = 0x7f1213b0
+.field public static final v7_preference_on:I = 0x7f1213e3
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$style.smali b/com.discord/smali/androidx/preference/ktx/R$style.smali
index 6346d17719..8343dfb08d 100644
--- a/com.discord/smali/androidx/preference/ktx/R$style.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$style.smali
@@ -39,743 +39,743 @@
.field public static final Base_DialogWindowTitle_AppCompat:I = 0x7f13003e
-.field public static final Base_TextAppearance_AppCompat:I = 0x7f130040
+.field public static final Base_TextAppearance_AppCompat:I = 0x7f130043
-.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130041
+.field public static final Base_TextAppearance_AppCompat_Body1:I = 0x7f130044
-.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130042
+.field public static final Base_TextAppearance_AppCompat_Body2:I = 0x7f130045
-.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130043
+.field public static final Base_TextAppearance_AppCompat_Button:I = 0x7f130046
-.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130044
+.field public static final Base_TextAppearance_AppCompat_Caption:I = 0x7f130047
-.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130045
+.field public static final Base_TextAppearance_AppCompat_Display1:I = 0x7f130048
-.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130046
+.field public static final Base_TextAppearance_AppCompat_Display2:I = 0x7f130049
-.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f130047
+.field public static final Base_TextAppearance_AppCompat_Display3:I = 0x7f13004a
-.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f130048
+.field public static final Base_TextAppearance_AppCompat_Display4:I = 0x7f13004b
-.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f130049
+.field public static final Base_TextAppearance_AppCompat_Headline:I = 0x7f13004c
-.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004a
+.field public static final Base_TextAppearance_AppCompat_Inverse:I = 0x7f13004d
-.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004b
+.field public static final Base_TextAppearance_AppCompat_Large:I = 0x7f13004e
-.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004c
+.field public static final Base_TextAppearance_AppCompat_Large_Inverse:I = 0x7f13004f
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13004d
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f130050
-.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f13004e
+.field public static final Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130051
-.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f13004f
+.field public static final Base_TextAppearance_AppCompat_Medium:I = 0x7f130052
-.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130050
+.field public static final Base_TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130053
-.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130051
+.field public static final Base_TextAppearance_AppCompat_Menu:I = 0x7f130054
-.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130052
+.field public static final Base_TextAppearance_AppCompat_SearchResult:I = 0x7f130055
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130053
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130056
-.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130054
+.field public static final Base_TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130057
-.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130055
+.field public static final Base_TextAppearance_AppCompat_Small:I = 0x7f130058
-.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130056
+.field public static final Base_TextAppearance_AppCompat_Small_Inverse:I = 0x7f130059
-.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f130057
+.field public static final Base_TextAppearance_AppCompat_Subhead:I = 0x7f13005a
-.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130058
+.field public static final Base_TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f13005b
-.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f130059
+.field public static final Base_TextAppearance_AppCompat_Title:I = 0x7f13005c
-.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005a
+.field public static final Base_TextAppearance_AppCompat_Title_Inverse:I = 0x7f13005d
-.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005b
+.field public static final Base_TextAppearance_AppCompat_Tooltip:I = 0x7f13005e
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005c
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13005f
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13005d
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f130060
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13005e
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f130061
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f13005f
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f130062
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130060
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f130063
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130061
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f130064
-.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130062
+.field public static final Base_TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f130065
-.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130063
+.field public static final Base_TextAppearance_AppCompat_Widget_Button:I = 0x7f130066
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130064
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f130067
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130065
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f130068
-.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130066
+.field public static final Base_TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f130069
-.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f130067
+.field public static final Base_TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f13006a
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f130068
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f13006b
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f130069
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f13006c
-.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006a
+.field public static final Base_TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f13006d
-.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006b
+.field public static final Base_TextAppearance_AppCompat_Widget_Switch:I = 0x7f13006e
-.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006c
+.field public static final Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f13006f
-.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f13006d
+.field public static final Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130074
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f13006e
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130075
-.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f13006f
+.field public static final Base_TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130076
-.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f13008f
+.field public static final Base_ThemeOverlay_AppCompat:I = 0x7f130098
-.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130090
+.field public static final Base_ThemeOverlay_AppCompat_ActionBar:I = 0x7f130099
-.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f130091
+.field public static final Base_ThemeOverlay_AppCompat_Dark:I = 0x7f13009a
-.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130092
+.field public static final Base_ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f13009b
-.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f130093
+.field public static final Base_ThemeOverlay_AppCompat_Dialog:I = 0x7f13009c
-.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130094
+.field public static final Base_ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13009d
-.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f130095
+.field public static final Base_ThemeOverlay_AppCompat_Light:I = 0x7f13009e
-.field public static final Base_Theme_AppCompat:I = 0x7f130070
+.field public static final Base_Theme_AppCompat:I = 0x7f130077
-.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130071
+.field public static final Base_Theme_AppCompat_CompactMenu:I = 0x7f130078
-.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130072
+.field public static final Base_Theme_AppCompat_Dialog:I = 0x7f130079
-.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f130076
+.field public static final Base_Theme_AppCompat_DialogWhenLarge:I = 0x7f13007d
-.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f130073
+.field public static final Base_Theme_AppCompat_Dialog_Alert:I = 0x7f13007a
-.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f130074
+.field public static final Base_Theme_AppCompat_Dialog_FixedSize:I = 0x7f13007b
-.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f130075
+.field public static final Base_Theme_AppCompat_Dialog_MinWidth:I = 0x7f13007c
-.field public static final Base_Theme_AppCompat_Light:I = 0x7f130077
+.field public static final Base_Theme_AppCompat_Light:I = 0x7f13007e
-.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f130078
+.field public static final Base_Theme_AppCompat_Light_DarkActionBar:I = 0x7f13007f
-.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130079
+.field public static final Base_Theme_AppCompat_Light_Dialog:I = 0x7f130080
-.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f13007d
+.field public static final Base_Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130084
-.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f13007a
+.field public static final Base_Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130081
-.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f13007b
+.field public static final Base_Theme_AppCompat_Light_Dialog_FixedSize:I = 0x7f130082
-.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f13007c
+.field public static final Base_Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130083
-.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300a5
+.field public static final Base_V21_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b2
-.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300a1
+.field public static final Base_V21_Theme_AppCompat:I = 0x7f1300ae
-.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300a2
+.field public static final Base_V21_Theme_AppCompat_Dialog:I = 0x7f1300af
-.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300a3
+.field public static final Base_V21_Theme_AppCompat_Light:I = 0x7f1300b0
-.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300a4
+.field public static final Base_V21_Theme_AppCompat_Light_Dialog:I = 0x7f1300b1
-.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300a6
+.field public static final Base_V22_Theme_AppCompat:I = 0x7f1300b3
-.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300a7
+.field public static final Base_V22_Theme_AppCompat_Light:I = 0x7f1300b4
-.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300a8
+.field public static final Base_V23_Theme_AppCompat:I = 0x7f1300b5
-.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300a9
+.field public static final Base_V23_Theme_AppCompat_Light:I = 0x7f1300b6
-.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300aa
+.field public static final Base_V26_Theme_AppCompat:I = 0x7f1300b7
-.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300ab
+.field public static final Base_V26_Theme_AppCompat_Light:I = 0x7f1300b8
-.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300ac
+.field public static final Base_V26_Widget_AppCompat_Toolbar:I = 0x7f1300b9
-.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ad
+.field public static final Base_V28_Theme_AppCompat:I = 0x7f1300ba
-.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300ae
+.field public static final Base_V28_Theme_AppCompat_Light:I = 0x7f1300bb
-.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300b3
+.field public static final Base_V7_ThemeOverlay_AppCompat_Dialog:I = 0x7f1300c0
-.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300af
+.field public static final Base_V7_Theme_AppCompat:I = 0x7f1300bc
-.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300b0
+.field public static final Base_V7_Theme_AppCompat_Dialog:I = 0x7f1300bd
-.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300b1
+.field public static final Base_V7_Theme_AppCompat_Light:I = 0x7f1300be
-.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300b2
+.field public static final Base_V7_Theme_AppCompat_Light_Dialog:I = 0x7f1300bf
-.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300b4
+.field public static final Base_V7_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
-.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300b5
+.field public static final Base_V7_Widget_AppCompat_EditText:I = 0x7f1300c2
-.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300b6
+.field public static final Base_V7_Widget_AppCompat_Toolbar:I = 0x7f1300c3
-.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300b7
+.field public static final Base_Widget_AppCompat_ActionBar:I = 0x7f1300c4
-.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300b8
+.field public static final Base_Widget_AppCompat_ActionBar_Solid:I = 0x7f1300c5
-.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300b9
+.field public static final Base_Widget_AppCompat_ActionBar_TabBar:I = 0x7f1300c6
-.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300ba
+.field public static final Base_Widget_AppCompat_ActionBar_TabText:I = 0x7f1300c7
-.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300bb
+.field public static final Base_Widget_AppCompat_ActionBar_TabView:I = 0x7f1300c8
-.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300bc
+.field public static final Base_Widget_AppCompat_ActionButton:I = 0x7f1300c9
-.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300bd
+.field public static final Base_Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1300ca
-.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300be
+.field public static final Base_Widget_AppCompat_ActionButton_Overflow:I = 0x7f1300cb
-.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300bf
+.field public static final Base_Widget_AppCompat_ActionMode:I = 0x7f1300cc
-.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300c0
+.field public static final Base_Widget_AppCompat_ActivityChooserView:I = 0x7f1300cd
-.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300c1
+.field public static final Base_Widget_AppCompat_AutoCompleteTextView:I = 0x7f1300ce
-.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300c2
+.field public static final Base_Widget_AppCompat_Button:I = 0x7f1300cf
-.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300c8
+.field public static final Base_Widget_AppCompat_ButtonBar:I = 0x7f1300d5
-.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300c9
+.field public static final Base_Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1300d6
-.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300c3
+.field public static final Base_Widget_AppCompat_Button_Borderless:I = 0x7f1300d0
-.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300c4
+.field public static final Base_Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1300d1
-.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300c5
+.field public static final Base_Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1300d2
-.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300c6
+.field public static final Base_Widget_AppCompat_Button_Colored:I = 0x7f1300d3
-.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300c7
+.field public static final Base_Widget_AppCompat_Button_Small:I = 0x7f1300d4
-.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300ca
+.field public static final Base_Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1300d7
-.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300cb
+.field public static final Base_Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1300d8
-.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300cc
+.field public static final Base_Widget_AppCompat_CompoundButton_Switch:I = 0x7f1300d9
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300cd
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle:I = 0x7f1300da
-.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300ce
+.field public static final Base_Widget_AppCompat_DrawerArrowToggle_Common:I = 0x7f1300db
-.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300cf
+.field public static final Base_Widget_AppCompat_DropDownItem_Spinner:I = 0x7f1300dc
-.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300d0
+.field public static final Base_Widget_AppCompat_EditText:I = 0x7f1300dd
-.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300d1
+.field public static final Base_Widget_AppCompat_ImageButton:I = 0x7f1300de
-.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300d2
+.field public static final Base_Widget_AppCompat_Light_ActionBar:I = 0x7f1300df
-.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300d3
+.field public static final Base_Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f1300e0
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300d4
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f1300e1
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300d5
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f1300e2
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300d6
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f1300e3
-.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300d7
+.field public static final Base_Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f1300e4
-.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300d8
+.field public static final Base_Widget_AppCompat_Light_PopupMenu:I = 0x7f1300e5
-.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300d9
+.field public static final Base_Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f1300e6
-.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300da
+.field public static final Base_Widget_AppCompat_ListMenuView:I = 0x7f1300e7
-.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300db
+.field public static final Base_Widget_AppCompat_ListPopupWindow:I = 0x7f1300e8
-.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300dc
+.field public static final Base_Widget_AppCompat_ListView:I = 0x7f1300e9
-.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300dd
+.field public static final Base_Widget_AppCompat_ListView_DropDown:I = 0x7f1300ea
-.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300de
+.field public static final Base_Widget_AppCompat_ListView_Menu:I = 0x7f1300eb
-.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300df
+.field public static final Base_Widget_AppCompat_PopupMenu:I = 0x7f1300ec
-.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300e0
+.field public static final Base_Widget_AppCompat_PopupMenu_Overflow:I = 0x7f1300ed
-.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300e1
+.field public static final Base_Widget_AppCompat_PopupWindow:I = 0x7f1300ee
-.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300e2
+.field public static final Base_Widget_AppCompat_ProgressBar:I = 0x7f1300ef
-.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300e3
+.field public static final Base_Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f1300f0
-.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300e4
+.field public static final Base_Widget_AppCompat_RatingBar:I = 0x7f1300f1
-.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300e5
+.field public static final Base_Widget_AppCompat_RatingBar_Indicator:I = 0x7f1300f2
-.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300e6
+.field public static final Base_Widget_AppCompat_RatingBar_Small:I = 0x7f1300f3
-.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300e7
+.field public static final Base_Widget_AppCompat_SearchView:I = 0x7f1300f4
-.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300e8
+.field public static final Base_Widget_AppCompat_SearchView_ActionBar:I = 0x7f1300f5
-.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300e9
+.field public static final Base_Widget_AppCompat_SeekBar:I = 0x7f1300f6
-.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300ea
+.field public static final Base_Widget_AppCompat_SeekBar_Discrete:I = 0x7f1300f7
-.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300eb
+.field public static final Base_Widget_AppCompat_Spinner:I = 0x7f1300f8
-.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300ec
+.field public static final Base_Widget_AppCompat_Spinner_Underlined:I = 0x7f1300f9
-.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300ed
+.field public static final Base_Widget_AppCompat_TextView:I = 0x7f1300fa
-.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300ee
+.field public static final Base_Widget_AppCompat_TextView_SpinnerItem:I = 0x7f1300fb
-.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300ef
+.field public static final Base_Widget_AppCompat_Toolbar:I = 0x7f1300fc
-.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300f0
+.field public static final Base_Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f1300fd
-.field public static final Platform_AppCompat:I = 0x7f13013f
+.field public static final Platform_AppCompat:I = 0x7f13015e
-.field public static final Platform_AppCompat_Light:I = 0x7f130140
+.field public static final Platform_AppCompat_Light:I = 0x7f13015f
-.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130145
+.field public static final Platform_ThemeOverlay_AppCompat:I = 0x7f130164
-.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130146
+.field public static final Platform_ThemeOverlay_AppCompat_Dark:I = 0x7f130165
-.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130147
+.field public static final Platform_ThemeOverlay_AppCompat_Light:I = 0x7f130166
-.field public static final Platform_V21_AppCompat:I = 0x7f130148
+.field public static final Platform_V21_AppCompat:I = 0x7f130167
-.field public static final Platform_V21_AppCompat_Light:I = 0x7f130149
+.field public static final Platform_V21_AppCompat_Light:I = 0x7f130168
-.field public static final Platform_V25_AppCompat:I = 0x7f13014a
+.field public static final Platform_V25_AppCompat:I = 0x7f130169
-.field public static final Platform_V25_AppCompat_Light:I = 0x7f13014b
+.field public static final Platform_V25_AppCompat_Light:I = 0x7f13016a
-.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13014c
+.field public static final Platform_Widget_AppCompat_Spinner:I = 0x7f13016b
-.field public static final Preference:I = 0x7f13014d
+.field public static final Preference:I = 0x7f13016c
-.field public static final PreferenceCategoryTitleTextStyle:I = 0x7f130163
+.field public static final PreferenceCategoryTitleTextStyle:I = 0x7f130182
-.field public static final PreferenceFragment:I = 0x7f130164
+.field public static final PreferenceFragment:I = 0x7f130183
-.field public static final PreferenceFragmentList:I = 0x7f130166
+.field public static final PreferenceFragmentList:I = 0x7f130185
-.field public static final PreferenceFragmentList_Material:I = 0x7f130167
+.field public static final PreferenceFragmentList_Material:I = 0x7f130186
-.field public static final PreferenceFragment_Material:I = 0x7f130165
+.field public static final PreferenceFragment_Material:I = 0x7f130184
-.field public static final PreferenceSummaryTextStyle:I = 0x7f130168
+.field public static final PreferenceSummaryTextStyle:I = 0x7f130187
-.field public static final PreferenceThemeOverlay:I = 0x7f130169
+.field public static final PreferenceThemeOverlay:I = 0x7f130188
-.field public static final PreferenceThemeOverlay_v14:I = 0x7f13016a
+.field public static final PreferenceThemeOverlay_v14:I = 0x7f130189
-.field public static final PreferenceThemeOverlay_v14_Material:I = 0x7f13016b
+.field public static final PreferenceThemeOverlay_v14_Material:I = 0x7f13018a
-.field public static final Preference_Category:I = 0x7f13014e
+.field public static final Preference_Category:I = 0x7f13016d
-.field public static final Preference_Category_Material:I = 0x7f13014f
+.field public static final Preference_Category_Material:I = 0x7f13016e
-.field public static final Preference_CheckBoxPreference:I = 0x7f130150
+.field public static final Preference_CheckBoxPreference:I = 0x7f13016f
-.field public static final Preference_CheckBoxPreference_Material:I = 0x7f130151
+.field public static final Preference_CheckBoxPreference_Material:I = 0x7f130170
-.field public static final Preference_DialogPreference:I = 0x7f130152
+.field public static final Preference_DialogPreference:I = 0x7f130171
-.field public static final Preference_DialogPreference_EditTextPreference:I = 0x7f130153
+.field public static final Preference_DialogPreference_EditTextPreference:I = 0x7f130172
-.field public static final Preference_DialogPreference_EditTextPreference_Material:I = 0x7f130154
+.field public static final Preference_DialogPreference_EditTextPreference_Material:I = 0x7f130173
-.field public static final Preference_DialogPreference_Material:I = 0x7f130155
+.field public static final Preference_DialogPreference_Material:I = 0x7f130174
-.field public static final Preference_DropDown:I = 0x7f130156
+.field public static final Preference_DropDown:I = 0x7f130175
-.field public static final Preference_DropDown_Material:I = 0x7f130157
+.field public static final Preference_DropDown_Material:I = 0x7f130176
-.field public static final Preference_Information:I = 0x7f130158
+.field public static final Preference_Information:I = 0x7f130177
-.field public static final Preference_Information_Material:I = 0x7f130159
+.field public static final Preference_Information_Material:I = 0x7f130178
-.field public static final Preference_Material:I = 0x7f13015a
+.field public static final Preference_Material:I = 0x7f130179
-.field public static final Preference_PreferenceScreen:I = 0x7f13015b
+.field public static final Preference_PreferenceScreen:I = 0x7f13017a
-.field public static final Preference_PreferenceScreen_Material:I = 0x7f13015c
+.field public static final Preference_PreferenceScreen_Material:I = 0x7f13017b
-.field public static final Preference_SeekBarPreference:I = 0x7f13015d
+.field public static final Preference_SeekBarPreference:I = 0x7f13017c
-.field public static final Preference_SeekBarPreference_Material:I = 0x7f13015e
+.field public static final Preference_SeekBarPreference_Material:I = 0x7f13017d
-.field public static final Preference_SwitchPreference:I = 0x7f13015f
+.field public static final Preference_SwitchPreference:I = 0x7f13017e
-.field public static final Preference_SwitchPreferenceCompat:I = 0x7f130161
+.field public static final Preference_SwitchPreferenceCompat:I = 0x7f130180
-.field public static final Preference_SwitchPreferenceCompat_Material:I = 0x7f130162
+.field public static final Preference_SwitchPreferenceCompat_Material:I = 0x7f130181
-.field public static final Preference_SwitchPreference_Material:I = 0x7f130160
+.field public static final Preference_SwitchPreference_Material:I = 0x7f13017f
-.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13016c
+.field public static final RtlOverlay_DialogWindowTitle_AppCompat:I = 0x7f13018b
-.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13016d
+.field public static final RtlOverlay_Widget_AppCompat_ActionBar_TitleItem:I = 0x7f13018c
-.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13016e
+.field public static final RtlOverlay_Widget_AppCompat_DialogTitle_Icon:I = 0x7f13018d
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13016f
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem:I = 0x7f13018e
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f130170
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup:I = 0x7f13018f
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130171
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut:I = 0x7f130190
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130172
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow:I = 0x7f130191
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130173
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Text:I = 0x7f130192
-.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130174
+.field public static final RtlOverlay_Widget_AppCompat_PopupMenuItem_Title:I = 0x7f130193
-.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f13017a
+.field public static final RtlOverlay_Widget_AppCompat_SearchView_MagIcon:I = 0x7f130199
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130175
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown:I = 0x7f130194
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130176
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1:I = 0x7f130195
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130177
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2:I = 0x7f130196
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130178
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Query:I = 0x7f130197
-.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130179
+.field public static final RtlOverlay_Widget_AppCompat_Search_DropDown_Text:I = 0x7f130198
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13017b
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton:I = 0x7f13019a
-.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13017c
+.field public static final RtlUnderlay_Widget_AppCompat_ActionButton_Overflow:I = 0x7f13019b
-.field public static final TextAppearance_AppCompat:I = 0x7f130180
+.field public static final TextAppearance_AppCompat:I = 0x7f1301be
-.field public static final TextAppearance_AppCompat_Body1:I = 0x7f130181
+.field public static final TextAppearance_AppCompat_Body1:I = 0x7f1301bf
-.field public static final TextAppearance_AppCompat_Body2:I = 0x7f130182
+.field public static final TextAppearance_AppCompat_Body2:I = 0x7f1301c0
-.field public static final TextAppearance_AppCompat_Button:I = 0x7f130183
+.field public static final TextAppearance_AppCompat_Button:I = 0x7f1301c1
-.field public static final TextAppearance_AppCompat_Caption:I = 0x7f130184
+.field public static final TextAppearance_AppCompat_Caption:I = 0x7f1301c2
-.field public static final TextAppearance_AppCompat_Display1:I = 0x7f130185
+.field public static final TextAppearance_AppCompat_Display1:I = 0x7f1301c3
-.field public static final TextAppearance_AppCompat_Display2:I = 0x7f130186
+.field public static final TextAppearance_AppCompat_Display2:I = 0x7f1301c4
-.field public static final TextAppearance_AppCompat_Display3:I = 0x7f130187
+.field public static final TextAppearance_AppCompat_Display3:I = 0x7f1301c5
-.field public static final TextAppearance_AppCompat_Display4:I = 0x7f130188
+.field public static final TextAppearance_AppCompat_Display4:I = 0x7f1301c6
-.field public static final TextAppearance_AppCompat_Headline:I = 0x7f130189
+.field public static final TextAppearance_AppCompat_Headline:I = 0x7f1301c7
-.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f13018a
+.field public static final TextAppearance_AppCompat_Inverse:I = 0x7f1301c8
-.field public static final TextAppearance_AppCompat_Large:I = 0x7f13018b
+.field public static final TextAppearance_AppCompat_Large:I = 0x7f1301c9
-.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f13018c
+.field public static final TextAppearance_AppCompat_Large_Inverse:I = 0x7f1301ca
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f13018d
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Subtitle:I = 0x7f1301cb
-.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f13018e
+.field public static final TextAppearance_AppCompat_Light_SearchResult_Title:I = 0x7f1301cc
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f13018f
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Large:I = 0x7f1301cd
-.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f130190
+.field public static final TextAppearance_AppCompat_Light_Widget_PopupMenu_Small:I = 0x7f1301ce
-.field public static final TextAppearance_AppCompat_Medium:I = 0x7f130191
+.field public static final TextAppearance_AppCompat_Medium:I = 0x7f1301cf
-.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f130192
+.field public static final TextAppearance_AppCompat_Medium_Inverse:I = 0x7f1301d0
-.field public static final TextAppearance_AppCompat_Menu:I = 0x7f130193
+.field public static final TextAppearance_AppCompat_Menu:I = 0x7f1301d1
-.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f130194
+.field public static final TextAppearance_AppCompat_SearchResult_Subtitle:I = 0x7f1301d2
-.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f130195
+.field public static final TextAppearance_AppCompat_SearchResult_Title:I = 0x7f1301d3
-.field public static final TextAppearance_AppCompat_Small:I = 0x7f130196
+.field public static final TextAppearance_AppCompat_Small:I = 0x7f1301d4
-.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f130197
+.field public static final TextAppearance_AppCompat_Small_Inverse:I = 0x7f1301d5
-.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f130198
+.field public static final TextAppearance_AppCompat_Subhead:I = 0x7f1301d6
-.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f130199
+.field public static final TextAppearance_AppCompat_Subhead_Inverse:I = 0x7f1301d7
-.field public static final TextAppearance_AppCompat_Title:I = 0x7f13019a
+.field public static final TextAppearance_AppCompat_Title:I = 0x7f1301d8
-.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f13019b
+.field public static final TextAppearance_AppCompat_Title_Inverse:I = 0x7f1301d9
-.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f13019c
+.field public static final TextAppearance_AppCompat_Tooltip:I = 0x7f1301da
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f13019d
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Menu:I = 0x7f1301db
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f13019e
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle:I = 0x7f1301dc
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f13019f
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse:I = 0x7f1301dd
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301a0
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title:I = 0x7f1301de
-.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301a1
+.field public static final TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse:I = 0x7f1301df
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301a2
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle:I = 0x7f1301e0
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301a3
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse:I = 0x7f1301e1
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301a4
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title:I = 0x7f1301e2
-.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301a5
+.field public static final TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse:I = 0x7f1301e3
-.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301a6
+.field public static final TextAppearance_AppCompat_Widget_Button:I = 0x7f1301e4
-.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301a7
+.field public static final TextAppearance_AppCompat_Widget_Button_Borderless_Colored:I = 0x7f1301e5
-.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301a8
+.field public static final TextAppearance_AppCompat_Widget_Button_Colored:I = 0x7f1301e6
-.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301a9
+.field public static final TextAppearance_AppCompat_Widget_Button_Inverse:I = 0x7f1301e7
-.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301aa
+.field public static final TextAppearance_AppCompat_Widget_DropDownItem:I = 0x7f1301e8
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301ab
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Header:I = 0x7f1301e9
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ac
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Large:I = 0x7f1301ea
-.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301ad
+.field public static final TextAppearance_AppCompat_Widget_PopupMenu_Small:I = 0x7f1301eb
-.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ae
+.field public static final TextAppearance_AppCompat_Widget_Switch:I = 0x7f1301ec
-.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301af
+.field public static final TextAppearance_AppCompat_Widget_TextView_SpinnerItem:I = 0x7f1301ed
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f1301d2
+.field public static final TextAppearance_Widget_AppCompat_ExpandedMenu_Item:I = 0x7f130210
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f1301d3
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Subtitle:I = 0x7f130211
-.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f1301d4
+.field public static final TextAppearance_Widget_AppCompat_Toolbar_Title:I = 0x7f130212
-.field public static final ThemeOverlay_AppCompat:I = 0x7f130205
+.field public static final ThemeOverlay_AppCompat:I = 0x7f13025f
-.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130206
+.field public static final ThemeOverlay_AppCompat_ActionBar:I = 0x7f130260
-.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130207
+.field public static final ThemeOverlay_AppCompat_Dark:I = 0x7f130261
-.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130208
+.field public static final ThemeOverlay_AppCompat_Dark_ActionBar:I = 0x7f130262
-.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130209
+.field public static final ThemeOverlay_AppCompat_DayNight:I = 0x7f130263
-.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f13020a
+.field public static final ThemeOverlay_AppCompat_DayNight_ActionBar:I = 0x7f130264
-.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f13020b
+.field public static final ThemeOverlay_AppCompat_Dialog:I = 0x7f130265
-.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f13020c
+.field public static final ThemeOverlay_AppCompat_Dialog_Alert:I = 0x7f130266
-.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f13020d
+.field public static final ThemeOverlay_AppCompat_Light:I = 0x7f130267
-.field public static final Theme_AppCompat:I = 0x7f1301d5
+.field public static final Theme_AppCompat:I = 0x7f130213
-.field public static final Theme_AppCompat_CompactMenu:I = 0x7f1301d6
+.field public static final Theme_AppCompat_CompactMenu:I = 0x7f130214
-.field public static final Theme_AppCompat_DayNight:I = 0x7f1301d7
+.field public static final Theme_AppCompat_DayNight:I = 0x7f130215
-.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f1301d8
+.field public static final Theme_AppCompat_DayNight_DarkActionBar:I = 0x7f130216
-.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f1301d9
+.field public static final Theme_AppCompat_DayNight_Dialog:I = 0x7f130217
-.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f1301dc
+.field public static final Theme_AppCompat_DayNight_DialogWhenLarge:I = 0x7f13021a
-.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f1301da
+.field public static final Theme_AppCompat_DayNight_Dialog_Alert:I = 0x7f130218
-.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f1301db
+.field public static final Theme_AppCompat_DayNight_Dialog_MinWidth:I = 0x7f130219
-.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f1301dd
+.field public static final Theme_AppCompat_DayNight_NoActionBar:I = 0x7f13021b
-.field public static final Theme_AppCompat_Dialog:I = 0x7f1301de
+.field public static final Theme_AppCompat_Dialog:I = 0x7f13021c
-.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f1301e1
+.field public static final Theme_AppCompat_DialogWhenLarge:I = 0x7f13021f
-.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f1301df
+.field public static final Theme_AppCompat_Dialog_Alert:I = 0x7f13021d
-.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f1301e0
+.field public static final Theme_AppCompat_Dialog_MinWidth:I = 0x7f13021e
-.field public static final Theme_AppCompat_Light:I = 0x7f1301e2
+.field public static final Theme_AppCompat_Light:I = 0x7f130220
-.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f1301e3
+.field public static final Theme_AppCompat_Light_DarkActionBar:I = 0x7f130221
-.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f1301e4
+.field public static final Theme_AppCompat_Light_Dialog:I = 0x7f130222
-.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f1301e7
+.field public static final Theme_AppCompat_Light_DialogWhenLarge:I = 0x7f130225
-.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f1301e5
+.field public static final Theme_AppCompat_Light_Dialog_Alert:I = 0x7f130223
-.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f1301e6
+.field public static final Theme_AppCompat_Light_Dialog_MinWidth:I = 0x7f130224
-.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f1301e8
+.field public static final Theme_AppCompat_Light_NoActionBar:I = 0x7f130226
-.field public static final Theme_AppCompat_NoActionBar:I = 0x7f1301e9
+.field public static final Theme_AppCompat_NoActionBar:I = 0x7f130227
-.field public static final Widget_AppCompat_ActionBar:I = 0x7f1302ea
+.field public static final Widget_AppCompat_ActionBar:I = 0x7f130352
-.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f1302eb
+.field public static final Widget_AppCompat_ActionBar_Solid:I = 0x7f130353
-.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f1302ec
+.field public static final Widget_AppCompat_ActionBar_TabBar:I = 0x7f130354
-.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f1302ed
+.field public static final Widget_AppCompat_ActionBar_TabText:I = 0x7f130355
-.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f1302ee
+.field public static final Widget_AppCompat_ActionBar_TabView:I = 0x7f130356
-.field public static final Widget_AppCompat_ActionButton:I = 0x7f1302ef
+.field public static final Widget_AppCompat_ActionButton:I = 0x7f130357
-.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f1302f0
+.field public static final Widget_AppCompat_ActionButton_CloseMode:I = 0x7f130358
-.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f1302f1
+.field public static final Widget_AppCompat_ActionButton_Overflow:I = 0x7f130359
-.field public static final Widget_AppCompat_ActionMode:I = 0x7f1302f2
+.field public static final Widget_AppCompat_ActionMode:I = 0x7f13035a
-.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f1302f3
+.field public static final Widget_AppCompat_ActivityChooserView:I = 0x7f13035b
-.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f1302f4
+.field public static final Widget_AppCompat_AutoCompleteTextView:I = 0x7f13035c
-.field public static final Widget_AppCompat_Button:I = 0x7f1302f5
+.field public static final Widget_AppCompat_Button:I = 0x7f13035d
-.field public static final Widget_AppCompat_ButtonBar:I = 0x7f1302fb
+.field public static final Widget_AppCompat_ButtonBar:I = 0x7f130363
-.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f1302fc
+.field public static final Widget_AppCompat_ButtonBar_AlertDialog:I = 0x7f130364
-.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f1302f6
+.field public static final Widget_AppCompat_Button_Borderless:I = 0x7f13035e
-.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f1302f7
+.field public static final Widget_AppCompat_Button_Borderless_Colored:I = 0x7f13035f
-.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f1302f8
+.field public static final Widget_AppCompat_Button_ButtonBar_AlertDialog:I = 0x7f130360
-.field public static final Widget_AppCompat_Button_Colored:I = 0x7f1302f9
+.field public static final Widget_AppCompat_Button_Colored:I = 0x7f130361
-.field public static final Widget_AppCompat_Button_Small:I = 0x7f1302fa
+.field public static final Widget_AppCompat_Button_Small:I = 0x7f130362
-.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f1302fd
+.field public static final Widget_AppCompat_CompoundButton_CheckBox:I = 0x7f130365
-.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f1302fe
+.field public static final Widget_AppCompat_CompoundButton_RadioButton:I = 0x7f130366
-.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f1302ff
+.field public static final Widget_AppCompat_CompoundButton_Switch:I = 0x7f130367
-.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130300
+.field public static final Widget_AppCompat_DrawerArrowToggle:I = 0x7f130368
-.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130301
+.field public static final Widget_AppCompat_DropDownItem_Spinner:I = 0x7f130369
-.field public static final Widget_AppCompat_EditText:I = 0x7f130302
+.field public static final Widget_AppCompat_EditText:I = 0x7f13036a
-.field public static final Widget_AppCompat_ImageButton:I = 0x7f130303
+.field public static final Widget_AppCompat_ImageButton:I = 0x7f13036b
-.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f130304
+.field public static final Widget_AppCompat_Light_ActionBar:I = 0x7f13036c
-.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f130305
+.field public static final Widget_AppCompat_Light_ActionBar_Solid:I = 0x7f13036d
-.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f130306
+.field public static final Widget_AppCompat_Light_ActionBar_Solid_Inverse:I = 0x7f13036e
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f130307
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar:I = 0x7f13036f
-.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130308
+.field public static final Widget_AppCompat_Light_ActionBar_TabBar_Inverse:I = 0x7f130370
-.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130309
+.field public static final Widget_AppCompat_Light_ActionBar_TabText:I = 0x7f130371
-.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f13030a
+.field public static final Widget_AppCompat_Light_ActionBar_TabText_Inverse:I = 0x7f130372
-.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f13030b
+.field public static final Widget_AppCompat_Light_ActionBar_TabView:I = 0x7f130373
-.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f13030c
+.field public static final Widget_AppCompat_Light_ActionBar_TabView_Inverse:I = 0x7f130374
-.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f13030d
+.field public static final Widget_AppCompat_Light_ActionButton:I = 0x7f130375
-.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f13030e
+.field public static final Widget_AppCompat_Light_ActionButton_CloseMode:I = 0x7f130376
-.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f13030f
+.field public static final Widget_AppCompat_Light_ActionButton_Overflow:I = 0x7f130377
-.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130310
+.field public static final Widget_AppCompat_Light_ActionMode_Inverse:I = 0x7f130378
-.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130311
+.field public static final Widget_AppCompat_Light_ActivityChooserView:I = 0x7f130379
-.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f130312
+.field public static final Widget_AppCompat_Light_AutoCompleteTextView:I = 0x7f13037a
-.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f130313
+.field public static final Widget_AppCompat_Light_DropDownItem_Spinner:I = 0x7f13037b
-.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f130314
+.field public static final Widget_AppCompat_Light_ListPopupWindow:I = 0x7f13037c
-.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f130315
+.field public static final Widget_AppCompat_Light_ListView_DropDown:I = 0x7f13037d
-.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f130316
+.field public static final Widget_AppCompat_Light_PopupMenu:I = 0x7f13037e
-.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f130317
+.field public static final Widget_AppCompat_Light_PopupMenu_Overflow:I = 0x7f13037f
-.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130318
+.field public static final Widget_AppCompat_Light_SearchView:I = 0x7f130380
-.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130319
+.field public static final Widget_AppCompat_Light_Spinner_DropDown_ActionBar:I = 0x7f130381
-.field public static final Widget_AppCompat_ListMenuView:I = 0x7f13031a
+.field public static final Widget_AppCompat_ListMenuView:I = 0x7f130382
-.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f13031b
+.field public static final Widget_AppCompat_ListPopupWindow:I = 0x7f130383
-.field public static final Widget_AppCompat_ListView:I = 0x7f13031c
+.field public static final Widget_AppCompat_ListView:I = 0x7f130384
-.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f13031d
+.field public static final Widget_AppCompat_ListView_DropDown:I = 0x7f130385
-.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f13031e
+.field public static final Widget_AppCompat_ListView_Menu:I = 0x7f130386
-.field public static final Widget_AppCompat_PopupMenu:I = 0x7f13031f
+.field public static final Widget_AppCompat_PopupMenu:I = 0x7f130387
-.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130320
+.field public static final Widget_AppCompat_PopupMenu_Overflow:I = 0x7f130388
-.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130321
+.field public static final Widget_AppCompat_PopupWindow:I = 0x7f130389
-.field public static final Widget_AppCompat_ProgressBar:I = 0x7f130322
+.field public static final Widget_AppCompat_ProgressBar:I = 0x7f13038a
-.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f130323
+.field public static final Widget_AppCompat_ProgressBar_Horizontal:I = 0x7f13038b
-.field public static final Widget_AppCompat_RatingBar:I = 0x7f130324
+.field public static final Widget_AppCompat_RatingBar:I = 0x7f13038c
-.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f130325
+.field public static final Widget_AppCompat_RatingBar_Indicator:I = 0x7f13038d
-.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f130326
+.field public static final Widget_AppCompat_RatingBar_Small:I = 0x7f13038e
-.field public static final Widget_AppCompat_SearchView:I = 0x7f130327
+.field public static final Widget_AppCompat_SearchView:I = 0x7f13038f
-.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130328
+.field public static final Widget_AppCompat_SearchView_ActionBar:I = 0x7f130390
-.field public static final Widget_AppCompat_SeekBar:I = 0x7f130329
+.field public static final Widget_AppCompat_SeekBar:I = 0x7f130391
-.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f13032a
+.field public static final Widget_AppCompat_SeekBar_Discrete:I = 0x7f130392
-.field public static final Widget_AppCompat_Spinner:I = 0x7f13032b
+.field public static final Widget_AppCompat_Spinner:I = 0x7f130393
-.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f13032c
+.field public static final Widget_AppCompat_Spinner_DropDown:I = 0x7f130394
-.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f13032d
+.field public static final Widget_AppCompat_Spinner_DropDown_ActionBar:I = 0x7f130395
-.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f13032e
+.field public static final Widget_AppCompat_Spinner_Underlined:I = 0x7f130396
-.field public static final Widget_AppCompat_TextView:I = 0x7f13032f
+.field public static final Widget_AppCompat_TextView:I = 0x7f130397
-.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130330
+.field public static final Widget_AppCompat_TextView_SpinnerItem:I = 0x7f130398
-.field public static final Widget_AppCompat_Toolbar:I = 0x7f130331
+.field public static final Widget_AppCompat_Toolbar:I = 0x7f130399
-.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f130332
+.field public static final Widget_AppCompat_Toolbar_Button_Navigation:I = 0x7f13039a
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
-.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130363
+.field public static final Widget_Support_CoordinatorLayout:I = 0x7f130403
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$styleable.smali b/com.discord/smali/androidx/preference/ktx/R$styleable.smali
index 10ab30af50..007df1afb1 100644
--- a/com.discord/smali/androidx/preference/ktx/R$styleable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$styleable.smali
@@ -1400,7 +1400,7 @@
new-array v7, v0, [I
- const v8, 0x7f040033
+ const v8, 0x7f040034
aput v8, v7, v2
@@ -1454,7 +1454,7 @@
new-array v4, v0, [I
- const v9, 0x7f040456
+ const v9, 0x7f0404cf
aput v9, v4, v2
@@ -1548,7 +1548,7 @@
new-array v9, v0, [I
- const v11, 0x7f04037e
+ const v11, 0x7f0403f3
aput v11, v9, v2
@@ -1696,63 +1696,63 @@
:array_0
.array-data 4
- 0x7f04004e
- 0x7f040050
0x7f040051
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f040106
- 0x7f040129
- 0x7f04012a
- 0x7f040145
- 0x7f04018d
- 0x7f040192
- 0x7f040199
- 0x7f04019a
- 0x7f040216
- 0x7f04023c
- 0x7f040248
- 0x7f0402b3
- 0x7f0402d4
- 0x7f0402f0
- 0x7f040328
- 0x7f040329
- 0x7f04038c
- 0x7f04038f
- 0x7f04042b
- 0x7f040435
+ 0x7f040059
+ 0x7f04005a
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040134
+ 0x7f04015b
+ 0x7f04015c
+ 0x7f040177
+ 0x7f0401cf
+ 0x7f0401d5
+ 0x7f0401dd
+ 0x7f0401de
+ 0x7f04025a
+ 0x7f040280
+ 0x7f04028f
+ 0x7f040306
+ 0x7f04033b
+ 0x7f040359
+ 0x7f040391
+ 0x7f040392
+ 0x7f040402
+ 0x7f040405
+ 0x7f0404a3
+ 0x7f0404ad
.end array-data
:array_1
.array-data 4
- 0x7f04004e
- 0x7f040050
- 0x7f0400bd
- 0x7f04018d
- 0x7f04038f
- 0x7f040435
+ 0x7f040051
+ 0x7f040059
+ 0x7f0400d4
+ 0x7f0401cf
+ 0x7f040405
+ 0x7f0404ad
.end array-data
:array_2
.array-data 4
- 0x7f04014f
- 0x7f04023d
+ 0x7f04018e
+ 0x7f040281
.end array-data
:array_3
.array-data 4
0x10100f2
- 0x7f040082
- 0x7f040083
- 0x7f0402a8
- 0x7f0402a9
- 0x7f0402d1
- 0x7f04036f
- 0x7f040370
+ 0x7f040094
+ 0x7f040095
+ 0x7f0402fb
+ 0x7f0402fc
+ 0x7f040338
+ 0x7f0403de
+ 0x7f0403e0
.end array-data
:array_4
@@ -1782,17 +1782,17 @@
:array_7
.array-data 4
0x1010119
- 0x7f04037c
- 0x7f040429
- 0x7f04042a
+ 0x7f0403ec
+ 0x7f0404a1
+ 0x7f0404a2
.end array-data
:array_8
.array-data 4
0x1010142
- 0x7f040426
- 0x7f040427
- 0x7f040428
+ 0x7f04049e
+ 0x7f04049f
+ 0x7f0404a0
.end array-data
:array_9
@@ -1809,26 +1809,26 @@
:array_a
.array-data 4
0x1010034
- 0x7f040048
- 0x7f040049
- 0x7f04004a
0x7f04004b
0x7f04004c
- 0x7f040131
- 0x7f040132
- 0x7f040133
- 0x7f040134
- 0x7f040136
- 0x7f040137
- 0x7f040138
- 0x7f040139
+ 0x7f04004d
+ 0x7f04004e
+ 0x7f04004f
+ 0x7f040163
+ 0x7f040164
+ 0x7f040165
+ 0x7f040166
0x7f040168
- 0x7f040175
- 0x7f04017d
- 0x7f040254
- 0x7f0402a2
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f040169
+ 0x7f04016a
+ 0x7f04016b
+ 0x7f0401aa
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f0402a5
+ 0x7f0402f5
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_b
@@ -1865,105 +1865,105 @@
0x7f04001c
0x7f04001d
0x7f04001e
- 0x7f040025
- 0x7f04002a
+ 0x7f040026
0x7f04002b
0x7f04002c
0x7f04002d
- 0x7f040047
- 0x7f04006c
- 0x7f04007b
- 0x7f04007c
+ 0x7f04002e
+ 0x7f04004a
0x7f04007d
- 0x7f04007e
- 0x7f04007f
- 0x7f040085
- 0x7f040086
- 0x7f04009d
- 0x7f0400a2
- 0x7f0400c3
- 0x7f0400c5
- 0x7f0400ca
- 0x7f0400cb
- 0x7f0400cc
- 0x7f0400cd
- 0x7f0400ce
- 0x7f0400d1
- 0x7f0400d4
- 0x7f0400d9
- 0x7f0400f1
- 0x7f040120
- 0x7f040125
- 0x7f040126
- 0x7f04012e
- 0x7f040130
- 0x7f04013e
- 0x7f04013f
- 0x7f040141
- 0x7f040142
- 0x7f040144
- 0x7f040199
- 0x7f040222
- 0x7f0402a4
- 0x7f0402a5
- 0x7f0402a6
- 0x7f0402a7
- 0x7f0402aa
- 0x7f0402ab
- 0x7f0402ac
- 0x7f0402ad
- 0x7f0402ae
- 0x7f0402af
- 0x7f0402b0
- 0x7f0402b1
- 0x7f0402b2
- 0x7f0402e4
- 0x7f0402e5
- 0x7f0402e6
- 0x7f0402ef
- 0x7f0402f1
- 0x7f04032e
- 0x7f040331
- 0x7f040332
- 0x7f040333
- 0x7f04035c
- 0x7f040360
- 0x7f040362
- 0x7f040363
- 0x7f040378
- 0x7f040379
- 0x7f040398
- 0x7f0403c4
- 0x7f0403c5
+ 0x7f04008d
+ 0x7f04008e
+ 0x7f04008f
+ 0x7f040090
+ 0x7f040091
+ 0x7f040097
+ 0x7f040098
+ 0x7f0400b0
+ 0x7f0400b7
+ 0x7f0400da
+ 0x7f0400dc
+ 0x7f0400e1
+ 0x7f0400e3
+ 0x7f0400e4
+ 0x7f0400e5
+ 0x7f0400e6
+ 0x7f0400ef
+ 0x7f0400f2
+ 0x7f0400fb
+ 0x7f040113
+ 0x7f040152
+ 0x7f040157
+ 0x7f040158
+ 0x7f040160
+ 0x7f040162
+ 0x7f040170
+ 0x7f040171
+ 0x7f040173
+ 0x7f040174
+ 0x7f040176
+ 0x7f0401dd
+ 0x7f040266
+ 0x7f0402f7
+ 0x7f0402f8
+ 0x7f0402f9
+ 0x7f0402fa
+ 0x7f0402fd
+ 0x7f0402fe
+ 0x7f0402ff
+ 0x7f040300
+ 0x7f040301
+ 0x7f040302
+ 0x7f040303
+ 0x7f040304
+ 0x7f040305
+ 0x7f04034c
+ 0x7f04034d
+ 0x7f04034e
+ 0x7f040358
+ 0x7f04035a
+ 0x7f040397
+ 0x7f04039b
+ 0x7f04039c
+ 0x7f04039d
0x7f0403c6
- 0x7f0403c7
- 0x7f0403c9
0x7f0403ca
- 0x7f0403cb
0x7f0403cc
- 0x7f0403cf
- 0x7f0403d0
- 0x7f040438
- 0x7f040439
+ 0x7f0403cd
+ 0x7f0403e8
+ 0x7f0403e9
+ 0x7f04040e
0x7f04043a
- 0x7f04043b
- 0x7f04045d
- 0x7f040461
- 0x7f040462
- 0x7f040463
- 0x7f040464
- 0x7f040465
- 0x7f040466
- 0x7f040467
- 0x7f040468
- 0x7f040469
- 0x7f04046a
+ 0x7f04043c
+ 0x7f04043d
+ 0x7f04043e
+ 0x7f040440
+ 0x7f040441
+ 0x7f040442
+ 0x7f040443
+ 0x7f040446
+ 0x7f040447
+ 0x7f0404b0
+ 0x7f0404b1
+ 0x7f0404b2
+ 0x7f0404b3
+ 0x7f0404d6
+ 0x7f0404da
+ 0x7f0404db
+ 0x7f0404dc
+ 0x7f0404dd
+ 0x7f0404de
+ 0x7f0404df
+ 0x7f0404e0
+ 0x7f0404e1
+ 0x7f0404e2
+ 0x7f0404e3
.end array-data
:array_c
.array-data 4
0x101030e
- 0x7f040362
+ 0x7f0403cc
.end array-data
:array_d
@@ -1971,41 +1971,41 @@
0x10101ef
0x10101f0
0x10101f1
- 0x7f040128
- 0x7f040392
- 0x7f040393
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
.end array-data
:array_e
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_f
.array-data 4
0x1010107
- 0x7f040080
- 0x7f040087
- 0x7f040088
+ 0x7f040092
+ 0x7f040099
+ 0x7f04009a
.end array-data
:array_10
.array-data 4
- 0x7f040250
- 0x7f040383
+ 0x7f0402a1
+ 0x7f0403f9
.end array-data
:array_11
.array-data 4
0x10100b3
- 0x7f040258
- 0x7f040259
- 0x7f04025a
- 0x7f040286
- 0x7f040292
- 0x7f040293
+ 0x7f0402a9
+ 0x7f0402aa
+ 0x7f0402ab
+ 0x7f0402d7
+ 0x7f0402e3
+ 0x7f0402e4
.end array-data
:array_12
@@ -2016,34 +2016,34 @@
0x10101f5
0x10101f6
0x10101f7
- 0x7f040121
- 0x7f040122
- 0x7f040123
- 0x7f040127
- 0x7f0402d6
- 0x7f0402f2
+ 0x7f040153
+ 0x7f040154
+ 0x7f040155
+ 0x7f040159
+ 0x7f04033d
+ 0x7f04035b
.end array-data
:array_13
.array-data 4
- 0x7f04003f
- 0x7f040040
- 0x7f040054
- 0x7f0400c2
- 0x7f040135
- 0x7f040181
- 0x7f040377
- 0x7f040422
+ 0x7f040042
+ 0x7f040043
+ 0x7f040061
+ 0x7f0400d9
+ 0x7f040167
+ 0x7f0401c3
+ 0x7f0403e7
+ 0x7f04049a
.end array-data
:array_14
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_15
@@ -2053,11 +2053,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_16
@@ -2089,10 +2089,10 @@
0x1010126
0x1010127
0x1010128
- 0x7f04012a
- 0x7f04012f
- 0x7f0402ce
- 0x7f04036b
+ 0x7f04015c
+ 0x7f040161
+ 0x7f040334
+ 0x7f0403da
.end array-data
:array_19
@@ -2113,9 +2113,9 @@
.array-data 4
0x10100b2
0x10101f8
- 0x7f04014b
- 0x7f04014c
- 0x7f040456
+ 0x7f040186
+ 0x7f040187
+ 0x7f0404cf
.end array-data
:array_1c
@@ -2145,14 +2145,14 @@
0x101026f
0x7f04000d
0x7f04001f
- 0x7f040020
- 0x7f040035
- 0x7f0400e4
- 0x7f04021d
- 0x7f04021e
- 0x7f0402d9
- 0x7f040367
- 0x7f04043c
+ 0x7f040021
+ 0x7f040036
+ 0x7f040106
+ 0x7f040261
+ 0x7f040262
+ 0x7f040341
+ 0x7f0403d6
+ 0x7f0404b4
.end array-data
:array_1e
@@ -2164,23 +2164,23 @@
0x101012f
0x1010130
0x1010131
- 0x7f0402fc
- 0x7f04038a
+ 0x7f040365
+ 0x7f040400
.end array-data
:array_1f
.array-data 4
0x10100b2
0x10101f8
- 0x7f04014b
- 0x7f04014c
+ 0x7f040186
+ 0x7f040187
.end array-data
:array_20
.array-data 4
0x1010176
0x10102c9
- 0x7f0402dc
+ 0x7f040344
.end array-data
:array_21
@@ -2201,26 +2201,26 @@
0x10102e3
0x101055c
0x1010561
- 0x7f040030
- 0x7f040032
- 0x7f04011e
- 0x7f04011f
- 0x7f040147
- 0x7f040148
- 0x7f040180
- 0x7f040216
- 0x7f04021b
- 0x7f040241
- 0x7f04024f
- 0x7f040255
- 0x7f0402da
- 0x7f0402ec
- 0x7f040361
- 0x7f040365
- 0x7f040372
- 0x7f040391
- 0x7f04042b
- 0x7f040460
+ 0x7f040031
+ 0x7f040033
+ 0x7f040150
+ 0x7f040151
+ 0x7f04017b
+ 0x7f04017c
+ 0x7f0401c2
+ 0x7f04025a
+ 0x7f04025f
+ 0x7f040286
+ 0x7f0402a0
+ 0x7f0402a6
+ 0x7f040342
+ 0x7f040354
+ 0x7f0403cb
+ 0x7f0403d4
+ 0x7f0403e2
+ 0x7f040407
+ 0x7f0404a3
+ 0x7f0404d9
.end array-data
:array_22
@@ -2228,7 +2228,7 @@
0x10100f2
0x1010129
0x101012a
- 0x7f040031
+ 0x7f040032
.end array-data
:array_23
@@ -2236,48 +2236,48 @@
0x10100f2
0x1010129
0x101012a
- 0x7f040031
+ 0x7f040032
.end array-data
:array_24
.array-data 4
0x10101e7
- 0x7f04023e
- 0x7f0402db
+ 0x7f040282
+ 0x7f040343
.end array-data
:array_25
.array-data 4
0x101011f
0x1010120
- 0x7f0402c9
- 0x7f0402cc
+ 0x7f04032f
+ 0x7f040332
.end array-data
:array_26
.array-data 4
- 0x7f04009c
- 0x7f040124
- 0x7f040140
- 0x7f040143
- 0x7f0402f3
- 0x7f0402f4
- 0x7f0402f5
- 0x7f0402f6
- 0x7f0402f7
- 0x7f0402f8
- 0x7f0402f9
- 0x7f0402fa
- 0x7f0402fb
+ 0x7f0400af
+ 0x7f040156
+ 0x7f040172
+ 0x7f040175
+ 0x7f04035c
+ 0x7f04035d
+ 0x7f04035e
0x7f04035f
- 0x7f040396
- 0x7f040397
+ 0x7f040360
+ 0x7f040361
+ 0x7f040362
+ 0x7f040363
+ 0x7f040364
+ 0x7f0403c9
+ 0x7f04040c
+ 0x7f04040d
.end array-data
:array_27
.array-data 4
- 0x7f0402e0
- 0x7f0402e3
+ 0x7f040348
+ 0x7f04034b
.end array-data
:array_28
@@ -2285,15 +2285,15 @@
0x10100c4
0x10100eb
0x10100f1
- 0x7f040161
- 0x7f040162
- 0x7f040163
- 0x7f040164
- 0x7f040165
- 0x7f040256
- 0x7f040337
- 0x7f040376
- 0x7f04037d
+ 0x7f0401a3
+ 0x7f0401a4
+ 0x7f0401a5
+ 0x7f0401a6
+ 0x7f0401a7
+ 0x7f0402a7
+ 0x7f0403a1
+ 0x7f0403e6
+ 0x7f0403ed
.end array-data
:array_29
@@ -2302,30 +2302,30 @@
0x101011f
0x1010220
0x1010264
- 0x7f0400b6
- 0x7f0400df
- 0x7f04011d
- 0x7f040186
- 0x7f04021f
- 0x7f040255
- 0x7f04032c
- 0x7f04032d
- 0x7f04035a
- 0x7f04035b
- 0x7f04038b
- 0x7f040390
- 0x7f04045e
+ 0x7f0400cd
+ 0x7f040101
+ 0x7f04014f
+ 0x7f0401c8
+ 0x7f040263
+ 0x7f0402a6
+ 0x7f040395
+ 0x7f040396
+ 0x7f0403c4
+ 0x7f0403c5
+ 0x7f040401
+ 0x7f040406
+ 0x7f0404d7
.end array-data
:array_2a
.array-data 4
0x10100f2
0x1010136
- 0x7f040029
- 0x7f0402d0
- 0x7f04035e
- 0x7f04036d
- 0x7f040454
+ 0x7f04002a
+ 0x7f040336
+ 0x7f0403c8
+ 0x7f0403dc
+ 0x7f0404cc
.end array-data
:array_2b
@@ -2334,7 +2334,7 @@
0x1010176
0x101017b
0x1010262
- 0x7f0402f0
+ 0x7f040359
.end array-data
:array_2c
@@ -2352,17 +2352,17 @@
0x1010124
0x1010125
0x1010142
- 0x7f04036e
- 0x7f04037a
- 0x7f040394
- 0x7f040395
- 0x7f040399
- 0x7f040423
- 0x7f040424
- 0x7f040425
- 0x7f04043d
- 0x7f04043e
- 0x7f04043f
+ 0x7f0403dd
+ 0x7f0403ea
+ 0x7f04040a
+ 0x7f04040b
+ 0x7f04040f
+ 0x7f04049b
+ 0x7f04049c
+ 0x7f04049d
+ 0x7f0404b5
+ 0x7f0404b6
+ 0x7f0404b7
.end array-data
:array_2e
@@ -2372,11 +2372,11 @@
0x10101f1
0x101036b
0x101036c
- 0x7f040128
- 0x7f040392
- 0x7f040393
- 0x7f04039a
- 0x7f04039b
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
+ 0x7f040410
+ 0x7f040411
.end array-data
:array_2f
@@ -2386,11 +2386,11 @@
0x10101f1
0x101036b
0x101036c
- 0x7f040128
- 0x7f040392
- 0x7f040393
- 0x7f04039a
- 0x7f04039b
+ 0x7f04015a
+ 0x7f040408
+ 0x7f040409
+ 0x7f040410
+ 0x7f040411
.end array-data
:array_30
@@ -2407,60 +2407,60 @@
0x1010164
0x10103ac
0x1010585
- 0x7f040175
- 0x7f04017d
- 0x7f0403b9
- 0x7f0403d3
+ 0x7f0401b7
+ 0x7f0401bf
+ 0x7f04042f
+ 0x7f04044a
.end array-data
:array_31
.array-data 4
0x10100af
0x1010140
- 0x7f040081
- 0x7f0400be
- 0x7f0400bf
- 0x7f0400e5
- 0x7f0400e6
- 0x7f0400e7
- 0x7f0400e8
- 0x7f0400e9
- 0x7f0400ea
- 0x7f0402b3
- 0x7f0402b4
- 0x7f0402c8
- 0x7f0402cf
- 0x7f0402d2
- 0x7f0402d3
- 0x7f0402f0
- 0x7f04038c
- 0x7f04038d
- 0x7f04038e
- 0x7f04042b
- 0x7f04042d
- 0x7f04042e
- 0x7f04042f
- 0x7f040430
- 0x7f040431
- 0x7f040432
- 0x7f040433
- 0x7f040434
+ 0x7f040093
+ 0x7f0400d5
+ 0x7f0400d6
+ 0x7f040107
+ 0x7f040108
+ 0x7f040109
+ 0x7f04010a
+ 0x7f04010b
+ 0x7f04010c
+ 0x7f040306
+ 0x7f040307
+ 0x7f04032d
+ 0x7f040335
+ 0x7f040339
+ 0x7f04033a
+ 0x7f040359
+ 0x7f040402
+ 0x7f040403
+ 0x7f040404
+ 0x7f0404a3
+ 0x7f0404a5
+ 0x7f0404a6
+ 0x7f0404a7
+ 0x7f0404a8
+ 0x7f0404a9
+ 0x7f0404aa
+ 0x7f0404ab
+ 0x7f0404ac
.end array-data
:array_32
.array-data 4
0x1010000
0x10100da
- 0x7f0402e1
- 0x7f0402e2
- 0x7f0403d6
+ 0x7f040349
+ 0x7f04034a
+ 0x7f04044d
.end array-data
:array_33
.array-data 4
0x10100d4
- 0x7f040052
- 0x7f040053
+ 0x7f04005b
+ 0x7f04005c
.end array-data
:array_34
diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali
index 80c639d2b4..5f5a452bce 100644
--- a/com.discord/smali/androidx/recyclerview/R$attr.smali
+++ b/com.discord/smali/androidx/recyclerview/R$attr.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final fastScrollEnabled:I = 0x7f040161
+.field public static final fastScrollEnabled:I = 0x7f0401a3
-.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f040162
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f0401a4
-.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f040163
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f0401a5
-.field public static final fastScrollVerticalThumbDrawable:I = 0x7f040164
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f0401a6
-.field public static final fastScrollVerticalTrackDrawable:I = 0x7f040165
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f0401a7
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final layoutManager:I = 0x7f040256
+.field public static final layoutManager:I = 0x7f0402a7
-.field public static final recyclerViewStyle:I = 0x7f040334
+.field public static final recyclerViewStyle:I = 0x7f04039e
-.field public static final reverseLayout:I = 0x7f040337
+.field public static final reverseLayout:I = 0x7f0403a1
-.field public static final spanCount:I = 0x7f040376
+.field public static final spanCount:I = 0x7f0403e6
-.field public static final stackFromEnd:I = 0x7f04037d
+.field public static final stackFromEnd:I = 0x7f0403ed
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$color.smali b/com.discord/smali/androidx/recyclerview/R$color.smali
index 19c54cde4f..fdf4618db8 100644
--- a/com.discord/smali/androidx/recyclerview/R$color.smali
+++ b/com.discord/smali/androidx/recyclerview/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$dimen.smali b/com.discord/smali/androidx/recyclerview/R$dimen.smali
index 1a65794024..86055a222a 100644
--- a/com.discord/smali/androidx/recyclerview/R$dimen.smali
+++ b/com.discord/smali/androidx/recyclerview/R$dimen.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final fastscroll_default_thickness:I = 0x7f0700be
+.field public static final fastscroll_default_thickness:I = 0x7f0700c3
-.field public static final fastscroll_margin:I = 0x7f0700bf
+.field public static final fastscroll_margin:I = 0x7f0700c4
-.field public static final fastscroll_minimum_range:I = 0x7f0700c0
+.field public static final fastscroll_minimum_range:I = 0x7f0700c5
-.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d4
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d9
-.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700d5
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700da
-.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700d6
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700db
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 259d571c28..b2d84fe952 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index e3e99e12c2..aac0bb2773 100644
--- a/com.discord/smali/androidx/recyclerview/R$id.smali
+++ b/com.discord/smali/androidx/recyclerview/R$id.smali
@@ -15,141 +15,141 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0430
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0441
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$integer.smali b/com.discord/smali/androidx/recyclerview/R$integer.smali
index 59bfad687c..673d6bf9df 100644
--- a/com.discord/smali/androidx/recyclerview/R$integer.smali
+++ b/com.discord/smali/androidx/recyclerview/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$layout.smali b/com.discord/smali/androidx/recyclerview/R$layout.smali
index 23a4e9bdd2..e833df66c1 100644
--- a/com.discord/smali/androidx/recyclerview/R$layout.smali
+++ b/com.discord/smali/androidx/recyclerview/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 1e97579c19..476f3921c5 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$style.smali b/com.discord/smali/androidx/recyclerview/R$style.smali
index 5b25f4f678..73a78ccd5c 100644
--- a/com.discord/smali/androidx/recyclerview/R$style.smali
+++ b/com.discord/smali/androidx/recyclerview/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali
index 9b59aa9972..041b266b72 100644
--- a/com.discord/smali/androidx/recyclerview/R$styleable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali
@@ -174,17 +174,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -194,11 +194,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
@@ -228,15 +228,15 @@
0x10100c4
0x10100eb
0x10100f1
- 0x7f040161
- 0x7f040162
- 0x7f040163
- 0x7f040164
- 0x7f040165
- 0x7f040256
- 0x7f040337
- 0x7f040376
- 0x7f04037d
+ 0x7f0401a3
+ 0x7f0401a4
+ 0x7f0401a5
+ 0x7f0401a6
+ 0x7f0401a7
+ 0x7f0402a7
+ 0x7f0403a1
+ 0x7f0403e6
+ 0x7f0403ed
.end array-data
.end method
diff --git a/com.discord/smali/androidx/room/R$attr.smali b/com.discord/smali/androidx/room/R$attr.smali
index 7e0e0d7499..4dbb679fe9 100644
--- a/com.discord/smali/androidx/room/R$attr.smali
+++ b/com.discord/smali/androidx/room/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/room/R$color.smali b/com.discord/smali/androidx/room/R$color.smali
index 6c0050ab44..3ff3a7de22 100644
--- a/com.discord/smali/androidx/room/R$color.smali
+++ b/com.discord/smali/androidx/room/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/room/R$dimen.smali b/com.discord/smali/androidx/room/R$dimen.smali
index f93373c480..c6ea5f3b34 100644
--- a/com.discord/smali/androidx/room/R$dimen.smali
+++ b/com.discord/smali/androidx/room/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index ef82ef1065..bed89b578e 100644
--- a/com.discord/smali/androidx/room/R$drawable.smali
+++ b/com.discord/smali/androidx/room/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/room/R$id.smali b/com.discord/smali/androidx/room/R$id.smali
index aca74e9420..ca220a8614 100644
--- a/com.discord/smali/androidx/room/R$id.smali
+++ b/com.discord/smali/androidx/room/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/room/R$integer.smali b/com.discord/smali/androidx/room/R$integer.smali
index b6be9d8d26..9ad0a56994 100644
--- a/com.discord/smali/androidx/room/R$integer.smali
+++ b/com.discord/smali/androidx/room/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/room/R$layout.smali b/com.discord/smali/androidx/room/R$layout.smali
index 40c93fa4d9..6afc2594ed 100644
--- a/com.discord/smali/androidx/room/R$layout.smali
+++ b/com.discord/smali/androidx/room/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 037875051f..e77283ed1f 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/room/R$style.smali b/com.discord/smali/androidx/room/R$style.smali
index 40df8c0de3..97973c6821 100644
--- a/com.discord/smali/androidx/room/R$style.smali
+++ b/com.discord/smali/androidx/room/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/room/R$styleable.smali b/com.discord/smali/androidx/room/R$styleable.smali
index 13204d2b45..d2beea8721 100644
--- a/com.discord/smali/androidx/room/R$styleable.smali
+++ b/com.discord/smali/androidx/room/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
index 05eb514c1b..dd8e743f3d 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$color.smali b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
index b2ef597f3f..2b7eb0bae5 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$color.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
index 5765ba2767..4b315600ed 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 877f74b75d..e05a093fb3 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index ec3a683104..4683acd360 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$id.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$integer.smali b/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
index 0ae0991608..f0cc9b6876 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
index 1fda57b29f..8bd49f9e2a 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index df89d3f181..76b8dd8ff3 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$style.smali b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
index a5b3c4742f..46f01d9e59 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$style.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
index 5578775eae..55ad34a301 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
index 1403d2d795..56cfca244c 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
index 7db5be286a..508d484c50 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
index 4e3442102e..afb27648ce 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 978d708afe..afa8055944 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index f33ef4dab4..f89d0a17d1 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali b/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
index ae35f1bbb1..7c09d3485a 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
index 5d487da3c1..237fd932f6 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 6453931a78..31575192a1 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
index 70ad4299c6..fa11c4cd46 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
index e004d228e3..aba43bedb6 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/transition/ArcMotion.smali b/com.discord/smali/androidx/transition/ArcMotion.smali
index e2ef7952dd..90b91aa138 100644
--- a/com.discord/smali/androidx/transition/ArcMotion.smali
+++ b/com.discord/smali/androidx/transition/ArcMotion.smali
@@ -74,6 +74,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 4
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/PathMotion;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
diff --git a/com.discord/smali/androidx/transition/CanvasUtils.smali b/com.discord/smali/androidx/transition/CanvasUtils.smali
new file mode 100644
index 0000000000..f857e06314
--- /dev/null
+++ b/com.discord/smali/androidx/transition/CanvasUtils.smali
@@ -0,0 +1,167 @@
+.class public Landroidx/transition/CanvasUtils;
+.super Ljava/lang/Object;
+.source "CanvasUtils.java"
+
+
+# static fields
+.field public static sInorderBarrierMethod:Ljava/lang/reflect/Method;
+
+.field public static sOrderMethodsFetched:Z
+
+.field public static sReorderBarrierMethod:Ljava/lang/reflect/Method;
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+.method public static enableZ(Landroid/graphics/Canvas;Z)V
+ .locals 5
+ .param p0 # Landroid/graphics/Canvas;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "SoonBlockedPrivateApi"
+ }
+ .end annotation
+
+ sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+ const/16 v1, 0x1d
+
+ if-lt v0, v1, :cond_1
+
+ if-eqz p1, :cond_0
+
+ invoke-virtual {p0}, Landroid/graphics/Canvas;->enableZ()V
+
+ goto :goto_2
+
+ :cond_0
+ invoke-virtual {p0}, Landroid/graphics/Canvas;->disableZ()V
+
+ goto :goto_2
+
+ :cond_1
+ const/16 v1, 0x1c
+
+ if-eq v0, v1, :cond_5
+
+ sget-boolean v0, Landroidx/transition/CanvasUtils;->sOrderMethodsFetched:Z
+
+ const/4 v1, 0x0
+
+ if-nez v0, :cond_2
+
+ const/4 v0, 0x1
+
+ :try_start_0
+ const-class v2, Landroid/graphics/Canvas;
+
+ const-string v3, "insertReorderBarrier"
+
+ new-array v4, v1, [Ljava/lang/Class;
+
+ invoke-virtual {v2, v3, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+ move-result-object v2
+
+ sput-object v2, Landroidx/transition/CanvasUtils;->sReorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ sget-object v2, Landroidx/transition/CanvasUtils;->sReorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ invoke-virtual {v2, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+
+ const-class v2, Landroid/graphics/Canvas;
+
+ const-string v3, "insertInorderBarrier"
+
+ new-array v4, v1, [Ljava/lang/Class;
+
+ invoke-virtual {v2, v3, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+ move-result-object v2
+
+ sput-object v2, Landroidx/transition/CanvasUtils;->sInorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ sget-object v2, Landroidx/transition/CanvasUtils;->sInorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ invoke-virtual {v2, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+ :catch_0
+ sput-boolean v0, Landroidx/transition/CanvasUtils;->sOrderMethodsFetched:Z
+
+ :cond_2
+ if-eqz p1, :cond_3
+
+ :try_start_1
+ sget-object v0, Landroidx/transition/CanvasUtils;->sReorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ if-eqz v0, :cond_3
+
+ sget-object v0, Landroidx/transition/CanvasUtils;->sReorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ new-array v2, v1, [Ljava/lang/Object;
+
+ invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+ goto :goto_0
+
+ :catch_1
+ move-exception p0
+
+ goto :goto_1
+
+ :cond_3
+ :goto_0
+ if-nez p1, :cond_4
+
+ sget-object p1, Landroidx/transition/CanvasUtils;->sInorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ if-eqz p1, :cond_4
+
+ sget-object p1, Landroidx/transition/CanvasUtils;->sInorderBarrierMethod:Ljava/lang/reflect/Method;
+
+ new-array v0, v1, [Ljava/lang/Object;
+
+ invoke-virtual {p1, p0, v0}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ :try_end_1
+ .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_2
+ .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_1 .. :try_end_1} :catch_1
+
+ goto :goto_2
+
+ :goto_1
+ new-instance p1, Ljava/lang/RuntimeException;
+
+ invoke-virtual {p0}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
+
+ move-result-object p0
+
+ invoke-direct {p1, p0}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
+
+ throw p1
+
+ :catch_2
+ :cond_4
+ :goto_2
+ return-void
+
+ :cond_5
+ new-instance p0, Ljava/lang/IllegalStateException;
+
+ const-string p1, "This method doesn\'t work on Pie!"
+
+ invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p0
+.end method
diff --git a/com.discord/smali/androidx/transition/ChangeBounds.smali b/com.discord/smali/androidx/transition/ChangeBounds.smali
index 9ff2d40b3b..46b7cd5629 100644
--- a/com.discord/smali/androidx/transition/ChangeBounds.smali
+++ b/com.discord/smali/androidx/transition/ChangeBounds.smali
@@ -208,6 +208,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 2
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Transition;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
diff --git a/com.discord/smali/androidx/transition/ChangeImageTransform.smali b/com.discord/smali/androidx/transition/ChangeImageTransform.smali
index 986111dcbd..644a04e381 100644
--- a/com.discord/smali/androidx/transition/ChangeImageTransform.smali
+++ b/com.discord/smali/androidx/transition/ChangeImageTransform.smali
@@ -229,6 +229,28 @@
.method public static copyImageMatrix(Landroid/widget/ImageView;)Landroid/graphics/Matrix;
.locals 2
+ .param p0 # Landroid/widget/ImageView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getDrawable()Landroid/graphics/drawable/Drawable;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicWidth()I
+
+ move-result v1
+
+ if-lez v1, :cond_2
+
+ invoke-virtual {v0}, Landroid/graphics/drawable/Drawable;->getIntrinsicHeight()I
+
+ move-result v0
+
+ if-lez v0, :cond_2
sget-object v0, Landroidx/transition/ChangeImageTransform$3;->$SwitchMap$android$widget$ImageView$ScaleType:[I
@@ -250,15 +272,7 @@
if-eq v0, v1, :cond_0
- new-instance v0, Landroid/graphics/Matrix;
-
- invoke-virtual {p0}, Landroid/widget/ImageView;->getImageMatrix()Landroid/graphics/Matrix;
-
- move-result-object p0
-
- invoke-direct {v0, p0}, Landroid/graphics/Matrix;->(Landroid/graphics/Matrix;)V
-
- return-object v0
+ goto :goto_0
:cond_0
invoke-static {p0}, Landroidx/transition/ChangeImageTransform;->centerCropMatrix(Landroid/widget/ImageView;)Landroid/graphics/Matrix;
@@ -273,6 +287,18 @@
move-result-object p0
return-object p0
+
+ :cond_2
+ :goto_0
+ new-instance v0, Landroid/graphics/Matrix;
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getImageMatrix()Landroid/graphics/Matrix;
+
+ move-result-object p0
+
+ invoke-direct {v0, p0}, Landroid/graphics/Matrix;->(Landroid/graphics/Matrix;)V
+
+ return-object v0
.end method
.method private createMatrixAnimator(Landroid/widget/ImageView;Landroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/animation/ObjectAnimator;
@@ -305,6 +331,12 @@
.method private createNullAnimator(Landroid/widget/ImageView;)Landroid/animation/ObjectAnimator;
.locals 5
+ .param p1 # Landroid/widget/ImageView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
sget-object v0, Landroidx/transition/ChangeImageTransform;->ANIMATED_TRANSFORM_PROPERTY:Landroid/util/Property;
@@ -314,7 +346,7 @@
new-array v2, v2, [Landroid/graphics/Matrix;
- const/4 v3, 0x0
+ sget-object v3, Landroidx/transition/MatrixUtils;->IDENTITY_MATRIX:Landroid/graphics/Matrix;
const/4 v4, 0x0
@@ -414,7 +446,7 @@
if-nez p3, :cond_0
- goto/16 :goto_3
+ goto/16 :goto_2
:cond_0
iget-object v0, p2, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
@@ -439,7 +471,7 @@
if-nez v1, :cond_1
- goto :goto_3
+ goto :goto_2
:cond_1
iget-object p2, p2, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
@@ -509,11 +541,9 @@
move-result p3
- invoke-static {p1}, Landroidx/transition/ImageViewUtils;->startAnimateTransform(Landroid/widget/ImageView;)V
+ if-lez v0, :cond_9
- if-eqz v0, :cond_9
-
- if-nez p3, :cond_6
+ if-gtz p3, :cond_6
goto :goto_1
@@ -534,7 +564,7 @@
invoke-direct {p0, p1, p2, v2}, Landroidx/transition/ChangeImageTransform;->createMatrixAnimator(Landroid/widget/ImageView;Landroid/graphics/Matrix;Landroid/graphics/Matrix;)Landroid/animation/ObjectAnimator;
- move-result-object p2
+ move-result-object p1
goto :goto_2
@@ -542,15 +572,10 @@
:goto_1
invoke-direct {p0, p1}, Landroidx/transition/ChangeImageTransform;->createNullAnimator(Landroid/widget/ImageView;)Landroid/animation/ObjectAnimator;
- move-result-object p2
-
- :goto_2
- invoke-static {p1, p2}, Landroidx/transition/ImageViewUtils;->reserveEndAnimateTransform(Landroid/widget/ImageView;Landroid/animation/Animator;)V
-
- return-object p2
+ move-result-object p1
:cond_a
- :goto_3
+ :goto_2
return-object p1
.end method
diff --git a/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali b/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
index 84fc77cae0..8aac0ea574 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform$GhostListener.smali
@@ -15,20 +15,20 @@
# instance fields
-.field public mGhostView:Landroidx/transition/GhostViewImpl;
+.field public mGhostView:Landroidx/transition/GhostView;
.field public mView:Landroid/view/View;
# direct methods
-.method public constructor (Landroid/view/View;Landroidx/transition/GhostViewImpl;)V
+.method public constructor (Landroid/view/View;Landroidx/transition/GhostView;)V
.locals 0
invoke-direct {p0}, Landroidx/transition/TransitionListenerAdapter;->()V
iput-object p1, p0, Landroidx/transition/ChangeTransform$GhostListener;->mView:Landroid/view/View;
- iput-object p2, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostViewImpl;
+ iput-object p2, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostView;
return-void
.end method
@@ -72,11 +72,11 @@
.end annotation
.end param
- iget-object p1, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostViewImpl;
+ iget-object p1, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostView;
const/4 v0, 0x4
- invoke-interface {p1, v0}, Landroidx/transition/GhostViewImpl;->setVisibility(I)V
+ invoke-interface {p1, v0}, Landroidx/transition/GhostView;->setVisibility(I)V
return-void
.end method
@@ -88,11 +88,11 @@
.end annotation
.end param
- iget-object p1, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostViewImpl;
+ iget-object p1, p0, Landroidx/transition/ChangeTransform$GhostListener;->mGhostView:Landroidx/transition/GhostView;
const/4 v0, 0x0
- invoke-interface {p1, v0}, Landroidx/transition/GhostViewImpl;->setVisibility(I)V
+ invoke-interface {p1, v0}, Landroidx/transition/GhostView;->setVisibility(I)V
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ChangeTransform.smali b/com.discord/smali/androidx/transition/ChangeTransform.smali
index 3baaaf5c18..a2eb75bd70 100644
--- a/com.discord/smali/androidx/transition/ChangeTransform.smali
+++ b/com.discord/smali/androidx/transition/ChangeTransform.smali
@@ -127,6 +127,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 3
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Transition;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -330,7 +335,7 @@
invoke-static {p1, v2}, Landroidx/transition/ViewUtils;->transformMatrixToLocal(Landroid/view/View;Landroid/graphics/Matrix;)V
- invoke-static {v0, p1, v2}, Landroidx/transition/GhostViewUtils;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewImpl;
+ invoke-static {v0, p1, v2}, Landroidx/transition/GhostViewUtils;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostView;
move-result-object p1
@@ -351,7 +356,7 @@
iget-object v2, p2, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
- invoke-interface {p1, v1, v2}, Landroidx/transition/GhostViewImpl;->reserveEndViewTransition(Landroid/view/ViewGroup;Landroid/view/View;)V
+ invoke-interface {p1, v1, v2}, Landroidx/transition/GhostView;->reserveEndViewTransition(Landroid/view/ViewGroup;Landroid/view/View;)V
move-object v1, p0
@@ -367,7 +372,7 @@
:cond_1
new-instance v2, Landroidx/transition/ChangeTransform$GhostListener;
- invoke-direct {v2, v0, p1}, Landroidx/transition/ChangeTransform$GhostListener;->(Landroid/view/View;Landroidx/transition/GhostViewImpl;)V
+ invoke-direct {v2, v0, p1}, Landroidx/transition/ChangeTransform$GhostListener;->(Landroid/view/View;Landroidx/transition/GhostView;)V
invoke-virtual {v1, v2}, Landroidx/transition/Transition;->addListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
diff --git a/com.discord/smali/androidx/transition/Explode.smali b/com.discord/smali/androidx/transition/Explode.smali
index 1103e2f9e0..bfa95ac8f3 100644
--- a/com.discord/smali/androidx/transition/Explode.smali
+++ b/com.discord/smali/androidx/transition/Explode.smali
@@ -369,7 +369,7 @@
.end method
.method public onAppear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
- .locals 9
+ .locals 10
if-nez p4, :cond_0
@@ -428,7 +428,9 @@
move-object v1, p4
- invoke-static/range {v0 .. v8}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
+ move-object v9, p0
+
+ invoke-static/range {v0 .. v9}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;Landroidx/transition/Transition;)Landroid/animation/Animator;
move-result-object p1
@@ -541,7 +543,9 @@
move-object v1, p3
- invoke-static/range {v0 .. v8}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
+ move-object v9, p0
+
+ invoke-static/range {v0 .. v9}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;Landroidx/transition/Transition;)Landroid/animation/Animator;
move-result-object p1
diff --git a/com.discord/smali/androidx/transition/Fade.smali b/com.discord/smali/androidx/transition/Fade.smali
index a2d2dc8b3e..77ab4d1f4f 100644
--- a/com.discord/smali/androidx/transition/Fade.smali
+++ b/com.discord/smali/androidx/transition/Fade.smali
@@ -42,6 +42,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 3
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Visibility;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
index 22a9550c62..cbe5aee54a 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport$3.smali
@@ -1,10 +1,7 @@
.class public Landroidx/transition/FragmentTransitionSupport$3;
-.super Ljava/lang/Object;
+.super Landroidx/transition/TransitionListenerAdapter;
.source "FragmentTransitionSupport.java"
-# interfaces
-.implements Landroidx/transition/Transition$TransitionListener;
-
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
@@ -51,23 +48,13 @@
iput-object p7, p0, Landroidx/transition/FragmentTransitionSupport$3;->val$sharedElementsIn:Ljava/util/ArrayList;
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ invoke-direct {p0}, Landroidx/transition/TransitionListenerAdapter;->()V
return-void
.end method
# virtual methods
-.method public onTransitionCancel(Landroidx/transition/Transition;)V
- .locals 0
- .param p1 # Landroidx/transition/Transition;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- return-void
-.end method
-
.method public onTransitionEnd(Landroidx/transition/Transition;)V
.locals 0
.param p1 # Landroidx/transition/Transition;
@@ -75,25 +62,7 @@
.end annotation
.end param
- return-void
-.end method
-
-.method public onTransitionPause(Landroidx/transition/Transition;)V
- .locals 0
- .param p1 # Landroidx/transition/Transition;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- return-void
-.end method
-
-.method public onTransitionResume(Landroidx/transition/Transition;)V
- .locals 0
- .param p1 # Landroidx/transition/Transition;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
+ invoke-virtual {p1, p0}, Landroidx/transition/Transition;->removeListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali b/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
index 6c26eab192..de647eb532 100644
--- a/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
+++ b/com.discord/smali/androidx/transition/FragmentTransitionSupport.smali
@@ -4,9 +4,15 @@
# annotations
+.annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+.end annotation
+
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/transition/GhostViewImpl.smali b/com.discord/smali/androidx/transition/GhostView.smali
similarity index 67%
rename from com.discord/smali/androidx/transition/GhostViewImpl.smali
rename to com.discord/smali/androidx/transition/GhostView.smali
index 8bad87d9ff..a5c79b4074 100644
--- a/com.discord/smali/androidx/transition/GhostViewImpl.smali
+++ b/com.discord/smali/androidx/transition/GhostView.smali
@@ -1,6 +1,6 @@
-.class public interface abstract Landroidx/transition/GhostViewImpl;
+.class public interface abstract Landroidx/transition/GhostView;
.super Ljava/lang/Object;
-.source "GhostViewImpl.java"
+.source "GhostView.java"
# virtual methods
diff --git a/com.discord/smali/androidx/transition/GhostViewApi14$1.smali b/com.discord/smali/androidx/transition/GhostViewApi14$1.smali
deleted file mode 100644
index 4e2220c080..0000000000
--- a/com.discord/smali/androidx/transition/GhostViewApi14$1.smali
+++ /dev/null
@@ -1,84 +0,0 @@
-.class public Landroidx/transition/GhostViewApi14$1;
-.super Ljava/lang/Object;
-.source "GhostViewApi14.java"
-
-# interfaces
-.implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Landroidx/transition/GhostViewApi14;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x1
- name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic this$0:Landroidx/transition/GhostViewApi14;
-
-
-# direct methods
-.method public constructor (Landroidx/transition/GhostViewApi14;)V
- .locals 0
-
- iput-object p1, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public onPreDraw()Z
- .locals 2
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- iget-object v1, v0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v1}, Landroid/view/View;->getMatrix()Landroid/graphics/Matrix;
-
- move-result-object v1
-
- iput-object v1, v0, Landroidx/transition/GhostViewApi14;->mCurrentMatrix:Landroid/graphics/Matrix;
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- iget-object v1, v0, Landroidx/transition/GhostViewApi14;->mStartParent:Landroid/view/ViewGroup;
-
- if-eqz v1, :cond_0
-
- iget-object v0, v0, Landroidx/transition/GhostViewApi14;->mStartView:Landroid/view/View;
-
- if-eqz v0, :cond_0
-
- invoke-virtual {v1, v0}, Landroid/view/ViewGroup;->endViewTransition(Landroid/view/View;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- iget-object v0, v0, Landroidx/transition/GhostViewApi14;->mStartParent:Landroid/view/ViewGroup;
-
- invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14$1;->this$0:Landroidx/transition/GhostViewApi14;
-
- const/4 v1, 0x0
-
- iput-object v1, v0, Landroidx/transition/GhostViewApi14;->mStartParent:Landroid/view/ViewGroup;
-
- iput-object v1, v0, Landroidx/transition/GhostViewApi14;->mStartView:Landroid/view/View;
-
- :cond_0
- const/4 v0, 0x1
-
- return v0
-.end method
diff --git a/com.discord/smali/androidx/transition/GhostViewApi14.smali b/com.discord/smali/androidx/transition/GhostViewApi14.smali
deleted file mode 100644
index eda13f3297..0000000000
--- a/com.discord/smali/androidx/transition/GhostViewApi14.smali
+++ /dev/null
@@ -1,392 +0,0 @@
-.class public Landroidx/transition/GhostViewApi14;
-.super Landroid/view/View;
-.source "GhostViewApi14.java"
-
-# interfaces
-.implements Landroidx/transition/GhostViewImpl;
-
-
-# annotations
-.annotation build Landroid/annotation/SuppressLint;
- value = {
- "ViewConstructor"
- }
-.end annotation
-
-
-# instance fields
-.field public mCurrentMatrix:Landroid/graphics/Matrix;
-
-.field public mDeltaX:I
-
-.field public mDeltaY:I
-
-.field public final mMatrix:Landroid/graphics/Matrix;
-
-.field public final mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
-.field public mReferences:I
-
-.field public mStartParent:Landroid/view/ViewGroup;
-
-.field public mStartView:Landroid/view/View;
-
-.field public final mView:Landroid/view/View;
-
-
-# direct methods
-.method public constructor (Landroid/view/View;)V
- .locals 1
-
- invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
- move-result-object v0
-
- invoke-direct {p0, v0}, Landroid/view/View;->(Landroid/content/Context;)V
-
- new-instance v0, Landroid/graphics/Matrix;
-
- invoke-direct {v0}, Landroid/graphics/Matrix;->()V
-
- iput-object v0, p0, Landroidx/transition/GhostViewApi14;->mMatrix:Landroid/graphics/Matrix;
-
- new-instance v0, Landroidx/transition/GhostViewApi14$1;
-
- invoke-direct {v0, p0}, Landroidx/transition/GhostViewApi14$1;->(Landroidx/transition/GhostViewApi14;)V
-
- iput-object v0, p0, Landroidx/transition/GhostViewApi14;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
- iput-object p1, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- const/4 p1, 0x2
-
- const/4 v0, 0x0
-
- invoke-virtual {p0, p1, v0}, Landroid/view/View;->setLayerType(ILandroid/graphics/Paint;)V
-
- return-void
-.end method
-
-.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;)Landroidx/transition/GhostViewImpl;
- .locals 1
-
- invoke-static {p0}, Landroidx/transition/GhostViewApi14;->getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewApi14;
-
- move-result-object v0
-
- if-nez v0, :cond_1
-
- invoke-static {p1}, Landroidx/transition/GhostViewApi14;->findFrameLayout(Landroid/view/ViewGroup;)Landroid/widget/FrameLayout;
-
- move-result-object p1
-
- if-nez p1, :cond_0
-
- const/4 p0, 0x0
-
- return-object p0
-
- :cond_0
- new-instance v0, Landroidx/transition/GhostViewApi14;
-
- invoke-direct {v0, p0}, Landroidx/transition/GhostViewApi14;->(Landroid/view/View;)V
-
- invoke-virtual {p1, v0}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
-
- :cond_1
- iget p0, v0, Landroidx/transition/GhostViewApi14;->mReferences:I
-
- add-int/lit8 p0, p0, 0x1
-
- iput p0, v0, Landroidx/transition/GhostViewApi14;->mReferences:I
-
- return-object v0
-.end method
-
-.method public static findFrameLayout(Landroid/view/ViewGroup;)Landroid/widget/FrameLayout;
- .locals 1
-
- :goto_0
- instance-of v0, p0, Landroid/widget/FrameLayout;
-
- if-nez v0, :cond_1
-
- invoke-virtual {p0}, Landroid/view/ViewGroup;->getParent()Landroid/view/ViewParent;
-
- move-result-object p0
-
- instance-of v0, p0, Landroid/view/ViewGroup;
-
- if-nez v0, :cond_0
-
- const/4 p0, 0x0
-
- return-object p0
-
- :cond_0
- check-cast p0, Landroid/view/ViewGroup;
-
- goto :goto_0
-
- :cond_1
- check-cast p0, Landroid/widget/FrameLayout;
-
- return-object p0
-.end method
-
-.method public static getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewApi14;
- .locals 1
- .param p0 # Landroid/view/View;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- sget v0, Landroidx/transition/R$id;->ghost_view:I
-
- invoke-virtual {p0, v0}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
-
- move-result-object p0
-
- check-cast p0, Landroidx/transition/GhostViewApi14;
-
- return-object p0
-.end method
-
-.method public static removeGhost(Landroid/view/View;)V
- .locals 2
-
- invoke-static {p0}, Landroidx/transition/GhostViewApi14;->getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewApi14;
-
- move-result-object p0
-
- if-eqz p0, :cond_0
-
- iget v0, p0, Landroidx/transition/GhostViewApi14;->mReferences:I
-
- add-int/lit8 v0, v0, -0x1
-
- iput v0, p0, Landroidx/transition/GhostViewApi14;->mReferences:I
-
- iget v0, p0, Landroidx/transition/GhostViewApi14;->mReferences:I
-
- if-gtz v0, :cond_0
-
- invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
-
- move-result-object v0
-
- instance-of v1, v0, Landroid/view/ViewGroup;
-
- if-eqz v1, :cond_0
-
- check-cast v0, Landroid/view/ViewGroup;
-
- invoke-virtual {v0, p0}, Landroid/view/ViewGroup;->endViewTransition(Landroid/view/View;)V
-
- invoke-virtual {v0, p0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
-
- :cond_0
- return-void
-.end method
-
-.method public static setGhostView(Landroid/view/View;Landroidx/transition/GhostViewApi14;)V
- .locals 1
- .param p0 # Landroid/view/View;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- sget v0, Landroidx/transition/R$id;->ghost_view:I
-
- invoke-virtual {p0, v0, p1}, Landroid/view/View;->setTag(ILjava/lang/Object;)V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public onAttachedToWindow()V
- .locals 6
-
- invoke-super {p0}, Landroid/view/View;->onAttachedToWindow()V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-static {v0, p0}, Landroidx/transition/GhostViewApi14;->setGhostView(Landroid/view/View;Landroidx/transition/GhostViewApi14;)V
-
- const/4 v0, 0x2
-
- new-array v1, v0, [I
-
- new-array v0, v0, [I
-
- invoke-virtual {p0, v1}, Landroid/view/View;->getLocationOnScreen([I)V
-
- iget-object v2, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v2, v0}, Landroid/view/View;->getLocationOnScreen([I)V
-
- const/4 v2, 0x0
-
- aget v3, v0, v2
-
- int-to-float v3, v3
-
- iget-object v4, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v4}, Landroid/view/View;->getTranslationX()F
-
- move-result v4
-
- sub-float/2addr v3, v4
-
- float-to-int v3, v3
-
- aput v3, v0, v2
-
- const/4 v3, 0x1
-
- aget v4, v0, v3
-
- int-to-float v4, v4
-
- iget-object v5, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v5}, Landroid/view/View;->getTranslationY()F
-
- move-result v5
-
- sub-float/2addr v4, v5
-
- float-to-int v4, v4
-
- aput v4, v0, v3
-
- aget v4, v0, v2
-
- aget v2, v1, v2
-
- sub-int/2addr v4, v2
-
- iput v4, p0, Landroidx/transition/GhostViewApi14;->mDeltaX:I
-
- aget v0, v0, v3
-
- aget v1, v1, v3
-
- sub-int/2addr v0, v1
-
- iput v0, p0, Landroidx/transition/GhostViewApi14;->mDeltaY:I
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
-
- move-result-object v0
-
- iget-object v1, p0, Landroidx/transition/GhostViewApi14;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
- invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- const/4 v1, 0x4
-
- invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
- return-void
-.end method
-
-.method public onDetachedFromWindow()V
- .locals 2
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
-
- move-result-object v0
-
- iget-object v1, p0, Landroidx/transition/GhostViewApi14;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
-
- invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- const/4 v1, 0x0
-
- invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- const/4 v1, 0x0
-
- invoke-static {v0, v1}, Landroidx/transition/GhostViewApi14;->setGhostView(Landroid/view/View;Landroidx/transition/GhostViewApi14;)V
-
- invoke-super {p0}, Landroid/view/View;->onDetachedFromWindow()V
-
- return-void
-.end method
-
-.method public onDraw(Landroid/graphics/Canvas;)V
- .locals 3
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mMatrix:Landroid/graphics/Matrix;
-
- iget-object v1, p0, Landroidx/transition/GhostViewApi14;->mCurrentMatrix:Landroid/graphics/Matrix;
-
- invoke-virtual {v0, v1}, Landroid/graphics/Matrix;->set(Landroid/graphics/Matrix;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mMatrix:Landroid/graphics/Matrix;
-
- iget v1, p0, Landroidx/transition/GhostViewApi14;->mDeltaX:I
-
- int-to-float v1, v1
-
- iget v2, p0, Landroidx/transition/GhostViewApi14;->mDeltaY:I
-
- int-to-float v2, v2
-
- invoke-virtual {v0, v1, v2}, Landroid/graphics/Matrix;->postTranslate(FF)Z
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mMatrix:Landroid/graphics/Matrix;
-
- invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->setMatrix(Landroid/graphics/Matrix;)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- invoke-virtual {v0, p1}, Landroid/view/View;->draw(Landroid/graphics/Canvas;)V
-
- return-void
-.end method
-
-.method public reserveEndViewTransition(Landroid/view/ViewGroup;Landroid/view/View;)V
- .locals 0
-
- iput-object p1, p0, Landroidx/transition/GhostViewApi14;->mStartParent:Landroid/view/ViewGroup;
-
- iput-object p2, p0, Landroidx/transition/GhostViewApi14;->mStartView:Landroid/view/View;
-
- return-void
-.end method
-
-.method public setVisibility(I)V
- .locals 1
-
- invoke-super {p0, p1}, Landroid/view/View;->setVisibility(I)V
-
- iget-object v0, p0, Landroidx/transition/GhostViewApi14;->mView:Landroid/view/View;
-
- if-nez p1, :cond_0
-
- const/4 p1, 0x4
-
- goto :goto_0
-
- :cond_0
- const/4 p1, 0x0
-
- :goto_0
- invoke-virtual {v0, p1}, Landroid/view/View;->setVisibility(I)V
-
- return-void
-.end method
diff --git a/com.discord/smali/androidx/transition/GhostViewHolder.smali b/com.discord/smali/androidx/transition/GhostViewHolder.smali
new file mode 100644
index 0000000000..1c2bf8ec69
--- /dev/null
+++ b/com.discord/smali/androidx/transition/GhostViewHolder.smali
@@ -0,0 +1,504 @@
+.class public Landroidx/transition/GhostViewHolder;
+.super Landroid/widget/FrameLayout;
+.source "GhostViewHolder.java"
+
+
+# annotations
+.annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "ViewConstructor"
+ }
+.end annotation
+
+
+# instance fields
+.field public mAttached:Z
+
+.field public mParent:Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor (Landroid/view/ViewGroup;)V
+ .locals 1
+
+ invoke-virtual {p1}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+ move-result-object v0
+
+ invoke-direct {p0, v0}, Landroid/widget/FrameLayout;->(Landroid/content/Context;)V
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p0, v0}, Landroid/widget/FrameLayout;->setClipChildren(Z)V
+
+ iput-object p1, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ iget-object p1, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ sget v0, Landroidx/transition/R$id;->ghost_view_holder:I
+
+ invoke-virtual {p1, v0, p0}, Landroid/view/ViewGroup;->setTag(ILjava/lang/Object;)V
+
+ iget-object p1, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object p1
+
+ invoke-interface {p1, p0}, Landroidx/transition/ViewGroupOverlayImpl;->add(Landroid/view/View;)V
+
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Landroidx/transition/GhostViewHolder;->mAttached:Z
+
+ return-void
+.end method
+
+.method public static getHolder(Landroid/view/ViewGroup;)Landroidx/transition/GhostViewHolder;
+ .locals 1
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ sget v0, Landroidx/transition/R$id;->ghost_view_holder:I
+
+ invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->getTag(I)Ljava/lang/Object;
+
+ move-result-object p0
+
+ check-cast p0, Landroidx/transition/GhostViewHolder;
+
+ return-object p0
+.end method
+
+.method private getInsertIndex(Ljava/util/ArrayList;)I
+ .locals 5
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/ArrayList<",
+ "Landroid/view/View;",
+ ">;)I"
+ }
+ .end annotation
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ invoke-virtual {p0}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result v1
+
+ add-int/lit8 v1, v1, -0x1
+
+ const/4 v2, 0x0
+
+ :goto_0
+ if-gt v2, v1, :cond_1
+
+ add-int v3, v2, v1
+
+ div-int/lit8 v3, v3, 0x2
+
+ invoke-virtual {p0, v3}, Landroid/widget/FrameLayout;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v4
+
+ check-cast v4, Landroidx/transition/GhostViewPort;
+
+ iget-object v4, v4, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-static {v4, v0}, Landroidx/transition/GhostViewHolder;->getParents(Landroid/view/View;Ljava/util/ArrayList;)V
+
+ invoke-static {p1, v0}, Landroidx/transition/GhostViewHolder;->isOnTop(Ljava/util/ArrayList;Ljava/util/ArrayList;)Z
+
+ move-result v4
+
+ if-eqz v4, :cond_0
+
+ add-int/lit8 v3, v3, 0x1
+
+ move v2, v3
+
+ goto :goto_1
+
+ :cond_0
+ add-int/lit8 v3, v3, -0x1
+
+ move v1, v3
+
+ :goto_1
+ invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
+
+ goto :goto_0
+
+ :cond_1
+ return v2
+.end method
+
+.method public static getParents(Landroid/view/View;Ljava/util/ArrayList;)V
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroid/view/View;",
+ "Ljava/util/ArrayList<",
+ "Landroid/view/View;",
+ ">;)V"
+ }
+ .end annotation
+
+ invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ instance-of v1, v0, Landroid/view/ViewGroup;
+
+ if-eqz v1, :cond_0
+
+ check-cast v0, Landroid/view/View;
+
+ invoke-static {v0, p1}, Landroidx/transition/GhostViewHolder;->getParents(Landroid/view/View;Ljava/util/ArrayList;)V
+
+ :cond_0
+ invoke-virtual {p1, p0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+ return-void
+.end method
+
+.method public static isOnTop(Landroid/view/View;Landroid/view/View;)Z
+ .locals 6
+
+ invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ check-cast v0, Landroid/view/ViewGroup;
+
+ invoke-virtual {v0}, Landroid/view/ViewGroup;->getChildCount()I
+
+ move-result v1
+
+ sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+
+ invoke-virtual {p0}, Landroid/view/View;->getZ()F
+
+ move-result v2
+
+ invoke-virtual {p1}, Landroid/view/View;->getZ()F
+
+ move-result v3
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x1
+
+ cmpl-float v2, v2, v3
+
+ if-eqz v2, :cond_1
+
+ invoke-virtual {p0}, Landroid/view/View;->getZ()F
+
+ move-result p0
+
+ invoke-virtual {p1}, Landroid/view/View;->getZ()F
+
+ move-result p1
+
+ cmpl-float p0, p0, p1
+
+ if-lez p0, :cond_0
+
+ const/4 v4, 0x1
+
+ :cond_0
+ return v4
+
+ :cond_1
+ const/4 v2, 0x0
+
+ :goto_0
+ if-ge v2, v1, :cond_4
+
+ invoke-static {v0, v2}, Landroidx/transition/ViewGroupUtils;->getChildDrawingOrder(Landroid/view/ViewGroup;I)I
+
+ move-result v3
+
+ invoke-virtual {v0, v3}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v3
+
+ if-ne v3, p0, :cond_2
+
+ const/4 v5, 0x0
+
+ goto :goto_1
+
+ :cond_2
+ if-ne v3, p1, :cond_3
+
+ goto :goto_1
+
+ :cond_3
+ add-int/lit8 v2, v2, 0x1
+
+ goto :goto_0
+
+ :cond_4
+ :goto_1
+ return v5
+.end method
+
+.method public static isOnTop(Ljava/util/ArrayList;Ljava/util/ArrayList;)Z
+ .locals 6
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/ArrayList<",
+ "Landroid/view/View;",
+ ">;",
+ "Ljava/util/ArrayList<",
+ "Landroid/view/View;",
+ ">;)Z"
+ }
+ .end annotation
+
+ invoke-virtual {p0}, Ljava/util/ArrayList;->isEmpty()Z
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-nez v0, :cond_4
+
+ invoke-virtual {p1}, Ljava/util/ArrayList;->isEmpty()Z
+
+ move-result v0
+
+ if-nez v0, :cond_4
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p0, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+ move-result-object v2
+
+ invoke-virtual {p1, v0}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+ move-result-object v3
+
+ if-eq v2, v3, :cond_0
+
+ goto :goto_1
+
+ :cond_0
+ invoke-virtual {p0}, Ljava/util/ArrayList;->size()I
+
+ move-result v2
+
+ invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
+
+ move-result v3
+
+ invoke-static {v2, v3}, Ljava/lang/Math;->min(II)I
+
+ move-result v2
+
+ const/4 v3, 0x1
+
+ :goto_0
+ if-ge v3, v2, :cond_2
+
+ invoke-virtual {p0, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+ move-result-object v4
+
+ check-cast v4, Landroid/view/View;
+
+ invoke-virtual {p1, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Landroid/view/View;
+
+ if-eq v4, v5, :cond_1
+
+ invoke-static {v4, v5}, Landroidx/transition/GhostViewHolder;->isOnTop(Landroid/view/View;Landroid/view/View;)Z
+
+ move-result p0
+
+ return p0
+
+ :cond_1
+ add-int/lit8 v3, v3, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ invoke-virtual {p1}, Ljava/util/ArrayList;->size()I
+
+ move-result p0
+
+ if-ne p0, v2, :cond_3
+
+ const/4 v0, 0x1
+
+ :cond_3
+ return v0
+
+ :cond_4
+ :goto_1
+ return v1
+.end method
+
+
+# virtual methods
+.method public addGhostView(Landroidx/transition/GhostViewPort;)V
+ .locals 2
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ iget-object v1, p1, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-static {v1, v0}, Landroidx/transition/GhostViewHolder;->getParents(Landroid/view/View;Ljava/util/ArrayList;)V
+
+ invoke-direct {p0, v0}, Landroidx/transition/GhostViewHolder;->getInsertIndex(Ljava/util/ArrayList;)I
+
+ move-result v0
+
+ if-ltz v0, :cond_1
+
+ invoke-virtual {p0}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result v1
+
+ if-lt v0, v1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {p0, p1, v0}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;I)V
+
+ goto :goto_1
+
+ :cond_1
+ :goto_0
+ invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
+
+ :goto_1
+ return-void
+.end method
+
+.method public onViewAdded(Landroid/view/View;)V
+ .locals 1
+
+ iget-boolean v0, p0, Landroidx/transition/GhostViewHolder;->mAttached:Z
+
+ if-eqz v0, :cond_0
+
+ invoke-super {p0, p1}, Landroid/widget/FrameLayout;->onViewAdded(Landroid/view/View;)V
+
+ return-void
+
+ :cond_0
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "This GhostViewHolder is detached!"
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public onViewRemoved(Landroid/view/View;)V
+ .locals 3
+
+ invoke-super {p0, p1}, Landroid/widget/FrameLayout;->onViewRemoved(Landroid/view/View;)V
+
+ invoke-virtual {p0}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result v0
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x1
+
+ if-ne v0, v2, :cond_0
+
+ invoke-virtual {p0, v1}, Landroid/widget/FrameLayout;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v0
+
+ if-eq v0, p1, :cond_1
+
+ :cond_0
+ invoke-virtual {p0}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result p1
+
+ if-nez p1, :cond_2
+
+ :cond_1
+ iget-object p1, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ sget v0, Landroidx/transition/R$id;->ghost_view_holder:I
+
+ const/4 v2, 0x0
+
+ invoke-virtual {p1, v0, v2}, Landroid/view/ViewGroup;->setTag(ILjava/lang/Object;)V
+
+ iget-object p1, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object p1
+
+ invoke-interface {p1, p0}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
+
+ iput-boolean v1, p0, Landroidx/transition/GhostViewHolder;->mAttached:Z
+
+ :cond_2
+ return-void
+.end method
+
+.method public popToOverlayTop()V
+ .locals 2
+
+ iget-boolean v0, p0, Landroidx/transition/GhostViewHolder;->mAttached:Z
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ invoke-static {v0}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object v0
+
+ invoke-interface {v0, p0}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewHolder;->mParent:Landroid/view/ViewGroup;
+
+ invoke-static {v0}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object v0
+
+ invoke-interface {v0, p0}, Landroidx/transition/ViewGroupOverlayImpl;->add(Landroid/view/View;)V
+
+ return-void
+
+ :cond_0
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "This GhostViewHolder is detached!"
+
+ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+.end method
diff --git a/com.discord/smali/androidx/transition/GhostViewApi21.smali b/com.discord/smali/androidx/transition/GhostViewPlatform.smali
similarity index 73%
rename from com.discord/smali/androidx/transition/GhostViewApi21.smali
rename to com.discord/smali/androidx/transition/GhostViewPlatform.smali
index 2cb010e598..b56a9dd48d 100644
--- a/com.discord/smali/androidx/transition/GhostViewApi21.smali
+++ b/com.discord/smali/androidx/transition/GhostViewPlatform.smali
@@ -1,9 +1,9 @@
-.class public Landroidx/transition/GhostViewApi21;
+.class public Landroidx/transition/GhostViewPlatform;
.super Ljava/lang/Object;
-.source "GhostViewApi21.java"
+.source "GhostViewPlatform.java"
# interfaces
-.implements Landroidx/transition/GhostViewImpl;
+.implements Landroidx/transition/GhostView;
# annotations
@@ -49,24 +49,24 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Landroidx/transition/GhostViewApi21;->mGhostView:Landroid/view/View;
+ iput-object p1, p0, Landroidx/transition/GhostViewPlatform;->mGhostView:Landroid/view/View;
return-void
.end method
-.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewImpl;
+.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostView;
.locals 5
- invoke-static {}, Landroidx/transition/GhostViewApi21;->fetchAddGhostMethod()V
+ invoke-static {}, Landroidx/transition/GhostViewPlatform;->fetchAddGhostMethod()V
- sget-object v0, Landroidx/transition/GhostViewApi21;->sAddGhostMethod:Ljava/lang/reflect/Method;
+ sget-object v0, Landroidx/transition/GhostViewPlatform;->sAddGhostMethod:Ljava/lang/reflect/Method;
const/4 v1, 0x0
if-eqz v0, :cond_0
:try_start_0
- new-instance v2, Landroidx/transition/GhostViewApi21;
+ new-instance v2, Landroidx/transition/GhostViewPlatform;
const/4 v3, 0x3
@@ -90,7 +90,7 @@
check-cast p0, Landroid/view/View;
- invoke-direct {v2, p0}, Landroidx/transition/GhostViewApi21;->(Landroid/view/View;)V
+ invoke-direct {v2, p0}, Landroidx/transition/GhostViewPlatform;->(Landroid/view/View;)V
:try_end_0
.catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
.catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
@@ -118,16 +118,16 @@
.method public static fetchAddGhostMethod()V
.locals 6
- sget-boolean v0, Landroidx/transition/GhostViewApi21;->sAddGhostMethodFetched:Z
+ sget-boolean v0, Landroidx/transition/GhostViewPlatform;->sAddGhostMethodFetched:Z
if-nez v0, :cond_0
const/4 v0, 0x1
:try_start_0
- invoke-static {}, Landroidx/transition/GhostViewApi21;->fetchGhostViewClass()V
+ invoke-static {}, Landroidx/transition/GhostViewPlatform;->fetchGhostViewClass()V
- sget-object v1, Landroidx/transition/GhostViewApi21;->sGhostViewClass:Ljava/lang/Class;
+ sget-object v1, Landroidx/transition/GhostViewPlatform;->sGhostViewClass:Ljava/lang/Class;
const-string v2, "addGhost"
@@ -155,9 +155,9 @@
move-result-object v1
- sput-object v1, Landroidx/transition/GhostViewApi21;->sAddGhostMethod:Ljava/lang/reflect/Method;
+ sput-object v1, Landroidx/transition/GhostViewPlatform;->sAddGhostMethod:Ljava/lang/reflect/Method;
- sget-object v1, Landroidx/transition/GhostViewApi21;->sAddGhostMethod:Ljava/lang/reflect/Method;
+ sget-object v1, Landroidx/transition/GhostViewPlatform;->sAddGhostMethod:Ljava/lang/reflect/Method;
invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
:try_end_0
@@ -175,7 +175,7 @@
invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
:goto_0
- sput-boolean v0, Landroidx/transition/GhostViewApi21;->sAddGhostMethodFetched:Z
+ sput-boolean v0, Landroidx/transition/GhostViewPlatform;->sAddGhostMethodFetched:Z
:cond_0
return-void
@@ -184,7 +184,7 @@
.method public static fetchGhostViewClass()V
.locals 3
- sget-boolean v0, Landroidx/transition/GhostViewApi21;->sGhostViewClassFetched:Z
+ sget-boolean v0, Landroidx/transition/GhostViewPlatform;->sGhostViewClassFetched:Z
if-nez v0, :cond_0
@@ -195,7 +195,7 @@
move-result-object v0
- sput-object v0, Landroidx/transition/GhostViewApi21;->sGhostViewClass:Ljava/lang/Class;
+ sput-object v0, Landroidx/transition/GhostViewPlatform;->sGhostViewClass:Ljava/lang/Class;
:try_end_0
.catch Ljava/lang/ClassNotFoundException; {:try_start_0 .. :try_end_0} :catch_0
@@ -213,7 +213,7 @@
:goto_0
const/4 v0, 0x1
- sput-boolean v0, Landroidx/transition/GhostViewApi21;->sGhostViewClassFetched:Z
+ sput-boolean v0, Landroidx/transition/GhostViewPlatform;->sGhostViewClassFetched:Z
:cond_0
return-void
@@ -222,16 +222,16 @@
.method public static fetchRemoveGhostMethod()V
.locals 6
- sget-boolean v0, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethodFetched:Z
+ sget-boolean v0, Landroidx/transition/GhostViewPlatform;->sRemoveGhostMethodFetched:Z
if-nez v0, :cond_0
const/4 v0, 0x1
:try_start_0
- invoke-static {}, Landroidx/transition/GhostViewApi21;->fetchGhostViewClass()V
+ invoke-static {}, Landroidx/transition/GhostViewPlatform;->fetchGhostViewClass()V
- sget-object v1, Landroidx/transition/GhostViewApi21;->sGhostViewClass:Ljava/lang/Class;
+ sget-object v1, Landroidx/transition/GhostViewPlatform;->sGhostViewClass:Ljava/lang/Class;
const-string v2, "removeGhost"
@@ -247,9 +247,9 @@
move-result-object v1
- sput-object v1, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
+ sput-object v1, Landroidx/transition/GhostViewPlatform;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
- sget-object v1, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
+ sget-object v1, Landroidx/transition/GhostViewPlatform;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
:try_end_0
@@ -267,7 +267,7 @@
invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
:goto_0
- sput-boolean v0, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethodFetched:Z
+ sput-boolean v0, Landroidx/transition/GhostViewPlatform;->sRemoveGhostMethodFetched:Z
:cond_0
return-void
@@ -276,9 +276,9 @@
.method public static removeGhost(Landroid/view/View;)V
.locals 4
- invoke-static {}, Landroidx/transition/GhostViewApi21;->fetchRemoveGhostMethod()V
+ invoke-static {}, Landroidx/transition/GhostViewPlatform;->fetchRemoveGhostMethod()V
- sget-object v0, Landroidx/transition/GhostViewApi21;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
+ sget-object v0, Landroidx/transition/GhostViewPlatform;->sRemoveGhostMethod:Ljava/lang/reflect/Method;
if-eqz v0, :cond_0
@@ -330,7 +330,7 @@
.method public setVisibility(I)V
.locals 1
- iget-object v0, p0, Landroidx/transition/GhostViewApi21;->mGhostView:Landroid/view/View;
+ iget-object v0, p0, Landroidx/transition/GhostViewPlatform;->mGhostView:Landroid/view/View;
invoke-virtual {v0, p1}, Landroid/view/View;->setVisibility(I)V
diff --git a/com.discord/smali/androidx/transition/GhostViewPort$1.smali b/com.discord/smali/androidx/transition/GhostViewPort$1.smali
new file mode 100644
index 0000000000..af774405c8
--- /dev/null
+++ b/com.discord/smali/androidx/transition/GhostViewPort$1.smali
@@ -0,0 +1,74 @@
+.class public Landroidx/transition/GhostViewPort$1;
+.super Ljava/lang/Object;
+.source "GhostViewPort.java"
+
+# interfaces
+.implements Landroid/view/ViewTreeObserver$OnPreDrawListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/transition/GhostViewPort;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/transition/GhostViewPort;
+
+
+# direct methods
+.method public constructor (Landroidx/transition/GhostViewPort;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/transition/GhostViewPort$1;->this$0:Landroidx/transition/GhostViewPort;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onPreDraw()Z
+ .locals 2
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort$1;->this$0:Landroidx/transition/GhostViewPort;
+
+ invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort$1;->this$0:Landroidx/transition/GhostViewPort;
+
+ iget-object v1, v0, Landroidx/transition/GhostViewPort;->mStartParent:Landroid/view/ViewGroup;
+
+ if-eqz v1, :cond_0
+
+ iget-object v0, v0, Landroidx/transition/GhostViewPort;->mStartView:Landroid/view/View;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v1, v0}, Landroid/view/ViewGroup;->endViewTransition(Landroid/view/View;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort$1;->this$0:Landroidx/transition/GhostViewPort;
+
+ iget-object v0, v0, Landroidx/transition/GhostViewPort;->mStartParent:Landroid/view/ViewGroup;
+
+ invoke-static {v0}, Landroidx/core/view/ViewCompat;->postInvalidateOnAnimation(Landroid/view/View;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort$1;->this$0:Landroidx/transition/GhostViewPort;
+
+ const/4 v1, 0x0
+
+ iput-object v1, v0, Landroidx/transition/GhostViewPort;->mStartParent:Landroid/view/ViewGroup;
+
+ iput-object v1, v0, Landroidx/transition/GhostViewPort;->mStartView:Landroid/view/View;
+
+ :cond_0
+ const/4 v0, 0x1
+
+ return v0
+.end method
diff --git a/com.discord/smali/androidx/transition/GhostViewPort.smali b/com.discord/smali/androidx/transition/GhostViewPort.smali
new file mode 100644
index 0000000000..532ed97015
--- /dev/null
+++ b/com.discord/smali/androidx/transition/GhostViewPort.smali
@@ -0,0 +1,497 @@
+.class public Landroidx/transition/GhostViewPort;
+.super Landroid/view/ViewGroup;
+.source "GhostViewPort.java"
+
+# interfaces
+.implements Landroidx/transition/GhostView;
+
+
+# annotations
+.annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "ViewConstructor"
+ }
+.end annotation
+
+
+# instance fields
+.field public mMatrix:Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+.end field
+
+.field public final mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+
+.field public mReferences:I
+
+.field public mStartParent:Landroid/view/ViewGroup;
+
+.field public mStartView:Landroid/view/View;
+
+.field public final mView:Landroid/view/View;
+
+
+# direct methods
+.method public constructor (Landroid/view/View;)V
+ .locals 1
+
+ invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
+
+ move-result-object v0
+
+ invoke-direct {p0, v0}, Landroid/view/ViewGroup;->(Landroid/content/Context;)V
+
+ new-instance v0, Landroidx/transition/GhostViewPort$1;
+
+ invoke-direct {v0, p0}, Landroidx/transition/GhostViewPort$1;->(Landroidx/transition/GhostViewPort;)V
+
+ iput-object v0, p0, Landroidx/transition/GhostViewPort;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+
+ iput-object p1, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 p1, 0x0
+
+ invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->setWillNotDraw(Z)V
+
+ const/4 p1, 0x2
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p0, p1, v0}, Landroid/view/ViewGroup;->setLayerType(ILandroid/graphics/Paint;)V
+
+ return-void
+.end method
+
+.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewPort;
+ .locals 4
+
+ invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ instance-of v0, v0, Landroid/view/ViewGroup;
+
+ if-eqz v0, :cond_5
+
+ invoke-static {p1}, Landroidx/transition/GhostViewHolder;->getHolder(Landroid/view/ViewGroup;)Landroidx/transition/GhostViewHolder;
+
+ move-result-object v0
+
+ invoke-static {p0}, Landroidx/transition/GhostViewPort;->getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewPort;
+
+ move-result-object v1
+
+ const/4 v2, 0x0
+
+ if-eqz v1, :cond_0
+
+ invoke-virtual {v1}, Landroid/view/ViewGroup;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v3
+
+ check-cast v3, Landroidx/transition/GhostViewHolder;
+
+ if-eq v3, v0, :cond_0
+
+ iget v2, v1, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ invoke-virtual {v3, v1}, Landroid/widget/FrameLayout;->removeView(Landroid/view/View;)V
+
+ const/4 v1, 0x0
+
+ :cond_0
+ if-nez v1, :cond_3
+
+ if-nez p2, :cond_1
+
+ new-instance p2, Landroid/graphics/Matrix;
+
+ invoke-direct {p2}, Landroid/graphics/Matrix;->()V
+
+ invoke-static {p0, p1, p2}, Landroidx/transition/GhostViewPort;->calculateMatrix(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)V
+
+ :cond_1
+ new-instance v1, Landroidx/transition/GhostViewPort;
+
+ invoke-direct {v1, p0}, Landroidx/transition/GhostViewPort;->(Landroid/view/View;)V
+
+ invoke-virtual {v1, p2}, Landroidx/transition/GhostViewPort;->setMatrix(Landroid/graphics/Matrix;)V
+
+ if-nez v0, :cond_2
+
+ new-instance v0, Landroidx/transition/GhostViewHolder;
+
+ invoke-direct {v0, p1}, Landroidx/transition/GhostViewHolder;->(Landroid/view/ViewGroup;)V
+
+ goto :goto_0
+
+ :cond_2
+ invoke-virtual {v0}, Landroidx/transition/GhostViewHolder;->popToOverlayTop()V
+
+ :goto_0
+ invoke-static {p1, v0}, Landroidx/transition/GhostViewPort;->copySize(Landroid/view/View;Landroid/view/View;)V
+
+ invoke-static {p1, v1}, Landroidx/transition/GhostViewPort;->copySize(Landroid/view/View;Landroid/view/View;)V
+
+ invoke-virtual {v0, v1}, Landroidx/transition/GhostViewHolder;->addGhostView(Landroidx/transition/GhostViewPort;)V
+
+ iput v2, v1, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ goto :goto_1
+
+ :cond_3
+ if-eqz p2, :cond_4
+
+ invoke-virtual {v1, p2}, Landroidx/transition/GhostViewPort;->setMatrix(Landroid/graphics/Matrix;)V
+
+ :cond_4
+ :goto_1
+ iget p0, v1, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ add-int/lit8 p0, p0, 0x1
+
+ iput p0, v1, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ return-object v1
+
+ :cond_5
+ new-instance p0, Ljava/lang/IllegalArgumentException;
+
+ const-string p1, "Ghosted views must be parented by a ViewGroup"
+
+ invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V
+
+ throw p0
+.end method
+
+.method public static calculateMatrix(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)V
+ .locals 1
+
+ invoke-virtual {p0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p0
+
+ check-cast p0, Landroid/view/ViewGroup;
+
+ invoke-virtual {p2}, Landroid/graphics/Matrix;->reset()V
+
+ invoke-static {p0, p2}, Landroidx/transition/ViewUtils;->transformMatrixToGlobal(Landroid/view/View;Landroid/graphics/Matrix;)V
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getScrollX()I
+
+ move-result v0
+
+ neg-int v0, v0
+
+ int-to-float v0, v0
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getScrollY()I
+
+ move-result p0
+
+ neg-int p0, p0
+
+ int-to-float p0, p0
+
+ invoke-virtual {p2, v0, p0}, Landroid/graphics/Matrix;->preTranslate(FF)Z
+
+ invoke-static {p1, p2}, Landroidx/transition/ViewUtils;->transformMatrixToLocal(Landroid/view/View;Landroid/graphics/Matrix;)V
+
+ return-void
+.end method
+
+.method public static copySize(Landroid/view/View;Landroid/view/View;)V
+ .locals 4
+
+ invoke-virtual {p1}, Landroid/view/View;->getLeft()I
+
+ move-result v0
+
+ invoke-virtual {p1}, Landroid/view/View;->getTop()I
+
+ move-result v1
+
+ invoke-virtual {p1}, Landroid/view/View;->getLeft()I
+
+ move-result v2
+
+ invoke-virtual {p0}, Landroid/view/View;->getWidth()I
+
+ move-result v3
+
+ add-int/2addr v3, v2
+
+ invoke-virtual {p1}, Landroid/view/View;->getTop()I
+
+ move-result v2
+
+ invoke-virtual {p0}, Landroid/view/View;->getHeight()I
+
+ move-result p0
+
+ add-int/2addr p0, v2
+
+ invoke-static {p1, v0, v1, v3, p0}, Landroidx/transition/ViewUtils;->setLeftTopRightBottom(Landroid/view/View;IIII)V
+
+ return-void
+.end method
+
+.method public static getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewPort;
+ .locals 1
+
+ sget v0, Landroidx/transition/R$id;->ghost_view:I
+
+ invoke-virtual {p0, v0}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
+
+ move-result-object p0
+
+ check-cast p0, Landroidx/transition/GhostViewPort;
+
+ return-object p0
+.end method
+
+.method public static removeGhost(Landroid/view/View;)V
+ .locals 1
+
+ invoke-static {p0}, Landroidx/transition/GhostViewPort;->getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewPort;
+
+ move-result-object p0
+
+ if-eqz p0, :cond_0
+
+ iget v0, p0, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ add-int/lit8 v0, v0, -0x1
+
+ iput v0, p0, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ iget v0, p0, Landroidx/transition/GhostViewPort;->mReferences:I
+
+ if-gtz v0, :cond_0
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ check-cast v0, Landroidx/transition/GhostViewHolder;
+
+ invoke-virtual {v0, p0}, Landroid/widget/FrameLayout;->removeView(Landroid/view/View;)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public static setGhostView(Landroid/view/View;Landroidx/transition/GhostViewPort;)V
+ .locals 1
+ .param p0 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroidx/transition/GhostViewPort;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+
+ sget v0, Landroidx/transition/R$id;->ghost_view:I
+
+ invoke-virtual {p0, v0, p1}, Landroid/view/View;->setTag(ILjava/lang/Object;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onAttachedToWindow()V
+ .locals 2
+
+ invoke-super {p0}, Landroid/view/ViewGroup;->onAttachedToWindow()V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-static {v0, p0}, Landroidx/transition/GhostViewPort;->setGhostView(Landroid/view/View;Landroidx/transition/GhostViewPort;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
+
+ move-result-object v0
+
+ iget-object v1, p0, Landroidx/transition/GhostViewPort;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+
+ invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->addOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 v1, 0x4
+
+ invoke-static {v0, v1}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ check-cast v0, Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->invalidate()V
+
+ :cond_0
+ return-void
+.end method
+
+.method public onDetachedFromWindow()V
+ .locals 2
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getViewTreeObserver()Landroid/view/ViewTreeObserver;
+
+ move-result-object v0
+
+ iget-object v1, p0, Landroidx/transition/GhostViewPort;->mOnPreDrawListener:Landroid/view/ViewTreeObserver$OnPreDrawListener;
+
+ invoke-virtual {v0, v1}, Landroid/view/ViewTreeObserver;->removeOnPreDrawListener(Landroid/view/ViewTreeObserver$OnPreDrawListener;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 v1, 0x0
+
+ invoke-static {v0, v1}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 v1, 0x0
+
+ invoke-static {v0, v1}, Landroidx/transition/GhostViewPort;->setGhostView(Landroid/view/View;Landroidx/transition/GhostViewPort;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ check-cast v0, Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->invalidate()V
+
+ :cond_0
+ invoke-super {p0}, Landroid/view/ViewGroup;->onDetachedFromWindow()V
+
+ return-void
+.end method
+
+.method public onDraw(Landroid/graphics/Canvas;)V
+ .locals 4
+
+ const/4 v0, 0x1
+
+ invoke-static {p1, v0}, Landroidx/transition/CanvasUtils;->enableZ(Landroid/graphics/Canvas;Z)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mMatrix:Landroid/graphics/Matrix;
+
+ invoke-virtual {p1, v0}, Landroid/graphics/Canvas;->setMatrix(Landroid/graphics/Matrix;)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 v1, 0x0
+
+ invoke-static {v0, v1}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {v0}, Landroid/view/View;->invalidate()V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ const/4 v2, 0x4
+
+ invoke-static {v0, v2}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getDrawingTime()J
+
+ move-result-wide v2
+
+ invoke-virtual {p0, p1, v0, v2, v3}, Landroid/view/ViewGroup;->drawChild(Landroid/graphics/Canvas;Landroid/view/View;J)Z
+
+ invoke-static {p1, v1}, Landroidx/transition/CanvasUtils;->enableZ(Landroid/graphics/Canvas;Z)V
+
+ return-void
+.end method
+
+.method public onLayout(ZIIII)V
+ .locals 0
+
+ return-void
+.end method
+
+.method public reserveEndViewTransition(Landroid/view/ViewGroup;Landroid/view/View;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/transition/GhostViewPort;->mStartParent:Landroid/view/ViewGroup;
+
+ iput-object p2, p0, Landroidx/transition/GhostViewPort;->mStartView:Landroid/view/View;
+
+ return-void
+.end method
+
+.method public setMatrix(Landroid/graphics/Matrix;)V
+ .locals 0
+ .param p1 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iput-object p1, p0, Landroidx/transition/GhostViewPort;->mMatrix:Landroid/graphics/Matrix;
+
+ return-void
+.end method
+
+.method public setVisibility(I)V
+ .locals 1
+
+ invoke-super {p0, p1}, Landroid/view/ViewGroup;->setVisibility(I)V
+
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-static {v0}, Landroidx/transition/GhostViewPort;->getGhostView(Landroid/view/View;)Landroidx/transition/GhostViewPort;
+
+ move-result-object v0
+
+ if-ne v0, p0, :cond_1
+
+ if-nez p1, :cond_0
+
+ const/4 p1, 0x4
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ :goto_0
+ iget-object v0, p0, Landroidx/transition/GhostViewPort;->mView:Landroid/view/View;
+
+ invoke-static {v0, p1}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+
+ :cond_1
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/transition/GhostViewUtils.smali b/com.discord/smali/androidx/transition/GhostViewUtils.smali
index db2f7337e6..23471519c0 100644
--- a/com.discord/smali/androidx/transition/GhostViewUtils.smali
+++ b/com.discord/smali/androidx/transition/GhostViewUtils.smali
@@ -12,12 +12,37 @@
return-void
.end method
-.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewImpl;
- .locals 1
+.method public static addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostView;
+ .locals 2
+ .param p0 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
- invoke-static {p0, p1, p2}, Landroidx/transition/GhostViewApi21;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewImpl;
+ const/16 v1, 0x1c
+
+ if-ne v0, v1, :cond_0
+
+ invoke-static {p0, p1, p2}, Landroidx/transition/GhostViewPlatform;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostView;
+
+ move-result-object p0
+
+ return-object p0
+
+ :cond_0
+ invoke-static {p0, p1, p2}, Landroidx/transition/GhostViewPort;->addGhost(Landroid/view/View;Landroid/view/ViewGroup;Landroid/graphics/Matrix;)Landroidx/transition/GhostViewPort;
move-result-object p0
@@ -25,11 +50,21 @@
.end method
.method public static removeGhost(Landroid/view/View;)V
- .locals 1
+ .locals 2
sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
- invoke-static {p0}, Landroidx/transition/GhostViewApi21;->removeGhost(Landroid/view/View;)V
+ const/16 v1, 0x1c
+ if-ne v0, v1, :cond_0
+
+ invoke-static {p0}, Landroidx/transition/GhostViewPlatform;->removeGhost(Landroid/view/View;)V
+
+ goto :goto_0
+
+ :cond_0
+ invoke-static {p0}, Landroidx/transition/GhostViewPort;->removeGhost(Landroid/view/View;)V
+
+ :goto_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ImageViewUtils$1.smali b/com.discord/smali/androidx/transition/ImageViewUtils$1.smali
deleted file mode 100644
index c81ba7bb2d..0000000000
--- a/com.discord/smali/androidx/transition/ImageViewUtils$1.smali
+++ /dev/null
@@ -1,85 +0,0 @@
-.class public final Landroidx/transition/ImageViewUtils$1;
-.super Landroid/animation/AnimatorListenerAdapter;
-.source "ImageViewUtils.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Landroidx/transition/ImageViewUtils;->reserveEndAnimateTransform(Landroid/widget/ImageView;Landroid/animation/Animator;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = null
-.end annotation
-
-
-# instance fields
-.field public final synthetic val$view:Landroid/widget/ImageView;
-
-
-# direct methods
-.method public constructor (Landroid/widget/ImageView;)V
- .locals 0
-
- iput-object p1, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public onAnimationEnd(Landroid/animation/Animator;)V
- .locals 4
-
- iget-object v0, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- sget v1, Landroidx/transition/R$id;->save_scale_type:I
-
- invoke-virtual {v0, v1}, Landroid/widget/ImageView;->getTag(I)Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Landroid/widget/ImageView$ScaleType;
-
- iget-object v1, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- invoke-virtual {v1, v0}, Landroid/widget/ImageView;->setScaleType(Landroid/widget/ImageView$ScaleType;)V
-
- iget-object v1, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- sget v2, Landroidx/transition/R$id;->save_scale_type:I
-
- const/4 v3, 0x0
-
- invoke-virtual {v1, v2, v3}, Landroid/widget/ImageView;->setTag(ILjava/lang/Object;)V
-
- sget-object v1, Landroid/widget/ImageView$ScaleType;->MATRIX:Landroid/widget/ImageView$ScaleType;
-
- if-ne v0, v1, :cond_0
-
- iget-object v0, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- sget v1, Landroidx/transition/R$id;->save_image_matrix:I
-
- invoke-virtual {v0, v1}, Landroid/widget/ImageView;->getTag(I)Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Landroid/graphics/Matrix;
-
- invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageMatrix(Landroid/graphics/Matrix;)V
-
- iget-object v0, p0, Landroidx/transition/ImageViewUtils$1;->val$view:Landroid/widget/ImageView;
-
- sget v1, Landroidx/transition/R$id;->save_image_matrix:I
-
- invoke-virtual {v0, v1, v3}, Landroid/widget/ImageView;->setTag(ILjava/lang/Object;)V
-
- :cond_0
- invoke-virtual {p1, p0}, Landroid/animation/Animator;->removeListener(Landroid/animation/Animator$AnimatorListener;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/androidx/transition/ImageViewUtils.smali b/com.discord/smali/androidx/transition/ImageViewUtils.smali
index 92bd991530..417be786bd 100644
--- a/com.discord/smali/androidx/transition/ImageViewUtils.smali
+++ b/com.discord/smali/androidx/transition/ImageViewUtils.smali
@@ -4,14 +4,20 @@
# static fields
-.field public static final TAG:Ljava/lang/String; = "ImageViewUtils"
+.field public static sDrawMatrixField:Ljava/lang/reflect/Field; = null
-.field public static sAnimateTransformMethod:Ljava/lang/reflect/Method;
+.field public static sDrawMatrixFieldFetched:Z = false
-.field public static sAnimateTransformMethodFetched:Z
+.field public static sTryHiddenAnimateTransform:Z = true
# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 0
@@ -22,54 +28,86 @@
.method public static animateTransform(Landroid/widget/ImageView;Landroid/graphics/Matrix;)V
.locals 3
+ .param p0 # Landroid/widget/ImageView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
- invoke-static {}, Landroidx/transition/ImageViewUtils;->fetchAnimateTransformMethod()V
+ const/16 v1, 0x1d
- sget-object v0, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethod:Ljava/lang/reflect/Method;
+ if-lt v0, v1, :cond_0
- if-eqz v0, :cond_0
-
- const/4 v1, 0x1
-
- :try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- aput-object p1, v1, v2
-
- invoke-virtual {v0, p0, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- :try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ invoke-virtual {p0, p1}, Landroid/widget/ImageView;->animateTransform(Landroid/graphics/Matrix;)V
goto :goto_0
- :catch_0
- move-exception p0
-
- new-instance p1, Ljava/lang/RuntimeException;
-
- invoke-virtual {p0}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p0
-
- invoke-direct {p1, p0}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p1
-
- :catch_1
:cond_0
+ if-nez p1, :cond_1
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getDrawable()Landroid/graphics/drawable/Drawable;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_2
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getWidth()I
+
+ move-result v0
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getPaddingLeft()I
+
+ move-result v1
+
+ sub-int/2addr v0, v1
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getPaddingRight()I
+
+ move-result v1
+
+ sub-int/2addr v0, v1
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getHeight()I
+
+ move-result v1
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getPaddingTop()I
+
+ move-result v2
+
+ sub-int/2addr v1, v2
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->getPaddingBottom()I
+
+ move-result v2
+
+ sub-int/2addr v1, v2
+
+ const/4 v2, 0x0
+
+ invoke-virtual {p1, v2, v2, v0, v1}, Landroid/graphics/drawable/Drawable;->setBounds(IIII)V
+
+ invoke-virtual {p0}, Landroid/widget/ImageView;->invalidate()V
+
+ goto :goto_0
+
+ :cond_1
+ invoke-static {p0, p1}, Landroidx/transition/ImageViewUtils;->hiddenAnimateTransform(Landroid/widget/ImageView;Landroid/graphics/Matrix;)V
+
+ :cond_2
:goto_0
return-void
.end method
-.method public static fetchAnimateTransformMethod()V
- .locals 5
+.method public static fetchDrawMatrixField()V
+ .locals 3
- sget-boolean v0, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethodFetched:Z
+ sget-boolean v0, Landroidx/transition/ImageViewUtils;->sDrawMatrixFieldFetched:Z
if-nez v0, :cond_0
@@ -78,61 +116,64 @@
:try_start_0
const-class v1, Landroid/widget/ImageView;
- new-array v2, v0, [Ljava/lang/Class;
+ const-string v2, "mDrawMatrix"
- const/4 v3, 0x0
-
- const-class v4, Landroid/graphics/Matrix;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "animateTransform"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+ invoke-virtual {v1, v2}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
move-result-object v1
- sput-object v1, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethod:Ljava/lang/reflect/Method;
+ sput-object v1, Landroidx/transition/ImageViewUtils;->sDrawMatrixField:Ljava/lang/reflect/Field;
- sget-object v1, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethod:Ljava/lang/reflect/Method;
+ sget-object v1, Landroidx/transition/ImageViewUtils;->sDrawMatrixField:Ljava/lang/reflect/Field;
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
+ invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
:catch_0
- move-exception v1
-
- const-string v2, "ImageViewUtils"
-
- const-string v3, "Failed to retrieve animateTransform method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ImageViewUtils;->sAnimateTransformMethodFetched:Z
+ sput-boolean v0, Landroidx/transition/ImageViewUtils;->sDrawMatrixFieldFetched:Z
:cond_0
return-void
.end method
-.method public static reserveEndAnimateTransform(Landroid/widget/ImageView;Landroid/animation/Animator;)V
- .locals 0
+.method public static hiddenAnimateTransform(Landroid/widget/ImageView;Landroid/graphics/Matrix;)V
+ .locals 1
+ .param p0 # Landroid/widget/ImageView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- sget p0, Landroid/os/Build$VERSION;->SDK_INT:I
-
- return-void
-.end method
-
-.method public static startAnimateTransform(Landroid/widget/ImageView;)V
- .locals 0
-
- sget p0, Landroid/os/Build$VERSION;->SDK_INT:I
+ .annotation build Landroidx/annotation/RequiresApi;
+ value = 0x15
+ .end annotation
+ sget-boolean v0, Landroidx/transition/ImageViewUtils;->sTryHiddenAnimateTransform:Z
+
+ if-eqz v0, :cond_0
+
+ :try_start_0
+ invoke-virtual {p0, p1}, Landroid/widget/ImageView;->animateTransform(Landroid/graphics/Matrix;)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ const/4 p0, 0x0
+
+ sput-boolean p0, Landroidx/transition/ImageViewUtils;->sTryHiddenAnimateTransform:Z
+
+ :cond_0
+ :goto_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/PatternPathMotion.smali b/com.discord/smali/androidx/transition/PatternPathMotion.smali
index e7a6e8a4f9..ff6c22ce40 100644
--- a/com.discord/smali/androidx/transition/PatternPathMotion.smali
+++ b/com.discord/smali/androidx/transition/PatternPathMotion.smali
@@ -46,6 +46,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 2
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0}, Landroidx/transition/PathMotion;->()V
diff --git a/com.discord/smali/androidx/transition/R$attr.smali b/com.discord/smali/androidx/transition/R$attr.smali
index 5dfd27797e..394b9893bb 100644
--- a/com.discord/smali/androidx/transition/R$attr.smali
+++ b/com.discord/smali/androidx/transition/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$color.smali b/com.discord/smali/androidx/transition/R$color.smali
index 6fb1b677bd..8d7b375d44 100644
--- a/com.discord/smali/androidx/transition/R$color.smali
+++ b/com.discord/smali/androidx/transition/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$dimen.smali b/com.discord/smali/androidx/transition/R$dimen.smali
index a7fd7254bd..ff930c6dc8 100644
--- a/com.discord/smali/androidx/transition/R$dimen.smali
+++ b/com.discord/smali/androidx/transition/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index 82efc9d73b..6645a5a9cd 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index d402095689..d9db257363 100644
--- a/com.discord/smali/androidx/transition/R$id.smali
+++ b/com.discord/smali/androidx/transition/R$id.smali
@@ -15,81 +15,81 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final ghost_view:I = 0x7f0a032a
+.field public static final ghost_view:I = 0x7f0a0339
-.field public static final icon:I = 0x7f0a03b4
+.field public static final ghost_view_holder:I = 0x7f0a033a
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon:I = 0x7f0a03c5
-.field public static final info:I = 0x7f0a03cb
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final italic:I = 0x7f0a03f8
+.field public static final info:I = 0x7f0a03dc
-.field public static final line1:I = 0x7f0a0440
+.field public static final italic:I = 0x7f0a0409
-.field public static final line3:I = 0x7f0a0441
+.field public static final line1:I = 0x7f0a0451
-.field public static final normal:I = 0x7f0a04ce
+.field public static final line3:I = 0x7f0a0452
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final parent_matrix:I = 0x7f0a0512
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final parent_matrix:I = 0x7f0a053c
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final save_image_matrix:I = 0x7f0a060c
+.field public static final right_side:I = 0x7f0a060e
-.field public static final save_non_transition_alpha:I = 0x7f0a060d
+.field public static final save_non_transition_alpha:I = 0x7f0a0639
-.field public static final save_scale_type:I = 0x7f0a060e
+.field public static final save_overlay_view:I = 0x7f0a063a
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
-.field public static final transition_current_scene:I = 0x7f0a07ee
+.field public static final transition_current_scene:I = 0x7f0a0821
-.field public static final transition_layout_save:I = 0x7f0a07ef
+.field public static final transition_layout_save:I = 0x7f0a0822
-.field public static final transition_position:I = 0x7f0a07f0
+.field public static final transition_position:I = 0x7f0a0823
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a07f1
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0824
-.field public static final transition_transform:I = 0x7f0a07f2
+.field public static final transition_transform:I = 0x7f0a0825
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$integer.smali b/com.discord/smali/androidx/transition/R$integer.smali
index 6976c23134..6207451088 100644
--- a/com.discord/smali/androidx/transition/R$integer.smali
+++ b/com.discord/smali/androidx/transition/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$layout.smali b/com.discord/smali/androidx/transition/R$layout.smali
index 9c3a8ebb4f..80a87592d0 100644
--- a/com.discord/smali/androidx/transition/R$layout.smali
+++ b/com.discord/smali/androidx/transition/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index f8a166db0e..21d8fd41c4 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$style.smali b/com.discord/smali/androidx/transition/R$style.smali
index 9e132ed967..1d551fc626 100644
--- a/com.discord/smali/androidx/transition/R$style.smali
+++ b/com.discord/smali/androidx/transition/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali
index 9701cc6c0f..dc42085ed9 100644
--- a/com.discord/smali/androidx/transition/R$styleable.smali
+++ b/com.discord/smali/androidx/transition/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/transition/Scene.smali b/com.discord/smali/androidx/transition/Scene.smali
index a2e8497fd3..11139b45d7 100644
--- a/com.discord/smali/androidx/transition/Scene.smali
+++ b/com.discord/smali/androidx/transition/Scene.smali
@@ -78,12 +78,18 @@
return-void
.end method
-.method public static getCurrentScene(Landroid/view/View;)Landroidx/transition/Scene;
+.method public static getCurrentScene(Landroid/view/ViewGroup;)Landroidx/transition/Scene;
.locals 1
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
sget v0, Landroidx/transition/R$id;->transition_current_scene:I
- invoke-virtual {p0, v0}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
+ invoke-virtual {p0, v0}, Landroid/view/ViewGroup;->getTag(I)Ljava/lang/Object;
move-result-object p0
@@ -148,12 +154,20 @@
return-object v1
.end method
-.method public static setCurrentScene(Landroid/view/View;Landroidx/transition/Scene;)V
+.method public static setCurrentScene(Landroid/view/ViewGroup;Landroidx/transition/Scene;)V
.locals 1
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroidx/transition/Scene;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
sget v0, Landroidx/transition/R$id;->transition_current_scene:I
- invoke-virtual {p0, v0, p1}, Landroid/view/View;->setTag(ILjava/lang/Object;)V
+ invoke-virtual {p0, v0, p1}, Landroid/view/ViewGroup;->setTag(ILjava/lang/Object;)V
return-void
.end method
@@ -214,7 +228,7 @@
:cond_3
iget-object v0, p0, Landroidx/transition/Scene;->mSceneRoot:Landroid/view/ViewGroup;
- invoke-static {v0, p0}, Landroidx/transition/Scene;->setCurrentScene(Landroid/view/View;Landroidx/transition/Scene;)V
+ invoke-static {v0, p0}, Landroidx/transition/Scene;->setCurrentScene(Landroid/view/ViewGroup;Landroidx/transition/Scene;)V
return-void
.end method
@@ -224,7 +238,7 @@
iget-object v0, p0, Landroidx/transition/Scene;->mSceneRoot:Landroid/view/ViewGroup;
- invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/View;)Landroidx/transition/Scene;
+ invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/ViewGroup;)Landroidx/transition/Scene;
move-result-object v0
diff --git a/com.discord/smali/androidx/transition/Slide$GravityFlag.smali b/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
index 8b61c85c60..65b584c306 100644
--- a/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
+++ b/com.discord/smali/androidx/transition/Slide$GravityFlag.smali
@@ -9,7 +9,7 @@
# annotations
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/transition/Slide.smali b/com.discord/smali/androidx/transition/Slide.smali
index 24720726fd..5d195d0555 100644
--- a/com.discord/smali/androidx/transition/Slide.smali
+++ b/com.discord/smali/androidx/transition/Slide.smali
@@ -133,6 +133,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 3
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Visibility;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -226,7 +231,7 @@
.end method
.method public onAppear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
- .locals 9
+ .locals 10
if-nez p4, :cond_0
@@ -279,7 +284,9 @@
move-object v1, p4
- invoke-static/range {v0 .. v8}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
+ move-object v9, p0
+
+ invoke-static/range {v0 .. v9}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;Landroidx/transition/Transition;)Landroid/animation/Animator;
move-result-object p1
@@ -287,7 +294,7 @@
.end method
.method public onDisappear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
- .locals 9
+ .locals 10
if-nez p3, :cond_0
@@ -340,7 +347,9 @@
move-object v1, p3
- invoke-static/range {v0 .. v8}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
+ move-object v9, p0
+
+ invoke-static/range {v0 .. v9}, Landroidx/transition/TranslationAnimationCreator;->createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;Landroidx/transition/Transition;)Landroid/animation/Animator;
move-result-object p1
diff --git a/com.discord/smali/androidx/transition/Transition$MatchOrder.smali b/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
index ba4d5bbb53..91ac4da124 100644
--- a/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
+++ b/com.discord/smali/androidx/transition/Transition$MatchOrder.smali
@@ -9,7 +9,7 @@
# annotations
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/transition/Transition.smali b/com.discord/smali/androidx/transition/Transition.smali
index 7180cb3620..377b43b3c8 100644
--- a/com.discord/smali/androidx/transition/Transition.smali
+++ b/com.discord/smali/androidx/transition/Transition.smali
@@ -228,8 +228,8 @@
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/util/ArrayList<",
- "Ljava/lang/Class;",
- ">;"
+ "Ljava/lang/Class<",
+ "*>;>;"
}
.end annotation
.end field
@@ -238,8 +238,8 @@
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/util/ArrayList<",
- "Ljava/lang/Class;",
- ">;"
+ "Ljava/lang/Class<",
+ "*>;>;"
}
.end annotation
.end field
@@ -248,8 +248,8 @@
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/util/ArrayList<",
- "Ljava/lang/Class;",
- ">;"
+ "Ljava/lang/Class<",
+ "*>;>;"
}
.end annotation
.end field
@@ -410,6 +410,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 8
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -944,9 +949,7 @@
new-instance v1, Landroidx/transition/TransitionValues;
- invoke-direct {v1}, Landroidx/transition/TransitionValues;->()V
-
- iput-object p1, v1, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+ invoke-direct {v1, p1}, Landroidx/transition/TransitionValues;->(Landroid/view/View;)V
if-eqz p2, :cond_5
@@ -1153,13 +1156,13 @@
value = {
"(",
"Ljava/util/ArrayList<",
- "Ljava/lang/Class;",
- ">;",
- "Ljava/lang/Class;",
- "Z)",
+ "Ljava/lang/Class<",
+ "*>;>;",
+ "Ljava/lang/Class<",
+ "*>;Z)",
"Ljava/util/ArrayList<",
- "Ljava/lang/Class;",
- ">;"
+ "Ljava/lang/Class<",
+ "*>;>;"
}
.end annotation
@@ -1466,8 +1469,6 @@
iget-object v2, v1, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
- if-eqz v2, :cond_0
-
invoke-virtual {p0, v2}, Landroidx/transition/Transition;->isValidTarget(Landroid/view/View;)Z
move-result v2
@@ -2024,6 +2025,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;)",
+ "Landroidx/transition/Transition;"
+ }
+ .end annotation
+
iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypes:Ljava/util/ArrayList;
if-nez v0, :cond_0
@@ -2073,7 +2083,7 @@
.locals 5
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -2113,7 +2123,13 @@
move-result-wide v0
- invoke-virtual {p1, v0, v1}, Landroid/animation/Animator;->setStartDelay(J)V
+ invoke-virtual {p1}, Landroid/animation/Animator;->getStartDelay()J
+
+ move-result-wide v2
+
+ add-long/2addr v2, v0
+
+ invoke-virtual {p1, v2, v3}, Landroid/animation/Animator;->setStartDelay(J)V
:cond_2
invoke-virtual {p0}, Landroidx/transition/Transition;->getInterpolator()Landroid/animation/TimeInterpolator;
@@ -2145,7 +2161,7 @@
.locals 4
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -2383,9 +2399,7 @@
new-instance v3, Landroidx/transition/TransitionValues;
- invoke-direct {v3}, Landroidx/transition/TransitionValues;->()V
-
- iput-object v2, v3, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+ invoke-direct {v3, v2}, Landroidx/transition/TransitionValues;->(Landroid/view/View;)V
if-eqz p2, :cond_4
@@ -2444,9 +2458,7 @@
new-instance v2, Landroidx/transition/TransitionValues;
- invoke-direct {v2}, Landroidx/transition/TransitionValues;->()V
-
- iput-object v0, v2, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+ invoke-direct {v2, v0}, Landroidx/transition/TransitionValues;->(Landroid/view/View;)V
if-eqz p2, :cond_8
@@ -2691,7 +2703,7 @@
.locals 20
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -2825,8 +2837,6 @@
move-result-object v4
- if-eqz v15, :cond_9
-
if-eqz v4, :cond_9
array-length v11, v4
@@ -2835,9 +2845,7 @@
new-instance v11, Landroidx/transition/TransitionValues;
- invoke-direct {v11}, Landroidx/transition/TransitionValues;->()V
-
- iput-object v15, v11, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+ invoke-direct {v11, v15}, Landroidx/transition/TransitionValues;->(Landroid/view/View;)V
move-object/from16 v17, v5
@@ -3052,11 +3060,11 @@
goto/16 :goto_0
:cond_d
- const-wide/16 v2, 0x0
+ invoke-virtual {v9}, Landroid/util/SparseIntArray;->size()I
- cmp-long v4, v0, v2
+ move-result v2
- if-eqz v4, :cond_e
+ if-eqz v2, :cond_e
const/4 v2, 0x0
@@ -3107,7 +3115,7 @@
.locals 6
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -3286,6 +3294,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;Z)",
+ "Landroidx/transition/Transition;"
+ }
+ .end annotation
+
iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypeChildExcludes:Ljava/util/ArrayList;
invoke-direct {p0, v0, p1, p2}, Landroidx/transition/Transition;->excludeType(Ljava/util/ArrayList;Ljava/lang/Class;Z)Ljava/util/ArrayList;
@@ -3346,6 +3363,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;Z)",
+ "Landroidx/transition/Transition;"
+ }
+ .end annotation
+
iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypeExcludes:Ljava/util/ArrayList;
invoke-direct {p0, v0, p1, p2}, Landroidx/transition/Transition;->excludeType(Ljava/util/ArrayList;Ljava/lang/Class;Z)Ljava/util/ArrayList;
@@ -3381,7 +3407,7 @@
.locals 4
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -3393,51 +3419,63 @@
move-result v1
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_2
+ if-nez v1, :cond_0
+
+ goto :goto_1
+
+ :cond_0
invoke-static {p1}, Landroidx/transition/ViewUtils;->getWindowId(Landroid/view/View;)Landroidx/transition/WindowIdImpl;
move-result-object p1
+ new-instance v2, Landroidx/collection/ArrayMap;
+
+ invoke-direct {v2, v0}, Landroidx/collection/ArrayMap;->(Landroidx/collection/SimpleArrayMap;)V
+
+ invoke-virtual {v0}, Landroidx/collection/SimpleArrayMap;->clear()V
+
add-int/lit8 v1, v1, -0x1
:goto_0
- if-ltz v1, :cond_1
+ if-ltz v1, :cond_2
- invoke-virtual {v0, v1}, Landroidx/collection/SimpleArrayMap;->valueAt(I)Ljava/lang/Object;
+ invoke-virtual {v2, v1}, Landroidx/collection/SimpleArrayMap;->valueAt(I)Ljava/lang/Object;
- move-result-object v2
+ move-result-object v0
- check-cast v2, Landroidx/transition/Transition$AnimationInfo;
+ check-cast v0, Landroidx/transition/Transition$AnimationInfo;
- iget-object v3, v2, Landroidx/transition/Transition$AnimationInfo;->mView:Landroid/view/View;
+ iget-object v3, v0, Landroidx/transition/Transition$AnimationInfo;->mView:Landroid/view/View;
- if-eqz v3, :cond_0
+ if-eqz v3, :cond_1
- if-eqz p1, :cond_0
+ if-eqz p1, :cond_1
- iget-object v2, v2, Landroidx/transition/Transition$AnimationInfo;->mWindowId:Landroidx/transition/WindowIdImpl;
+ iget-object v0, v0, Landroidx/transition/Transition$AnimationInfo;->mWindowId:Landroidx/transition/WindowIdImpl;
- invoke-virtual {p1, v2}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+ invoke-virtual {p1, v0}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
- move-result v2
+ move-result v0
- if-eqz v2, :cond_0
+ if-eqz v0, :cond_1
- invoke-virtual {v0, v1}, Landroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
+ invoke-virtual {v2, v1}, Landroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
- move-result-object v2
+ move-result-object v0
- check-cast v2, Landroid/animation/Animator;
+ check-cast v0, Landroid/animation/Animator;
- invoke-virtual {v2}, Landroid/animation/Animator;->end()V
+ invoke-virtual {v0}, Landroid/animation/Animator;->end()V
- :cond_0
+ :cond_1
add-int/lit8 v1, v1, -0x1
goto :goto_0
- :cond_1
+ :cond_2
+ :goto_1
return-void
.end method
@@ -3667,8 +3705,8 @@
value = {
"()",
"Ljava/util/List<",
- "Ljava/lang/Class;",
- ">;"
+ "Ljava/lang/Class<",
+ "*>;>;"
}
.end annotation
@@ -4061,7 +4099,7 @@
.locals 5
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -4204,7 +4242,7 @@
sub-int/2addr v1, v3
:goto_0
- if-ltz v1, :cond_5
+ if-ltz v1, :cond_6
invoke-virtual {v0, v1}, Landroidx/collection/SimpleArrayMap;->keyAt(I)Ljava/lang/Object;
@@ -4212,7 +4250,7 @@
check-cast v4, Landroid/animation/Animator;
- if-eqz v4, :cond_4
+ if-eqz v4, :cond_5
invoke-virtual {v0, v4}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -4220,11 +4258,11 @@
check-cast v5, Landroidx/transition/Transition$AnimationInfo;
- if-eqz v5, :cond_4
+ if-eqz v5, :cond_5
iget-object v6, v5, Landroidx/transition/Transition$AnimationInfo;->mView:Landroid/view/View;
- if-eqz v6, :cond_4
+ if-eqz v6, :cond_5
iget-object v6, v5, Landroidx/transition/Transition$AnimationInfo;->mWindowId:Landroidx/transition/WindowIdImpl;
@@ -4232,7 +4270,7 @@
move-result v6
- if-eqz v6, :cond_4
+ if-eqz v6, :cond_5
iget-object v6, v5, Landroidx/transition/Transition$AnimationInfo;->mValues:Landroidx/transition/TransitionValues;
@@ -4244,61 +4282,78 @@
invoke-virtual {p0, v7, v3}, Landroidx/transition/Transition;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
- move-result-object v7
+ move-result-object v9
if-nez v8, :cond_0
- if-eqz v7, :cond_1
+ if-nez v9, :cond_0
+
+ iget-object v9, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
+
+ iget-object v9, v9, Landroidx/transition/TransitionValuesMaps;->mViewValues:Landroidx/collection/ArrayMap;
+
+ invoke-virtual {v9, v7}, Landroidx/collection/SimpleArrayMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v7
+
+ move-object v9, v7
+
+ check-cast v9, Landroidx/transition/TransitionValues;
:cond_0
- iget-object v5, v5, Landroidx/transition/Transition$AnimationInfo;->mTransition:Landroidx/transition/Transition;
+ if-nez v8, :cond_1
- invoke-virtual {v5, v6, v7}, Landroidx/transition/Transition;->isTransitionRequired(Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Z
-
- move-result v5
-
- if-eqz v5, :cond_1
-
- const/4 v5, 0x1
-
- goto :goto_1
+ if-eqz v9, :cond_2
:cond_1
- const/4 v5, 0x0
+ iget-object v5, v5, Landroidx/transition/Transition$AnimationInfo;->mTransition:Landroidx/transition/Transition;
- :goto_1
- if-eqz v5, :cond_4
-
- invoke-virtual {v4}, Landroid/animation/Animator;->isRunning()Z
-
- move-result v5
-
- if-nez v5, :cond_3
-
- invoke-virtual {v4}, Landroid/animation/Animator;->isStarted()Z
+ invoke-virtual {v5, v6, v9}, Landroidx/transition/Transition;->isTransitionRequired(Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Z
move-result v5
if-eqz v5, :cond_2
- goto :goto_2
+ const/4 v5, 0x1
+
+ goto :goto_1
:cond_2
+ const/4 v5, 0x0
+
+ :goto_1
+ if-eqz v5, :cond_5
+
+ invoke-virtual {v4}, Landroid/animation/Animator;->isRunning()Z
+
+ move-result v5
+
+ if-nez v5, :cond_4
+
+ invoke-virtual {v4}, Landroid/animation/Animator;->isStarted()Z
+
+ move-result v5
+
+ if-eqz v5, :cond_3
+
+ goto :goto_2
+
+ :cond_3
invoke-virtual {v0, v4}, Landroidx/collection/SimpleArrayMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
goto :goto_3
- :cond_3
+ :cond_4
:goto_2
invoke-virtual {v4}, Landroid/animation/Animator;->cancel()V
- :cond_4
+ :cond_5
:goto_3
add-int/lit8 v1, v1, -0x1
goto :goto_0
- :cond_5
+ :cond_6
iget-object v6, p0, Landroidx/transition/Transition;->mStartValues:Landroidx/transition/TransitionValuesMaps;
iget-object v7, p0, Landroidx/transition/Transition;->mEndValues:Landroidx/transition/TransitionValuesMaps;
@@ -4400,6 +4455,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;)",
+ "Landroidx/transition/Transition;"
+ }
+ .end annotation
+
iget-object v0, p0, Landroidx/transition/Transition;->mTargetTypes:Ljava/util/ArrayList;
if-eqz v0, :cond_0
@@ -4433,7 +4497,7 @@
.locals 5
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -4546,7 +4610,7 @@
.locals 4
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -4774,7 +4838,7 @@
.locals 5
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/transition/TransitionInflater.smali b/com.discord/smali/androidx/transition/TransitionInflater.smali
index b2bc354ac3..21afd99160 100644
--- a/com.discord/smali/androidx/transition/TransitionInflater.smali
+++ b/com.discord/smali/androidx/transition/TransitionInflater.smali
@@ -9,8 +9,8 @@
value = {
"Landroidx/collection/ArrayMap<",
"Ljava/lang/String;",
- "Ljava/lang/reflect/Constructor;",
- ">;"
+ "Ljava/lang/reflect/Constructor<",
+ "*>;>;"
}
.end annotation
.end field
@@ -77,6 +77,17 @@
.method private createCustom(Landroid/util/AttributeSet;Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Object;
.locals 6
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroid/util/AttributeSet;",
+ "Ljava/lang/Class<",
+ "*>;",
+ "Ljava/lang/String;",
+ ")",
+ "Ljava/lang/Object;"
+ }
+ .end annotation
const/4 v0, 0x0
@@ -106,50 +117,50 @@
const/4 v2, 0x1
+ const/4 v3, 0x0
+
if-nez v1, :cond_0
- iget-object v3, p0, Landroidx/transition/TransitionInflater;->mContext:Landroid/content/Context;
+ iget-object v4, p0, Landroidx/transition/TransitionInflater;->mContext:Landroid/content/Context;
- invoke-virtual {v3}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
+ invoke-virtual {v4}, Landroid/content/Context;->getClassLoader()Ljava/lang/ClassLoader;
- move-result-object v3
+ move-result-object v4
- invoke-virtual {v3, v0}, Ljava/lang/ClassLoader;->loadClass(Ljava/lang/String;)Ljava/lang/Class;
+ invoke-static {v0, v3, v4}, Ljava/lang/Class;->forName(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;
- move-result-object v3
+ move-result-object v4
- invoke-virtual {v3, p2}, Ljava/lang/Class;->asSubclass(Ljava/lang/Class;)Ljava/lang/Class;
+ invoke-virtual {v4, p2}, Ljava/lang/Class;->asSubclass(Ljava/lang/Class;)Ljava/lang/Class;
- move-result-object v3
+ move-result-object v4
- if-eqz v3, :cond_0
+ if-eqz v4, :cond_0
sget-object v1, Landroidx/transition/TransitionInflater;->CONSTRUCTOR_SIGNATURE:[Ljava/lang/Class;
- invoke-virtual {v3, v1}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
+ invoke-virtual {v4, v1}, Ljava/lang/Class;->getConstructor([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;
move-result-object v1
invoke-virtual {v1, v2}, Ljava/lang/reflect/Constructor;->setAccessible(Z)V
- sget-object v3, Landroidx/transition/TransitionInflater;->CONSTRUCTORS:Landroidx/collection/ArrayMap;
+ sget-object v4, Landroidx/transition/TransitionInflater;->CONSTRUCTORS:Landroidx/collection/ArrayMap;
- invoke-virtual {v3, v0, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v4, v0, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
:cond_0
- const/4 v3, 0x2
+ const/4 v4, 0x2
- new-array v3, v3, [Ljava/lang/Object;
-
- const/4 v4, 0x0
+ new-array v4, v4, [Ljava/lang/Object;
iget-object v5, p0, Landroidx/transition/TransitionInflater;->mContext:Landroid/content/Context;
- aput-object v5, v3, v4
+ aput-object v5, v4, v3
- aput-object p1, v3, v2
+ aput-object p1, v4, v2
- invoke-virtual {v1, v3}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v1, v4}, Ljava/lang/reflect/Constructor;->newInstance([Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p1
@@ -739,6 +750,12 @@
.method private getTargetIds(Lorg/xmlpull/v1/XmlPullParser;Landroid/util/AttributeSet;Landroidx/transition/Transition;)V
.locals 7
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
+
.annotation system Ldalvik/annotation/Throws;
value = {
Lorg/xmlpull/v1/XmlPullParserException;,
@@ -941,6 +958,12 @@
.method private loadTransition(Landroid/util/AttributeSet;Lorg/xmlpull/v1/XmlPullParser;Landroid/view/ViewGroup;Landroidx/transition/TransitionManager;)V
.locals 6
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
+
.annotation system Ldalvik/annotation/Throws;
value = {
Landroid/content/res/Resources$NotFoundException;
diff --git a/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali b/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
index 5c290290ec..81d8c8e975 100644
--- a/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
+++ b/com.discord/smali/androidx/transition/TransitionManager$MultiListener$1.smali
@@ -56,5 +56,7 @@
invoke-virtual {v0, p1}, Ljava/util/ArrayList;->remove(Ljava/lang/Object;)Z
+ invoke-virtual {p1, p0}, Landroidx/transition/Transition;->removeListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
+
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/TransitionManager.smali b/com.discord/smali/androidx/transition/TransitionManager.smali
index 1111b87354..e03fdbc298 100644
--- a/com.discord/smali/androidx/transition/TransitionManager.smali
+++ b/com.discord/smali/androidx/transition/TransitionManager.smali
@@ -168,7 +168,7 @@
const/4 v0, 0x0
- invoke-static {p0, v0}, Landroidx/transition/Scene;->setCurrentScene(Landroid/view/View;Landroidx/transition/Scene;)V
+ invoke-static {p0, v0}, Landroidx/transition/Scene;->setCurrentScene(Landroid/view/ViewGroup;Landroidx/transition/Scene;)V
invoke-static {p0, p1}, Landroidx/transition/TransitionManager;->sceneChangeRunTransition(Landroid/view/ViewGroup;Landroidx/transition/Transition;)V
@@ -177,7 +177,7 @@
.end method
.method public static changeScene(Landroidx/transition/Scene;Landroidx/transition/Transition;)V
- .locals 2
+ .locals 3
invoke-virtual {p0}, Landroidx/transition/Scene;->getSceneRoot()Landroid/view/ViewGroup;
@@ -189,18 +189,27 @@
move-result v1
- if-nez v1, :cond_2
+ if-nez v1, :cond_3
- if-nez p1, :cond_0
+ invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/ViewGroup;)Landroidx/transition/Scene;
+ move-result-object v1
+
+ if-nez p1, :cond_1
+
+ if-eqz v1, :cond_0
+
+ invoke-virtual {v1}, Landroidx/transition/Scene;->exit()V
+
+ :cond_0
invoke-virtual {p0}, Landroidx/transition/Scene;->enter()V
goto :goto_0
- :cond_0
- sget-object v1, Landroidx/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList;
+ :cond_1
+ sget-object v2, Landroidx/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList;
- invoke-virtual {v1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {v2, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
invoke-virtual {p1}, Landroidx/transition/Transition;->clone()Landroidx/transition/Transition;
@@ -208,30 +217,26 @@
invoke-virtual {p1, v0}, Landroidx/transition/Transition;->setSceneRoot(Landroid/view/ViewGroup;)Landroidx/transition/Transition;
- invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/View;)Landroidx/transition/Scene;
-
- move-result-object v1
-
- if-eqz v1, :cond_1
+ if-eqz v1, :cond_2
invoke-virtual {v1}, Landroidx/transition/Scene;->isCreatedFromLayoutResource()Z
move-result v1
- if-eqz v1, :cond_1
+ if-eqz v1, :cond_2
const/4 v1, 0x1
invoke-virtual {p1, v1}, Landroidx/transition/Transition;->setCanRemoveViews(Z)V
- :cond_1
+ :cond_2
invoke-static {v0, p1}, Landroidx/transition/TransitionManager;->sceneChangeSetup(Landroid/view/ViewGroup;Landroidx/transition/Transition;)V
invoke-virtual {p0}, Landroidx/transition/Scene;->enter()V
invoke-static {v0, p1}, Landroidx/transition/TransitionManager;->sceneChangeRunTransition(Landroid/view/ViewGroup;Landroidx/transition/Transition;)V
- :cond_2
+ :cond_3
:goto_0
return-void
.end method
@@ -348,7 +353,7 @@
if-eqz v0, :cond_0
- invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/View;)Landroidx/transition/Scene;
+ invoke-static {v0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/ViewGroup;)Landroidx/transition/Scene;
move-result-object v0
@@ -497,7 +502,7 @@
invoke-virtual {p1, p0, v0}, Landroidx/transition/Transition;->captureValues(Landroid/view/ViewGroup;Z)V
:cond_1
- invoke-static {p0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/View;)Landroidx/transition/Scene;
+ invoke-static {p0}, Landroidx/transition/Scene;->getCurrentScene(Landroid/view/ViewGroup;)Landroidx/transition/Scene;
move-result-object p0
diff --git a/com.discord/smali/androidx/transition/TransitionSet.smali b/com.discord/smali/androidx/transition/TransitionSet.smali
index d9231acde0..1f4e22f7f1 100644
--- a/com.discord/smali/androidx/transition/TransitionSet.smali
+++ b/com.discord/smali/androidx/transition/TransitionSet.smali
@@ -72,6 +72,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 2
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Transition;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -112,6 +117,22 @@
return-void
.end method
+.method private addTransitionInternal(Landroidx/transition/Transition;)V
+ .locals 1
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/transition/TransitionSet;->mTransitions:Ljava/util/ArrayList;
+
+ invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+ iput-object p0, p1, Landroidx/transition/Transition;->mParent:Landroidx/transition/TransitionSet;
+
+ return-void
+.end method
+
.method private setupStartEndListeners()V
.locals 3
@@ -351,6 +372,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;)",
+ "Landroidx/transition/TransitionSet;"
+ }
+ .end annotation
+
const/4 v0, 0x0
:goto_0
@@ -439,11 +469,7 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
- iget-object v0, p0, Landroidx/transition/TransitionSet;->mTransitions:Ljava/util/ArrayList;
-
- invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
- iput-object p0, p1, Landroidx/transition/Transition;->mParent:Landroidx/transition/TransitionSet;
+ invoke-direct {p0, p1}, Landroidx/transition/TransitionSet;->addTransitionInternal(Landroidx/transition/Transition;)V
iget-wide v0, p0, Landroidx/transition/Transition;->mDuration:J
@@ -515,7 +541,7 @@
.locals 3
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -732,7 +758,7 @@
move-result-object v3
- invoke-virtual {v0, v3}, Landroidx/transition/TransitionSet;->addTransition(Landroidx/transition/Transition;)Landroidx/transition/TransitionSet;
+ invoke-direct {v0, v3}, Landroidx/transition/TransitionSet;->addTransitionInternal(Landroidx/transition/Transition;)V
add-int/lit8 v2, v2, 0x1
@@ -761,7 +787,7 @@
.locals 12
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -948,6 +974,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;Z)",
+ "Landroidx/transition/Transition;"
+ }
+ .end annotation
+
const/4 v0, 0x0
:goto_0
@@ -1027,7 +1062,7 @@
.locals 3
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -1074,6 +1109,8 @@
.method public getTransitionAt(I)Landroidx/transition/Transition;
.locals 1
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
if-ltz p1, :cond_1
@@ -1121,7 +1158,7 @@
.locals 3
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -1351,6 +1388,15 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Class<",
+ "*>;)",
+ "Landroidx/transition/TransitionSet;"
+ }
+ .end annotation
+
const/4 v0, 0x0
:goto_0
@@ -1454,7 +1500,7 @@
.locals 3
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -1493,7 +1539,7 @@
.locals 4
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -1666,6 +1712,8 @@
iget-object v0, p0, Landroidx/transition/TransitionSet;->mTransitions:Ljava/util/ArrayList;
+ if-eqz v0, :cond_0
+
invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
move-result v0
@@ -1849,6 +1897,10 @@
iput v0, p0, Landroidx/transition/TransitionSet;->mChangeFlags:I
+ iget-object v0, p0, Landroidx/transition/TransitionSet;->mTransitions:Ljava/util/ArrayList;
+
+ if-eqz v0, :cond_0
+
const/4 v0, 0x0
:goto_0
diff --git a/com.discord/smali/androidx/transition/TransitionValues.smali b/com.discord/smali/androidx/transition/TransitionValues.smali
index 54b7c282b3..614e1bf1d4 100644
--- a/com.discord/smali/androidx/transition/TransitionValues.smali
+++ b/com.discord/smali/androidx/transition/TransitionValues.smali
@@ -31,6 +31,8 @@
# direct methods
.method public constructor ()V
.locals 1
+ .annotation runtime Ljava/lang/Deprecated;
+ .end annotation
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -49,6 +51,32 @@
return-void
.end method
+.method public constructor (Landroid/view/View;)V
+ .locals 1
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ new-instance v0, Ljava/util/HashMap;
+
+ invoke-direct {v0}, Ljava/util/HashMap;->()V
+
+ iput-object v0, p0, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ iput-object v0, p0, Landroidx/transition/TransitionValues;->mTargetedTransitions:Ljava/util/ArrayList;
+
+ iput-object p1, p0, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
+
+ return-void
+.end method
+
# virtual methods
.method public equals(Ljava/lang/Object;)Z
diff --git a/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali b/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
index 7dd2ab59c8..07ee0216cb 100644
--- a/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
+++ b/com.discord/smali/androidx/transition/TranslationAnimationCreator$TransitionPositionListener.smali
@@ -2,6 +2,9 @@
.super Landroid/animation/AnimatorListenerAdapter;
.source "TranslationAnimationCreator.java"
+# interfaces
+.implements Landroidx/transition/Transition$TransitionListener;
+
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
@@ -175,24 +178,6 @@
return-void
.end method
-.method public onAnimationEnd(Landroid/animation/Animator;)V
- .locals 1
-
- iget-object p1, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mMovingView:Landroid/view/View;
-
- iget v0, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mTerminalX:F
-
- invoke-virtual {p1, v0}, Landroid/view/View;->setTranslationX(F)V
-
- iget-object p1, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mMovingView:Landroid/view/View;
-
- iget v0, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mTerminalY:F
-
- invoke-virtual {p1, v0}, Landroid/view/View;->setTranslationY(F)V
-
- return-void
-.end method
-
.method public onAnimationPause(Landroid/animation/Animator;)V
.locals 1
@@ -244,3 +229,67 @@
return-void
.end method
+
+.method public onTransitionCancel(Landroidx/transition/Transition;)V
+ .locals 0
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
+
+.method public onTransitionEnd(Landroidx/transition/Transition;)V
+ .locals 2
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mMovingView:Landroid/view/View;
+
+ iget v1, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mTerminalX:F
+
+ invoke-virtual {v0, v1}, Landroid/view/View;->setTranslationX(F)V
+
+ iget-object v0, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mMovingView:Landroid/view/View;
+
+ iget v1, p0, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->mTerminalY:F
+
+ invoke-virtual {v0, v1}, Landroid/view/View;->setTranslationY(F)V
+
+ invoke-virtual {p1, p0}, Landroidx/transition/Transition;->removeListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
+
+ return-void
+.end method
+
+.method public onTransitionPause(Landroidx/transition/Transition;)V
+ .locals 0
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
+
+.method public onTransitionResume(Landroidx/transition/Transition;)V
+ .locals 0
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
+
+.method public onTransitionStart(Landroidx/transition/Transition;)V
+ .locals 0
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali b/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
index 623fb06ab8..6a0860a2ed 100644
--- a/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
+++ b/com.discord/smali/androidx/transition/TranslationAnimationCreator.smali
@@ -20,8 +20,26 @@
return-void
.end method
-.method public static createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;)Landroid/animation/Animator;
+.method public static createAnimation(Landroid/view/View;Landroidx/transition/TransitionValues;IIFFFFLandroid/animation/TimeInterpolator;Landroidx/transition/Transition;)Landroid/animation/Animator;
.locals 14
+ .param p0 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Landroidx/transition/TransitionValues;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p8 # Landroid/animation/TimeInterpolator;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .param p9 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
move-object v0, p0
@@ -164,6 +182,10 @@
invoke-direct/range {p1 .. p7}, Landroidx/transition/TranslationAnimationCreator$TransitionPositionListener;->(Landroid/view/View;Landroid/view/View;IIFF)V
+ move-object/from16 v0, p9
+
+ invoke-virtual {v0, v5}, Landroidx/transition/Transition;->addListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
+
invoke-virtual {v4, v5}, Landroid/animation/ObjectAnimator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
invoke-static {v4, v5}, Landroidx/transition/AnimatorUtils;->addPauseListener(Landroid/animation/Animator;Landroid/animation/AnimatorListenerAdapter;)V
diff --git a/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali b/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
index 0967c7d943..92d4c9d1bd 100644
--- a/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupOverlayApi18.smali
@@ -65,16 +65,6 @@
return-void
.end method
-.method public clear()V
- .locals 1
-
- iget-object v0, p0, Landroidx/transition/ViewGroupOverlayApi18;->mViewGroupOverlay:Landroid/view/ViewGroupOverlay;
-
- invoke-virtual {v0}, Landroid/view/ViewGroupOverlay;->clear()V
-
- return-void
-.end method
-
.method public remove(Landroid/graphics/drawable/Drawable;)V
.locals 1
.param p1 # Landroid/graphics/drawable/Drawable;
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtils.smali b/com.discord/smali/androidx/transition/ViewGroupUtils.smali
index ff2db6e021..15010cec7e 100644
--- a/com.discord/smali/androidx/transition/ViewGroupUtils.smali
+++ b/com.discord/smali/androidx/transition/ViewGroupUtils.smali
@@ -3,7 +3,21 @@
.source "ViewGroupUtils.java"
+# static fields
+.field public static sGetChildDrawingOrderMethod:Ljava/lang/reflect/Method; = null
+
+.field public static sGetChildDrawingOrderMethodFetched:Z = false
+
+.field public static sTryHiddenSuppressLayout:Z = true
+
+
# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 0
@@ -12,6 +26,113 @@
return-void
.end method
+.method public static getChildDrawingOrder(Landroid/view/ViewGroup;I)I
+ .locals 6
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+ const/16 v1, 0x1d
+
+ if-lt v0, v1, :cond_0
+
+ invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->getChildDrawingOrder(I)I
+
+ move-result p0
+
+ return p0
+
+ :cond_0
+ sget-boolean v0, Landroidx/transition/ViewGroupUtils;->sGetChildDrawingOrderMethodFetched:Z
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x2
+
+ const/4 v3, 0x1
+
+ if-nez v0, :cond_1
+
+ :try_start_0
+ const-class v0, Landroid/view/ViewGroup;
+
+ new-array v4, v2, [Ljava/lang/Class;
+
+ sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v5, v4, v1
+
+ sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v5, v4, v3
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+ const-string v5, "getChildDrawingOrder"
+
+ :try_start_1
+ invoke-virtual {v0, v5, v4}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+ move-result-object v0
+
+ sput-object v0, Landroidx/transition/ViewGroupUtils;->sGetChildDrawingOrderMethod:Ljava/lang/reflect/Method;
+
+ sget-object v0, Landroidx/transition/ViewGroupUtils;->sGetChildDrawingOrderMethod:Ljava/lang/reflect/Method;
+
+ invoke-virtual {v0, v3}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+ :try_end_1
+ .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
+
+ :catch_0
+ sput-boolean v3, Landroidx/transition/ViewGroupUtils;->sGetChildDrawingOrderMethodFetched:Z
+
+ :cond_1
+ sget-object v0, Landroidx/transition/ViewGroupUtils;->sGetChildDrawingOrderMethod:Ljava/lang/reflect/Method;
+
+ if-eqz v0, :cond_2
+
+ :try_start_2
+ new-array v2, v2, [Ljava/lang/Object;
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
+
+ move-result v4
+
+ invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v4
+
+ aput-object v4, v2, v1
+
+ invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v1
+
+ aput-object v1, v2, v3
+
+ invoke-virtual {v0, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p0
+
+ check-cast p0, Ljava/lang/Integer;
+
+ invoke-virtual {p0}, Ljava/lang/Integer;->intValue()I
+
+ move-result p0
+ :try_end_2
+ .catch Ljava/lang/IllegalAccessException; {:try_start_2 .. :try_end_2} :catch_1
+ .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_2 .. :try_end_2} :catch_1
+
+ return p0
+
+ :catch_1
+ :cond_2
+ return p1
+.end method
+
.method public static getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
.locals 1
.param p0 # Landroid/view/ViewGroup;
@@ -28,16 +149,63 @@
return-object v0
.end method
-.method public static suppressLayout(Landroid/view/ViewGroup;Z)V
+.method public static hiddenSuppressLayout(Landroid/view/ViewGroup;Z)V
.locals 1
.param p0 # Landroid/view/ViewGroup;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
+
+ .annotation build Landroidx/annotation/RequiresApi;
+ value = 0x12
+ .end annotation
+
+ sget-boolean v0, Landroidx/transition/ViewGroupUtils;->sTryHiddenSuppressLayout:Z
+
+ if-eqz v0, :cond_0
+
+ :try_start_0
+ invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->suppressLayout(Z)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ const/4 p0, 0x0
+
+ sput-boolean p0, Landroidx/transition/ViewGroupUtils;->sTryHiddenSuppressLayout:Z
+
+ :cond_0
+ :goto_0
+ return-void
+.end method
+
+.method public static suppressLayout(Landroid/view/ViewGroup;Z)V
+ .locals 2
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
- invoke-static {p0, p1}, Landroidx/transition/ViewGroupUtilsApi18;->suppressLayout(Landroid/view/ViewGroup;Z)V
+ const/16 v1, 0x1d
+ if-lt v0, v1, :cond_0
+
+ invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->suppressLayout(Z)V
+
+ goto :goto_0
+
+ :cond_0
+ invoke-static {p0, p1}, Landroidx/transition/ViewGroupUtils;->hiddenSuppressLayout(Landroid/view/ViewGroup;Z)V
+
+ :goto_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali b/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali
deleted file mode 100644
index 544508d10e..0000000000
--- a/com.discord/smali/androidx/transition/ViewGroupUtilsApi18.smali
+++ /dev/null
@@ -1,138 +0,0 @@
-.class public Landroidx/transition/ViewGroupUtilsApi18;
-.super Ljava/lang/Object;
-.source "ViewGroupUtilsApi18.java"
-
-
-# annotations
-.annotation build Landroidx/annotation/RequiresApi;
- value = 0x12
-.end annotation
-
-
-# static fields
-.field public static final TAG:Ljava/lang/String; = "ViewUtilsApi18"
-
-.field public static sSuppressLayoutMethod:Ljava/lang/reflect/Method;
-
-.field public static sSuppressLayoutMethodFetched:Z
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-.method public static fetchSuppressLayoutMethod()V
- .locals 5
-
- sget-boolean v0, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/ViewGroup;
-
- new-array v2, v0, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- sget-object v4, Ljava/lang/Boolean;->TYPE:Ljava/lang/Class;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "suppressLayout"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi18"
-
- const-string v3, "Failed to retrieve suppressLayout method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
-.method public static suppressLayout(Landroid/view/ViewGroup;Z)V
- .locals 4
- .param p0 # Landroid/view/ViewGroup;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- const-string v0, "ViewUtilsApi18"
-
- invoke-static {}, Landroidx/transition/ViewGroupUtilsApi18;->fetchSuppressLayoutMethod()V
-
- sget-object v1, Landroidx/transition/ViewGroupUtilsApi18;->sSuppressLayoutMethod:Ljava/lang/reflect/Method;
-
- if-eqz v1, :cond_0
-
- const/4 v2, 0x1
-
- :try_start_0
- new-array v2, v2, [Ljava/lang/Object;
-
- const/4 v3, 0x0
-
- invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- aput-object p1, v2, v3
-
- invoke-virtual {v1, p0, v2}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- :try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception p0
-
- const-string p1, "Error invoking suppressLayout method"
-
- invoke-static {v0, p1, p0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- goto :goto_0
-
- :catch_1
- move-exception p0
-
- const-string p1, "Failed to invoke suppressLayout method"
-
- invoke-static {v0, p1, p0}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :cond_0
- :goto_0
- return-void
-.end method
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali
deleted file mode 100644
index 516d58eeda..0000000000
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor.smali
+++ /dev/null
@@ -1,24 +0,0 @@
-.class public Landroidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor;
-.super Landroid/view/View;
-.source "ViewOverlayApi14.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = "TouchInterceptor"
-.end annotation
-
-
-# direct methods
-.method public constructor (Landroid/content/Context;)V
- .locals 0
-
- invoke-direct {p0, p1}, Landroid/view/View;->(Landroid/content/Context;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
index 7b45035207..0bc0dedf02 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi14$OverlayViewGroup.smali
@@ -13,18 +13,14 @@
name = "OverlayViewGroup"
.end annotation
-.annotation system Ldalvik/annotation/MemberClasses;
- value = {
- Landroidx/transition/ViewOverlayApi14$OverlayViewGroup$TouchInterceptor;
- }
-.end annotation
-
# static fields
.field public static sInvalidateChildInParentFastMethod:Ljava/lang/reflect/Method;
# instance fields
+.field public mDisposed:Z
+
.field public mDrawables:Ljava/util/ArrayList;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -117,6 +113,57 @@
return-void
.end method
+.method private assertNotDisposed()V
+ .locals 2
+
+ iget-boolean v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDisposed:Z
+
+ if-nez v0, :cond_0
+
+ return-void
+
+ :cond_0
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "This overlay was disposed already. Please use a new one via ViewGroupUtils.getOverlay()"
+
+ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method private disposeIfEmpty()V
+ .locals 1
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
+
+ move-result v0
+
+ if-nez v0, :cond_1
+
+ iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
+
+ move-result v0
+
+ if-nez v0, :cond_1
+
+ :cond_0
+ const/4 v0, 0x1
+
+ iput-boolean v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDisposed:Z
+
+ iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
+
+ invoke-virtual {v0, p0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
+
+ :cond_1
+ return-void
+.end method
+
.method private getOffset([I)V
.locals 5
@@ -162,6 +209,8 @@
.method public add(Landroid/graphics/drawable/Drawable;)V
.locals 1
+ invoke-direct {p0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->assertNotDisposed()V
+
iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
if-nez v0, :cond_0
@@ -198,7 +247,9 @@
.end method
.method public add(Landroid/view/View;)V
- .locals 6
+ .locals 5
+
+ invoke-direct {p0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->assertNotDisposed()V
invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -206,8 +257,6 @@
instance-of v0, v0, Landroid/view/ViewGroup;
- const/4 v1, 0x1
-
if-eqz v0, :cond_1
invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -216,87 +265,68 @@
check-cast v0, Landroid/view/ViewGroup;
- iget-object v2, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
+ iget-object v1, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
- if-eq v0, v2, :cond_0
+ if-eq v0, v1, :cond_0
invoke-virtual {v0}, Landroid/view/ViewGroup;->getParent()Landroid/view/ViewParent;
- move-result-object v2
+ move-result-object v1
- if-eqz v2, :cond_0
+ if-eqz v1, :cond_0
invoke-static {v0}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
- move-result v2
+ move-result v1
- if-eqz v2, :cond_0
+ if-eqz v1, :cond_0
- const/4 v2, 0x2
+ const/4 v1, 0x2
- new-array v3, v2, [I
+ new-array v2, v1, [I
- new-array v2, v2, [I
+ new-array v1, v1, [I
- invoke-virtual {v0, v3}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
+ invoke-virtual {v0, v2}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
- iget-object v4, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
+ iget-object v3, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
- invoke-virtual {v4, v2}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
+ invoke-virtual {v3, v1}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
- const/4 v4, 0x0
+ const/4 v3, 0x0
- aget v5, v3, v4
+ aget v4, v2, v3
- aget v4, v2, v4
+ aget v3, v1, v3
- sub-int/2addr v5, v4
+ sub-int/2addr v4, v3
- invoke-static {p1, v5}, Landroidx/core/view/ViewCompat;->offsetLeftAndRight(Landroid/view/View;I)V
+ invoke-static {p1, v4}, Landroidx/core/view/ViewCompat;->offsetLeftAndRight(Landroid/view/View;I)V
- aget v3, v3, v1
+ const/4 v3, 0x1
- aget v2, v2, v1
+ aget v2, v2, v3
- sub-int/2addr v3, v2
+ aget v1, v1, v3
- invoke-static {p1, v3}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
+ sub-int/2addr v2, v1
+
+ invoke-static {p1, v2}, Landroidx/core/view/ViewCompat;->offsetTopAndBottom(Landroid/view/View;I)V
:cond_0
invoke-virtual {v0, p1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
- move-result-object v2
+ move-result-object v1
- if-eqz v2, :cond_1
+ if-eqz v1, :cond_1
invoke-virtual {v0, p1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
:cond_1
- invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
+ invoke-super {p0, p1}, Landroid/view/ViewGroup;->addView(Landroid/view/View;)V
- move-result v0
-
- sub-int/2addr v0, v1
-
- invoke-super {p0, p1, v0}, Landroid/view/ViewGroup;->addView(Landroid/view/View;I)V
-
- return-void
-.end method
-
-.method public clear()V
- .locals 1
-
- invoke-virtual {p0}, Landroid/view/ViewGroup;->removeAllViews()V
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
- if-eqz v0, :cond_0
-
- invoke-virtual {v0}, Ljava/util/ArrayList;->clear()V
-
- :cond_0
return-void
.end method
@@ -401,49 +431,6 @@
return p1
.end method
-.method public invalidateChildFast(Landroid/view/View;Landroid/graphics/Rect;)V
- .locals 3
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
-
- if-eqz v0, :cond_0
-
- invoke-virtual {p1}, Landroid/view/View;->getLeft()I
-
- move-result v0
-
- invoke-virtual {p1}, Landroid/view/View;->getTop()I
-
- move-result p1
-
- const/4 v1, 0x2
-
- new-array v1, v1, [I
-
- invoke-direct {p0, v1}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->getOffset([I)V
-
- const/4 v2, 0x0
-
- aget v2, v1, v2
-
- add-int/2addr v0, v2
-
- const/4 v2, 0x1
-
- aget v1, v1, v2
-
- add-int/2addr p1, v1
-
- invoke-virtual {p2, v0, p1}, Landroid/graphics/Rect;->offset(II)V
-
- iget-object p1, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
-
- invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->invalidate(Landroid/graphics/Rect;)V
-
- :cond_0
- return-void
-.end method
-
.method public invalidateChildInParent([ILandroid/graphics/Rect;)Landroid/view/ViewParent;
.locals 4
@@ -502,7 +489,7 @@
.locals 5
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
@@ -591,37 +578,6 @@
return-void
.end method
-.method public isEmpty()Z
- .locals 1
-
- invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
-
- move-result v0
-
- if-nez v0, :cond_1
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mDrawables:Ljava/util/ArrayList;
-
- if-eqz v0, :cond_0
-
- invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
-
- move-result v0
-
- if-nez v0, :cond_1
-
- :cond_0
- const/4 v0, 0x1
-
- goto :goto_0
-
- :cond_1
- const/4 v0, 0x0
-
- :goto_0
- return v0
-.end method
-
.method public onLayout(ZIIII)V
.locals 0
@@ -647,6 +603,8 @@
invoke-virtual {p1, v0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V
+ invoke-direct {p0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->disposeIfEmpty()V
+
:cond_0
return-void
.end method
@@ -656,17 +614,8 @@
invoke-super {p0, p1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
- invoke-virtual {p0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->isEmpty()Z
+ invoke-direct {p0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->disposeIfEmpty()V
- move-result p1
-
- if-eqz p1, :cond_0
-
- iget-object p1, p0, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->mHostView:Landroid/view/ViewGroup;
-
- invoke-virtual {p1, p0}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
-
- :cond_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi14.smali b/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
index 166f0fc85a..6e870f3faa 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi14.smali
@@ -19,14 +19,6 @@
# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
.method public constructor (Landroid/content/Context;Landroid/view/ViewGroup;Landroid/view/View;)V
.locals 1
@@ -157,36 +149,6 @@
return-void
.end method
-.method public clear()V
- .locals 1
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14;->mOverlayViewGroup:Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;
-
- invoke-virtual {v0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->clear()V
-
- return-void
-.end method
-
-.method public getOverlayView()Landroid/view/ViewGroup;
- .locals 1
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14;->mOverlayViewGroup:Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;
-
- return-object v0
-.end method
-
-.method public isEmpty()Z
- .locals 1
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi14;->mOverlayViewGroup:Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;
-
- invoke-virtual {v0}, Landroidx/transition/ViewOverlayApi14$OverlayViewGroup;->isEmpty()Z
-
- move-result v0
-
- return v0
-.end method
-
.method public remove(Landroid/graphics/drawable/Drawable;)V
.locals 1
.param p1 # Landroid/graphics/drawable/Drawable;
diff --git a/com.discord/smali/androidx/transition/ViewOverlayApi18.smali b/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
index 1b76e5c475..e100d286e1 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayApi18.smali
@@ -51,16 +51,6 @@
return-void
.end method
-.method public clear()V
- .locals 1
-
- iget-object v0, p0, Landroidx/transition/ViewOverlayApi18;->mViewOverlay:Landroid/view/ViewOverlay;
-
- invoke-virtual {v0}, Landroid/view/ViewOverlay;->clear()V
-
- return-void
-.end method
-
.method public remove(Landroid/graphics/drawable/Drawable;)V
.locals 1
.param p1 # Landroid/graphics/drawable/Drawable;
diff --git a/com.discord/smali/androidx/transition/ViewOverlayImpl.smali b/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
index ab37d28fd7..a788def950 100644
--- a/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
+++ b/com.discord/smali/androidx/transition/ViewOverlayImpl.smali
@@ -11,9 +11,6 @@
.end param
.end method
-.method public abstract clear()V
-.end method
-
.method public abstract remove(Landroid/graphics/drawable/Drawable;)V
.param p1 # Landroid/graphics/drawable/Drawable;
.annotation build Landroidx/annotation/NonNull;
diff --git a/com.discord/smali/androidx/transition/ViewUtils.smali b/com.discord/smali/androidx/transition/ViewUtils.smali
index 071f67d415..a017e1eca2 100644
--- a/com.discord/smali/androidx/transition/ViewUtils.smali
+++ b/com.discord/smali/androidx/transition/ViewUtils.smali
@@ -30,12 +30,6 @@
.end annotation
.end field
-.field public static final VISIBILITY_MASK:I = 0xc
-
-.field public static sViewFlagsField:Ljava/lang/reflect/Field;
-
-.field public static sViewFlagsFieldFetched:Z
-
# direct methods
.method public static constructor ()V
@@ -43,10 +37,36 @@
sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
- const/16 v1, 0x16
+ const/16 v1, 0x1d
if-lt v0, v1, :cond_0
+ new-instance v0, Landroidx/transition/ViewUtilsApi29;
+
+ invoke-direct {v0}, Landroidx/transition/ViewUtilsApi29;->()V
+
+ sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
+
+ goto :goto_0
+
+ :cond_0
+ const/16 v1, 0x17
+
+ if-lt v0, v1, :cond_1
+
+ new-instance v0, Landroidx/transition/ViewUtilsApi23;
+
+ invoke-direct {v0}, Landroidx/transition/ViewUtilsApi23;->()V
+
+ sput-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
+
+ goto :goto_0
+
+ :cond_1
+ const/16 v1, 0x16
+
+ if-lt v0, v1, :cond_2
+
new-instance v0, Landroidx/transition/ViewUtilsApi22;
invoke-direct {v0}, Landroidx/transition/ViewUtilsApi22;->()V
@@ -55,7 +75,7 @@
goto :goto_0
- :cond_0
+ :cond_2
new-instance v0, Landroidx/transition/ViewUtilsApi21;
invoke-direct {v0}, Landroidx/transition/ViewUtilsApi21;->()V
@@ -108,48 +128,6 @@
return-void
.end method
-.method public static fetchViewFlagsField()V
- .locals 3
-
- sget-boolean v0, Landroidx/transition/ViewUtils;->sViewFlagsFieldFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- const-string v2, "mViewFlags"
-
- invoke-virtual {v1, v2}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtils;->sViewFlagsField:Ljava/lang/reflect/Field;
-
- sget-object v1, Landroidx/transition/ViewUtils;->sViewFlagsField:Ljava/lang/reflect/Field;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V
- :try_end_0
- .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
-
- goto :goto_0
-
- :catch_0
- const-string v1, "ViewUtils"
-
- const-string v2, "fetchViewFlagsField: "
-
- invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtils;->sViewFlagsFieldFetched:Z
-
- :cond_0
- return-void
-.end method
-
.method public static getOverlay(Landroid/view/View;)Landroidx/transition/ViewOverlayImpl;
.locals 1
.param p0 # Landroid/view/View;
@@ -269,35 +247,16 @@
.end method
.method public static setTransitionVisibility(Landroid/view/View;I)V
- .locals 2
+ .locals 1
.param p0 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
- invoke-static {}, Landroidx/transition/ViewUtils;->fetchViewFlagsField()V
+ sget-object v0, Landroidx/transition/ViewUtils;->IMPL:Landroidx/transition/ViewUtilsBase;
- sget-object v0, Landroidx/transition/ViewUtils;->sViewFlagsField:Ljava/lang/reflect/Field;
+ invoke-virtual {v0, p0, p1}, Landroidx/transition/ViewUtilsBase;->setTransitionVisibility(Landroid/view/View;I)V
- if-eqz v0, :cond_0
-
- :try_start_0
- invoke-virtual {v0, p0}, Ljava/lang/reflect/Field;->getInt(Ljava/lang/Object;)I
-
- move-result v0
-
- sget-object v1, Landroidx/transition/ViewUtils;->sViewFlagsField:Ljava/lang/reflect/Field;
-
- and-int/lit8 v0, v0, -0xd
-
- or-int/2addr p1, v0
-
- invoke-virtual {v1, p0, p1}, Ljava/lang/reflect/Field;->setInt(Ljava/lang/Object;I)V
- :try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
-
- :catch_0
- :cond_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi19.smali b/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
index 45eb1bc0d6..50ee04c23e 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi19.smali
@@ -10,18 +10,16 @@
# static fields
-.field public static final TAG:Ljava/lang/String; = "ViewUtilsApi19"
-
-.field public static sGetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
-.field public static sGetTransitionAlphaMethodFetched:Z
-
-.field public static sSetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
-.field public static sSetTransitionAlphaMethodFetched:Z
+.field public static sTryHiddenTransitionAlpha:Z = true
# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 0
@@ -30,112 +28,6 @@
return-void
.end method
-.method private fetchGetTransitionAlphaMethod()V
- .locals 4
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- const/4 v2, 0x0
-
- new-array v2, v2, [Ljava/lang/Class;
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "getTransitionAlpha"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi19"
-
- const-string v3, "Failed to retrieve getTransitionAlpha method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
-.method private fetchSetTransitionAlphaMethod()V
- .locals 5
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- new-array v2, v0, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- sget-object v4, Ljava/lang/Float;->TYPE:Ljava/lang/Class;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "setTransitionAlpha"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi19"
-
- const-string v3, "Failed to retrieve setTransitionAlpha method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
# virtual methods
.method public clearNonTransitionAlpha(Landroid/view/View;)V
@@ -149,54 +41,37 @@
.end method
.method public getTransitionAlpha(Landroid/view/View;)F
- .locals 2
+ .locals 1
.param p1 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi19;->fetchGetTransitionAlphaMethod()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi19;->sGetTransitionAlphaMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi19;->sTryHiddenTransitionAlpha:Z
if-eqz v0, :cond_0
- const/4 v1, 0x0
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Ljava/lang/Float;
-
- invoke-virtual {v0}, Ljava/lang/Float;->floatValue()F
+ invoke-virtual {p1}, Landroid/view/View;->getTransitionAlpha()F
move-result p1
:try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
return p1
:catch_0
- move-exception p1
+ const/4 v0, 0x0
- new-instance v0, Ljava/lang/RuntimeException;
+ sput-boolean v0, Landroidx/transition/ViewUtilsApi19;->sTryHiddenTransitionAlpha:Z
- invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {v0, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw v0
-
- :catch_1
:cond_0
- invoke-super {p0, p1}, Landroidx/transition/ViewUtilsBase;->getTransitionAlpha(Landroid/view/View;)F
+ invoke-virtual {p1}, Landroid/view/View;->getAlpha()F
move-result p1
@@ -214,55 +89,35 @@
.end method
.method public setTransitionAlpha(Landroid/view/View;F)V
- .locals 3
+ .locals 1
.param p1 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi19;->fetchSetTransitionAlphaMethod()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi19;->sSetTransitionAlphaMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi19;->sTryHiddenTransitionAlpha:Z
if-eqz v0, :cond_0
- const/4 v1, 0x1
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- invoke-static {p2}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float;
-
- move-result-object p2
-
- aput-object p2, v1, v2
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {p1, p2}, Landroid/view/View;->setTransitionAlpha(F)V
:try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
- goto :goto_0
+ return-void
:catch_0
- move-exception p1
+ const/4 v0, 0x0
- new-instance p2, Ljava/lang/RuntimeException;
-
- invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p2
+ sput-boolean v0, Landroidx/transition/ViewUtilsApi19;->sTryHiddenTransitionAlpha:Z
:cond_0
invoke-virtual {p1, p2}, Landroid/view/View;->setAlpha(F)V
- :catch_1
- :goto_0
return-void
.end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi21.smali b/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
index ebd1e984c2..6b12646bbd 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi21.smali
@@ -10,22 +10,20 @@
# static fields
-.field public static final TAG:Ljava/lang/String; = "ViewUtilsApi21"
+.field public static sTryHiddenSetAnimationMatrix:Z = true
-.field public static sSetAnimationMatrixMethod:Ljava/lang/reflect/Method;
+.field public static sTryHiddenTransformMatrixToGlobal:Z = true
-.field public static sSetAnimationMatrixMethodFetched:Z
-
-.field public static sTransformMatrixToGlobalMethod:Ljava/lang/reflect/Method;
-
-.field public static sTransformMatrixToGlobalMethodFetched:Z
-
-.field public static sTransformMatrixToLocalMethod:Ljava/lang/reflect/Method;
-
-.field public static sTransformMatrixToLocalMethodFetched:Z
+.field public static sTryHiddenTransformMatrixToLocal:Z = true
# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 0
@@ -34,223 +32,47 @@
return-void
.end method
-.method private fetchSetAnimationMatrix()V
- .locals 5
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- new-array v2, v0, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- const-class v4, Landroid/graphics/Matrix;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "setAnimationMatrix"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi21"
-
- const-string v3, "Failed to retrieve setAnimationMatrix method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
-.method private fetchTransformMatrixToGlobalMethod()V
- .locals 5
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- new-array v2, v0, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- const-class v4, Landroid/graphics/Matrix;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "transformMatrixToGlobal"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi21"
-
- const-string v3, "Failed to retrieve transformMatrixToGlobal method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
-.method private fetchTransformMatrixToLocalMethod()V
- .locals 5
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- new-array v2, v0, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- const-class v4, Landroid/graphics/Matrix;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "transformMatrixToLocal"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi21"
-
- const-string v3, "Failed to retrieve transformMatrixToLocal method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
# virtual methods
.method public setAnimationMatrix(Landroid/view/View;Landroid/graphics/Matrix;)V
- .locals 3
+ .locals 1
.param p1 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi21;->fetchSetAnimationMatrix()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi21;->sSetAnimationMatrixMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTryHiddenSetAnimationMatrix:Z
if-eqz v0, :cond_0
- const/4 v1, 0x1
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- aput-object p2, v1, v2
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {p1, p2}, Landroid/view/View;->setAnimationMatrix(Landroid/graphics/Matrix;)V
:try_end_0
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
goto :goto_0
:catch_0
- move-exception p1
+ const/4 p1, 0x0
- new-instance p2, Ljava/lang/RuntimeException;
+ sput-boolean p1, Landroidx/transition/ViewUtilsApi21;->sTryHiddenSetAnimationMatrix:Z
- invoke-virtual {p1}, Ljava/lang/IllegalAccessException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p2
-
- :catch_1
:cond_0
:goto_0
return-void
.end method
.method public transformMatrixToGlobal(Landroid/view/View;Landroid/graphics/Matrix;)V
- .locals 3
+ .locals 1
.param p1 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
@@ -259,50 +81,35 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi21;->fetchTransformMatrixToGlobalMethod()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToGlobalMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTryHiddenTransformMatrixToGlobal:Z
if-eqz v0, :cond_0
- const/4 v1, 0x1
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- aput-object p2, v1, v2
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {p1, p2}, Landroid/view/View;->transformMatrixToGlobal(Landroid/graphics/Matrix;)V
:try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
goto :goto_0
:catch_0
- move-exception p1
+ const/4 p1, 0x0
- new-instance p2, Ljava/lang/RuntimeException;
+ sput-boolean p1, Landroidx/transition/ViewUtilsApi21;->sTryHiddenTransformMatrixToGlobal:Z
- invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p2
-
- :catch_1
:cond_0
:goto_0
return-void
.end method
.method public transformMatrixToLocal(Landroid/view/View;Landroid/graphics/Matrix;)V
- .locals 3
+ .locals 1
.param p1 # Landroid/view/View;
.annotation build Landroidx/annotation/NonNull;
.end annotation
@@ -311,43 +118,28 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi21;->fetchTransformMatrixToLocalMethod()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi21;->sTransformMatrixToLocalMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi21;->sTryHiddenTransformMatrixToLocal:Z
if-eqz v0, :cond_0
- const/4 v1, 0x1
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- aput-object p2, v1, v2
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {p1, p2}, Landroid/view/View;->transformMatrixToLocal(Landroid/graphics/Matrix;)V
:try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
goto :goto_0
:catch_0
- move-exception p1
+ const/4 p1, 0x0
- new-instance p2, Ljava/lang/RuntimeException;
+ sput-boolean p1, Landroidx/transition/ViewUtilsApi21;->sTryHiddenTransformMatrixToLocal:Z
- invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p2
-
- :catch_1
:cond_0
:goto_0
return-void
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi22.smali b/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
index 69c8c7ddcb..11fa00b3c0 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi22.smali
@@ -10,14 +10,16 @@
# static fields
-.field public static final TAG:Ljava/lang/String; = "ViewUtilsApi22"
-
-.field public static sSetLeftTopRightBottomMethod:Ljava/lang/reflect/Method;
-
-.field public static sSetLeftTopRightBottomMethodFetched:Z
+.field public static sTryHiddenSetLeftTopRightBottom:Z = true
# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 0
@@ -26,153 +28,36 @@
return-void
.end method
-.method private fetchSetLeftTopRightBottomMethod()V
- .locals 5
- .annotation build Landroid/annotation/SuppressLint;
- value = {
- "PrivateApi"
- }
- .end annotation
-
- sget-boolean v0, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethodFetched:Z
-
- if-nez v0, :cond_0
-
- const/4 v0, 0x1
-
- :try_start_0
- const-class v1, Landroid/view/View;
-
- const/4 v2, 0x4
-
- new-array v2, v2, [Ljava/lang/Class;
-
- const/4 v3, 0x0
-
- sget-object v4, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
- aput-object v4, v2, v3
-
- sget-object v3, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
- aput-object v3, v2, v0
-
- const/4 v3, 0x2
-
- sget-object v4, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
- aput-object v4, v2, v3
-
- const/4 v3, 0x3
-
- sget-object v4, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
-
- aput-object v4, v2, v3
- :try_end_0
- .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
-
- const-string v3, "setLeftTopRightBottom"
-
- :try_start_1
- invoke-virtual {v1, v3, v2}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
-
- move-result-object v1
-
- sput-object v1, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethod:Ljava/lang/reflect/Method;
-
- sget-object v1, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethod:Ljava/lang/reflect/Method;
-
- invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
- :try_end_1
- .catch Ljava/lang/NoSuchMethodException; {:try_start_1 .. :try_end_1} :catch_0
-
- goto :goto_0
-
- :catch_0
- move-exception v1
-
- const-string v2, "ViewUtilsApi22"
-
- const-string v3, "Failed to retrieve setLeftTopRightBottom method"
-
- invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
-
- :goto_0
- sput-boolean v0, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethodFetched:Z
-
- :cond_0
- return-void
-.end method
-
# virtual methods
.method public setLeftTopRightBottom(Landroid/view/View;IIII)V
- .locals 3
+ .locals 1
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
- invoke-direct {p0}, Landroidx/transition/ViewUtilsApi22;->fetchSetLeftTopRightBottomMethod()V
-
- sget-object v0, Landroidx/transition/ViewUtilsApi22;->sSetLeftTopRightBottomMethod:Ljava/lang/reflect/Method;
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi22;->sTryHiddenSetLeftTopRightBottom:Z
if-eqz v0, :cond_0
- const/4 v1, 0x4
-
:try_start_0
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p2
-
- aput-object p2, v1, v2
-
- const/4 p2, 0x1
-
- invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p3
-
- aput-object p3, v1, p2
-
- const/4 p2, 0x2
-
- invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p3
-
- aput-object p3, v1, p2
-
- const/4 p2, 0x3
-
- invoke-static {p5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p3
-
- aput-object p3, v1, p2
-
- invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {p1, p2, p3, p4, p5}, Landroid/view/View;->setLeftTopRightBottom(IIII)V
:try_end_0
- .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
- .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
goto :goto_0
:catch_0
- move-exception p1
+ const/4 p1, 0x0
- new-instance p2, Ljava/lang/RuntimeException;
+ sput-boolean p1, Landroidx/transition/ViewUtilsApi22;->sTryHiddenSetLeftTopRightBottom:Z
- invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
-
- move-result-object p1
-
- invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
-
- throw p2
-
- :catch_1
:cond_0
:goto_0
return-void
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi23.smali b/com.discord/smali/androidx/transition/ViewUtilsApi23.smali
new file mode 100644
index 0000000000..4591890020
--- /dev/null
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi23.smali
@@ -0,0 +1,75 @@
+.class public Landroidx/transition/ViewUtilsApi23;
+.super Landroidx/transition/ViewUtilsApi22;
+.source "ViewUtilsApi23.java"
+
+
+# annotations
+.annotation build Landroidx/annotation/RequiresApi;
+ value = 0x17
+.end annotation
+
+
+# static fields
+.field public static sTryHiddenSetTransitionVisibility:Z = true
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 0
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Landroidx/transition/ViewUtilsApi22;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public setTransitionVisibility(Landroid/view/View;I)V
+ .locals 2
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "NewApi"
+ }
+ .end annotation
+
+ sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
+
+ const/16 v1, 0x1c
+
+ if-ne v0, v1, :cond_0
+
+ invoke-super {p0, p1, p2}, Landroidx/transition/ViewUtilsBase;->setTransitionVisibility(Landroid/view/View;I)V
+
+ goto :goto_0
+
+ :cond_0
+ sget-boolean v0, Landroidx/transition/ViewUtilsApi23;->sTryHiddenSetTransitionVisibility:Z
+
+ if-eqz v0, :cond_1
+
+ :try_start_0
+ invoke-virtual {p1, p2}, Landroid/view/View;->setTransitionVisibility(I)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodError; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ const/4 p1, 0x0
+
+ sput-boolean p1, Landroidx/transition/ViewUtilsApi23;->sTryHiddenSetTransitionVisibility:Z
+
+ :cond_1
+ :goto_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsApi29.smali b/com.discord/smali/androidx/transition/ViewUtilsApi29.smali
new file mode 100644
index 0000000000..937621a262
--- /dev/null
+++ b/com.discord/smali/androidx/transition/ViewUtilsApi29.smali
@@ -0,0 +1,119 @@
+.class public Landroidx/transition/ViewUtilsApi29;
+.super Landroidx/transition/ViewUtilsApi23;
+.source "ViewUtilsApi29.java"
+
+
+# annotations
+.annotation build Landroidx/annotation/RequiresApi;
+ value = 0x1d
+.end annotation
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Landroidx/transition/ViewUtilsApi23;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public getTransitionAlpha(Landroid/view/View;)F
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroid/view/View;->getTransitionAlpha()F
+
+ move-result p1
+
+ return p1
+.end method
+
+.method public setAnimationMatrix(Landroid/view/View;Landroid/graphics/Matrix;)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2}, Landroid/view/View;->setAnimationMatrix(Landroid/graphics/Matrix;)V
+
+ return-void
+.end method
+
+.method public setLeftTopRightBottom(Landroid/view/View;IIII)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2, p3, p4, p5}, Landroid/view/View;->setLeftTopRightBottom(IIII)V
+
+ return-void
+.end method
+
+.method public setTransitionAlpha(Landroid/view/View;F)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2}, Landroid/view/View;->setTransitionAlpha(F)V
+
+ return-void
+.end method
+
+.method public setTransitionVisibility(Landroid/view/View;I)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2}, Landroid/view/View;->setTransitionVisibility(I)V
+
+ return-void
+.end method
+
+.method public transformMatrixToGlobal(Landroid/view/View;Landroid/graphics/Matrix;)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2}, Landroid/view/View;->transformMatrixToGlobal(Landroid/graphics/Matrix;)V
+
+ return-void
+.end method
+
+.method public transformMatrixToLocal(Landroid/view/View;Landroid/graphics/Matrix;)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1, p2}, Landroid/view/View;->transformMatrixToLocal(Landroid/graphics/Matrix;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/transition/ViewUtilsBase.smali b/com.discord/smali/androidx/transition/ViewUtilsBase.smali
index c498c609c1..e6deda4fbb 100644
--- a/com.discord/smali/androidx/transition/ViewUtilsBase.smali
+++ b/com.discord/smali/androidx/transition/ViewUtilsBase.smali
@@ -3,6 +3,20 @@
.source "ViewUtilsBase.java"
+# static fields
+.field public static final TAG:Ljava/lang/String; = "ViewUtilsBase"
+
+.field public static final VISIBILITY_MASK:I = 0xc
+
+.field public static sSetFrameFetched:Z
+
+.field public static sSetFrameMethod:Ljava/lang/reflect/Method;
+
+.field public static sViewFlagsField:Ljava/lang/reflect/Field;
+
+.field public static sViewFlagsFieldFetched:Z
+
+
# instance fields
.field public mMatrixValues:[F
@@ -16,6 +30,81 @@
return-void
.end method
+.method private fetchSetFrame()V
+ .locals 6
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "PrivateApi"
+ }
+ .end annotation
+
+ sget-boolean v0, Landroidx/transition/ViewUtilsBase;->sSetFrameFetched:Z
+
+ if-nez v0, :cond_0
+
+ const/4 v0, 0x1
+
+ :try_start_0
+ const-class v1, Landroid/view/View;
+
+ const-string v2, "setFrame"
+
+ const/4 v3, 0x4
+
+ new-array v3, v3, [Ljava/lang/Class;
+
+ const/4 v4, 0x0
+
+ sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v5, v3, v4
+
+ sget-object v4, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v4, v3, v0
+
+ const/4 v4, 0x2
+
+ sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v5, v3, v4
+
+ const/4 v4, 0x3
+
+ sget-object v5, Ljava/lang/Integer;->TYPE:Ljava/lang/Class;
+
+ aput-object v5, v3, v4
+
+ invoke-virtual {v1, v2, v3}, Ljava/lang/Class;->getDeclaredMethod(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;
+
+ move-result-object v1
+
+ sput-object v1, Landroidx/transition/ViewUtilsBase;->sSetFrameMethod:Ljava/lang/reflect/Method;
+
+ sget-object v1, Landroidx/transition/ViewUtilsBase;->sSetFrameMethod:Ljava/lang/reflect/Method;
+
+ invoke-virtual {v1, v0}, Ljava/lang/reflect/Method;->setAccessible(Z)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchMethodException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ move-exception v1
+
+ const-string v2, "ViewUtilsBase"
+
+ const-string v3, "Failed to retrieve setFrame method"
+
+ invoke-static {v2, v3, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+
+ :goto_0
+ sput-boolean v0, Landroidx/transition/ViewUtilsBase;->sSetFrameFetched:Z
+
+ :cond_0
+ return-void
+.end method
+
# virtual methods
.method public clearNonTransitionAlpha(Landroid/view/View;)V
@@ -115,6 +204,10 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
+ .param p2 # Landroid/graphics/Matrix;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
const/high16 v0, 0x3f800000 # 1.0f
@@ -265,16 +358,78 @@
.end method
.method public setLeftTopRightBottom(Landroid/view/View;IIII)V
- .locals 0
+ .locals 3
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
- invoke-virtual {p1, p2}, Landroid/view/View;->setLeft(I)V
+ invoke-direct {p0}, Landroidx/transition/ViewUtilsBase;->fetchSetFrame()V
- invoke-virtual {p1, p3}, Landroid/view/View;->setTop(I)V
+ sget-object v0, Landroidx/transition/ViewUtilsBase;->sSetFrameMethod:Ljava/lang/reflect/Method;
- invoke-virtual {p1, p4}, Landroid/view/View;->setRight(I)V
+ if-eqz v0, :cond_0
- invoke-virtual {p1, p5}, Landroid/view/View;->setBottom(I)V
+ const/4 v1, 0x4
+ :try_start_0
+ new-array v1, v1, [Ljava/lang/Object;
+
+ const/4 v2, 0x0
+
+ invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object p2
+
+ aput-object p2, v1, v2
+
+ const/4 p2, 0x1
+
+ invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object p3
+
+ aput-object p3, v1, p2
+
+ const/4 p2, 0x2
+
+ invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object p3
+
+ aput-object p3, v1, p2
+
+ const/4 p2, 0x3
+
+ invoke-static {p5}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object p3
+
+ aput-object p3, v1, p2
+
+ invoke-virtual {v0, p1, v1}, Ljava/lang/reflect/Method;->invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ :try_end_0
+ .catch Ljava/lang/IllegalAccessException; {:try_start_0 .. :try_end_0} :catch_1
+ .catch Ljava/lang/reflect/InvocationTargetException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ move-exception p1
+
+ new-instance p2, Ljava/lang/RuntimeException;
+
+ invoke-virtual {p1}, Ljava/lang/reflect/InvocationTargetException;->getCause()Ljava/lang/Throwable;
+
+ move-result-object p1
+
+ invoke-direct {p2, p1}, Ljava/lang/RuntimeException;->(Ljava/lang/Throwable;)V
+
+ throw p2
+
+ :catch_1
+ :cond_0
+ :goto_0
return-void
.end method
@@ -312,6 +467,73 @@
return-void
.end method
+.method public setTransitionVisibility(Landroid/view/View;I)V
+ .locals 3
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ sget-boolean v0, Landroidx/transition/ViewUtilsBase;->sViewFlagsFieldFetched:Z
+
+ if-nez v0, :cond_0
+
+ const/4 v0, 0x1
+
+ :try_start_0
+ const-class v1, Landroid/view/View;
+
+ const-string v2, "mViewFlags"
+
+ invoke-virtual {v1, v2}, Ljava/lang/Class;->getDeclaredField(Ljava/lang/String;)Ljava/lang/reflect/Field;
+
+ move-result-object v1
+
+ sput-object v1, Landroidx/transition/ViewUtilsBase;->sViewFlagsField:Ljava/lang/reflect/Field;
+
+ sget-object v1, Landroidx/transition/ViewUtilsBase;->sViewFlagsField:Ljava/lang/reflect/Field;
+
+ invoke-virtual {v1, v0}, Ljava/lang/reflect/Field;->setAccessible(Z)V
+ :try_end_0
+ .catch Ljava/lang/NoSuchFieldException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ const-string v1, "ViewUtilsBase"
+
+ const-string v2, "fetchViewFlagsField: "
+
+ invoke-static {v1, v2}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+
+ :goto_0
+ sput-boolean v0, Landroidx/transition/ViewUtilsBase;->sViewFlagsFieldFetched:Z
+
+ :cond_0
+ sget-object v0, Landroidx/transition/ViewUtilsBase;->sViewFlagsField:Ljava/lang/reflect/Field;
+
+ if-eqz v0, :cond_1
+
+ :try_start_1
+ invoke-virtual {v0, p1}, Ljava/lang/reflect/Field;->getInt(Ljava/lang/Object;)I
+
+ move-result v0
+
+ sget-object v1, Landroidx/transition/ViewUtilsBase;->sViewFlagsField:Ljava/lang/reflect/Field;
+
+ and-int/lit8 v0, v0, -0xd
+
+ or-int/2addr p2, v0
+
+ invoke-virtual {v1, p1, p2}, Ljava/lang/reflect/Field;->setInt(Ljava/lang/Object;I)V
+ :try_end_1
+ .catch Ljava/lang/IllegalAccessException; {:try_start_1 .. :try_end_1} :catch_1
+
+ :catch_1
+ :cond_1
+ return-void
+.end method
+
.method public transformMatrixToGlobal(Landroid/view/View;Landroid/graphics/Matrix;)V
.locals 2
.param p1 # Landroid/view/View;
@@ -426,12 +648,16 @@
move-result v0
+ neg-int v0, v0
+
int-to-float v0, v0
invoke-virtual {p1}, Landroid/view/View;->getTop()I
move-result v1
+ neg-int v1, v1
+
int-to-float v1, v1
invoke-virtual {p2, v0, v1}, Landroid/graphics/Matrix;->postTranslate(FF)Z
diff --git a/com.discord/smali/androidx/transition/Visibility$1.smali b/com.discord/smali/androidx/transition/Visibility$1.smali
index 1b44d0b251..3ab95fffe6 100644
--- a/com.discord/smali/androidx/transition/Visibility$1.smali
+++ b/com.discord/smali/androidx/transition/Visibility$1.smali
@@ -1,5 +1,5 @@
.class public Landroidx/transition/Visibility$1;
-.super Landroid/animation/AnimatorListenerAdapter;
+.super Landroidx/transition/TransitionListenerAdapter;
.source "Visibility.java"
@@ -19,30 +19,72 @@
.field public final synthetic val$finalOverlayView:Landroid/view/View;
-.field public final synthetic val$overlay:Landroidx/transition/ViewGroupOverlayImpl;
+.field public final synthetic val$overlayHost:Landroid/view/ViewGroup;
+
+.field public final synthetic val$startView:Landroid/view/View;
# direct methods
-.method public constructor (Landroidx/transition/Visibility;Landroidx/transition/ViewGroupOverlayImpl;Landroid/view/View;)V
+.method public constructor (Landroidx/transition/Visibility;Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)V
.locals 0
iput-object p1, p0, Landroidx/transition/Visibility$1;->this$0:Landroidx/transition/Visibility;
- iput-object p2, p0, Landroidx/transition/Visibility$1;->val$overlay:Landroidx/transition/ViewGroupOverlayImpl;
+ iput-object p2, p0, Landroidx/transition/Visibility$1;->val$overlayHost:Landroid/view/ViewGroup;
iput-object p3, p0, Landroidx/transition/Visibility$1;->val$finalOverlayView:Landroid/view/View;
- invoke-direct {p0}, Landroid/animation/AnimatorListenerAdapter;->()V
+ iput-object p4, p0, Landroidx/transition/Visibility$1;->val$startView:Landroid/view/View;
+
+ invoke-direct {p0}, Landroidx/transition/TransitionListenerAdapter;->()V
return-void
.end method
# virtual methods
-.method public onAnimationEnd(Landroid/animation/Animator;)V
- .locals 1
+.method public onTransitionEnd(Landroidx/transition/Transition;)V
+ .locals 3
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
- iget-object p1, p0, Landroidx/transition/Visibility$1;->val$overlay:Landroidx/transition/ViewGroupOverlayImpl;
+ iget-object v0, p0, Landroidx/transition/Visibility$1;->val$startView:Landroid/view/View;
+
+ sget v1, Landroidx/transition/R$id;->save_overlay_view:I
+
+ const/4 v2, 0x0
+
+ invoke-virtual {v0, v1, v2}, Landroid/view/View;->setTag(ILjava/lang/Object;)V
+
+ iget-object v0, p0, Landroidx/transition/Visibility$1;->val$overlayHost:Landroid/view/ViewGroup;
+
+ invoke-static {v0}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object v0
+
+ iget-object v1, p0, Landroidx/transition/Visibility$1;->val$finalOverlayView:Landroid/view/View;
+
+ invoke-interface {v0, v1}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
+
+ invoke-virtual {p1, p0}, Landroidx/transition/Transition;->removeListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
+
+ return-void
+.end method
+
+.method public onTransitionPause(Landroidx/transition/Transition;)V
+ .locals 1
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object p1, p0, Landroidx/transition/Visibility$1;->val$overlayHost:Landroid/view/ViewGroup;
+
+ invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object p1
iget-object v0, p0, Landroidx/transition/Visibility$1;->val$finalOverlayView:Landroid/view/View;
@@ -50,3 +92,39 @@
return-void
.end method
+
+.method public onTransitionResume(Landroidx/transition/Transition;)V
+ .locals 1
+ .param p1 # Landroidx/transition/Transition;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object p1, p0, Landroidx/transition/Visibility$1;->val$finalOverlayView:Landroid/view/View;
+
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ if-nez p1, :cond_0
+
+ iget-object p1, p0, Landroidx/transition/Visibility$1;->val$overlayHost:Landroid/view/ViewGroup;
+
+ invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
+
+ move-result-object p1
+
+ iget-object v0, p0, Landroidx/transition/Visibility$1;->val$finalOverlayView:Landroid/view/View;
+
+ invoke-interface {p1, v0}, Landroidx/transition/ViewGroupOverlayImpl;->add(Landroid/view/View;)V
+
+ goto :goto_0
+
+ :cond_0
+ iget-object p1, p0, Landroidx/transition/Visibility$1;->this$0:Landroidx/transition/Visibility;
+
+ invoke-virtual {p1}, Landroidx/transition/Transition;->cancel()V
+
+ :goto_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/transition/Visibility$Mode.smali b/com.discord/smali/androidx/transition/Visibility$Mode.smali
index 21fa368762..3bf6f41f92 100644
--- a/com.discord/smali/androidx/transition/Visibility$Mode.smali
+++ b/com.discord/smali/androidx/transition/Visibility$Mode.smali
@@ -7,9 +7,15 @@
# annotations
+.annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "UniqueConstants"
+ }
+.end annotation
+
.annotation build Landroidx/annotation/RestrictTo;
value = {
- .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP:Landroidx/annotation/RestrictTo$Scope;
+ .enum Landroidx/annotation/RestrictTo$Scope;->LIBRARY_GROUP_PREFIX:Landroidx/annotation/RestrictTo$Scope;
}
.end annotation
diff --git a/com.discord/smali/androidx/transition/Visibility.smali b/com.discord/smali/androidx/transition/Visibility.smali
index d9804857ac..cc695642f4 100644
--- a/com.discord/smali/androidx/transition/Visibility.smali
+++ b/com.discord/smali/androidx/transition/Visibility.smali
@@ -62,6 +62,11 @@
.method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V
.locals 2
+ .annotation build Landroid/annotation/SuppressLint;
+ value = {
+ "RestrictedApi"
+ }
+ .end annotation
invoke-direct {p0, p1, p2}, Landroidx/transition/Transition;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
@@ -649,7 +654,7 @@
.end method
.method public onDisappear(Landroid/view/ViewGroup;Landroidx/transition/TransitionValues;ILandroidx/transition/TransitionValues;I)Landroid/animation/Animator;
- .locals 6
+ .locals 9
iget p3, p0, Landroidx/transition/Visibility;->mMode:I
@@ -664,104 +669,110 @@
return-object v1
:cond_0
- if-eqz p2, :cond_1
+ if-nez p2, :cond_1
- iget-object p3, p2, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
-
- goto :goto_0
+ return-object v1
:cond_1
- move-object p3, v1
+ iget-object p3, p2, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
- :goto_0
if-eqz p4, :cond_2
iget-object v2, p4, Landroidx/transition/TransitionValues;->view:Landroid/view/View;
- goto :goto_1
+ goto :goto_0
:cond_2
move-object v2, v1
- :goto_1
- const/4 v3, 0x1
+ :goto_0
+ sget v3, Landroidx/transition/R$id;->save_overlay_view:I
- if-eqz v2, :cond_7
+ invoke-virtual {p3, v3}, Landroid/view/View;->getTag(I)Ljava/lang/Object;
+
+ move-result-object v3
+
+ check-cast v3, Landroid/view/View;
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x1
+
+ if-eqz v3, :cond_3
+
+ move-object v6, v1
+
+ const/4 v2, 0x1
+
+ goto/16 :goto_7
+
+ :cond_3
+ if-eqz v2, :cond_6
invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
- move-result-object v4
+ move-result-object v3
- if-nez v4, :cond_3
-
- goto :goto_3
-
- :cond_3
- const/4 v4, 0x4
-
- if-ne p5, v4, :cond_4
+ if-nez v3, :cond_4
goto :goto_2
:cond_4
- if-ne p3, v2, :cond_5
+ const/4 v3, 0x4
- :goto_2
- move-object p3, v1
+ if-ne p5, v3, :cond_5
- goto/16 :goto_6
+ goto :goto_1
:cond_5
- iget-boolean v2, p0, Landroidx/transition/Transition;->mCanRemoveViews:Z
+ if-ne p3, v2, :cond_7
- if-eqz v2, :cond_6
+ :goto_1
+ move-object v3, v1
- goto :goto_5
+ move-object v6, v2
+
+ goto :goto_3
:cond_6
- invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+ :goto_2
+ if-eqz v2, :cond_7
- move-result-object v2
+ move-object v6, v1
- check-cast v2, Landroid/view/View;
+ move-object v3, v2
- invoke-static {p1, p3, v2}, Landroidx/transition/TransitionUtils;->copyViewImage(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)Landroid/view/View;
-
- move-result-object p3
+ :goto_3
+ const/4 v2, 0x0
goto :goto_4
:cond_7
- :goto_3
- if-eqz v2, :cond_8
+ move-object v3, v1
- move-object p3, v2
+ move-object v6, v3
+
+ const/4 v2, 0x1
:goto_4
- move-object v2, v1
-
- goto :goto_6
-
- :cond_8
- if-eqz p3, :cond_c
+ if-eqz v2, :cond_a
invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
move-result-object v2
- if-nez v2, :cond_9
+ if-nez v2, :cond_8
- :goto_5
- goto :goto_4
+ goto :goto_5
- :cond_9
+ :cond_8
invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
move-result-object v2
instance-of v2, v2, Landroid/view/View;
- if-eqz v2, :cond_c
+ if-eqz v2, :cond_a
invoke-virtual {p3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
@@ -769,71 +780,66 @@
check-cast v2, Landroid/view/View;
- invoke-virtual {p0, v2, v3}, Landroidx/transition/Transition;->getTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
+ invoke-virtual {p0, v2, v5}, Landroidx/transition/Transition;->getTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
- move-result-object v4
+ move-result-object v7
- invoke-virtual {p0, v2, v3}, Landroidx/transition/Transition;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
+ invoke-virtual {p0, v2, v5}, Landroidx/transition/Transition;->getMatchedTransitionValues(Landroid/view/View;Z)Landroidx/transition/TransitionValues;
- move-result-object v5
+ move-result-object v8
- invoke-direct {p0, v4, v5}, Landroidx/transition/Visibility;->getVisibilityChangeInfo(Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroidx/transition/Visibility$VisibilityInfo;
+ invoke-direct {p0, v7, v8}, Landroidx/transition/Visibility;->getVisibilityChangeInfo(Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroidx/transition/Visibility$VisibilityInfo;
- move-result-object v4
+ move-result-object v7
- iget-boolean v4, v4, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
+ iget-boolean v7, v7, Landroidx/transition/Visibility$VisibilityInfo;->mVisibilityChange:Z
- if-nez v4, :cond_a
+ if-nez v7, :cond_9
invoke-static {p1, p3, v2}, Landroidx/transition/TransitionUtils;->copyViewImage(Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)Landroid/view/View;
- move-result-object p3
+ move-result-object v2
- goto :goto_4
+ move-object v3, v2
- :cond_a
- invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
-
- move-result-object v4
-
- if-nez v4, :cond_b
+ goto :goto_6
+ :cond_9
invoke-virtual {v2}, Landroid/view/View;->getId()I
- move-result v2
+ move-result v7
- const/4 v4, -0x1
-
- if-eq v2, v4, :cond_b
-
- invoke-virtual {p1, v2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
+ invoke-virtual {v2}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
move-result-object v2
- if-eqz v2, :cond_b
+ if-nez v2, :cond_a
+
+ const/4 v2, -0x1
+
+ if-eq v7, v2, :cond_a
+
+ invoke-virtual {p1, v7}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
+
+ move-result-object v2
+
+ if-eqz v2, :cond_a
iget-boolean v2, p0, Landroidx/transition/Transition;->mCanRemoveViews:Z
- if-eqz v2, :cond_b
+ if-eqz v2, :cond_a
- goto :goto_4
-
- :cond_b
- move-object p3, v1
-
- goto :goto_4
-
- :cond_c
- move-object p3, v1
-
- move-object v2, p3
+ :goto_5
+ move-object v3, p3
+ :cond_a
:goto_6
- const/4 v4, 0x0
+ const/4 v2, 0x0
- if-eqz p3, :cond_e
+ :goto_7
+ if-eqz v3, :cond_e
- if-eqz p2, :cond_e
+ if-nez v2, :cond_b
iget-object p5, p2, Landroidx/transition/TransitionValues;->values:Ljava/util/Map;
@@ -847,72 +853,84 @@
aget v1, p5, v4
- aget p5, p5, v3
+ aget p5, p5, v5
new-array v0, v0, [I
invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->getLocationOnScreen([I)V
- aget v2, v0, v4
+ aget v4, v0, v4
- sub-int/2addr v1, v2
+ sub-int/2addr v1, v4
- invoke-virtual {p3}, Landroid/view/View;->getLeft()I
+ invoke-virtual {v3}, Landroid/view/View;->getLeft()I
- move-result v2
+ move-result v4
- sub-int/2addr v1, v2
+ sub-int/2addr v1, v4
- invoke-virtual {p3, v1}, Landroid/view/View;->offsetLeftAndRight(I)V
+ invoke-virtual {v3, v1}, Landroid/view/View;->offsetLeftAndRight(I)V
- aget v0, v0, v3
+ aget v0, v0, v5
sub-int/2addr p5, v0
- invoke-virtual {p3}, Landroid/view/View;->getTop()I
+ invoke-virtual {v3}, Landroid/view/View;->getTop()I
move-result v0
sub-int/2addr p5, v0
- invoke-virtual {p3, p5}, Landroid/view/View;->offsetTopAndBottom(I)V
+ invoke-virtual {v3, p5}, Landroid/view/View;->offsetTopAndBottom(I)V
invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
move-result-object p5
- invoke-interface {p5, p3}, Landroidx/transition/ViewGroupOverlayImpl;->add(Landroid/view/View;)V
+ invoke-interface {p5, v3}, Landroidx/transition/ViewGroupOverlayImpl;->add(Landroid/view/View;)V
- invoke-virtual {p0, p1, p3, p2, p4}, Landroidx/transition/Visibility;->onDisappear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
+ :cond_b
+ invoke-virtual {p0, p1, v3, p2, p4}, Landroidx/transition/Visibility;->onDisappear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
+
+ move-result-object p2
+
+ if-nez v2, :cond_d
+
+ if-nez p2, :cond_c
+
+ invoke-static {p1}, Landroidx/transition/ViewGroupUtils;->getOverlay(Landroid/view/ViewGroup;)Landroidx/transition/ViewGroupOverlayImpl;
move-result-object p1
- if-nez p1, :cond_d
+ invoke-interface {p1, v3}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
- invoke-interface {p5, p3}, Landroidx/transition/ViewGroupOverlayImpl;->remove(Landroid/view/View;)V
+ goto :goto_8
- goto :goto_7
+ :cond_c
+ sget p4, Landroidx/transition/R$id;->save_overlay_view:I
+
+ invoke-virtual {p3, p4, v3}, Landroid/view/View;->setTag(ILjava/lang/Object;)V
+
+ new-instance p4, Landroidx/transition/Visibility$1;
+
+ invoke-direct {p4, p0, p1, v3, p3}, Landroidx/transition/Visibility$1;->(Landroidx/transition/Visibility;Landroid/view/ViewGroup;Landroid/view/View;Landroid/view/View;)V
+
+ invoke-virtual {p0, p4}, Landroidx/transition/Transition;->addListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
:cond_d
- new-instance p2, Landroidx/transition/Visibility$1;
-
- invoke-direct {p2, p0, p5, p3}, Landroidx/transition/Visibility$1;->(Landroidx/transition/Visibility;Landroidx/transition/ViewGroupOverlayImpl;Landroid/view/View;)V
-
- invoke-virtual {p1, p2}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
-
- :goto_7
- return-object p1
+ :goto_8
+ return-object p2
:cond_e
- if-eqz v2, :cond_10
+ if-eqz v6, :cond_10
- invoke-virtual {v2}, Landroid/view/View;->getVisibility()I
+ invoke-virtual {v6}, Landroid/view/View;->getVisibility()I
move-result p3
- invoke-static {v2, v4}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+ invoke-static {v6, v4}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
- invoke-virtual {p0, p1, v2, p2, p4}, Landroidx/transition/Visibility;->onDisappear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
+ invoke-virtual {p0, p1, v6, p2, p4}, Landroidx/transition/Visibility;->onDisappear(Landroid/view/ViewGroup;Landroid/view/View;Landroidx/transition/TransitionValues;Landroidx/transition/TransitionValues;)Landroid/animation/Animator;
move-result-object p1
@@ -920,7 +938,7 @@
new-instance p2, Landroidx/transition/Visibility$DisappearListener;
- invoke-direct {p2, v2, p5, v3}, Landroidx/transition/Visibility$DisappearListener;->(Landroid/view/View;IZ)V
+ invoke-direct {p2, v6, p5, v5}, Landroidx/transition/Visibility$DisappearListener;->(Landroid/view/View;IZ)V
invoke-virtual {p1, p2}, Landroid/animation/Animator;->addListener(Landroid/animation/Animator$AnimatorListener;)V
@@ -928,12 +946,12 @@
invoke-virtual {p0, p2}, Landroidx/transition/Transition;->addListener(Landroidx/transition/Transition$TransitionListener;)Landroidx/transition/Transition;
- goto :goto_8
+ goto :goto_9
:cond_f
- invoke-static {v2, p3}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
+ invoke-static {v6, p3}, Landroidx/transition/ViewUtils;->setTransitionVisibility(Landroid/view/View;I)V
- :goto_8
+ :goto_9
return-object p1
:cond_10
diff --git a/com.discord/smali/androidx/vectordrawable/R$attr.smali b/com.discord/smali/androidx/vectordrawable/R$attr.smali
index d3207eb71b..9c8978e582 100644
--- a/com.discord/smali/androidx/vectordrawable/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$color.smali b/com.discord/smali/androidx/vectordrawable/R$color.smali
index dbdeb9f7aa..5c02983749 100644
--- a/com.discord/smali/androidx/vectordrawable/R$color.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
index da1699021d..54ec1d6a1c 100644
--- a/com.discord/smali/androidx/vectordrawable/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 24eb5f4f31..349bc061aa 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 366c91ea91..6476ae4ee7 100644
--- a/com.discord/smali/androidx/vectordrawable/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$integer.smali b/com.discord/smali/androidx/vectordrawable/R$integer.smali
index bf55dced12..917acb83e6 100644
--- a/com.discord/smali/androidx/vectordrawable/R$integer.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$layout.smali b/com.discord/smali/androidx/vectordrawable/R$layout.smali
index 7361e7c8cb..c4eeb5887a 100644
--- a/com.discord/smali/androidx/vectordrawable/R$layout.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index 6fc8a3aab2..dee5fbf399 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$style.smali b/com.discord/smali/androidx/vectordrawable/R$style.smali
index 36bb445d70..218fa1323d 100644
--- a/com.discord/smali/androidx/vectordrawable/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
index 8868da8112..3c5123a0e5 100644
--- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali b/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
index c97cca8ab8..68d17a5943 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$color.smali b/com.discord/smali/androidx/vectordrawable/animated/R$color.smali
index d8829c671d..600d2b869b 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$color.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali b/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
index b92a3d5266..f922f40ac2 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
index 68b95a8fd9..96d5aa8962 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
index 39b40bb689..0074fe8604 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
@@ -15,139 +15,139 @@
# static fields
-.field public static final accessibility_action_clickable_span:I = 0x7f0a000c
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
-.field public static final accessibility_custom_action_0:I = 0x7f0a000d
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
-.field public static final accessibility_custom_action_1:I = 0x7f0a000e
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
-.field public static final accessibility_custom_action_10:I = 0x7f0a000f
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
-.field public static final accessibility_custom_action_11:I = 0x7f0a0010
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
-.field public static final accessibility_custom_action_12:I = 0x7f0a0011
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
-.field public static final accessibility_custom_action_13:I = 0x7f0a0012
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
-.field public static final accessibility_custom_action_14:I = 0x7f0a0013
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
-.field public static final accessibility_custom_action_15:I = 0x7f0a0014
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
-.field public static final accessibility_custom_action_16:I = 0x7f0a0015
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
-.field public static final accessibility_custom_action_17:I = 0x7f0a0016
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
-.field public static final accessibility_custom_action_18:I = 0x7f0a0017
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
-.field public static final accessibility_custom_action_19:I = 0x7f0a0018
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
-.field public static final accessibility_custom_action_2:I = 0x7f0a0019
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
-.field public static final accessibility_custom_action_20:I = 0x7f0a001a
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
-.field public static final accessibility_custom_action_21:I = 0x7f0a001b
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
-.field public static final accessibility_custom_action_22:I = 0x7f0a001c
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
-.field public static final accessibility_custom_action_23:I = 0x7f0a001d
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
-.field public static final accessibility_custom_action_24:I = 0x7f0a001e
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
-.field public static final accessibility_custom_action_25:I = 0x7f0a001f
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
-.field public static final accessibility_custom_action_26:I = 0x7f0a0020
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
-.field public static final accessibility_custom_action_27:I = 0x7f0a0021
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
-.field public static final accessibility_custom_action_28:I = 0x7f0a0022
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
-.field public static final accessibility_custom_action_29:I = 0x7f0a0023
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
-.field public static final accessibility_custom_action_3:I = 0x7f0a0024
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
-.field public static final accessibility_custom_action_30:I = 0x7f0a0025
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
-.field public static final accessibility_custom_action_31:I = 0x7f0a0026
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
-.field public static final accessibility_custom_action_4:I = 0x7f0a0027
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
-.field public static final accessibility_custom_action_5:I = 0x7f0a0028
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
-.field public static final accessibility_custom_action_6:I = 0x7f0a0029
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
-.field public static final accessibility_custom_action_7:I = 0x7f0a002a
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
-.field public static final accessibility_custom_action_8:I = 0x7f0a002b
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
-.field public static final accessibility_custom_action_9:I = 0x7f0a002c
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final dialog_button:I = 0x7f0a0267
+.field public static final dialog_button:I = 0x7f0a0272
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_accessibility_actions:I = 0x7f0a07c7
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07c8
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
-.field public static final tag_accessibility_heading:I = 0x7f0a07c9
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
-.field public static final tag_accessibility_pane_title:I = 0x7f0a07ca
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
-.field public static final tag_screen_reader_focusable:I = 0x7f0a07cb
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$integer.smali b/com.discord/smali/androidx/vectordrawable/animated/R$integer.smali
index d71742f086..b2f9b77c62 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$integer.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$layout.smali b/com.discord/smali/androidx/vectordrawable/animated/R$layout.smali
index 96336ecde7..ee813b7361 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$layout.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$layout.smali
@@ -17,17 +17,17 @@
# static fields
.field public static final custom_dialog:I = 0x7f0d0023
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
index f102cfdfc9..db860572da 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$style.smali b/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
index 3848af8aaa..f1af498321 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
index 4477f56186..ea5993d65f 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/viewpager/R$attr.smali b/com.discord/smali/androidx/viewpager/R$attr.smali
index b00012aab5..f3d04f0889 100644
--- a/com.discord/smali/androidx/viewpager/R$attr.smali
+++ b/com.discord/smali/androidx/viewpager/R$attr.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final alpha:I = 0x7f040034
+.field public static final alpha:I = 0x7f040035
-.field public static final font:I = 0x7f040174
+.field public static final font:I = 0x7f0401b6
-.field public static final fontProviderAuthority:I = 0x7f040176
+.field public static final fontProviderAuthority:I = 0x7f0401b8
-.field public static final fontProviderCerts:I = 0x7f040177
+.field public static final fontProviderCerts:I = 0x7f0401b9
-.field public static final fontProviderFetchStrategy:I = 0x7f040178
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
-.field public static final fontProviderFetchTimeout:I = 0x7f040179
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
-.field public static final fontProviderPackage:I = 0x7f04017a
+.field public static final fontProviderPackage:I = 0x7f0401bc
-.field public static final fontProviderQuery:I = 0x7f04017b
+.field public static final fontProviderQuery:I = 0x7f0401bd
-.field public static final fontStyle:I = 0x7f04017c
+.field public static final fontStyle:I = 0x7f0401be
-.field public static final fontVariationSettings:I = 0x7f04017d
+.field public static final fontVariationSettings:I = 0x7f0401bf
-.field public static final fontWeight:I = 0x7f04017e
+.field public static final fontWeight:I = 0x7f0401c0
-.field public static final ttcIndex:I = 0x7f040440
+.field public static final ttcIndex:I = 0x7f0404b8
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$color.smali b/com.discord/smali/androidx/viewpager/R$color.smali
index d6faf0c5e9..b7b07fb434 100644
--- a/com.discord/smali/androidx/viewpager/R$color.smali
+++ b/com.discord/smali/androidx/viewpager/R$color.smali
@@ -15,13 +15,13 @@
# static fields
-.field public static final notification_action_color_filter:I = 0x7f0600b2
+.field public static final notification_action_color_filter:I = 0x7f0600f0
-.field public static final notification_icon_bg_color:I = 0x7f0600b3
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
-.field public static final ripple_material_light:I = 0x7f0600fe
+.field public static final ripple_material_light:I = 0x7f06013e
-.field public static final secondary_text_default_material_light:I = 0x7f060100
+.field public static final secondary_text_default_material_light:I = 0x7f060140
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$dimen.smali b/com.discord/smali/androidx/viewpager/R$dimen.smali
index 0f1710c35a..d31dac8311 100644
--- a/com.discord/smali/androidx/viewpager/R$dimen.smali
+++ b/com.discord/smali/androidx/viewpager/R$dimen.smali
@@ -15,49 +15,49 @@
# static fields
-.field public static final compat_button_inset_horizontal_material:I = 0x7f07007a
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
-.field public static final compat_button_inset_vertical_material:I = 0x7f07007b
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
-.field public static final compat_button_padding_horizontal_material:I = 0x7f07007c
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
-.field public static final compat_button_padding_vertical_material:I = 0x7f07007d
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
-.field public static final compat_control_corner_material:I = 0x7f07007e
+.field public static final compat_control_corner_material:I = 0x7f070080
-.field public static final compat_notification_large_icon_max_height:I = 0x7f07007f
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
-.field public static final compat_notification_large_icon_max_width:I = 0x7f070080
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
-.field public static final notification_action_icon_size:I = 0x7f070111
+.field public static final notification_action_icon_size:I = 0x7f07017c
-.field public static final notification_action_text_size:I = 0x7f070112
+.field public static final notification_action_text_size:I = 0x7f07017d
-.field public static final notification_big_circle_margin:I = 0x7f070113
+.field public static final notification_big_circle_margin:I = 0x7f07017e
-.field public static final notification_content_margin_start:I = 0x7f070114
+.field public static final notification_content_margin_start:I = 0x7f07017f
-.field public static final notification_large_icon_height:I = 0x7f070115
+.field public static final notification_large_icon_height:I = 0x7f070180
-.field public static final notification_large_icon_width:I = 0x7f070116
+.field public static final notification_large_icon_width:I = 0x7f070181
-.field public static final notification_main_column_padding_top:I = 0x7f070117
+.field public static final notification_main_column_padding_top:I = 0x7f070182
-.field public static final notification_media_narrow_margin:I = 0x7f070118
+.field public static final notification_media_narrow_margin:I = 0x7f070183
-.field public static final notification_right_icon_size:I = 0x7f070119
+.field public static final notification_right_icon_size:I = 0x7f070184
-.field public static final notification_right_side_padding_top:I = 0x7f07011a
+.field public static final notification_right_side_padding_top:I = 0x7f070185
-.field public static final notification_small_icon_background_padding:I = 0x7f07011b
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
-.field public static final notification_small_icon_size_as_large:I = 0x7f07011c
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
-.field public static final notification_subtext_size:I = 0x7f07011d
+.field public static final notification_subtext_size:I = 0x7f070188
-.field public static final notification_top_pad:I = 0x7f07011e
+.field public static final notification_top_pad:I = 0x7f070189
-.field public static final notification_top_pad_large_text:I = 0x7f07011f
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 2923a22aa4..f174e34ece 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0804ae
+.field public static final notification_action_background:I = 0x7f0804a8
-.field public static final notification_bg:I = 0x7f0804af
+.field public static final notification_bg:I = 0x7f0804a9
-.field public static final notification_bg_low:I = 0x7f0804b0
+.field public static final notification_bg_low:I = 0x7f0804aa
-.field public static final notification_bg_low_normal:I = 0x7f0804b1
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
-.field public static final notification_bg_low_pressed:I = 0x7f0804b2
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
-.field public static final notification_bg_normal:I = 0x7f0804b3
+.field public static final notification_bg_normal:I = 0x7f0804ad
-.field public static final notification_bg_normal_pressed:I = 0x7f0804b4
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
-.field public static final notification_icon_background:I = 0x7f0804b5
+.field public static final notification_icon_background:I = 0x7f0804af
-.field public static final notification_template_icon_bg:I = 0x7f0804b6
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
-.field public static final notification_template_icon_low_bg:I = 0x7f0804b7
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
-.field public static final notification_tile_bg:I = 0x7f0804b8
+.field public static final notification_tile_bg:I = 0x7f0804b2
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b9
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 5f436893ee..29ec474d07 100644
--- a/com.discord/smali/androidx/viewpager/R$id.smali
+++ b/com.discord/smali/androidx/viewpager/R$id.smali
@@ -15,61 +15,61 @@
# static fields
-.field public static final action_container:I = 0x7f0a0039
+.field public static final action_container:I = 0x7f0a003d
-.field public static final action_divider:I = 0x7f0a003b
+.field public static final action_divider:I = 0x7f0a003f
-.field public static final action_image:I = 0x7f0a003c
+.field public static final action_image:I = 0x7f0a0040
-.field public static final action_text:I = 0x7f0a0042
+.field public static final action_text:I = 0x7f0a0046
-.field public static final actions:I = 0x7f0a0043
+.field public static final actions:I = 0x7f0a0047
-.field public static final async:I = 0x7f0a0088
+.field public static final async:I = 0x7f0a008c
-.field public static final blocking:I = 0x7f0a00d6
+.field public static final blocking:I = 0x7f0a00da
-.field public static final chronometer:I = 0x7f0a021f
+.field public static final chronometer:I = 0x7f0a0226
-.field public static final forever:I = 0x7f0a0306
+.field public static final forever:I = 0x7f0a0315
-.field public static final icon:I = 0x7f0a03b4
+.field public static final icon:I = 0x7f0a03c5
-.field public static final icon_group:I = 0x7f0a03b6
+.field public static final icon_group:I = 0x7f0a03c7
-.field public static final info:I = 0x7f0a03cb
+.field public static final info:I = 0x7f0a03dc
-.field public static final italic:I = 0x7f0a03f8
+.field public static final italic:I = 0x7f0a0409
-.field public static final line1:I = 0x7f0a0440
+.field public static final line1:I = 0x7f0a0451
-.field public static final line3:I = 0x7f0a0441
+.field public static final line3:I = 0x7f0a0452
-.field public static final normal:I = 0x7f0a04ce
+.field public static final normal:I = 0x7f0a04f8
-.field public static final notification_background:I = 0x7f0a04d8
+.field public static final notification_background:I = 0x7f0a0502
-.field public static final notification_main_column:I = 0x7f0a04d9
+.field public static final notification_main_column:I = 0x7f0a0503
-.field public static final notification_main_column_container:I = 0x7f0a04da
+.field public static final notification_main_column_container:I = 0x7f0a0504
-.field public static final right_icon:I = 0x7f0a05e1
+.field public static final right_icon:I = 0x7f0a060d
-.field public static final right_side:I = 0x7f0a05e2
+.field public static final right_side:I = 0x7f0a060e
-.field public static final tag_transition_group:I = 0x7f0a07cc
+.field public static final tag_transition_group:I = 0x7f0a07fb
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07cd
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a07ce
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
-.field public static final text:I = 0x7f0a07d4
+.field public static final text:I = 0x7f0a0805
-.field public static final text2:I = 0x7f0a07d5
+.field public static final text2:I = 0x7f0a0806
-.field public static final time:I = 0x7f0a07e2
+.field public static final time:I = 0x7f0a0815
-.field public static final title:I = 0x7f0a07e3
+.field public static final title:I = 0x7f0a0816
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$integer.smali b/com.discord/smali/androidx/viewpager/R$integer.smali
index 2c8d1f0828..1eb8e8ff49 100644
--- a/com.discord/smali/androidx/viewpager/R$integer.smali
+++ b/com.discord/smali/androidx/viewpager/R$integer.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0010
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$layout.smali b/com.discord/smali/androidx/viewpager/R$layout.smali
index 32c6c3f96d..c065a8a0e7 100644
--- a/com.discord/smali/androidx/viewpager/R$layout.smali
+++ b/com.discord/smali/androidx/viewpager/R$layout.smali
@@ -15,17 +15,17 @@
# static fields
-.field public static final notification_action:I = 0x7f0d004b
+.field public static final notification_action:I = 0x7f0d0066
-.field public static final notification_action_tombstone:I = 0x7f0d004c
+.field public static final notification_action_tombstone:I = 0x7f0d0067
-.field public static final notification_template_custom_big:I = 0x7f0d0054
+.field public static final notification_template_custom_big:I = 0x7f0d006f
-.field public static final notification_template_icon_group:I = 0x7f0d0055
+.field public static final notification_template_icon_group:I = 0x7f0d0070
-.field public static final notification_template_part_chronometer:I = 0x7f0d0059
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
-.field public static final notification_template_part_time:I = 0x7f0d005a
+.field public static final notification_template_part_time:I = 0x7f0d0075
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 5bc32e4dbb..48a2390676 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121151
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$style.smali b/com.discord/smali/androidx/viewpager/R$style.smali
index 7a4f6271bf..28d307329a 100644
--- a/com.discord/smali/androidx/viewpager/R$style.smali
+++ b/com.discord/smali/androidx/viewpager/R$style.smali
@@ -15,19 +15,19 @@
# static fields
-.field public static final TextAppearance_Compat_Notification:I = 0x7f1301b0
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
-.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301b1
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
-.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301b3
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
-.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301b6
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
-.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301b8
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
-.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f130333
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
-.field public static final Widget_Compat_NotificationActionText:I = 0x7f130334
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali
index 883745ff4a..4b7a164cc2 100644
--- a/com.discord/smali/androidx/viewpager/R$styleable.smali
+++ b/com.discord/smali/androidx/viewpager/R$styleable.smali
@@ -144,17 +144,17 @@
.array-data 4
0x10101a5
0x101031f
- 0x7f040034
+ 0x7f040035
.end array-data
:array_1
.array-data 4
- 0x7f040176
- 0x7f040177
- 0x7f040178
- 0x7f040179
- 0x7f04017a
- 0x7f04017b
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
.end array-data
:array_2
@@ -164,11 +164,11 @@
0x101053f
0x101056f
0x1010570
- 0x7f040174
- 0x7f04017c
- 0x7f04017d
- 0x7f04017e
- 0x7f040440
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
.end array-data
:array_3
diff --git a/com.discord/smali/androidx/viewpager2/R$attr.smali b/com.discord/smali/androidx/viewpager2/R$attr.smali
new file mode 100644
index 0000000000..be5330b946
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$attr.smali
@@ -0,0 +1,70 @@
+.class public final Landroidx/viewpager2/R$attr;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "attr"
+.end annotation
+
+
+# static fields
+.field public static final alpha:I = 0x7f040035
+
+.field public static final fastScrollEnabled:I = 0x7f0401a3
+
+.field public static final fastScrollHorizontalThumbDrawable:I = 0x7f0401a4
+
+.field public static final fastScrollHorizontalTrackDrawable:I = 0x7f0401a5
+
+.field public static final fastScrollVerticalThumbDrawable:I = 0x7f0401a6
+
+.field public static final fastScrollVerticalTrackDrawable:I = 0x7f0401a7
+
+.field public static final font:I = 0x7f0401b6
+
+.field public static final fontProviderAuthority:I = 0x7f0401b8
+
+.field public static final fontProviderCerts:I = 0x7f0401b9
+
+.field public static final fontProviderFetchStrategy:I = 0x7f0401ba
+
+.field public static final fontProviderFetchTimeout:I = 0x7f0401bb
+
+.field public static final fontProviderPackage:I = 0x7f0401bc
+
+.field public static final fontProviderQuery:I = 0x7f0401bd
+
+.field public static final fontStyle:I = 0x7f0401be
+
+.field public static final fontVariationSettings:I = 0x7f0401bf
+
+.field public static final fontWeight:I = 0x7f0401c0
+
+.field public static final layoutManager:I = 0x7f0402a7
+
+.field public static final recyclerViewStyle:I = 0x7f04039e
+
+.field public static final reverseLayout:I = 0x7f0403a1
+
+.field public static final spanCount:I = 0x7f0403e6
+
+.field public static final stackFromEnd:I = 0x7f0403ed
+
+.field public static final ttcIndex:I = 0x7f0404b8
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$color.smali b/com.discord/smali/androidx/viewpager2/R$color.smali
new file mode 100644
index 0000000000..e85e444a02
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$color.smali
@@ -0,0 +1,34 @@
+.class public final Landroidx/viewpager2/R$color;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "color"
+.end annotation
+
+
+# static fields
+.field public static final notification_action_color_filter:I = 0x7f0600f0
+
+.field public static final notification_icon_bg_color:I = 0x7f0600f1
+
+.field public static final ripple_material_light:I = 0x7f06013e
+
+.field public static final secondary_text_default_material_light:I = 0x7f060140
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$dimen.smali b/com.discord/smali/androidx/viewpager2/R$dimen.smali
new file mode 100644
index 0000000000..a8c4f641d9
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$dimen.smali
@@ -0,0 +1,82 @@
+.class public final Landroidx/viewpager2/R$dimen;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "dimen"
+.end annotation
+
+
+# static fields
+.field public static final compat_button_inset_horizontal_material:I = 0x7f07007c
+
+.field public static final compat_button_inset_vertical_material:I = 0x7f07007d
+
+.field public static final compat_button_padding_horizontal_material:I = 0x7f07007e
+
+.field public static final compat_button_padding_vertical_material:I = 0x7f07007f
+
+.field public static final compat_control_corner_material:I = 0x7f070080
+
+.field public static final compat_notification_large_icon_max_height:I = 0x7f070081
+
+.field public static final compat_notification_large_icon_max_width:I = 0x7f070082
+
+.field public static final fastscroll_default_thickness:I = 0x7f0700c3
+
+.field public static final fastscroll_margin:I = 0x7f0700c4
+
+.field public static final fastscroll_minimum_range:I = 0x7f0700c5
+
+.field public static final item_touch_helper_max_drag_scroll_per_frame:I = 0x7f0700d9
+
+.field public static final item_touch_helper_swipe_escape_max_velocity:I = 0x7f0700da
+
+.field public static final item_touch_helper_swipe_escape_velocity:I = 0x7f0700db
+
+.field public static final notification_action_icon_size:I = 0x7f07017c
+
+.field public static final notification_action_text_size:I = 0x7f07017d
+
+.field public static final notification_big_circle_margin:I = 0x7f07017e
+
+.field public static final notification_content_margin_start:I = 0x7f07017f
+
+.field public static final notification_large_icon_height:I = 0x7f070180
+
+.field public static final notification_large_icon_width:I = 0x7f070181
+
+.field public static final notification_main_column_padding_top:I = 0x7f070182
+
+.field public static final notification_media_narrow_margin:I = 0x7f070183
+
+.field public static final notification_right_icon_size:I = 0x7f070184
+
+.field public static final notification_right_side_padding_top:I = 0x7f070185
+
+.field public static final notification_small_icon_background_padding:I = 0x7f070186
+
+.field public static final notification_small_icon_size_as_large:I = 0x7f070187
+
+.field public static final notification_subtext_size:I = 0x7f070188
+
+.field public static final notification_top_pad:I = 0x7f070189
+
+.field public static final notification_top_pad_large_text:I = 0x7f07018a
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali
new file mode 100644
index 0000000000..2f7105a3ac
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali
@@ -0,0 +1,50 @@
+.class public final Landroidx/viewpager2/R$drawable;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "drawable"
+.end annotation
+
+
+# static fields
+.field public static final notification_action_background:I = 0x7f0804a8
+
+.field public static final notification_bg:I = 0x7f0804a9
+
+.field public static final notification_bg_low:I = 0x7f0804aa
+
+.field public static final notification_bg_low_normal:I = 0x7f0804ab
+
+.field public static final notification_bg_low_pressed:I = 0x7f0804ac
+
+.field public static final notification_bg_normal:I = 0x7f0804ad
+
+.field public static final notification_bg_normal_pressed:I = 0x7f0804ae
+
+.field public static final notification_icon_background:I = 0x7f0804af
+
+.field public static final notification_template_icon_bg:I = 0x7f0804b0
+
+.field public static final notification_template_icon_low_bg:I = 0x7f0804b1
+
+.field public static final notification_tile_bg:I = 0x7f0804b2
+
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0804b3
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$id.smali b/com.discord/smali/androidx/viewpager2/R$id.smali
new file mode 100644
index 0000000000..90e35dd46b
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$id.smali
@@ -0,0 +1,162 @@
+.class public final Landroidx/viewpager2/R$id;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "id"
+.end annotation
+
+
+# static fields
+.field public static final accessibility_action_clickable_span:I = 0x7f0a0010
+
+.field public static final accessibility_custom_action_0:I = 0x7f0a0011
+
+.field public static final accessibility_custom_action_1:I = 0x7f0a0012
+
+.field public static final accessibility_custom_action_10:I = 0x7f0a0013
+
+.field public static final accessibility_custom_action_11:I = 0x7f0a0014
+
+.field public static final accessibility_custom_action_12:I = 0x7f0a0015
+
+.field public static final accessibility_custom_action_13:I = 0x7f0a0016
+
+.field public static final accessibility_custom_action_14:I = 0x7f0a0017
+
+.field public static final accessibility_custom_action_15:I = 0x7f0a0018
+
+.field public static final accessibility_custom_action_16:I = 0x7f0a0019
+
+.field public static final accessibility_custom_action_17:I = 0x7f0a001a
+
+.field public static final accessibility_custom_action_18:I = 0x7f0a001b
+
+.field public static final accessibility_custom_action_19:I = 0x7f0a001c
+
+.field public static final accessibility_custom_action_2:I = 0x7f0a001d
+
+.field public static final accessibility_custom_action_20:I = 0x7f0a001e
+
+.field public static final accessibility_custom_action_21:I = 0x7f0a001f
+
+.field public static final accessibility_custom_action_22:I = 0x7f0a0020
+
+.field public static final accessibility_custom_action_23:I = 0x7f0a0021
+
+.field public static final accessibility_custom_action_24:I = 0x7f0a0022
+
+.field public static final accessibility_custom_action_25:I = 0x7f0a0023
+
+.field public static final accessibility_custom_action_26:I = 0x7f0a0024
+
+.field public static final accessibility_custom_action_27:I = 0x7f0a0025
+
+.field public static final accessibility_custom_action_28:I = 0x7f0a0026
+
+.field public static final accessibility_custom_action_29:I = 0x7f0a0027
+
+.field public static final accessibility_custom_action_3:I = 0x7f0a0028
+
+.field public static final accessibility_custom_action_30:I = 0x7f0a0029
+
+.field public static final accessibility_custom_action_31:I = 0x7f0a002a
+
+.field public static final accessibility_custom_action_4:I = 0x7f0a002b
+
+.field public static final accessibility_custom_action_5:I = 0x7f0a002c
+
+.field public static final accessibility_custom_action_6:I = 0x7f0a002d
+
+.field public static final accessibility_custom_action_7:I = 0x7f0a002e
+
+.field public static final accessibility_custom_action_8:I = 0x7f0a002f
+
+.field public static final accessibility_custom_action_9:I = 0x7f0a0030
+
+.field public static final action_container:I = 0x7f0a003d
+
+.field public static final action_divider:I = 0x7f0a003f
+
+.field public static final action_image:I = 0x7f0a0040
+
+.field public static final action_text:I = 0x7f0a0046
+
+.field public static final actions:I = 0x7f0a0047
+
+.field public static final async:I = 0x7f0a008c
+
+.field public static final blocking:I = 0x7f0a00da
+
+.field public static final chronometer:I = 0x7f0a0226
+
+.field public static final dialog_button:I = 0x7f0a0272
+
+.field public static final forever:I = 0x7f0a0315
+
+.field public static final icon:I = 0x7f0a03c5
+
+.field public static final icon_group:I = 0x7f0a03c7
+
+.field public static final info:I = 0x7f0a03dc
+
+.field public static final italic:I = 0x7f0a0409
+
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0441
+
+.field public static final line1:I = 0x7f0a0451
+
+.field public static final line3:I = 0x7f0a0452
+
+.field public static final normal:I = 0x7f0a04f8
+
+.field public static final notification_background:I = 0x7f0a0502
+
+.field public static final notification_main_column:I = 0x7f0a0503
+
+.field public static final notification_main_column_container:I = 0x7f0a0504
+
+.field public static final right_icon:I = 0x7f0a060d
+
+.field public static final right_side:I = 0x7f0a060e
+
+.field public static final tag_accessibility_actions:I = 0x7f0a07f6
+
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a07f7
+
+.field public static final tag_accessibility_heading:I = 0x7f0a07f8
+
+.field public static final tag_accessibility_pane_title:I = 0x7f0a07f9
+
+.field public static final tag_screen_reader_focusable:I = 0x7f0a07fa
+
+.field public static final tag_transition_group:I = 0x7f0a07fb
+
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a07fc
+
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a07fd
+
+.field public static final text:I = 0x7f0a0805
+
+.field public static final text2:I = 0x7f0a0806
+
+.field public static final time:I = 0x7f0a0815
+
+.field public static final title:I = 0x7f0a0816
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$integer.smali b/com.discord/smali/androidx/viewpager2/R$integer.smali
new file mode 100644
index 0000000000..114773495f
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$integer.smali
@@ -0,0 +1,28 @@
+.class public final Landroidx/viewpager2/R$integer;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "integer"
+.end annotation
+
+
+# static fields
+.field public static final status_bar_notification_info_maxnum:I = 0x7f0b0016
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$layout.smali b/com.discord/smali/androidx/viewpager2/R$layout.smali
new file mode 100644
index 0000000000..ba4d8f3ab0
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$layout.smali
@@ -0,0 +1,40 @@
+.class public final Landroidx/viewpager2/R$layout;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "layout"
+.end annotation
+
+
+# static fields
+.field public static final custom_dialog:I = 0x7f0d0023
+
+.field public static final notification_action:I = 0x7f0d0066
+
+.field public static final notification_action_tombstone:I = 0x7f0d0067
+
+.field public static final notification_template_custom_big:I = 0x7f0d006f
+
+.field public static final notification_template_icon_group:I = 0x7f0d0070
+
+.field public static final notification_template_part_chronometer:I = 0x7f0d0074
+
+.field public static final notification_template_part_time:I = 0x7f0d0075
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
new file mode 100644
index 0000000000..77eb329a79
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -0,0 +1,28 @@
+.class public final Landroidx/viewpager2/R$string;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "string"
+.end annotation
+
+
+# static fields
+.field public static final status_bar_notification_info_overflow:I = 0x7f121181
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$style.smali b/com.discord/smali/androidx/viewpager2/R$style.smali
new file mode 100644
index 0000000000..6d6b2c0e42
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$style.smali
@@ -0,0 +1,40 @@
+.class public final Landroidx/viewpager2/R$style;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "style"
+.end annotation
+
+
+# static fields
+.field public static final TextAppearance_Compat_Notification:I = 0x7f1301ee
+
+.field public static final TextAppearance_Compat_Notification_Info:I = 0x7f1301ef
+
+.field public static final TextAppearance_Compat_Notification_Line2:I = 0x7f1301f1
+
+.field public static final TextAppearance_Compat_Notification_Time:I = 0x7f1301f4
+
+.field public static final TextAppearance_Compat_Notification_Title:I = 0x7f1301f6
+
+.field public static final Widget_Compat_NotificationActionContainer:I = 0x7f13039b
+
+.field public static final Widget_Compat_NotificationActionText:I = 0x7f13039c
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R$styleable.smali b/com.discord/smali/androidx/viewpager2/R$styleable.smali
new file mode 100644
index 0000000000..2d188ab3b8
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R$styleable.smali
@@ -0,0 +1,267 @@
+.class public final Landroidx/viewpager2/R$styleable;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/R;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "styleable"
+.end annotation
+
+
+# static fields
+.field public static final ColorStateListItem:[I
+
+.field public static final ColorStateListItem_alpha:I = 0x2
+
+.field public static final ColorStateListItem_android_alpha:I = 0x1
+
+.field public static final ColorStateListItem_android_color:I = 0x0
+
+.field public static final FontFamily:[I
+
+.field public static final FontFamilyFont:[I
+
+.field public static final FontFamilyFont_android_font:I = 0x0
+
+.field public static final FontFamilyFont_android_fontStyle:I = 0x2
+
+.field public static final FontFamilyFont_android_fontVariationSettings:I = 0x4
+
+.field public static final FontFamilyFont_android_fontWeight:I = 0x1
+
+.field public static final FontFamilyFont_android_ttcIndex:I = 0x3
+
+.field public static final FontFamilyFont_font:I = 0x5
+
+.field public static final FontFamilyFont_fontStyle:I = 0x6
+
+.field public static final FontFamilyFont_fontVariationSettings:I = 0x7
+
+.field public static final FontFamilyFont_fontWeight:I = 0x8
+
+.field public static final FontFamilyFont_ttcIndex:I = 0x9
+
+.field public static final FontFamily_fontProviderAuthority:I = 0x0
+
+.field public static final FontFamily_fontProviderCerts:I = 0x1
+
+.field public static final FontFamily_fontProviderFetchStrategy:I = 0x2
+
+.field public static final FontFamily_fontProviderFetchTimeout:I = 0x3
+
+.field public static final FontFamily_fontProviderPackage:I = 0x4
+
+.field public static final FontFamily_fontProviderQuery:I = 0x5
+
+.field public static final GradientColor:[I
+
+.field public static final GradientColorItem:[I
+
+.field public static final GradientColorItem_android_color:I = 0x0
+
+.field public static final GradientColorItem_android_offset:I = 0x1
+
+.field public static final GradientColor_android_centerColor:I = 0x7
+
+.field public static final GradientColor_android_centerX:I = 0x3
+
+.field public static final GradientColor_android_centerY:I = 0x4
+
+.field public static final GradientColor_android_endColor:I = 0x1
+
+.field public static final GradientColor_android_endX:I = 0xa
+
+.field public static final GradientColor_android_endY:I = 0xb
+
+.field public static final GradientColor_android_gradientRadius:I = 0x5
+
+.field public static final GradientColor_android_startColor:I = 0x0
+
+.field public static final GradientColor_android_startX:I = 0x8
+
+.field public static final GradientColor_android_startY:I = 0x9
+
+.field public static final GradientColor_android_tileMode:I = 0x6
+
+.field public static final GradientColor_android_type:I = 0x2
+
+.field public static final RecyclerView:[I
+
+.field public static final RecyclerView_android_clipToPadding:I = 0x1
+
+.field public static final RecyclerView_android_descendantFocusability:I = 0x2
+
+.field public static final RecyclerView_android_orientation:I = 0x0
+
+.field public static final RecyclerView_fastScrollEnabled:I = 0x3
+
+.field public static final RecyclerView_fastScrollHorizontalThumbDrawable:I = 0x4
+
+.field public static final RecyclerView_fastScrollHorizontalTrackDrawable:I = 0x5
+
+.field public static final RecyclerView_fastScrollVerticalThumbDrawable:I = 0x6
+
+.field public static final RecyclerView_fastScrollVerticalTrackDrawable:I = 0x7
+
+.field public static final RecyclerView_layoutManager:I = 0x8
+
+.field public static final RecyclerView_reverseLayout:I = 0x9
+
+.field public static final RecyclerView_spanCount:I = 0xa
+
+.field public static final RecyclerView_stackFromEnd:I = 0xb
+
+.field public static final ViewPager2:[I
+
+.field public static final ViewPager2_android_orientation:I
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 3
+
+ const/4 v0, 0x3
+
+ new-array v0, v0, [I
+
+ fill-array-data v0, :array_0
+
+ sput-object v0, Landroidx/viewpager2/R$styleable;->ColorStateListItem:[I
+
+ const/4 v0, 0x6
+
+ new-array v0, v0, [I
+
+ fill-array-data v0, :array_1
+
+ sput-object v0, Landroidx/viewpager2/R$styleable;->FontFamily:[I
+
+ const/16 v0, 0xa
+
+ new-array v0, v0, [I
+
+ fill-array-data v0, :array_2
+
+ sput-object v0, Landroidx/viewpager2/R$styleable;->FontFamilyFont:[I
+
+ const/16 v0, 0xc
+
+ new-array v1, v0, [I
+
+ fill-array-data v1, :array_3
+
+ sput-object v1, Landroidx/viewpager2/R$styleable;->GradientColor:[I
+
+ const/4 v1, 0x2
+
+ new-array v1, v1, [I
+
+ fill-array-data v1, :array_4
+
+ sput-object v1, Landroidx/viewpager2/R$styleable;->GradientColorItem:[I
+
+ new-array v0, v0, [I
+
+ fill-array-data v0, :array_5
+
+ sput-object v0, Landroidx/viewpager2/R$styleable;->RecyclerView:[I
+
+ const/4 v0, 0x1
+
+ new-array v0, v0, [I
+
+ const/4 v1, 0x0
+
+ const v2, 0x10100c4
+
+ aput v2, v0, v1
+
+ sput-object v0, Landroidx/viewpager2/R$styleable;->ViewPager2:[I
+
+ return-void
+
+ nop
+
+ :array_0
+ .array-data 4
+ 0x10101a5
+ 0x101031f
+ 0x7f040035
+ .end array-data
+
+ :array_1
+ .array-data 4
+ 0x7f0401b8
+ 0x7f0401b9
+ 0x7f0401ba
+ 0x7f0401bb
+ 0x7f0401bc
+ 0x7f0401bd
+ .end array-data
+
+ :array_2
+ .array-data 4
+ 0x1010532
+ 0x1010533
+ 0x101053f
+ 0x101056f
+ 0x1010570
+ 0x7f0401b6
+ 0x7f0401be
+ 0x7f0401bf
+ 0x7f0401c0
+ 0x7f0404b8
+ .end array-data
+
+ :array_3
+ .array-data 4
+ 0x101019d
+ 0x101019e
+ 0x10101a1
+ 0x10101a2
+ 0x10101a3
+ 0x10101a4
+ 0x1010201
+ 0x101020b
+ 0x1010510
+ 0x1010511
+ 0x1010512
+ 0x1010513
+ .end array-data
+
+ :array_4
+ .array-data 4
+ 0x10101a5
+ 0x1010514
+ .end array-data
+
+ :array_5
+ .array-data 4
+ 0x10100c4
+ 0x10100eb
+ 0x10100f1
+ 0x7f0401a3
+ 0x7f0401a4
+ 0x7f0401a5
+ 0x7f0401a6
+ 0x7f0401a7
+ 0x7f0402a7
+ 0x7f0403a1
+ 0x7f0403e6
+ 0x7f0403ed
+ .end array-data
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/R.smali b/com.discord/smali/androidx/viewpager2/R.smali
new file mode 100644
index 0000000000..375f6471a5
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/R.smali
@@ -0,0 +1,30 @@
+.class public final Landroidx/viewpager2/R;
+.super Ljava/lang/Object;
+.source "R.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Landroidx/viewpager2/R$styleable;,
+ Landroidx/viewpager2/R$style;,
+ Landroidx/viewpager2/R$string;,
+ Landroidx/viewpager2/R$layout;,
+ Landroidx/viewpager2/R$integer;,
+ Landroidx/viewpager2/R$id;,
+ Landroidx/viewpager2/R$drawable;,
+ Landroidx/viewpager2/R$dimen;,
+ Landroidx/viewpager2/R$color;,
+ Landroidx/viewpager2/R$attr;
+ }
+.end annotation
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$1.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$1.smali
new file mode 100644
index 0000000000..b1db5bc4ab
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$1.smali
@@ -0,0 +1,68 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$1;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Landroid/view/View$OnLayoutChangeListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;->onBindViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;I)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+.field public final synthetic val$container:Landroid/widget/FrameLayout;
+
+.field public final synthetic val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroid/widget/FrameLayout;Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iput-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->val$container:Landroid/widget/FrameLayout;
+
+ iput-object p3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onLayoutChange(Landroid/view/View;IIIIIIII)V
+ .locals 0
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->val$container:Landroid/widget/FrameLayout;
+
+ invoke-virtual {p1}, Landroid/widget/FrameLayout;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->val$container:Landroid/widget/FrameLayout;
+
+ invoke-virtual {p1, p0}, Landroid/widget/FrameLayout;->removeOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->placeFragmentInViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$2.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$2.smali
new file mode 100644
index 0000000000..ea5a4ab346
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$2.smali
@@ -0,0 +1,89 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$2;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Landroidx/lifecycle/LifecycleEventObserver;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;->placeFragmentInViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+.field public final synthetic val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iput-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+ .locals 0
+ .param p1 # Landroidx/lifecycle/LifecycleOwner;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/lifecycle/Lifecycle$Event;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->shouldDelayFragmentTransactions()Z
+
+ move-result p2
+
+ if-eqz p2, :cond_0
+
+ return-void
+
+ :cond_0
+ invoke-interface {p1}, Landroidx/lifecycle/LifecycleOwner;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+ move-result-object p1
+
+ invoke-virtual {p1, p0}, Landroidx/lifecycle/Lifecycle;->removeObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->getContainer()Landroid/widget/FrameLayout;
+
+ move-result-object p1
+
+ invoke-static {p1}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_1
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->val$holder:Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->placeFragmentInViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ :cond_1
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$3.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$3.smali
new file mode 100644
index 0000000000..085615133a
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$3.smali
@@ -0,0 +1,75 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$3;
+.super Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;
+.source "FragmentStateAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleViewAttach(Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+.field public final synthetic val$container:Landroid/widget/FrameLayout;
+
+.field public final synthetic val$fragment:Landroidx/fragment/app/Fragment;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iput-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->val$fragment:Landroidx/fragment/app/Fragment;
+
+ iput-object p3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->val$container:Landroid/widget/FrameLayout;
+
+ invoke-direct {p0}, Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onFragmentViewCreated(Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/view/View;Landroid/os/Bundle;)V
+ .locals 0
+ .param p1 # Landroidx/fragment/app/FragmentManager;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/fragment/app/Fragment;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p3 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p4 # Landroid/os/Bundle;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+
+ iget-object p4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->val$fragment:Landroidx/fragment/app/Fragment;
+
+ if-ne p2, p4, :cond_0
+
+ invoke-virtual {p1, p0}, Landroidx/fragment/app/FragmentManager;->unregisterFragmentLifecycleCallbacks(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;)V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->val$container:Landroid/widget/FrameLayout;
+
+ invoke-virtual {p1, p3, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->addViewToContainer(Landroid/view/View;Landroid/widget/FrameLayout;)V
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$4.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$4.smali
new file mode 100644
index 0000000000..0115e2273b
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$4.smali
@@ -0,0 +1,49 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$4;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Ljava/lang/Runnable;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleGracePeriodEnd()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$4;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public run()V
+ .locals 2
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$4;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ const/4 v1, 0x0
+
+ iput-boolean v1, v0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mIsInGracePeriod:Z
+
+ invoke-virtual {v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->gcFragments()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$5.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$5.smali
new file mode 100644
index 0000000000..22631314b6
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$5.smali
@@ -0,0 +1,74 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$5;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Landroidx/lifecycle/LifecycleEventObserver;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleGracePeriodEnd()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+.field public final synthetic val$handler:Landroid/os/Handler;
+
+.field public final synthetic val$runnable:Ljava/lang/Runnable;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroid/os/Handler;Ljava/lang/Runnable;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iput-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->val$handler:Landroid/os/Handler;
+
+ iput-object p3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->val$runnable:Ljava/lang/Runnable;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+ .locals 1
+ .param p1 # Landroidx/lifecycle/LifecycleOwner;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/lifecycle/Lifecycle$Event;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ sget-object v0, Landroidx/lifecycle/Lifecycle$Event;->ON_DESTROY:Landroidx/lifecycle/Lifecycle$Event;
+
+ if-ne p2, v0, :cond_0
+
+ iget-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->val$handler:Landroid/os/Handler;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->val$runnable:Ljava/lang/Runnable;
+
+ invoke-virtual {p2, v0}, Landroid/os/Handler;->removeCallbacks(Ljava/lang/Runnable;)V
+
+ invoke-interface {p1}, Landroidx/lifecycle/LifecycleOwner;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+ move-result-object p1
+
+ invoke-virtual {p1, p0}, Landroidx/lifecycle/Lifecycle;->removeObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver.smali
new file mode 100644
index 0000000000..eca6672ff6
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver.smali
@@ -0,0 +1,81 @@
+.class public abstract Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;
+.super Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+.source "FragmentStateAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x409
+ name = "DataSetChangeObserver"
+.end annotation
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;->()V
+
+ return-void
+.end method
+
+.method public synthetic constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter$1;)V
+ .locals 0
+
+ invoke-direct {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public abstract onChanged()V
+.end method
+
+.method public final onItemRangeChanged(II)V
+ .locals 0
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->onChanged()V
+
+ return-void
+.end method
+
+.method public final onItemRangeChanged(IILjava/lang/Object;)V
+ .locals 0
+ .param p3 # Ljava/lang/Object;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->onChanged()V
+
+ return-void
+.end method
+
+.method public final onItemRangeInserted(II)V
+ .locals 0
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->onChanged()V
+
+ return-void
+.end method
+
+.method public final onItemRangeMoved(III)V
+ .locals 0
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->onChanged()V
+
+ return-void
+.end method
+
+.method public final onItemRangeRemoved(II)V
+ .locals 0
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->onChanged()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1.smali
new file mode 100644
index 0000000000..0ba68a4e4b
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1.smali
@@ -0,0 +1,56 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;
+.super Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+.source "FragmentStateAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->register(Landroidx/recyclerview/widget/RecyclerView;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onPageScrollStateChanged(I)V
+ .locals 1
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p1, v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->updateFragmentMaxLifecycle(Z)V
+
+ return-void
+.end method
+
+.method public onPageSelected(I)V
+ .locals 1
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p1, v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->updateFragmentMaxLifecycle(Z)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2.smali
new file mode 100644
index 0000000000..fbb758f0dc
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2.smali
@@ -0,0 +1,46 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2;
+.super Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;
+.source "FragmentStateAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->register(Landroidx/recyclerview/widget/RecyclerView;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;->(Landroidx/viewpager2/adapter/FragmentStateAdapter$1;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onChanged()V
+ .locals 2
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 v1, 0x1
+
+ invoke-virtual {v0, v1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->updateFragmentMaxLifecycle(Z)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3.smali
new file mode 100644
index 0000000000..8702a1772d
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3.smali
@@ -0,0 +1,55 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Landroidx/lifecycle/LifecycleEventObserver;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->register(Landroidx/recyclerview/widget/RecyclerView;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onStateChanged(Landroidx/lifecycle/LifecycleOwner;Landroidx/lifecycle/Lifecycle$Event;)V
+ .locals 0
+ .param p1 # Landroidx/lifecycle/LifecycleOwner;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/lifecycle/Lifecycle$Event;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3;->this$1:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 p2, 0x0
+
+ invoke-virtual {p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->updateFragmentMaxLifecycle(Z)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer.smali
new file mode 100644
index 0000000000..115dd7efcf
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer.smali
@@ -0,0 +1,394 @@
+.class public Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+.super Ljava/lang/Object;
+.source "FragmentStateAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/adapter/FragmentStateAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = "FragmentMaxLifecycleEnforcer"
+.end annotation
+
+
+# instance fields
+.field public mDataObserver:Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+
+.field public mLifecycleObserver:Landroidx/lifecycle/LifecycleEventObserver;
+
+.field public mPageChangeCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+.field public mPrimaryItemId:J
+
+.field public mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+.field public final synthetic this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/adapter/FragmentStateAdapter;)V
+ .locals 2
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ const-wide/16 v0, -0x1
+
+ iput-wide v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPrimaryItemId:J
+
+ return-void
+.end method
+
+.method private inferViewPager(Landroidx/recyclerview/widget/RecyclerView;)Landroidx/viewpager2/widget/ViewPager2;
+ .locals 3
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ invoke-virtual {p1}, Landroid/view/ViewGroup;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ instance-of v0, p1, Landroidx/viewpager2/widget/ViewPager2;
+
+ if-eqz v0, :cond_0
+
+ check-cast p1, Landroidx/viewpager2/widget/ViewPager2;
+
+ return-object p1
+
+ :cond_0
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ new-instance v1, Ljava/lang/StringBuilder;
+
+ invoke-direct {v1}, Ljava/lang/StringBuilder;->()V
+
+ const-string v2, "Expected ViewPager2 instance. Got: "
+
+ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-direct {v0, p1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+
+# virtual methods
+.method public register(Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 1
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->inferViewPager(Landroidx/recyclerview/widget/RecyclerView;)Landroidx/viewpager2/widget/ViewPager2;
+
+ move-result-object p1
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ new-instance p1, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;
+
+ invoke-direct {p1, p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$1;->(Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPageChangeCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPageChangeCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ invoke-virtual {p1, v0}, Landroidx/viewpager2/widget/ViewPager2;->registerOnPageChangeCallback(Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;)V
+
+ new-instance p1, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2;
+
+ invoke-direct {p1, p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$2;->(Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mDataObserver:Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mDataObserver:Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+
+ invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->registerAdapterDataObserver(Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;)V
+
+ new-instance p1, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3;
+
+ invoke-direct {p1, p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer$3;->(Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;)V
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mLifecycleObserver:Landroidx/lifecycle/LifecycleEventObserver;
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p1, p1, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mLifecycleObserver:Landroidx/lifecycle/LifecycleEventObserver;
+
+ invoke-virtual {p1, v0}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ return-void
+.end method
+
+.method public unregister(Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 1
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->inferViewPager(Landroidx/recyclerview/widget/RecyclerView;)Landroidx/viewpager2/widget/ViewPager2;
+
+ move-result-object p1
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPageChangeCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ invoke-virtual {p1, v0}, Landroidx/viewpager2/widget/ViewPager2;->unregisterOnPageChangeCallback(Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;)V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mDataObserver:Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;
+
+ invoke-virtual {p1, v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->unregisterAdapterDataObserver(Landroidx/recyclerview/widget/RecyclerView$AdapterDataObserver;)V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p1, p1, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mLifecycleObserver:Landroidx/lifecycle/LifecycleEventObserver;
+
+ invoke-virtual {p1, v0}, Landroidx/lifecycle/Lifecycle;->removeObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ const/4 p1, 0x0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ return-void
+.end method
+
+.method public updateFragmentMaxLifecycle(Z)V
+ .locals 9
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->shouldDelayFragmentTransactions()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ return-void
+
+ :cond_0
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->getScrollState()I
+
+ move-result v0
+
+ if-eqz v0, :cond_1
+
+ return-void
+
+ :cond_1
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v0, v0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0}, Landroidx/collection/LongSparseArray;->isEmpty()Z
+
+ move-result v0
+
+ if-nez v0, :cond_b
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->getItemCount()I
+
+ move-result v0
+
+ if-nez v0, :cond_2
+
+ goto/16 :goto_4
+
+ :cond_2
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->getCurrentItem()I
+
+ move-result v0
+
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->getItemCount()I
+
+ move-result v1
+
+ if-lt v0, v1, :cond_3
+
+ return-void
+
+ :cond_3
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {v1, v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->getItemId(I)J
+
+ move-result-wide v0
+
+ iget-wide v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPrimaryItemId:J
+
+ cmp-long v4, v0, v2
+
+ if-nez v4, :cond_4
+
+ if-nez p1, :cond_4
+
+ return-void
+
+ :cond_4
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p1, p1, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {p1, v0, v1}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Landroidx/fragment/app/Fragment;
+
+ if-eqz p1, :cond_b
+
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result p1
+
+ if-nez p1, :cond_5
+
+ goto :goto_4
+
+ :cond_5
+ iput-wide v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPrimaryItemId:J
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object p1, p1, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {p1}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object p1
+
+ const/4 v0, 0x0
+
+ const/4 v1, 0x0
+
+ move-object v2, v0
+
+ const/4 v0, 0x0
+
+ :goto_0
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v3, v3, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v3
+
+ if-ge v0, v3, :cond_9
+
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v3, v3, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3, v0}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v3
+
+ iget-object v5, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->this$0:Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ iget-object v5, v5, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v5, v0}, Landroidx/collection/LongSparseArray;->valueAt(I)Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Landroidx/fragment/app/Fragment;
+
+ invoke-virtual {v5}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v6
+
+ if-nez v6, :cond_6
+
+ goto :goto_3
+
+ :cond_6
+ iget-wide v6, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPrimaryItemId:J
+
+ cmp-long v8, v3, v6
+
+ if-eqz v8, :cond_7
+
+ sget-object v6, Landroidx/lifecycle/Lifecycle$State;->STARTED:Landroidx/lifecycle/Lifecycle$State;
+
+ invoke-virtual {p1, v5, v6}, Landroidx/fragment/app/FragmentTransaction;->setMaxLifecycle(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/Lifecycle$State;)Landroidx/fragment/app/FragmentTransaction;
+
+ goto :goto_1
+
+ :cond_7
+ move-object v2, v5
+
+ :goto_1
+ iget-wide v6, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->mPrimaryItemId:J
+
+ cmp-long v8, v3, v6
+
+ if-nez v8, :cond_8
+
+ const/4 v3, 0x1
+
+ goto :goto_2
+
+ :cond_8
+ const/4 v3, 0x0
+
+ :goto_2
+ invoke-virtual {v5, v3}, Landroidx/fragment/app/Fragment;->setMenuVisibility(Z)V
+
+ :goto_3
+ add-int/lit8 v0, v0, 0x1
+
+ goto :goto_0
+
+ :cond_9
+ if-eqz v2, :cond_a
+
+ sget-object v0, Landroidx/lifecycle/Lifecycle$State;->RESUMED:Landroidx/lifecycle/Lifecycle$State;
+
+ invoke-virtual {p1, v2, v0}, Landroidx/fragment/app/FragmentTransaction;->setMaxLifecycle(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/Lifecycle$State;)Landroidx/fragment/app/FragmentTransaction;
+
+ :cond_a
+ invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->isEmpty()Z
+
+ move-result v0
+
+ if-nez v0, :cond_b
+
+ invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->commitNow()V
+
+ :cond_b
+ :goto_4
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter.smali
new file mode 100644
index 0000000000..d37d8fc9c8
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentStateAdapter.smali
@@ -0,0 +1,1597 @@
+.class public abstract Landroidx/viewpager2/adapter/FragmentStateAdapter;
+.super Landroidx/recyclerview/widget/RecyclerView$Adapter;
+.source "FragmentStateAdapter.java"
+
+# interfaces
+.implements Landroidx/viewpager2/adapter/StatefulAdapter;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Landroidx/viewpager2/adapter/FragmentStateAdapter$DataSetChangeObserver;,
+ Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+ }
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Landroidx/recyclerview/widget/RecyclerView$Adapter<",
+ "Landroidx/viewpager2/adapter/FragmentViewHolder;",
+ ">;",
+ "Landroidx/viewpager2/adapter/StatefulAdapter;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final GRACE_WINDOW_TIME_MS:J = 0x2710L
+
+.field public static final KEY_PREFIX_FRAGMENT:Ljava/lang/String; = "f#"
+
+.field public static final KEY_PREFIX_STATE:Ljava/lang/String; = "s#"
+
+
+# instance fields
+.field public final mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+.field public mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+.field public final mFragments:Landroidx/collection/LongSparseArray;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Landroidx/collection/LongSparseArray<",
+ "Landroidx/fragment/app/Fragment;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public mHasStaleFragments:Z
+
+.field public mIsInGracePeriod:Z
+
+.field public final mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Landroidx/collection/LongSparseArray<",
+ "Ljava/lang/Integer;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public final mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+.field public final mSavedStates:Landroidx/collection/LongSparseArray;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Landroidx/collection/LongSparseArray<",
+ "Landroidx/fragment/app/Fragment$SavedState;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor (Landroidx/fragment/app/Fragment;)V
+ .locals 1
+ .param p1 # Landroidx/fragment/app/Fragment;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getChildFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+ move-result-object v0
+
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+ move-result-object p1
+
+ invoke-direct {p0, v0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->(Landroidx/fragment/app/FragmentManager;Landroidx/lifecycle/Lifecycle;)V
+
+ return-void
+.end method
+
+.method public constructor (Landroidx/fragment/app/FragmentActivity;)V
+ .locals 1
+ .param p1 # Landroidx/fragment/app/FragmentActivity;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroidx/fragment/app/FragmentActivity;->getSupportFragmentManager()Landroidx/fragment/app/FragmentManager;
+
+ move-result-object v0
+
+ invoke-virtual {p1}, Landroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+ move-result-object p1
+
+ invoke-direct {p0, v0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->(Landroidx/fragment/app/FragmentManager;Landroidx/lifecycle/Lifecycle;)V
+
+ return-void
+.end method
+
+.method public constructor (Landroidx/fragment/app/FragmentManager;Landroidx/lifecycle/Lifecycle;)V
+ .locals 1
+ .param p1 # Landroidx/fragment/app/FragmentManager;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/lifecycle/Lifecycle;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->()V
+
+ new-instance v0, Landroidx/collection/LongSparseArray;
+
+ invoke-direct {v0}, Landroidx/collection/LongSparseArray;->()V
+
+ iput-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ new-instance v0, Landroidx/collection/LongSparseArray;
+
+ invoke-direct {v0}, Landroidx/collection/LongSparseArray;->()V
+
+ iput-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ new-instance v0, Landroidx/collection/LongSparseArray;
+
+ invoke-direct {v0}, Landroidx/collection/LongSparseArray;->()V
+
+ iput-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ const/4 v0, 0x0
+
+ iput-boolean v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mIsInGracePeriod:Z
+
+ iput-boolean v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mHasStaleFragments:Z
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ iput-object p2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+ const/4 p1, 0x1
+
+ invoke-super {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->setHasStableIds(Z)V
+
+ return-void
+.end method
+
+.method public static createKey(Ljava/lang/String;J)Ljava/lang/String;
+ .locals 0
+ .param p0 # Ljava/lang/String;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ invoke-static {p0, p1, p2}, Le/e/b/a/a;->a(Ljava/lang/String;J)Ljava/lang/String;
+
+ move-result-object p0
+
+ return-object p0
+.end method
+
+.method private ensureFragment(I)V
+ .locals 3
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->getItemId(I)J
+
+ move-result-wide v0
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v0, v1}, Landroidx/collection/LongSparseArray;->containsKey(J)Z
+
+ move-result v2
+
+ if-nez v2, :cond_0
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->createFragment(I)Landroidx/fragment/app/Fragment;
+
+ move-result-object p1
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v0, v1}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Landroidx/fragment/app/Fragment$SavedState;
+
+ invoke-virtual {p1, v2}, Landroidx/fragment/app/Fragment;->setInitialSavedState(Landroidx/fragment/app/Fragment$SavedState;)V
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v0, v1, p1}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
+
+ :cond_0
+ return-void
+.end method
+
+.method private isFragmentViewBound(J)Z
+ .locals 2
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->containsKey(J)Z
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-eqz v0, :cond_0
+
+ return v1
+
+ :cond_0
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Landroidx/fragment/app/Fragment;
+
+ const/4 p2, 0x0
+
+ if-nez p1, :cond_1
+
+ return p2
+
+ :cond_1
+ invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+ move-result-object p1
+
+ if-nez p1, :cond_2
+
+ return p2
+
+ :cond_2
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_3
+
+ const/4 p2, 0x1
+
+ :cond_3
+ return p2
+.end method
+
+.method public static isValidKey(Ljava/lang/String;Ljava/lang/String;)Z
+ .locals 1
+ .param p0 # Ljava/lang/String;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Ljava/lang/String;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p0, p1}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {p0}, Ljava/lang/String;->length()I
+
+ move-result p0
+
+ invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+ move-result p1
+
+ if-le p0, p1, :cond_0
+
+ const/4 p0, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p0, 0x0
+
+ :goto_0
+ return p0
+.end method
+
+.method private itemForViewHolder(I)Ljava/lang/Long;
+ .locals 4
+
+ const/4 v0, 0x0
+
+ const/4 v1, 0x0
+
+ :goto_0
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v2
+
+ if-ge v1, v2, :cond_2
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v1}, Landroidx/collection/LongSparseArray;->valueAt(I)Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Ljava/lang/Integer;
+
+ invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
+
+ move-result v2
+
+ if-ne v2, p1, :cond_1
+
+ if-nez v0, :cond_0
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, v1}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v2
+
+ invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ goto :goto_1
+
+ :cond_0
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "Design assumption violated: a ViewHolder can only be bound to one item at a time."
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+
+ :cond_1
+ :goto_1
+ add-int/lit8 v1, v1, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ return-object v0
+.end method
+
+.method public static parseIdFromKey(Ljava/lang/String;Ljava/lang/String;)J
+ .locals 0
+ .param p0 # Ljava/lang/String;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p1 # Ljava/lang/String;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Ljava/lang/String;->length()I
+
+ move-result p1
+
+ invoke-virtual {p0, p1}, Ljava/lang/String;->substring(I)Ljava/lang/String;
+
+ move-result-object p0
+
+ invoke-static {p0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+
+ move-result-wide p0
+
+ return-wide p0
+.end method
+
+.method private removeFragment(J)V
+ .locals 3
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Landroidx/fragment/app/Fragment;
+
+ if-nez v0, :cond_0
+
+ return-void
+
+ :cond_0
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+ move-result-object v1
+
+ if-eqz v1, :cond_1
+
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+ move-result-object v1
+
+ invoke-virtual {v1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v1
+
+ if-eqz v1, :cond_1
+
+ check-cast v1, Landroid/widget/FrameLayout;
+
+ invoke-virtual {v1}, Landroid/widget/FrameLayout;->removeAllViews()V
+
+ :cond_1
+ invoke-virtual {p0, p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->containsItem(J)Z
+
+ move-result v1
+
+ if-nez v1, :cond_2
+
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v1, p1, p2}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ :cond_2
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v1
+
+ if-nez v1, :cond_3
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ return-void
+
+ :cond_3
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->shouldDelayFragmentTransactions()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_4
+
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mHasStaleFragments:Z
+
+ return-void
+
+ :cond_4
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_5
+
+ invoke-virtual {p0, p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->containsItem(J)Z
+
+ move-result v1
+
+ if-eqz v1, :cond_5
+
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v2, v0}, Landroidx/fragment/app/FragmentManager;->saveFragmentInstanceState(Landroidx/fragment/app/Fragment;)Landroidx/fragment/app/Fragment$SavedState;
+
+ move-result-object v2
+
+ invoke-virtual {v1, p1, p2, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
+
+ :cond_5
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v1}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object v1
+
+ invoke-virtual {v1, v0}, Landroidx/fragment/app/FragmentTransaction;->remove(Landroidx/fragment/app/Fragment;)Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroidx/fragment/app/FragmentTransaction;->commitNow()V
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0, p1, p2}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ return-void
+.end method
+
+.method private scheduleGracePeriodEnd()V
+ .locals 4
+
+ new-instance v0, Landroid/os/Handler;
+
+ invoke-static {}, Landroid/os/Looper;->getMainLooper()Landroid/os/Looper;
+
+ move-result-object v1
+
+ invoke-direct {v0, v1}, Landroid/os/Handler;->(Landroid/os/Looper;)V
+
+ new-instance v1, Landroidx/viewpager2/adapter/FragmentStateAdapter$4;
+
+ invoke-direct {v1, p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$4;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;)V
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+ new-instance v3, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;
+
+ invoke-direct {v3, p0, v0, v1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$5;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroid/os/Handler;Ljava/lang/Runnable;)V
+
+ invoke-virtual {v2, v3}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ const-wide/16 v2, 0x2710
+
+ invoke-virtual {v0, v1, v2, v3}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z
+
+ return-void
+.end method
+
+.method private scheduleViewAttach(Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+ .locals 2
+ .param p2 # Landroid/widget/FrameLayout;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ new-instance v1, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;
+
+ invoke-direct {v1, p0, p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter$3;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+
+ const/4 p1, 0x0
+
+ invoke-virtual {v0, v1, p1}, Landroidx/fragment/app/FragmentManager;->registerFragmentLifecycleCallbacks(Landroidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks;Z)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public addViewToContainer(Landroid/view/View;Landroid/widget/FrameLayout;)V
+ .locals 2
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroid/widget/FrameLayout;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p2}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-gt v0, v1, :cond_3
+
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ if-ne v0, p2, :cond_0
+
+ return-void
+
+ :cond_0
+ invoke-virtual {p2}, Landroid/widget/FrameLayout;->getChildCount()I
+
+ move-result v0
+
+ if-lez v0, :cond_1
+
+ invoke-virtual {p2}, Landroid/widget/FrameLayout;->removeAllViews()V
+
+ :cond_1
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_2
+
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ check-cast v0, Landroid/view/ViewGroup;
+
+ invoke-virtual {v0, p1}, Landroid/view/ViewGroup;->removeView(Landroid/view/View;)V
+
+ :cond_2
+ invoke-virtual {p2, p1}, Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V
+
+ return-void
+
+ :cond_3
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string p2, "Design assumption violated."
+
+ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public containsItem(J)Z
+ .locals 3
+
+ const-wide/16 v0, 0x0
+
+ cmp-long v2, p1, v0
+
+ if-ltz v2, :cond_0
+
+ invoke-virtual {p0}, Landroidx/recyclerview/widget/RecyclerView$Adapter;->getItemCount()I
+
+ move-result v0
+
+ int-to-long v0, v0
+
+ cmp-long v2, p1, v0
+
+ if-gez v2, :cond_0
+
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ :goto_0
+ return p1
+.end method
+
+.method public abstract createFragment(I)Landroidx/fragment/app/Fragment;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end method
+
+.method public gcFragments()V
+ .locals 6
+
+ iget-boolean v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mHasStaleFragments:Z
+
+ if-eqz v0, :cond_5
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->shouldDelayFragmentTransactions()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ goto :goto_3
+
+ :cond_0
+ new-instance v0, Landroidx/collection/ArraySet;
+
+ invoke-direct {v0}, Landroidx/collection/ArraySet;->()V
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x0
+
+ :goto_0
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v3
+
+ if-ge v2, v3, :cond_2
+
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3, v2}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v3
+
+ invoke-virtual {p0, v3, v4}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->containsItem(J)Z
+
+ move-result v5
+
+ if-nez v5, :cond_1
+
+ invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v5
+
+ invoke-interface {v0, v5}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+ iget-object v5, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v5, v3, v4}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ :cond_1
+ add-int/lit8 v2, v2, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ iget-boolean v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mIsInGracePeriod:Z
+
+ if-nez v2, :cond_4
+
+ iput-boolean v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mHasStaleFragments:Z
+
+ :goto_1
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v2
+
+ if-ge v1, v2, :cond_4
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v1}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v2
+
+ invoke-direct {p0, v2, v3}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->isFragmentViewBound(J)Z
+
+ move-result v4
+
+ if-nez v4, :cond_3
+
+ invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-interface {v0, v2}, Ljava/util/Set;->add(Ljava/lang/Object;)Z
+
+ :cond_3
+ add-int/lit8 v1, v1, 0x1
+
+ goto :goto_1
+
+ :cond_4
+ invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_2
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_5
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Ljava/lang/Long;
+
+ invoke-virtual {v1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v1
+
+ invoke-direct {p0, v1, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->removeFragment(J)V
+
+ goto :goto_2
+
+ :cond_5
+ :goto_3
+ return-void
+.end method
+
+.method public getItemId(I)J
+ .locals 2
+
+ int-to-long v0, p1
+
+ return-wide v0
+.end method
+
+.method public onAttachedToRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 1
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/CallSuper;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ if-nez v0, :cond_0
+
+ const/4 v0, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ :goto_0
+ invoke-static {v0}, Landroidx/core/util/Preconditions;->checkArgument(Z)V
+
+ new-instance v0, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ invoke-direct {v0, p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;)V
+
+ iput-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ invoke-virtual {v0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->register(Landroidx/recyclerview/widget/RecyclerView;)V
+
+ return-void
+.end method
+
+.method public bridge synthetic onBindViewHolder(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ check-cast p1, Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p0, p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->onBindViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;I)V
+
+ return-void
+.end method
+
+.method public final onBindViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;I)V
+ .locals 7
+ .param p1 # Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
+
+ move-result-wide v0
+
+ invoke-virtual {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->getContainer()Landroid/widget/FrameLayout;
+
+ move-result-object v2
+
+ invoke-virtual {v2}, Landroid/widget/FrameLayout;->getId()I
+
+ move-result v2
+
+ invoke-direct {p0, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->itemForViewHolder(I)Ljava/lang/Long;
+
+ move-result-object v3
+
+ if-eqz v3, :cond_0
+
+ invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v4
+
+ cmp-long v6, v4, v0
+
+ if-eqz v6, :cond_0
+
+ invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v4
+
+ invoke-direct {p0, v4, v5}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->removeFragment(J)V
+
+ iget-object v4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v5
+
+ invoke-virtual {v4, v5, v6}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ :cond_0
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v2
+
+ invoke-virtual {v3, v0, v1, v2}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
+
+ invoke-direct {p0, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->ensureFragment(I)V
+
+ invoke-virtual {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->getContainer()Landroid/widget/FrameLayout;
+
+ move-result-object p2
+
+ invoke-static {p2}, Landroidx/core/view/ViewCompat;->isAttachedToWindow(Landroid/view/View;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_2
+
+ invoke-virtual {p2}, Landroid/widget/FrameLayout;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ if-nez v0, :cond_1
+
+ new-instance v0, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;
+
+ invoke-direct {v0, p0, p2, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$1;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroid/widget/FrameLayout;Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ invoke-virtual {p2, v0}, Landroid/widget/FrameLayout;->addOnLayoutChangeListener(Landroid/view/View$OnLayoutChangeListener;)V
+
+ goto :goto_0
+
+ :cond_1
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string p2, "Design assumption violated."
+
+ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+
+ :cond_2
+ :goto_0
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->gcFragments()V
+
+ return-void
+.end method
+
+.method public bridge synthetic onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+ .locals 0
+ .param p1 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ invoke-virtual {p0, p1, p2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final onCreateViewHolder(Landroid/view/ViewGroup;I)Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .locals 0
+ .param p1 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ invoke-static {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->create(Landroid/view/ViewGroup;)Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public onDetachedFromRecyclerView(Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 1
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/CallSuper;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ invoke-virtual {v0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->unregister(Landroidx/recyclerview/widget/RecyclerView;)V
+
+ const/4 p1, 0x0
+
+ iput-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ return-void
+.end method
+
+.method public bridge synthetic onFailedToRecycleView(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)Z
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ check-cast p1, Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->onFailedToRecycleView(Landroidx/viewpager2/adapter/FragmentViewHolder;)Z
+
+ move-result p1
+
+ return p1
+.end method
+
+.method public final onFailedToRecycleView(Landroidx/viewpager2/adapter/FragmentViewHolder;)Z
+ .locals 0
+ .param p1 # Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ const/4 p1, 0x1
+
+ return p1
+.end method
+
+.method public bridge synthetic onViewAttachedToWindow(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ check-cast p1, Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->onViewAttachedToWindow(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ return-void
+.end method
+
+.method public final onViewAttachedToWindow(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+ .locals 0
+ .param p1 # Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->placeFragmentInViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->gcFragments()V
+
+ return-void
+.end method
+
+.method public bridge synthetic onViewRecycled(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ check-cast p1, Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-virtual {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->onViewRecycled(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ return-void
+.end method
+
+.method public final onViewRecycled(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+ .locals 3
+ .param p1 # Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->getContainer()Landroid/widget/FrameLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Landroid/widget/FrameLayout;->getId()I
+
+ move-result p1
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->itemForViewHolder(I)Ljava/lang/Long;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_0
+
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v0
+
+ invoke-direct {p0, v0, v1}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->removeFragment(J)V
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mItemIdToViewHolder:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v1
+
+ invoke-virtual {v0, v1, v2}, Landroidx/collection/LongSparseArray;->remove(J)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public placeFragmentInViewHolder(Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+ .locals 5
+ .param p1 # Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
+
+ move-result-wide v1
+
+ invoke-virtual {v0, v1, v2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Landroidx/fragment/app/Fragment;
+
+ const-string v1, "Design assumption violated."
+
+ if-eqz v0, :cond_8
+
+ invoke-virtual {p1}, Landroidx/viewpager2/adapter/FragmentViewHolder;->getContainer()Landroid/widget/FrameLayout;
+
+ move-result-object v2
+
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View;
+
+ move-result-object v3
+
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v4
+
+ if-nez v4, :cond_1
+
+ if-nez v3, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ invoke-direct {p1, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+
+ :cond_1
+ :goto_0
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_2
+
+ if-nez v3, :cond_2
+
+ invoke-direct {p0, v0, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleViewAttach(Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+
+ return-void
+
+ :cond_2
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_4
+
+ invoke-virtual {v3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v1
+
+ if-eqz v1, :cond_4
+
+ invoke-virtual {v3}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ if-eq p1, v2, :cond_3
+
+ invoke-virtual {p0, v3, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->addViewToContainer(Landroid/view/View;Landroid/widget/FrameLayout;)V
+
+ :cond_3
+ return-void
+
+ :cond_4
+ invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_5
+
+ invoke-virtual {p0, v3, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->addViewToContainer(Landroid/view/View;Landroid/widget/FrameLayout;)V
+
+ return-void
+
+ :cond_5
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->shouldDelayFragmentTransactions()Z
+
+ move-result v1
+
+ if-nez v1, :cond_6
+
+ invoke-direct {p0, v0, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleViewAttach(Landroidx/fragment/app/Fragment;Landroid/widget/FrameLayout;)V
+
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v1}, Landroidx/fragment/app/FragmentManager;->beginTransaction()Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object v1
+
+ const-string v2, "f"
+
+ invoke-static {v2}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ move-result-object v2
+
+ invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->getItemId()J
+
+ move-result-wide v3
+
+ invoke-virtual {v2, v3, v4}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-virtual {v1, v0, p1}, Landroidx/fragment/app/FragmentTransaction;->add(Landroidx/fragment/app/Fragment;Ljava/lang/String;)Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object p1
+
+ sget-object v1, Landroidx/lifecycle/Lifecycle$State;->STARTED:Landroidx/lifecycle/Lifecycle$State;
+
+ invoke-virtual {p1, v0, v1}, Landroidx/fragment/app/FragmentTransaction;->setMaxLifecycle(Landroidx/fragment/app/Fragment;Landroidx/lifecycle/Lifecycle$State;)Landroidx/fragment/app/FragmentTransaction;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Landroidx/fragment/app/FragmentTransaction;->commitNow()V
+
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentMaxLifecycleEnforcer:Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;
+
+ const/4 v0, 0x0
+
+ invoke-virtual {p1, v0}, Landroidx/viewpager2/adapter/FragmentStateAdapter$FragmentMaxLifecycleEnforcer;->updateFragmentMaxLifecycle(Z)V
+
+ goto :goto_1
+
+ :cond_6
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v0}, Landroidx/fragment/app/FragmentManager;->isDestroyed()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_7
+
+ return-void
+
+ :cond_7
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mLifecycle:Landroidx/lifecycle/Lifecycle;
+
+ new-instance v1, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;
+
+ invoke-direct {v1, p0, p1}, Landroidx/viewpager2/adapter/FragmentStateAdapter$2;->(Landroidx/viewpager2/adapter/FragmentStateAdapter;Landroidx/viewpager2/adapter/FragmentViewHolder;)V
+
+ invoke-virtual {v0, v1}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+ :goto_1
+ return-void
+
+ :cond_8
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ invoke-direct {p1, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public final restoreState(Landroid/os/Parcelable;)V
+ .locals 5
+ .param p1 # Landroid/os/Parcelable;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0}, Landroidx/collection/LongSparseArray;->isEmpty()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_6
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v0}, Landroidx/collection/LongSparseArray;->isEmpty()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_6
+
+ check-cast p1, Landroid/os/Bundle;
+
+ invoke-virtual {p1}, Landroid/os/Bundle;->getClassLoader()Ljava/lang/ClassLoader;
+
+ move-result-object v0
+
+ if-nez v0, :cond_0
+
+ const-class v0, Landroidx/viewpager2/adapter/FragmentStateAdapter;
+
+ invoke-virtual {v0}, Ljava/lang/Class;->getClassLoader()Ljava/lang/ClassLoader;
+
+ move-result-object v0
+
+ invoke-virtual {p1, v0}, Landroid/os/Bundle;->setClassLoader(Ljava/lang/ClassLoader;)V
+
+ :cond_0
+ invoke-virtual {p1}, Landroid/os/Bundle;->keySet()Ljava/util/Set;
+
+ move-result-object v0
+
+ invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :cond_1
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_4
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Ljava/lang/String;
+
+ const-string v2, "f#"
+
+ invoke-static {v1, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->isValidKey(Ljava/lang/String;Ljava/lang/String;)Z
+
+ move-result v3
+
+ if-eqz v3, :cond_2
+
+ invoke-static {v1, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->parseIdFromKey(Ljava/lang/String;Ljava/lang/String;)J
+
+ move-result-wide v2
+
+ iget-object v4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v4, p1, v1}, Landroidx/fragment/app/FragmentManager;->getFragment(Landroid/os/Bundle;Ljava/lang/String;)Landroidx/fragment/app/Fragment;
+
+ move-result-object v1
+
+ iget-object v4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v4, v2, v3, v1}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
+
+ goto :goto_0
+
+ :cond_2
+ const-string v2, "s#"
+
+ invoke-static {v1, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->isValidKey(Ljava/lang/String;Ljava/lang/String;)Z
+
+ move-result v3
+
+ if-eqz v3, :cond_3
+
+ invoke-static {v1, v2}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->parseIdFromKey(Ljava/lang/String;Ljava/lang/String;)J
+
+ move-result-wide v2
+
+ invoke-virtual {p1, v1}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
+
+ move-result-object v1
+
+ check-cast v1, Landroidx/fragment/app/Fragment$SavedState;
+
+ invoke-virtual {p0, v2, v3}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->containsItem(J)Z
+
+ move-result v4
+
+ if-eqz v4, :cond_1
+
+ iget-object v4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v4, v2, v3, v1}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
+
+ goto :goto_0
+
+ :cond_3
+ new-instance p1, Ljava/lang/IllegalArgumentException;
+
+ const-string v0, "Unexpected key in savedState: "
+
+ invoke-static {v0, v1}, Le/e/b/a/a;->a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object v0
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V
+
+ throw p1
+
+ :cond_4
+ iget-object p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {p1}, Landroidx/collection/LongSparseArray;->isEmpty()Z
+
+ move-result p1
+
+ if-nez p1, :cond_5
+
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mHasStaleFragments:Z
+
+ iput-boolean p1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mIsInGracePeriod:Z
+
+ invoke-virtual {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->gcFragments()V
+
+ invoke-direct {p0}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->scheduleGracePeriodEnd()V
+
+ :cond_5
+ return-void
+
+ :cond_6
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "Expected the adapter to be \'fresh\' while restoring state."
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public final saveState()Landroid/os/Parcelable;
+ .locals 7
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ new-instance v0, Landroid/os/Bundle;
+
+ iget-object v1, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v1}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v1
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v2
+
+ add-int/2addr v2, v1
+
+ invoke-direct {v0, v2}, Landroid/os/Bundle;->(I)V
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x0
+
+ :goto_0
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v3
+
+ if-ge v2, v3, :cond_1
+
+ iget-object v3, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v3, v2}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v3
+
+ iget-object v5, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragments:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v5, v3, v4}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object v5
+
+ check-cast v5, Landroidx/fragment/app/Fragment;
+
+ if-eqz v5, :cond_0
+
+ invoke-virtual {v5}, Landroidx/fragment/app/Fragment;->isAdded()Z
+
+ move-result v6
+
+ if-eqz v6, :cond_0
+
+ const-string v6, "f#"
+
+ invoke-static {v6, v3, v4}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->createKey(Ljava/lang/String;J)Ljava/lang/String;
+
+ move-result-object v3
+
+ iget-object v4, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v4, v0, v3, v5}, Landroidx/fragment/app/FragmentManager;->putFragment(Landroid/os/Bundle;Ljava/lang/String;Landroidx/fragment/app/Fragment;)V
+
+ :cond_0
+ add-int/lit8 v2, v2, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ :goto_1
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2}, Landroidx/collection/LongSparseArray;->size()I
+
+ move-result v2
+
+ if-ge v1, v2, :cond_3
+
+ iget-object v2, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v2, v1}, Landroidx/collection/LongSparseArray;->keyAt(I)J
+
+ move-result-wide v2
+
+ invoke-virtual {p0, v2, v3}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->containsItem(J)Z
+
+ move-result v4
+
+ if-eqz v4, :cond_2
+
+ const-string v4, "s#"
+
+ invoke-static {v4, v2, v3}, Landroidx/viewpager2/adapter/FragmentStateAdapter;->createKey(Ljava/lang/String;J)Ljava/lang/String;
+
+ move-result-object v4
+
+ iget-object v5, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mSavedStates:Landroidx/collection/LongSparseArray;
+
+ invoke-virtual {v5, v2, v3}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Landroid/os/Parcelable;
+
+ invoke-virtual {v0, v4, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+
+ :cond_2
+ add-int/lit8 v1, v1, 0x1
+
+ goto :goto_1
+
+ :cond_3
+ return-object v0
+.end method
+
+.method public final setHasStableIds(Z)V
+ .locals 1
+
+ new-instance p1, Ljava/lang/UnsupportedOperationException;
+
+ const-string v0, "Stable Ids are required for the adapter to function properly, and the adapter takes care of setting the flag."
+
+ invoke-direct {p1, v0}, Ljava/lang/UnsupportedOperationException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public shouldDelayFragmentTransactions()Z
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/adapter/FragmentStateAdapter;->mFragmentManager:Landroidx/fragment/app/FragmentManager;
+
+ invoke-virtual {v0}, Landroidx/fragment/app/FragmentManager;->isStateSaved()Z
+
+ move-result v0
+
+ return v0
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/FragmentViewHolder.smali b/com.discord/smali/androidx/viewpager2/adapter/FragmentViewHolder.smali
new file mode 100644
index 0000000000..60f98da84d
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/FragmentViewHolder.smali
@@ -0,0 +1,73 @@
+.class public final Landroidx/viewpager2/adapter/FragmentViewHolder;
+.super Landroidx/recyclerview/widget/RecyclerView$ViewHolder;
+.source "FragmentViewHolder.java"
+
+
+# direct methods
+.method public constructor (Landroid/widget/FrameLayout;)V
+ .locals 0
+ .param p1 # Landroid/widget/FrameLayout;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->(Landroid/view/View;)V
+
+ return-void
+.end method
+
+.method public static create(Landroid/view/ViewGroup;)Landroidx/viewpager2/adapter/FragmentViewHolder;
+ .locals 2
+ .param p0 # Landroid/view/ViewGroup;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ new-instance v0, Landroid/widget/FrameLayout;
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+ move-result-object p0
+
+ invoke-direct {v0, p0}, Landroid/widget/FrameLayout;->(Landroid/content/Context;)V
+
+ new-instance p0, Landroid/view/ViewGroup$LayoutParams;
+
+ const/4 v1, -0x1
+
+ invoke-direct {p0, v1, v1}, Landroid/view/ViewGroup$LayoutParams;->(II)V
+
+ invoke-virtual {v0, p0}, Landroid/widget/FrameLayout;->setLayoutParams(Landroid/view/ViewGroup$LayoutParams;)V
+
+ invoke-static {}, Landroidx/core/view/ViewCompat;->generateViewId()I
+
+ move-result p0
+
+ invoke-virtual {v0, p0}, Landroid/widget/FrameLayout;->setId(I)V
+
+ const/4 p0, 0x0
+
+ invoke-virtual {v0, p0}, Landroid/widget/FrameLayout;->setSaveEnabled(Z)V
+
+ new-instance p0, Landroidx/viewpager2/adapter/FragmentViewHolder;
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/adapter/FragmentViewHolder;->(Landroid/widget/FrameLayout;)V
+
+ return-object p0
+.end method
+
+
+# virtual methods
+.method public getContainer()Landroid/widget/FrameLayout;
+ .locals 1
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
+
+ check-cast v0, Landroid/widget/FrameLayout;
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/adapter/StatefulAdapter.smali b/com.discord/smali/androidx/viewpager2/adapter/StatefulAdapter.smali
new file mode 100644
index 0000000000..b4aeb7f777
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/adapter/StatefulAdapter.smali
@@ -0,0 +1,17 @@
+.class public interface abstract Landroidx/viewpager2/adapter/StatefulAdapter;
+.super Ljava/lang/Object;
+.source "StatefulAdapter.java"
+
+
+# virtual methods
+.method public abstract restoreState(Landroid/os/Parcelable;)V
+ .param p1 # Landroid/os/Parcelable;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+.end method
+
+.method public abstract saveState()Landroid/os/Parcelable;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector$1.smali b/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector$1.smali
new file mode 100644
index 0000000000..4aba994da6
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector$1.smali
@@ -0,0 +1,71 @@
+.class public Landroidx/viewpager2/widget/AnimateLayoutChangeDetector$1;
+.super Ljava/lang/Object;
+.source "AnimateLayoutChangeDetector.java"
+
+# interfaces
+.implements Ljava/util/Comparator;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->arePagesLaidOutContiguously()Z
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/lang/Object;",
+ "Ljava/util/Comparator<",
+ "[I>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector$1;->this$0:Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic compare(Ljava/lang/Object;Ljava/lang/Object;)I
+ .locals 0
+
+ check-cast p1, [I
+
+ check-cast p2, [I
+
+ invoke-virtual {p0, p1, p2}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector$1;->compare([I[I)I
+
+ move-result p1
+
+ return p1
+.end method
+
+.method public compare([I[I)I
+ .locals 1
+
+ const/4 v0, 0x0
+
+ aget p1, p1, v0
+
+ aget p2, p2, v0
+
+ sub-int/2addr p1, p2
+
+ return p1
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector.smali b/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector.smali
new file mode 100644
index 0000000000..bea0d2f4d6
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/AnimateLayoutChangeDetector.smali
@@ -0,0 +1,387 @@
+.class public final Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;
+.super Ljava/lang/Object;
+.source "AnimateLayoutChangeDetector.java"
+
+
+# static fields
+.field public static final ZERO_MARGIN_LAYOUT_PARAMS:Landroid/view/ViewGroup$MarginLayoutParams;
+
+
+# instance fields
+.field public mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 2
+
+ new-instance v0, Landroid/view/ViewGroup$MarginLayoutParams;
+
+ const/4 v1, -0x1
+
+ invoke-direct {v0, v1, v1}, Landroid/view/ViewGroup$MarginLayoutParams;->(II)V
+
+ sput-object v0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->ZERO_MARGIN_LAYOUT_PARAMS:Landroid/view/ViewGroup$MarginLayoutParams;
+
+ sget-object v0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->ZERO_MARGIN_LAYOUT_PARAMS:Landroid/view/ViewGroup$MarginLayoutParams;
+
+ const/4 v1, 0x0
+
+ invoke-virtual {v0, v1, v1, v1, v1}, Landroid/view/ViewGroup$MarginLayoutParams;->setMargins(IIII)V
+
+ return-void
+.end method
+
+.method public constructor (Landroidx/recyclerview/widget/LinearLayoutManager;)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/LinearLayoutManager;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ return-void
+.end method
+
+.method private arePagesLaidOutContiguously()Z
+ .locals 11
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-nez v0, :cond_0
+
+ return v1
+
+ :cond_0
+ iget-object v2, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->getOrientation()I
+
+ move-result v2
+
+ const/4 v3, 0x0
+
+ if-nez v2, :cond_1
+
+ const/4 v2, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ const/4 v2, 0x0
+
+ :goto_0
+ const/4 v4, 0x2
+
+ filled-new-array {v0, v4}, [I
+
+ move-result-object v4
+
+ const-class v5, I
+
+ invoke-static {v5, v4}, Ljava/lang/reflect/Array;->newInstance(Ljava/lang/Class;[I)Ljava/lang/Object;
+
+ move-result-object v4
+
+ check-cast v4, [[I
+
+ const/4 v5, 0x0
+
+ :goto_1
+ if-ge v5, v0, :cond_6
+
+ iget-object v6, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v6, v5}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v6
+
+ if-eqz v6, :cond_5
+
+ invoke-virtual {v6}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+ move-result-object v7
+
+ instance-of v8, v7, Landroid/view/ViewGroup$MarginLayoutParams;
+
+ if-eqz v8, :cond_2
+
+ check-cast v7, Landroid/view/ViewGroup$MarginLayoutParams;
+
+ goto :goto_2
+
+ :cond_2
+ sget-object v7, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->ZERO_MARGIN_LAYOUT_PARAMS:Landroid/view/ViewGroup$MarginLayoutParams;
+
+ :goto_2
+ aget-object v8, v4, v5
+
+ if-eqz v2, :cond_3
+
+ invoke-virtual {v6}, Landroid/view/View;->getLeft()I
+
+ move-result v9
+
+ iget v10, v7, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
+
+ goto :goto_3
+
+ :cond_3
+ invoke-virtual {v6}, Landroid/view/View;->getTop()I
+
+ move-result v9
+
+ iget v10, v7, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
+
+ :goto_3
+ sub-int/2addr v9, v10
+
+ aput v9, v8, v3
+
+ aget-object v8, v4, v5
+
+ if-eqz v2, :cond_4
+
+ invoke-virtual {v6}, Landroid/view/View;->getRight()I
+
+ move-result v6
+
+ iget v7, v7, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
+
+ goto :goto_4
+
+ :cond_4
+ invoke-virtual {v6}, Landroid/view/View;->getBottom()I
+
+ move-result v6
+
+ iget v7, v7, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
+
+ :goto_4
+ add-int/2addr v6, v7
+
+ aput v6, v8, v1
+
+ add-int/lit8 v5, v5, 0x1
+
+ goto :goto_1
+
+ :cond_5
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "null view contained in the view hierarchy"
+
+ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_6
+ new-instance v2, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector$1;
+
+ invoke-direct {v2, p0}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector$1;->(Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;)V
+
+ invoke-static {v4, v2}, Ljava/util/Arrays;->sort([Ljava/lang/Object;Ljava/util/Comparator;)V
+
+ const/4 v2, 0x1
+
+ :goto_5
+ if-ge v2, v0, :cond_8
+
+ add-int/lit8 v5, v2, -0x1
+
+ aget-object v5, v4, v5
+
+ aget v5, v5, v1
+
+ aget-object v6, v4, v2
+
+ aget v6, v6, v3
+
+ if-eq v5, v6, :cond_7
+
+ return v3
+
+ :cond_7
+ add-int/lit8 v2, v2, 0x1
+
+ goto :goto_5
+
+ :cond_8
+ aget-object v2, v4, v3
+
+ aget v2, v2, v1
+
+ aget-object v5, v4, v3
+
+ aget v5, v5, v3
+
+ sub-int/2addr v2, v5
+
+ aget-object v5, v4, v3
+
+ aget v5, v5, v3
+
+ if-gtz v5, :cond_a
+
+ sub-int/2addr v0, v1
+
+ aget-object v0, v4, v0
+
+ aget v0, v0, v1
+
+ if-ge v0, v2, :cond_9
+
+ goto :goto_6
+
+ :cond_9
+ return v1
+
+ :cond_a
+ :goto_6
+ return v3
+.end method
+
+.method private hasRunningChangingLayoutTransition()Z
+ .locals 4
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+
+ move-result v0
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x0
+
+ :goto_0
+ if-ge v2, v0, :cond_1
+
+ iget-object v3, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v3, v2}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v3
+
+ invoke-static {v3}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->hasRunningChangingLayoutTransition(Landroid/view/View;)Z
+
+ move-result v3
+
+ if-eqz v3, :cond_0
+
+ const/4 v0, 0x1
+
+ return v0
+
+ :cond_0
+ add-int/lit8 v2, v2, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ return v1
+.end method
+
+.method public static hasRunningChangingLayoutTransition(Landroid/view/View;)Z
+ .locals 5
+
+ instance-of v0, p0, Landroid/view/ViewGroup;
+
+ const/4 v1, 0x0
+
+ if-eqz v0, :cond_2
+
+ check-cast p0, Landroid/view/ViewGroup;
+
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getLayoutTransition()Landroid/animation/LayoutTransition;
+
+ move-result-object v0
+
+ const/4 v2, 0x1
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Landroid/animation/LayoutTransition;->isChangingLayout()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ return v2
+
+ :cond_0
+ invoke-virtual {p0}, Landroid/view/ViewGroup;->getChildCount()I
+
+ move-result v0
+
+ const/4 v3, 0x0
+
+ :goto_0
+ if-ge v3, v0, :cond_2
+
+ invoke-virtual {p0, v3}, Landroid/view/ViewGroup;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v4
+
+ invoke-static {v4}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->hasRunningChangingLayoutTransition(Landroid/view/View;)Z
+
+ move-result v4
+
+ if-eqz v4, :cond_1
+
+ return v2
+
+ :cond_1
+ add-int/lit8 v3, v3, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ return v1
+.end method
+
+
+# virtual methods
+.method public mayHaveInterferingAnimations()Z
+ .locals 2
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->arePagesLaidOutContiguously()Z
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+
+ move-result v0
+
+ if-gt v0, v1, :cond_1
+
+ :cond_0
+ invoke-direct {p0}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->hasRunningChangingLayoutTransition()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_1
+
+ goto :goto_0
+
+ :cond_1
+ const/4 v1, 0x0
+
+ :goto_0
+ return v1
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/CompositeOnPageChangeCallback.smali b/com.discord/smali/androidx/viewpager2/widget/CompositeOnPageChangeCallback.smali
new file mode 100644
index 0000000000..75d382fcb5
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/CompositeOnPageChangeCallback.smali
@@ -0,0 +1,186 @@
+.class public final Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;
+.super Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+.source "CompositeOnPageChangeCallback.java"
+
+
+# instance fields
+.field public final mCallbacks:Ljava/util/List;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor (I)V
+ .locals 1
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->()V
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0, p1}, Ljava/util/ArrayList;->(I)V
+
+ iput-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ return-void
+.end method
+
+.method private throwCallbackListModifiedWhileInUse(Ljava/util/ConcurrentModificationException;)V
+ .locals 2
+
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "Adding and removing callbacks during dispatch to callbacks is not supported"
+
+ invoke-direct {v0, v1, p1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;Ljava/lang/Throwable;)V
+
+ throw v0
+.end method
+
+
+# virtual methods
+.method public addOnPageChangeCallback(Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;)V
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+ return-void
+.end method
+
+.method public onPageScrollStateChanged(I)V
+ .locals 2
+
+ :try_start_0
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_0
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ invoke-virtual {v1, p1}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageScrollStateChanged(I)V
+ :try_end_0
+ .catch Ljava/util/ConcurrentModificationException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ move-exception p1
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->throwCallbackListModifiedWhileInUse(Ljava/util/ConcurrentModificationException;)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public onPageScrolled(IFI)V
+ .locals 2
+ .param p3 # I
+ .annotation build Landroidx/annotation/Px;
+ .end annotation
+ .end param
+
+ :try_start_0
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_0
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ invoke-virtual {v1, p1, p2, p3}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageScrolled(IFI)V
+ :try_end_0
+ .catch Ljava/util/ConcurrentModificationException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ move-exception p1
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->throwCallbackListModifiedWhileInUse(Ljava/util/ConcurrentModificationException;)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public onPageSelected(I)V
+ .locals 2
+
+ :try_start_0
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_0
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ invoke-virtual {v1, p1}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageSelected(I)V
+ :try_end_0
+ .catch Ljava/util/ConcurrentModificationException; {:try_start_0 .. :try_end_0} :catch_0
+
+ goto :goto_0
+
+ :catch_0
+ move-exception p1
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->throwCallbackListModifiedWhileInUse(Ljava/util/ConcurrentModificationException;)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public removeOnPageChangeCallback(Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;)V
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;->mCallbacks:Ljava/util/List;
+
+ invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/CompositePageTransformer.smali b/com.discord/smali/androidx/viewpager2/widget/CompositePageTransformer.smali
new file mode 100644
index 0000000000..d120782141
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/CompositePageTransformer.smali
@@ -0,0 +1,98 @@
+.class public final Landroidx/viewpager2/widget/CompositePageTransformer;
+.super Ljava/lang/Object;
+.source "CompositePageTransformer.java"
+
+# interfaces
+.implements Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+
+# instance fields
+.field public final mTransformers:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Landroidx/viewpager2/widget/ViewPager2$PageTransformer;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor ()V
+ .locals 1
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ iput-object v0, p0, Landroidx/viewpager2/widget/CompositePageTransformer;->mTransformers:Ljava/util/List;
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public addTransformer(Landroidx/viewpager2/widget/ViewPager2$PageTransformer;)V
+ .locals 1
+ .param p1 # Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositePageTransformer;->mTransformers:Ljava/util/List;
+
+ invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z
+
+ return-void
+.end method
+
+.method public removeTransformer(Landroidx/viewpager2/widget/ViewPager2$PageTransformer;)V
+ .locals 1
+ .param p1 # Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositePageTransformer;->mTransformers:Ljava/util/List;
+
+ invoke-interface {v0, p1}, Ljava/util/List;->remove(Ljava/lang/Object;)Z
+
+ return-void
+.end method
+
+.method public transformPage(Landroid/view/View;F)V
+ .locals 2
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/CompositePageTransformer;->mTransformers:Ljava/util/List;
+
+ invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object v0
+
+ :goto_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_0
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+ invoke-interface {v1, p1, p2}, Landroidx/viewpager2/widget/ViewPager2$PageTransformer;->transformPage(Landroid/view/View;F)V
+
+ goto :goto_0
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/FakeDrag.smali b/com.discord/smali/androidx/viewpager2/widget/FakeDrag.smali
new file mode 100644
index 0000000000..5a44b2b739
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/FakeDrag.smali
@@ -0,0 +1,363 @@
+.class public final Landroidx/viewpager2/widget/FakeDrag;
+.super Ljava/lang/Object;
+.source "FakeDrag.java"
+
+
+# instance fields
+.field public mActualDraggedDistance:I
+
+.field public mFakeDragBeginTime:J
+
+.field public mMaximumVelocity:I
+
+.field public final mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+.field public mRequestedDragDistance:F
+
+.field public final mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+.field public mVelocityTracker:Landroid/view/VelocityTracker;
+
+.field public final mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;Landroidx/viewpager2/widget/ScrollEventAdapter;Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/FakeDrag;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ iput-object p2, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ iput-object p3, p0, Landroidx/viewpager2/widget/FakeDrag;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ return-void
+.end method
+
+.method private addFakeMotionEvent(JIFF)V
+ .locals 8
+
+ iget-wide v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mFakeDragBeginTime:J
+
+ const/4 v7, 0x0
+
+ move-wide v2, p1
+
+ move v4, p3
+
+ move v5, p4
+
+ move v6, p5
+
+ invoke-static/range {v0 .. v7}, Landroid/view/MotionEvent;->obtain(JJIFFI)Landroid/view/MotionEvent;
+
+ move-result-object p1
+
+ iget-object p2, p0, Landroidx/viewpager2/widget/FakeDrag;->mVelocityTracker:Landroid/view/VelocityTracker;
+
+ invoke-virtual {p2, p1}, Landroid/view/VelocityTracker;->addMovement(Landroid/view/MotionEvent;)V
+
+ invoke-virtual {p1}, Landroid/view/MotionEvent;->recycle()V
+
+ return-void
+.end method
+
+.method private beginFakeVelocityTracker()V
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mVelocityTracker:Landroid/view/VelocityTracker;
+
+ if-nez v0, :cond_0
+
+ invoke-static {}, Landroid/view/VelocityTracker;->obtain()Landroid/view/VelocityTracker;
+
+ move-result-object v0
+
+ iput-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mVelocityTracker:Landroid/view/VelocityTracker;
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v0}, Landroid/view/ViewGroup;->getContext()Landroid/content/Context;
+
+ move-result-object v0
+
+ invoke-static {v0}, Landroid/view/ViewConfiguration;->get(Landroid/content/Context;)Landroid/view/ViewConfiguration;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroid/view/ViewConfiguration;->getScaledMaximumFlingVelocity()I
+
+ move-result v0
+
+ iput v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mMaximumVelocity:I
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {v0}, Landroid/view/VelocityTracker;->clear()V
+
+ :goto_0
+ return-void
+.end method
+
+
+# virtual methods
+.method public beginFakeDrag()Z
+ .locals 7
+ .annotation build Landroidx/annotation/UiThread;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isDragging()Z
+
+ move-result v0
+
+ const/4 v1, 0x0
+
+ if-eqz v0, :cond_0
+
+ return v1
+
+ :cond_0
+ iput v1, p0, Landroidx/viewpager2/widget/FakeDrag;->mActualDraggedDistance:I
+
+ int-to-float v0, v1
+
+ iput v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+ move-result-wide v0
+
+ iput-wide v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mFakeDragBeginTime:J
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/FakeDrag;->beginFakeVelocityTracker()V
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->notifyBeginFakeDrag()V
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isIdle()Z
+
+ move-result v0
+
+ if-nez v0, :cond_1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/RecyclerView;->stopScroll()V
+
+ :cond_1
+ iget-wide v2, p0, Landroidx/viewpager2/widget/FakeDrag;->mFakeDragBeginTime:J
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ const/4 v6, 0x0
+
+ move-object v1, p0
+
+ invoke-direct/range {v1 .. v6}, Landroidx/viewpager2/widget/FakeDrag;->addFakeMotionEvent(JIFF)V
+
+ const/4 v0, 0x1
+
+ return v0
+.end method
+
+.method public endFakeDrag()Z
+ .locals 3
+ .annotation build Landroidx/annotation/UiThread;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isFakeDragging()Z
+
+ move-result v0
+
+ if-nez v0, :cond_0
+
+ const/4 v0, 0x0
+
+ return v0
+
+ :cond_0
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->notifyEndFakeDrag()V
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mVelocityTracker:Landroid/view/VelocityTracker;
+
+ const/16 v1, 0x3e8
+
+ iget v2, p0, Landroidx/viewpager2/widget/FakeDrag;->mMaximumVelocity:I
+
+ int-to-float v2, v2
+
+ invoke-virtual {v0, v1, v2}, Landroid/view/VelocityTracker;->computeCurrentVelocity(IF)V
+
+ invoke-virtual {v0}, Landroid/view/VelocityTracker;->getXVelocity()F
+
+ move-result v1
+
+ float-to-int v1, v1
+
+ invoke-virtual {v0}, Landroid/view/VelocityTracker;->getYVelocity()F
+
+ move-result v0
+
+ float-to-int v0, v0
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/FakeDrag;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {v2, v1, v0}, Landroidx/recyclerview/widget/RecyclerView;->fling(II)Z
+
+ move-result v0
+
+ if-nez v0, :cond_1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->snapToPage()V
+
+ :cond_1
+ const/4 v0, 0x1
+
+ return v0
+.end method
+
+.method public fakeDragBy(F)Z
+ .locals 9
+ .annotation build Landroidx/annotation/UiThread;
+ .end annotation
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isFakeDragging()Z
+
+ move-result v0
+
+ const/4 v1, 0x0
+
+ if-nez v0, :cond_0
+
+ return v1
+
+ :cond_0
+ iget v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ sub-float/2addr v0, p1
+
+ iput v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ iget p1, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ iget v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mActualDraggedDistance:I
+
+ int-to-float v0, v0
+
+ sub-float/2addr p1, v0
+
+ invoke-static {p1}, Ljava/lang/Math;->round(F)I
+
+ move-result p1
+
+ iget v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mActualDraggedDistance:I
+
+ add-int/2addr v0, p1
+
+ iput v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mActualDraggedDistance:I
+
+ invoke-static {}, Landroid/os/SystemClock;->uptimeMillis()J
+
+ move-result-wide v3
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->getOrientation()I
+
+ move-result v0
+
+ const/4 v8, 0x1
+
+ if-nez v0, :cond_1
+
+ const/4 v0, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ const/4 v0, 0x0
+
+ :goto_0
+ if-eqz v0, :cond_2
+
+ move v2, p1
+
+ goto :goto_1
+
+ :cond_2
+ const/4 v2, 0x0
+
+ :goto_1
+ if-eqz v0, :cond_3
+
+ const/4 p1, 0x0
+
+ :cond_3
+ const/4 v1, 0x0
+
+ if-eqz v0, :cond_4
+
+ iget v5, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ move v6, v5
+
+ goto :goto_2
+
+ :cond_4
+ const/4 v6, 0x0
+
+ :goto_2
+ if-eqz v0, :cond_5
+
+ const/4 v7, 0x0
+
+ goto :goto_3
+
+ :cond_5
+ iget v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRequestedDragDistance:F
+
+ move v7, v0
+
+ :goto_3
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {v0, v2, p1}, Landroidx/recyclerview/widget/RecyclerView;->scrollBy(II)V
+
+ const/4 v5, 0x2
+
+ move-object v2, p0
+
+ invoke-direct/range {v2 .. v7}, Landroidx/viewpager2/widget/FakeDrag;->addFakeMotionEvent(JIFF)V
+
+ return v8
+.end method
+
+.method public isFakeDragging()Z
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/FakeDrag;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isFakeDragging()Z
+
+ move-result v0
+
+ return v0
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/MarginPageTransformer.smali b/com.discord/smali/androidx/viewpager2/widget/MarginPageTransformer.smali
new file mode 100644
index 0000000000..6ce8ea617a
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/MarginPageTransformer.smali
@@ -0,0 +1,112 @@
+.class public final Landroidx/viewpager2/widget/MarginPageTransformer;
+.super Ljava/lang/Object;
+.source "MarginPageTransformer.java"
+
+# interfaces
+.implements Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+
+# instance fields
+.field public final mMarginPx:I
+
+
+# direct methods
+.method public constructor (I)V
+ .locals 1
+ .param p1 # I
+ .annotation build Landroidx/annotation/Px;
+ .end annotation
+ .end param
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ const-string v0, "Margin must be non-negative"
+
+ invoke-static {p1, v0}, Landroidx/core/util/Preconditions;->checkArgumentNonnegative(ILjava/lang/String;)I
+
+ iput p1, p0, Landroidx/viewpager2/widget/MarginPageTransformer;->mMarginPx:I
+
+ return-void
+.end method
+
+.method private requireViewPager(Landroid/view/View;)Landroidx/viewpager2/widget/ViewPager2;
+ .locals 1
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroid/view/View;->getParent()Landroid/view/ViewParent;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/view/ViewParent;->getParent()Landroid/view/ViewParent;
+
+ move-result-object v0
+
+ instance-of p1, p1, Landroidx/recyclerview/widget/RecyclerView;
+
+ if-eqz p1, :cond_0
+
+ instance-of p1, v0, Landroidx/viewpager2/widget/ViewPager2;
+
+ if-eqz p1, :cond_0
+
+ check-cast v0, Landroidx/viewpager2/widget/ViewPager2;
+
+ return-object v0
+
+ :cond_0
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "Expected the page view to be managed by a ViewPager2 instance."
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+
+# virtual methods
+.method public transformPage(Landroid/view/View;F)V
+ .locals 2
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/MarginPageTransformer;->requireViewPager(Landroid/view/View;)Landroidx/viewpager2/widget/ViewPager2;
+
+ move-result-object v0
+
+ iget v1, p0, Landroidx/viewpager2/widget/MarginPageTransformer;->mMarginPx:I
+
+ int-to-float v1, v1
+
+ mul-float v1, v1, p2
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->getOrientation()I
+
+ move-result p2
+
+ if-nez p2, :cond_1
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ViewPager2;->isRtl()Z
+
+ move-result p2
+
+ if-eqz p2, :cond_0
+
+ neg-float v1, v1
+
+ :cond_0
+ invoke-virtual {p1, v1}, Landroid/view/View;->setTranslationX(F)V
+
+ goto :goto_0
+
+ :cond_1
+ invoke-virtual {p1, v1}, Landroid/view/View;->setTranslationY(F)V
+
+ :goto_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/PageTransformerAdapter.smali b/com.discord/smali/androidx/viewpager2/widget/PageTransformerAdapter.smali
new file mode 100644
index 0000000000..62469fc8d6
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/PageTransformerAdapter.smali
@@ -0,0 +1,151 @@
+.class public final Landroidx/viewpager2/widget/PageTransformerAdapter;
+.super Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+.source "PageTransformerAdapter.java"
+
+
+# instance fields
+.field public final mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+.field public mPageTransformer:Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+
+# direct methods
+.method public constructor (Landroidx/recyclerview/widget/LinearLayoutManager;)V
+ .locals 0
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->()V
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public getPageTransformer()Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mPageTransformer:Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+ return-object v0
+.end method
+
+.method public onPageScrollStateChanged(I)V
+ .locals 0
+
+ return-void
+.end method
+
+.method public onPageScrolled(IFI)V
+ .locals 4
+
+ iget-object p3, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mPageTransformer:Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+ if-nez p3, :cond_0
+
+ return-void
+
+ :cond_0
+ neg-float p2, p2
+
+ const/4 p3, 0x0
+
+ const/4 v0, 0x0
+
+ :goto_0
+ iget-object v1, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+
+ move-result v1
+
+ if-ge v0, v1, :cond_2
+
+ iget-object v1, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v1, v0}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildAt(I)Landroid/view/View;
+
+ move-result-object v1
+
+ if-eqz v1, :cond_1
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v2, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getPosition(Landroid/view/View;)I
+
+ move-result v2
+
+ sub-int/2addr v2, p1
+
+ int-to-float v2, v2
+
+ add-float/2addr v2, p2
+
+ iget-object v3, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mPageTransformer:Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+ invoke-interface {v3, v1, v2}, Landroidx/viewpager2/widget/ViewPager2$PageTransformer;->transformPage(Landroid/view/View;F)V
+
+ add-int/lit8 v0, v0, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ sget-object p2, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+ const/4 v1, 0x2
+
+ new-array v1, v1, [Ljava/lang/Object;
+
+ invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v0
+
+ aput-object v0, v1, p3
+
+ iget-object p3, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {p3}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getChildCount()I
+
+ move-result p3
+
+ invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object p3
+
+ const/4 v0, 0x1
+
+ aput-object p3, v1, v0
+
+ const-string p3, "LayoutManager returned a null child at pos %d/%d while transforming pages"
+
+ invoke-static {p2, p3, v1}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p2
+
+ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+
+ :cond_2
+ return-void
+.end method
+
+.method public onPageSelected(I)V
+ .locals 0
+
+ return-void
+.end method
+
+.method public setPageTransformer(Landroidx/viewpager2/widget/ViewPager2$PageTransformer;)V
+ .locals 0
+ .param p1 # Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/PageTransformerAdapter;->mPageTransformer:Landroidx/viewpager2/widget/ViewPager2$PageTransformer;
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues.smali b/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues.smali
new file mode 100644
index 0000000000..e8e8fb6a20
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues.smali
@@ -0,0 +1,52 @@
+.class public final Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+.super Ljava/lang/Object;
+.source "ScrollEventAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/widget/ScrollEventAdapter;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "ScrollEventValues"
+.end annotation
+
+
+# instance fields
+.field public mOffset:F
+
+.field public mOffsetPx:I
+
+.field public mPosition:I
+
+
+# direct methods
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public reset()V
+ .locals 1
+
+ const/4 v0, -0x1
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ const/4 v0, 0x0
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffset:F
+
+ const/4 v0, 0x0
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter.smali b/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter.smali
new file mode 100644
index 0000000000..1bbef7273d
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ScrollEventAdapter.smali
@@ -0,0 +1,1018 @@
+.class public final Landroidx/viewpager2/widget/ScrollEventAdapter;
+.super Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;
+.source "ScrollEventAdapter.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+ }
+.end annotation
+
+
+# static fields
+.field public static final NO_POSITION:I = -0x1
+
+.field public static final STATE_IDLE:I = 0x0
+
+.field public static final STATE_IN_PROGRESS_FAKE_DRAG:I = 0x4
+
+.field public static final STATE_IN_PROGRESS_IMMEDIATE_SCROLL:I = 0x3
+
+.field public static final STATE_IN_PROGRESS_MANUAL_DRAG:I = 0x1
+
+.field public static final STATE_IN_PROGRESS_SMOOTH_SCROLL:I = 0x2
+
+
+# instance fields
+.field public mAdapterState:I
+
+.field public mCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+.field public mDataSetChangeHappened:Z
+
+.field public mDispatchSelected:Z
+
+.field public mDragStartPosition:I
+
+.field public mFakeDragging:Z
+
+.field public final mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end field
+
+.field public final mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end field
+
+.field public mScrollHappened:Z
+
+.field public mScrollState:I
+
+.field public mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+.field public mTarget:I
+
+.field public final mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+ .param p1 # Landroidx/viewpager2/widget/ViewPager2;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-direct {p0}, Landroidx/recyclerview/widget/RecyclerView$OnScrollListener;->()V
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ iget-object p1, p1, Landroidx/viewpager2/widget/ViewPager2;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {p1}, Landroidx/recyclerview/widget/RecyclerView;->getLayoutManager()Landroidx/recyclerview/widget/RecyclerView$LayoutManager;
+
+ move-result-object p1
+
+ check-cast p1, Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ new-instance p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ invoke-direct {p1}, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->()V
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->resetState()V
+
+ return-void
+.end method
+
+.method private dispatchScrolled(IFI)V
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0, p1, p2, p3}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageScrolled(IFI)V
+
+ :cond_0
+ return-void
+.end method
+
+.method private dispatchSelected(I)V
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0, p1}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageSelected(I)V
+
+ :cond_0
+ return-void
+.end method
+
+.method private dispatchStateChanged(I)V
+ .locals 2
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ const/4 v1, 0x3
+
+ if-ne v0, v1, :cond_0
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ if-nez v0, :cond_0
+
+ return-void
+
+ :cond_0
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ if-ne v0, p1, :cond_1
+
+ return-void
+
+ :cond_1
+ iput p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ if-eqz v0, :cond_2
+
+ invoke-virtual {v0, p1}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->onPageScrollStateChanged(I)V
+
+ :cond_2
+ return-void
+.end method
+
+.method private getPosition()I
+ .locals 1
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleItemPosition()I
+
+ move-result v0
+
+ return v0
+.end method
+
+.method private isInAnyDraggingState()Z
+ .locals 3
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ const/4 v1, 0x1
+
+ if-eq v0, v1, :cond_1
+
+ const/4 v2, 0x4
+
+ if-ne v0, v2, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v1, 0x0
+
+ :cond_1
+ :goto_0
+ return v1
+.end method
+
+.method private resetState()V
+ .locals 2
+
+ const/4 v0, 0x0
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ iget-object v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ invoke-virtual {v1}, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->reset()V
+
+ const/4 v1, -0x1
+
+ iput v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ iput v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDispatchSelected:Z
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollHappened:Z
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDataSetChangeHappened:Z
+
+ return-void
+.end method
+
+.method private startDrag(Z)V
+ .locals 2
+
+ iput-boolean p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ const/4 v0, 0x1
+
+ if-eqz p1, :cond_0
+
+ const/4 p1, 0x4
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x1
+
+ :goto_0
+ iput p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ iget p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ const/4 v1, -0x1
+
+ if-eq p1, v1, :cond_1
+
+ iput p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ iput v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ goto :goto_1
+
+ :cond_1
+ iget p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ if-ne p1, v1, :cond_2
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->getPosition()I
+
+ move-result p1
+
+ iput p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ :cond_2
+ :goto_1
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ return-void
+.end method
+
+.method private updateScrollEventValues()V
+ .locals 9
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget-object v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->findFirstVisibleItemPosition()I
+
+ move-result v1
+
+ iput v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ iget v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ const/4 v2, -0x1
+
+ if-ne v1, v2, :cond_0
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->reset()V
+
+ return-void
+
+ :cond_0
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v2, v1}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View;
+
+ move-result-object v1
+
+ if-nez v1, :cond_1
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->reset()V
+
+ return-void
+
+ :cond_1
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v2, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getLeftDecorationWidth(Landroid/view/View;)I
+
+ move-result v2
+
+ iget-object v3, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v3, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getRightDecorationWidth(Landroid/view/View;)I
+
+ move-result v3
+
+ iget-object v4, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v4, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getTopDecorationHeight(Landroid/view/View;)I
+
+ move-result v4
+
+ iget-object v5, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v5, v1}, Landroidx/recyclerview/widget/RecyclerView$LayoutManager;->getBottomDecorationHeight(Landroid/view/View;)I
+
+ move-result v5
+
+ invoke-virtual {v1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+ move-result-object v6
+
+ instance-of v7, v6, Landroid/view/ViewGroup$MarginLayoutParams;
+
+ if-eqz v7, :cond_2
+
+ check-cast v6, Landroid/view/ViewGroup$MarginLayoutParams;
+
+ iget v7, v6, Landroid/view/ViewGroup$MarginLayoutParams;->leftMargin:I
+
+ add-int/2addr v2, v7
+
+ iget v7, v6, Landroid/view/ViewGroup$MarginLayoutParams;->rightMargin:I
+
+ add-int/2addr v3, v7
+
+ iget v7, v6, Landroid/view/ViewGroup$MarginLayoutParams;->topMargin:I
+
+ add-int/2addr v4, v7
+
+ iget v6, v6, Landroid/view/ViewGroup$MarginLayoutParams;->bottomMargin:I
+
+ add-int/2addr v5, v6
+
+ :cond_2
+ invoke-virtual {v1}, Landroid/view/View;->getHeight()I
+
+ move-result v6
+
+ add-int/2addr v6, v4
+
+ add-int/2addr v6, v5
+
+ invoke-virtual {v1}, Landroid/view/View;->getWidth()I
+
+ move-result v5
+
+ add-int/2addr v5, v2
+
+ add-int/2addr v3, v5
+
+ iget-object v5, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-virtual {v5}, Landroidx/recyclerview/widget/LinearLayoutManager;->getOrientation()I
+
+ move-result v5
+
+ const/4 v7, 0x1
+
+ const/4 v8, 0x0
+
+ if-nez v5, :cond_3
+
+ const/4 v5, 0x1
+
+ goto :goto_0
+
+ :cond_3
+ const/4 v5, 0x0
+
+ :goto_0
+ if-eqz v5, :cond_4
+
+ invoke-virtual {v1}, Landroid/view/View;->getLeft()I
+
+ move-result v1
+
+ sub-int/2addr v1, v2
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {v2}, Landroid/view/ViewGroup;->getPaddingLeft()I
+
+ move-result v2
+
+ sub-int/2addr v1, v2
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {v2}, Landroidx/viewpager2/widget/ViewPager2;->isRtl()Z
+
+ move-result v2
+
+ if-eqz v2, :cond_5
+
+ neg-int v1, v1
+
+ goto :goto_1
+
+ :cond_4
+ invoke-virtual {v1}, Landroid/view/View;->getTop()I
+
+ move-result v1
+
+ sub-int/2addr v1, v4
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ invoke-virtual {v2}, Landroid/view/ViewGroup;->getPaddingTop()I
+
+ move-result v2
+
+ sub-int/2addr v1, v2
+
+ move v3, v6
+
+ :cond_5
+ :goto_1
+ neg-int v1, v1
+
+ iput v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ iget v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-gez v1, :cond_7
+
+ new-instance v1, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;
+
+ iget-object v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mLayoutManager:Landroidx/recyclerview/widget/LinearLayoutManager;
+
+ invoke-direct {v1, v2}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->(Landroidx/recyclerview/widget/LinearLayoutManager;)V
+
+ invoke-virtual {v1}, Landroidx/viewpager2/widget/AnimateLayoutChangeDetector;->mayHaveInterferingAnimations()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_6
+
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "Page(s) contain a ViewGroup with a LayoutTransition (or animateLayoutChanges=\"true\"), which interferes with the scrolling animation. Make sure to call getLayoutTransition().setAnimateParentHierarchy(false) on all ViewGroups with a LayoutTransition before an animation is started."
+
+ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_6
+ new-instance v1, Ljava/lang/IllegalStateException;
+
+ sget-object v2, Ljava/util/Locale;->US:Ljava/util/Locale;
+
+ new-array v3, v7, [Ljava/lang/Object;
+
+ iget v0, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v0
+
+ aput-object v0, v3, v8
+
+ const-string v0, "Page can only be offset by a positive amount, not by %d"
+
+ invoke-static {v2, v0, v3}, Ljava/lang/String;->format(Ljava/util/Locale;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object v0
+
+ invoke-direct {v1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v1
+
+ :cond_7
+ if-nez v3, :cond_8
+
+ const/4 v1, 0x0
+
+ goto :goto_2
+
+ :cond_8
+ int-to-float v1, v1
+
+ int-to-float v2, v3
+
+ div-float/2addr v1, v2
+
+ :goto_2
+ iput v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffset:F
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public getRelativeScrollPosition()D
+ .locals 5
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->updateScrollEventValues()V
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget v1, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ int-to-double v1, v1
+
+ iget v0, v0, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffset:F
+
+ float-to-double v3, v0
+
+ add-double/2addr v1, v3
+
+ return-wide v1
+.end method
+
+.method public getScrollState()I
+ .locals 1
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ return v0
+.end method
+
+.method public isDragging()Z
+ .locals 2
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ const/4 v1, 0x1
+
+ if-ne v0, v1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v1, 0x0
+
+ :goto_0
+ return v1
+.end method
+
+.method public isFakeDragging()Z
+ .locals 1
+
+ iget-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ return v0
+.end method
+
+.method public isIdle()Z
+ .locals 1
+
+ iget v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ if-nez v0, :cond_0
+
+ const/4 v0, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ :goto_0
+ return v0
+.end method
+
+.method public notifyBeginFakeDrag()V
+ .locals 1
+
+ const/4 v0, 0x4
+
+ iput v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ const/4 v0, 0x1
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->startDrag(Z)V
+
+ return-void
+.end method
+
+.method public notifyDataSetChangeHappened()V
+ .locals 1
+
+ const/4 v0, 0x1
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDataSetChangeHappened:Z
+
+ return-void
+.end method
+
+.method public notifyEndFakeDrag()V
+ .locals 3
+
+ invoke-virtual {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isDragging()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ if-nez v0, :cond_0
+
+ return-void
+
+ :cond_0
+ const/4 v0, 0x0
+
+ iput-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->updateScrollEventValues()V
+
+ iget-object v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget v2, v1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-nez v2, :cond_2
+
+ iget v1, v1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ iget v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ if-eq v1, v2, :cond_1
+
+ invoke-direct {p0, v1}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ :cond_1
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->resetState()V
+
+ goto :goto_0
+
+ :cond_2
+ const/4 v0, 0x2
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ :goto_0
+ return-void
+.end method
+
+.method public notifyProgrammaticScroll(IZ)V
+ .locals 2
+
+ const/4 v0, 0x2
+
+ if-eqz p2, :cond_0
+
+ const/4 p2, 0x2
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p2, 0x3
+
+ :goto_0
+ iput p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ const/4 p2, 0x0
+
+ iput-boolean p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mFakeDragging:Z
+
+ iget v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ if-eq v1, p1, :cond_1
+
+ const/4 p2, 0x1
+
+ :cond_1
+ iput p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ if-eqz p2, :cond_2
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ :cond_2
+ return-void
+.end method
+
+.method public onScrollStateChanged(Landroidx/recyclerview/widget/RecyclerView;I)V
+ .locals 5
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ iget p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ const/4 v0, 0x0
+
+ const/4 v1, 0x1
+
+ if-ne p1, v1, :cond_0
+
+ iget p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ if-eq p1, v1, :cond_1
+
+ :cond_0
+ if-ne p2, v1, :cond_1
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->startDrag(Z)V
+
+ return-void
+
+ :cond_1
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isInAnyDraggingState()Z
+
+ move-result p1
+
+ const/4 v2, 0x2
+
+ if-eqz p1, :cond_3
+
+ if-ne p2, v2, :cond_3
+
+ iget-boolean p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollHappened:Z
+
+ if-eqz p1, :cond_2
+
+ invoke-direct {p0, v2}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ iput-boolean v1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDispatchSelected:Z
+
+ :cond_2
+ return-void
+
+ :cond_3
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->isInAnyDraggingState()Z
+
+ move-result p1
+
+ const/4 v3, -0x1
+
+ if-eqz p1, :cond_7
+
+ if-nez p2, :cond_7
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->updateScrollEventValues()V
+
+ iget-boolean p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollHappened:Z
+
+ if-nez p1, :cond_4
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p1, p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ if-eq p1, v3, :cond_6
+
+ const/4 v4, 0x0
+
+ invoke-direct {p0, p1, v4, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchScrolled(IFI)V
+
+ goto :goto_0
+
+ :cond_4
+ iget-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget v4, p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-nez v4, :cond_5
+
+ iget v4, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ iget p1, p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ if-eq v4, p1, :cond_6
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ goto :goto_0
+
+ :cond_5
+ const/4 v1, 0x0
+
+ :cond_6
+ :goto_0
+ if-eqz v1, :cond_7
+
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->resetState()V
+
+ :cond_7
+ iget p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ if-ne p1, v2, :cond_a
+
+ if-nez p2, :cond_a
+
+ iget-boolean p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDataSetChangeHappened:Z
+
+ if-eqz p1, :cond_a
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->updateScrollEventValues()V
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-nez p2, :cond_a
+
+ iget p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ iget p1, p1, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ if-eq p2, p1, :cond_9
+
+ if-ne p1, v3, :cond_8
+
+ const/4 p1, 0x0
+
+ :cond_8
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ :cond_9
+ invoke-direct {p0, v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->resetState()V
+
+ :cond_a
+ return-void
+.end method
+
+.method public onScrolled(Landroidx/recyclerview/widget/RecyclerView;II)V
+ .locals 3
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollHappened:Z
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->updateScrollEventValues()V
+
+ iget-boolean v0, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDispatchSelected:Z
+
+ const/4 v1, -0x1
+
+ const/4 v2, 0x0
+
+ if-eqz v0, :cond_4
+
+ iput-boolean v2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDispatchSelected:Z
+
+ if-gtz p3, :cond_2
+
+ if-nez p3, :cond_1
+
+ if-gez p2, :cond_0
+
+ const/4 p2, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p2, 0x0
+
+ :goto_0
+ iget-object p3, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mViewPager:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {p3}, Landroidx/viewpager2/widget/ViewPager2;->isRtl()Z
+
+ move-result p3
+
+ if-ne p2, p3, :cond_1
+
+ goto :goto_1
+
+ :cond_1
+ const/4 p2, 0x0
+
+ goto :goto_2
+
+ :cond_2
+ :goto_1
+ const/4 p2, 0x1
+
+ :goto_2
+ if-eqz p2, :cond_3
+
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p3, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-eqz p3, :cond_3
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ add-int/2addr p2, p1
+
+ goto :goto_3
+
+ :cond_3
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ :goto_3
+ iput p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ iget p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mDragStartPosition:I
+
+ iget p3, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ if-eq p2, p3, :cond_6
+
+ invoke-direct {p0, p3}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ goto :goto_4
+
+ :cond_4
+ iget p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mAdapterState:I
+
+ if-nez p2, :cond_6
+
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ if-ne p2, v1, :cond_5
+
+ const/4 p2, 0x0
+
+ :cond_5
+ invoke-direct {p0, p2}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchSelected(I)V
+
+ :cond_6
+ :goto_4
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ if-ne p2, v1, :cond_7
+
+ const/4 p2, 0x0
+
+ :cond_7
+ iget-object p3, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget v0, p3, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffset:F
+
+ iget p3, p3, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ invoke-direct {p0, p2, v0, p3}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchScrolled(IFI)V
+
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mPosition:I
+
+ iget p3, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mTarget:I
+
+ if-eq p2, p3, :cond_8
+
+ if-ne p3, v1, :cond_9
+
+ :cond_8
+ iget-object p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollValues:Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;
+
+ iget p2, p2, Landroidx/viewpager2/widget/ScrollEventAdapter$ScrollEventValues;->mOffsetPx:I
+
+ if-nez p2, :cond_9
+
+ iget p2, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mScrollState:I
+
+ if-eq p2, p1, :cond_9
+
+ invoke-direct {p0, v2}, Landroidx/viewpager2/widget/ScrollEventAdapter;->dispatchStateChanged(I)V
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->resetState()V
+
+ :cond_9
+ return-void
+.end method
+
+.method public setOnPageChangeCallback(Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ScrollEventAdapter;->mCallback:Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ViewPager2$1.smali b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$1.smali
new file mode 100644
index 0000000000..4b53430144
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$1.smali
@@ -0,0 +1,50 @@
+.class public Landroidx/viewpager2/widget/ViewPager2$1;
+.super Landroidx/viewpager2/widget/ViewPager2$DataSetChangeObserver;
+.source "ViewPager2.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/widget/ViewPager2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$1;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/ViewPager2$DataSetChangeObserver;->(Landroidx/viewpager2/widget/ViewPager2$1;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onChanged()V
+ .locals 2
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ViewPager2$1;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ const/4 v1, 0x1
+
+ iput-boolean v1, v0, Landroidx/viewpager2/widget/ViewPager2;->mCurrentItemDirty:Z
+
+ iget-object v0, v0, Landroidx/viewpager2/widget/ViewPager2;->mScrollEventAdapter:Landroidx/viewpager2/widget/ScrollEventAdapter;
+
+ invoke-virtual {v0}, Landroidx/viewpager2/widget/ScrollEventAdapter;->notifyDataSetChangeHappened()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ViewPager2$2.smali b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$2.smali
new file mode 100644
index 0000000000..10569d0998
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$2.smali
@@ -0,0 +1,64 @@
+.class public Landroidx/viewpager2/widget/ViewPager2$2;
+.super Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+.source "ViewPager2.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/widget/ViewPager2;->initialize(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$2;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onPageScrollStateChanged(I)V
+ .locals 0
+
+ if-nez p1, :cond_0
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$2;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {p1}, Landroidx/viewpager2/widget/ViewPager2;->updateCurrentItem()V
+
+ :cond_0
+ return-void
+.end method
+
+.method public onPageSelected(I)V
+ .locals 2
+
+ iget-object v0, p0, Landroidx/viewpager2/widget/ViewPager2$2;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ iget v1, v0, Landroidx/viewpager2/widget/ViewPager2;->mCurrentItem:I
+
+ if-eq v1, p1, :cond_0
+
+ iput p1, v0, Landroidx/viewpager2/widget/ViewPager2;->mCurrentItem:I
+
+ iget-object p1, v0, Landroidx/viewpager2/widget/ViewPager2;->mAccessibilityProvider:Landroidx/viewpager2/widget/ViewPager2$AccessibilityProvider;
+
+ invoke-virtual {p1}, Landroidx/viewpager2/widget/ViewPager2$AccessibilityProvider;->onSetNewCurrentItem()V
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ViewPager2$3.smali b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$3.smali
new file mode 100644
index 0000000000..d3301a6681
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$3.smali
@@ -0,0 +1,59 @@
+.class public Landroidx/viewpager2/widget/ViewPager2$3;
+.super Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;
+.source "ViewPager2.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/widget/ViewPager2;->initialize(Landroid/content/Context;Landroid/util/AttributeSet;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$3;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-direct {p0}, Landroidx/viewpager2/widget/ViewPager2$OnPageChangeCallback;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onPageSelected(I)V
+ .locals 1
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$3;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {p1}, Landroid/view/ViewGroup;->clearFocus()V
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$3;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-virtual {p1}, Landroid/view/ViewGroup;->hasFocus()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$3;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ iget-object p1, p1, Landroidx/viewpager2/widget/ViewPager2;->mRecyclerView:Landroidx/recyclerview/widget/RecyclerView;
+
+ const/4 v0, 0x2
+
+ invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->requestFocus(I)Z
+
+ :cond_0
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ViewPager2$4.smali b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$4.smali
new file mode 100644
index 0000000000..13648df335
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$4.smali
@@ -0,0 +1,80 @@
+.class public Landroidx/viewpager2/widget/ViewPager2$4;
+.super Ljava/lang/Object;
+.source "ViewPager2.java"
+
+# interfaces
+.implements Landroidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Landroidx/viewpager2/widget/ViewPager2;->enforceChildFillListener()Landroidx/recyclerview/widget/RecyclerView$OnChildAttachStateChangeListener;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$4;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onChildViewAttachedToWindow(Landroid/view/View;)V
+ .locals 2
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ invoke-virtual {p1}, Landroid/view/View;->getLayoutParams()Landroid/view/ViewGroup$LayoutParams;
+
+ move-result-object p1
+
+ check-cast p1, Landroidx/recyclerview/widget/RecyclerView$LayoutParams;
+
+ iget v0, p1, Landroid/view/ViewGroup$MarginLayoutParams;->width:I
+
+ const/4 v1, -0x1
+
+ if-ne v0, v1, :cond_0
+
+ iget p1, p1, Landroid/view/ViewGroup$MarginLayoutParams;->height:I
+
+ if-ne p1, v1, :cond_0
+
+ return-void
+
+ :cond_0
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "Pages must fill the whole ViewPager2 (use match_parent)"
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public onChildViewDetachedFromWindow(Landroid/view/View;)V
+ .locals 0
+ .param p1 # Landroid/view/View;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
diff --git a/com.discord/smali/androidx/viewpager2/widget/ViewPager2$AccessibilityProvider.smali b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$AccessibilityProvider.smali
new file mode 100644
index 0000000000..0ade3cd442
--- /dev/null
+++ b/com.discord/smali/androidx/viewpager2/widget/ViewPager2$AccessibilityProvider.smali
@@ -0,0 +1,224 @@
+.class public abstract Landroidx/viewpager2/widget/ViewPager2$AccessibilityProvider;
+.super Ljava/lang/Object;
+.source "ViewPager2.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Landroidx/viewpager2/widget/ViewPager2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x401
+ name = "AccessibilityProvider"
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+
+# direct methods
+.method public constructor (Landroidx/viewpager2/widget/ViewPager2;)V
+ .locals 0
+
+ iput-object p1, p0, Landroidx/viewpager2/widget/ViewPager2$AccessibilityProvider;->this$0:Landroidx/viewpager2/widget/ViewPager2;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+.method public synthetic constructor (Landroidx/viewpager2/widget/ViewPager2;Landroidx/viewpager2/widget/ViewPager2$1;)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Landroidx/viewpager2/widget/ViewPager2$AccessibilityProvider;->(Landroidx/viewpager2/widget/ViewPager2;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public handlesGetAccessibilityClassName()Z
+ .locals 1
+
+ const/4 v0, 0x0
+
+ return v0
+.end method
+
+.method public handlesLmPerformAccessibilityAction(I)Z
+ .locals 0
+
+ const/4 p1, 0x0
+
+ return p1
+.end method
+
+.method public handlesPerformAccessibilityAction(ILandroid/os/Bundle;)Z
+ .locals 0
+
+ const/4 p1, 0x0
+
+ return p1
+.end method
+
+.method public handlesRvGetAccessibilityClassName()Z
+ .locals 1
+
+ const/4 v0, 0x0
+
+ return v0
+.end method
+
+.method public onAttachAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$Adapter;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroidx/recyclerview/widget/RecyclerView$Adapter<",
+ "*>;)V"
+ }
+ .end annotation
+
+ return-void
+.end method
+
+.method public onDetachAdapter(Landroidx/recyclerview/widget/RecyclerView$Adapter;)V
+ .locals 0
+ .param p1 # Landroidx/recyclerview/widget/RecyclerView$Adapter;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroidx/recyclerview/widget/RecyclerView$Adapter<",
+ "*>;)V"
+ }
+ .end annotation
+
+ return-void
+.end method
+
+.method public onGetAccessibilityClassName()Ljava/lang/String;
+ .locals 2
+
+ new-instance v0, Ljava/lang/IllegalStateException;
+
+ const-string v1, "Not implemented."
+
+ invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public onInitialize(Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;Landroidx/recyclerview/widget/RecyclerView;)V
+ .locals 0
+ .param p1 # Landroidx/viewpager2/widget/CompositeOnPageChangeCallback;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p2 # Landroidx/recyclerview/widget/RecyclerView;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
+
+.method public onInitializeAccessibilityNodeInfo(Landroid/view/accessibility/AccessibilityNodeInfo;)V
+ .locals 0
+
+ return-void
+.end method
+
+.method public onLmInitializeAccessibilityNodeInfo(Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;)V
+ .locals 0
+ .param p1 # Landroidx/core/view/accessibility/AccessibilityNodeInfoCompat;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+
+ return-void
+.end method
+
+.method public onLmPerformAccessibilityAction(I)Z
+ .locals 1
+
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string v0, "Not implemented."
+
+ invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
+
+.method public onPerformAccessibilityAction(ILandroid/os/Bundle;)Z
+ .locals 0
+
+ new-instance p1, Ljava/lang/IllegalStateException;
+
+ const-string p2, "Not implemented."
+
+ invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;->