Changes of com.discord v1349

com.discord/AndroidManifest.xml

@@ -176,11 +176,11 @@
             <meta-data android:name="com.google.firebase.components:com.google.firebase.analytics.connector.internal.AnalyticsConnectorRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.ndk.CrashlyticsNdkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.crashlytics.CrashlyticsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+            <meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.remoteconfig.RemoteConfigRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonKtxRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
             <meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
-            <meta-data android:name="com.google.firebase.components:com.google.firebase.datatransport.TransportRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
         </service>
         <service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
             <intent-filter>

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1348.apk
+apkFileName: com.discord-1349.apk
 compressionType: false
 doNotCompress:
 - resources.arsc
@@ -82,5 +82,5 @@ usesFramework:
   tag: null
 version: 2.4.2-83a459-SNAPSHOT
 versionInfo:
-  versionCode: '1348'
+  versionCode: '1349'
-  versionName: '50.2'
+  versionName: '51.1'

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

@@ -14,7 +14,7 @@
         <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" style="@style/UiKit.TextView" />
             <FrameLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:layout_width="40.0dip" android:layout_height="40.0dip" android:src="@drawable/ic_emoji_24dp" android:scaleType="centerInside" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
                 <ImageView android:layout_gravity="bottom|center|right" android:id="@id/flex_input_expression_btn_badge" android:visibility="gone" android:layout_width="7.0dip" android:layout_height="7.0dip" android:layout_marginRight="11.0dip" android:layout_marginBottom="11.0dip" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500" />
             </FrameLayout>
         </LinearLayout>

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

@@ -7,7 +7,7 @@
         <TextView android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" android:paddingHorizontal="64.0dip" style="@style/UiKit.TextAppearance.Semibold" />
         <com.google.android.material.button.MaterialButton android:id="@id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
     </LinearLayout>
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/call_non_video_container" android:layout_width="fill_parent" android:layout_height="fill_parent">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/call_non_video_container" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
             <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
         </com.google.android.material.appbar.AppBarLayout>
@@ -30,7 +30,7 @@
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
         <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/call_controls_sheet_container" android:layout_width="fill_parent" android:layout_height="fill_parent">
+    <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/call_controls_sheet_container" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView2 android:layout_gravity="center_horizontal" android:id="@id/call_controls_floating_new" android:visibility="invisible" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" style="@style/VoiceControlsSheet" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -4,10 +4,11 @@
     <FrameLayout android:id="@id/chat_list_adapter_item_text_decorator_reply_link_icon" android:clipChildren="false" android:layout_width="32.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_decorator" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_decorator">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="7.0dip" android:layout_marginStart="2.0dip" app:end_padding="2.0dip" app:tint="?colorBackgroundAccent" />
     </FrameLayout>
-    <FrameLayout android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:minHeight="18.0dip" android:layout_marginVertical="4.0dip" app:layout_constraintBottom_toTopOf="@id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/chat_list_adapter_item_text_header" app:layout_constraintTop_toTopOf="parent">
+    <FrameLayout android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:minHeight="18.0dip" android:layout_marginVertical="4.0dip" app:layout_constraintBottom_toTopOf="@id/chat_list_adapter_item_text_avatar" app:layout_constraintLeft_toLeftOf="@id/chat_list_adapter_item_text_header" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <LinearLayout android:id="@id/chat_list_adapter_item_reply_leading_views" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="16.0dip" android:layout_height="16.0dip" style="@style/Avatar.Chat" />
+            <ImageView android:id="@id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2.0dip" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4.0dip" android:backgroundTint="?colorBackgroundTertiary" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageView" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:maxLines="1" android:layout_marginHorizontal="4.0dip" style="@style/UiKit.TextView" />
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4.0dip" style="@style/Avatar.Chat" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/UiKit.TextView" />
     </FrameLayout>

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

@@ -3,14 +3,14 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/sticker_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
+            <RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
-                <com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
+                <com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/sticker_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_stickers" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
             </RelativeLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:layout_height="fill_parent" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:layout_height="fill_parent" android:layout_marginLeft="8.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="8.0dip" android:layout_marginHorizontal="8.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
         <LinearLayout android:gravity="center" android:id="@id/chat_input_sticker_picker_empty_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@id/chat_input_sticker_picker_empty_image" android:layout_width="72.0dip" android:layout_height="72.0dip" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" />
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />

com.discord/res/layout/flex_input_widget.xml

@@ -14,7 +14,7 @@
         <LinearLayout android:id="@id/flex_input_main_input_container" android:background="@drawable/drawable_bg_corners_20dp" android:paddingLeft="12.0dip" android:paddingRight="4.0dip" android:layout_marginTop="8.0dip" android:layout_marginBottom="8.0dip" android:layout_toLeftOf="@id/flex_input_send_btn_container" android:layout_toRightOf="@id/flex_input_left_btns_container" android:layout_centerVertical="true" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundSecondaryAlt" style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
             <com.lytefast.flexinput.widget.FlexEditText android:textSize="@dimen/uikit_textsize_medium" android:textColor="?colorTextNormal" android:textColorHint="?colorTextMuted" android:layout_gravity="center_vertical" android:id="@id/flex_input_text_input" android:background="@color/transparent" android:paddingTop="4.0dip" android:paddingBottom="4.0dip" android:focusableInTouchMode="true" android:scrollbars="vertical" android:layout_width="0.0dip" android:minHeight="40.0dip" android:maxLines="5" android:layout_weight="1.0" android:lineSpacingMultiplier="1.0" android:inputType="textCapSentences|textMultiLine" android:imeOptions="flagNoExtractUi" style="@style/UiKit.TextView" />
             <FrameLayout android:layout_gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content">
-                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:layout_width="40.0dip" android:layout_height="40.0dip" android:src="@drawable/ic_emoji_24dp" android:scaleType="centerInside" android:contentDescription="@string/emoji" style="@style/UiKit.ImageButton" />
+                <androidx.appcompat.widget.AppCompatImageButton android:id="@id/flex_input_expression_btn" android:background="@null" android:padding="8.0dip" android:visibility="gone" android:src="@drawable/ic_emoji_24dp" android:contentDescription="@string/emoji" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageButton" />
                 <ImageView android:layout_gravity="bottom|center|right" android:id="@id/flex_input_expression_btn_badge" android:visibility="gone" android:layout_width="7.0dip" android:layout_height="7.0dip" android:layout_marginRight="11.0dip" android:layout_marginBottom="11.0dip" android:src="@drawable/drawable_circle_red" android:importantForAccessibility="no" app:tint="@color/status_red_500" />
             </FrameLayout>
         </LinearLayout>

com.discord/res/layout/premium_upsell_dialog.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:theme="@style/AppTheme.Dark" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
+<RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.Page.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.viewpager.widget.ViewPager android:id="@id/premium_upsell_viewpager" android:layout_width="fill_parent" android:layout_height="250.0dip" />
     <com.google.android.material.tabs.TabLayout android:id="@id/premium_upsell_dots" android:layout_below="@id/premium_upsell_viewpager" style="@style/UiKit.TabLayout.PagerIndicator" />
     <View android:id="@id/premium_upsell_divider" android:layout_below="@id/premium_upsell_dots" style="@style/UiKit.Settings.Divider" />
     <LinearLayout android:id="@id/premium_upsell_button_container" android:layout_below="@id/premium_upsell_divider" style="@style/UiKit.Dialog.ButtonContainer">
-        <com.google.android.material.button.MaterialButton android:textColor="@color/primary_100" android:id="@id/premium_upsell_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit.Material.Button.Transparent" />
+        <com.google.android.material.button.MaterialButton android:textColor="?colorHeaderPrimary" android:id="@id/premium_upsell_close" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/close" style="@style/UiKit.Material.Button.Transparent" />
         <com.google.android.material.button.MaterialButton android:id="@id/premium_upsell_send_compressed" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/send_compressed" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button.Fit" />
         <com.google.android.material.button.MaterialButton android:id="@id/premium_upsell_learn_more" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/learn_more" android:layout_marginStart="8.0dip" style="@style/UiKit.Material.Button.Green.Fit" />
     </LinearLayout>

com.discord/res/layout/sticker_category_item_recent.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout style="@style/ExpressionPickerCategoryItem"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_category_recent" />
+    <ImageView android:layout_gravity="center" android:layout_width="24.0dip" android:layout_height="24.0dip" android:src="@drawable/ic_recent_24dp" android:scaleType="fitCenter" android:contentDescription="@string/sticker_category_recent" app:tint="?colorInteractiveNormal" />
     <include layout="@layout/expression_picker_category_selection_overline_view" />
 </FrameLayout>

com.discord/res/layout/sticker_pack_activated_dialog.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:clipChildren="false" style="@style/UiKit.ViewGroup.Page.LinearLayout"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout android:layout_marginBottom="32.0dip" style="@style/UiKit.ViewGroup.RelativeLayout">
-        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/sticker_pack_activated_banner" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="108.0dip" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
+        <com.facebook.drawee.view.SimpleDraweeView android:id="@id/sticker_pack_activated_banner" android:background="?colorBackgroundPrimary" android:layout_width="fill_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" android:importantForAccessibility="no" app:actualImageScaleType="centerCrop" app:viewAspectRatio="4.4" style="@style/UiKit.ImageView" />
     </RelativeLayout>
     <TextView android:gravity="center" android:layout_width="fill_parent" android:layout_marginLeft="24.0dip" android:layout_marginTop="8.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="8.0dip" android:text="@string/sticker_purchase_modal_confirm_body_header" style="@style/UiKit.TextView.H1" />
     <TextView android:gravity="center" android:id="@id/sticker_pack_activated_body" android:layout_width="fill_parent" android:layout_marginLeft="24.0dip" android:layout_marginRight="24.0dip" android:layout_marginBottom="32.0dip" style="@style/UiKit.TextView" />

com.discord/res/layout/sticker_picker_store_buy_button.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout android:paddingLeft="12.0dip" android:paddingTop="16.0dip" android:paddingRight="12.0dip" android:paddingBottom="16.0dip" style="@style/UiKit.ViewGroup.LinearLayout">
         <com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button_premium" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_background_color="@color/status_green" app:lb_icon="@drawable/ic_nitro_badge_white" app:lb_icon_gravity="textStart" app:lb_progress_color="@color/white" />
-        <com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_background_color="?colorButtonSecondary" app:lb_progress_color="@color/white" />
+        <com.discord.views.LoadingButton android:id="@id/sticker_store_buy_button" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:lb_background_color="?colorButtonSecondary" app:lb_progress_color="?colorHeaderPrimary" app:lb_text_color="?colorHeaderPrimary" />
     </LinearLayout>
     <View android:id="@id/sticker_store_buy_button_divider" style="@style/UiKit.Divider" />
 </LinearLayout>

com.discord/res/layout/sticker_store_header_item.xml

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <LinearLayout style="@style/UiKit.ViewGroup.LinearLayout.Horizontal">
         <ImageView android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_expiring" android:visibility="gone" android:layout_width="16.0sp" android:layout_height="16.0sp" android:src="@drawable/ic_warning_circle_24dp" android:contentDescription="@string/sticker_picker_pack_expiring_soon" android:layout_marginEnd="4.0dip" />
-        <com.google.android.material.chip.Chip android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_new" android:visibility="gone" android:text="@string/_new" android:layout_marginEnd="4.0dip" style="@style/UiKit.Chip.New" />
+        <com.google.android.material.chip.Chip android:textColor="@color/white" android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_new" android:visibility="gone" android:text="@string/_new" android:layout_marginEnd="4.0dip" style="@style/UiKit.Chip.New" />
         <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_large" android:textColor="?colorHeaderPrimary" android:id="@id/sticker_store_header_item_title" style="@style/UiKit.TextView" />
         <RelativeLayout android:layout_gravity="center_vertical" android:id="@id/sticker_store_header_item_container" android:paddingLeft="8.0dip" android:paddingTop="2.0dip" android:paddingRight="8.0dip" android:paddingBottom="2.0dip" android:layout_width="wrap_content" style="@style/UiKit.ViewGroup.RelativeLayout">
             <FrameLayout android:id="@id/sticker_store_header_item_animated" android:background="?primary_200_circle" android:visibility="gone" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_centerVertical="true" android:layout_alignParentStart="true" android:backgroundTint="?colorBackgroundModifierAccent">

com.discord/res/layout/widget_call_fullscreen.xml

@@ -7,7 +7,7 @@
         <TextView android:textColor="@color/white" android:paddingLeft="64.0dip" android:paddingRight="64.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="16.0dip" android:text="@string/mobile_stream_participants_hidden" android:textAlignment="center" style="@style/UiKit.TextAppearance.Semibold" />
         <com.google.android.material.button.MaterialButton android:id="@id/call_participants_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/stream_show_all_participants" android:backgroundTint="@color/primary_500" app:cornerRadius="100.0dip" style="@style/UiKit.Material.Button" />
     </LinearLayout>
-    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/call_non_video_container" android:layout_width="fill_parent" android:layout_height="fill_parent">
+    <androidx.constraintlayout.widget.ConstraintLayout android:id="@id/call_non_video_container" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <com.google.android.material.appbar.AppBarLayout android:id="@id/action_bar_toolbar_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" style="@style/AppTheme.AppBarLayout.Flat.Transparent">
             <androidx.appcompat.widget.Toolbar style="@style/AppTheme.Toolbar.Transparent" />
         </com.google.android.material.appbar.AppBarLayout>
@@ -30,7 +30,7 @@
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView android:theme="@style/AppTheme.Dark" android:id="@id/call_controls_floating" android:visibility="gone" android:layout_width="fill_parent" android:layout_height="wrap_content" app:layout_constrainedHeight="true" app:layout_constraintBottom_toTopOf="@id/call_floating_push_to_talk" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" />
         <com.google.android.material.button.MaterialButton android:theme="@style/AppTheme.Dark" android:textColor="@color/primary_100" android:id="@id/call_floating_push_to_talk" android:visibility="gone" android:layout_width="0.0dip" android:layout_margin="8.0dip" android:text="@string/input_mode_ptt" android:backgroundTint="@color/primary_630_alpha_90" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" style="@style/UiKit.Material.Button" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/call_controls_sheet_container" android:layout_width="fill_parent" android:layout_height="fill_parent">
+    <androidx.coordinatorlayout.widget.CoordinatorLayout android:id="@id/call_controls_sheet_container" android:layout_width="0.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <com.discord.widgets.voice.controls.FloatingVoiceControlsView2 android:layout_gravity="center_horizontal" android:id="@id/call_controls_floating_new" android:visibility="invisible" app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" style="@style/VoiceControlsSheet" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_chat_input_command_application_header_item.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout android:background="?bg_pressed_highlight" android:layout_height="32.0dip" style="@style/UiKit.ViewGroup.ConstraintLayout"
+  xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+    <com.facebook.drawee.view.SimpleDraweeView android:id="@id/chat_input_application_avatar" android:layout_width="16.0dip" android:layout_height="16.0dip" android:layout_marginStart="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" style="@style/Avatar.Standard" />
+    <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorInteractiveNormal" android:id="@id/chat_input_application_name" android:singleLine="true" android:layout_marginStart="8.0dip" android:layout_marginEnd="16.0dip" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/chat_input_application_avatar" app:layout_constraintTop_toTopOf="parent" style="@style/UiKit.TextView" />
+</androidx.constraintlayout.widget.ConstraintLayout>

com.discord/res/layout/widget_chat_list_actions.xml

@@ -9,7 +9,6 @@
         <TextView android:id="@id/dialog_chat_actions_copy" android:text="@string/copy_text" app:drawableStartCompat="@drawable/ic_copy_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_delete" android:text="@string/delete" app:drawableStartCompat="@drawable/ic_delete_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:gravity="center_vertical" android:id="@id/dialog_chat_actions_profile" android:text="@string/profile" app:drawableStartCompat="@drawable/ic_profile_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
-        <TextView android:id="@id/dialog_chat_actions_quote" android:text="@string/quote" app:drawableStartCompat="?ic_quote" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_manage_reactions" android:text="@string/reactions" app:drawableStartCompat="@drawable/ic_reaction_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_remove_all_reactions" android:text="@string/remove_all_reactions" app:drawableStartCompat="@drawable/ic_remove_reaction_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />
         <TextView android:id="@id/dialog_chat_actions_publish" android:visibility="gone" android:text="@string/news_channel_publish" app:drawableStartCompat="@drawable/ic_publish_24dp" app:drawableTint="?colorInteractiveNormal" style="@style/UiKit.Settings.Item.Icon" />

com.discord/res/layout/widget_chat_list_adapter_item_text.xml

@@ -4,10 +4,11 @@
     <FrameLayout android:id="@id/chat_list_adapter_item_text_decorator_reply_link_icon" android:clipChildren="false" android:layout_width="32.0dip" android:layout_height="0.0dip" app:layout_constraintBottom_toBottomOf="@id/chat_list_adapter_item_text_decorator" app:layout_constraintEnd_toStartOf="@id/chat_list_adapter_item_text_decorator" app:layout_constraintTop_toTopOf="@id/chat_list_adapter_item_text_decorator">
         <com.discord.widgets.chat.list.ViewReplySpline android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_marginTop="7.0dip" android:layout_marginStart="2.0dip" app:end_padding="2.0dip" app:tint="?colorBackgroundAccent" />
     </FrameLayout>
-    <FrameLayout android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:minHeight="18.0dip" app:layout_constraintBottom_toTopOf="@id/chat_list_adapter_item_text_avatar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/chat_list_adapter_item_text_header" app:layout_constraintTop_toTopOf="parent">
+    <FrameLayout android:gravity="center_vertical" android:id="@id/chat_list_adapter_item_text_decorator" android:visibility="gone" android:layout_width="0.0dip" android:layout_height="wrap_content" android:layout_marginTop="4.0dip" android:layout_marginBottom="4.0dip" android:minHeight="18.0dip" app:layout_constraintBottom_toTopOf="@id/chat_list_adapter_item_text_avatar" app:layout_constraintLeft_toLeftOf="@id/chat_list_adapter_item_text_header" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent">
         <LinearLayout android:id="@id/chat_list_adapter_item_reply_leading_views" android:layout_width="wrap_content" android:layout_height="wrap_content">
-            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="16.0dip" android:layout_height="16.0dip" style="@style/Avatar.Chat" />
+            <ImageView android:id="@id/chat_list_adapter_item_text_decorator_reply_icon" android:background="@drawable/drawable_circle_black" android:padding="2.0dip" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:src="@drawable/ic_reply_24dp" android:contentDescription="@null" android:layout_marginEnd="4.0dip" android:backgroundTint="?colorBackgroundTertiary" app:tint="?colorInteractiveNormal" style="@style/UiKit.ImageView" />
-            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4.0dip" android:layout_marginRight="4.0dip" android:maxLines="1" style="@style/UiKit.TextView" />
+            <com.facebook.drawee.view.SimpleDraweeView android:layout_gravity="center" android:id="@id/chat_list_adapter_item_text_decorator_avatar" android:layout_width="@dimen/avatar_size_reply" android:layout_height="@dimen/avatar_size_reply" android:layout_marginEnd="4.0dip" style="@style/Avatar.Chat" />
+            <TextView android:textSize="@dimen/uikit_textsize_small" android:id="@id/chat_list_adapter_item_text_decorator_reply_name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="1" android:layout_marginEnd="4.0dip" style="@style/UiKit.TextView" />
         </LinearLayout>
         <com.discord.utilities.view.text.SimpleDraweeSpanTextView android:textSize="@dimen/uikit_textsize_small" android:textColor="?colorTextNormal" android:ellipsize="end" android:id="@id/chat_list_adapter_item_text_reply_content" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" android:singleLine="false" android:alpha="0.64" style="@style/UiKit.TextView" />
     </FrameLayout>

com.discord/res/layout/widget_premium_upsell.xml

@@ -2,6 +2,6 @@
 <LinearLayout android:gravity="center" android:layout_gravity="center" android:paddingLeft="24.0dip" android:paddingTop="24.0dip" android:paddingRight="24.0dip" android:paddingBottom="8.0dip" android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/UiKit.ViewGroup.LinearLayout"
   xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView android:id="@id/premium_upsell_img" android:layout_height="80.0dip" android:adjustViewBounds="true" android:importantForAccessibility="no" style="@style/UiKit.ImageView" />
-    <TextView android:textSize="18.0dip" android:textColor="@color/primary_100" android:gravity="center_horizontal" android:id="@id/premium_upsell_header" android:layout_marginTop="16.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+    <TextView android:textSize="18.0dip" android:textColor="?colorHeaderPrimary" android:gravity="center_horizontal" android:id="@id/premium_upsell_header" android:layout_marginTop="16.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
-    <TextView android:textSize="14.0dip" android:textColor="@color/primary_300" android:gravity="center_horizontal" android:id="@id/premium_upsell_body" android:layout_marginTop="8.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
+    <TextView android:textSize="14.0dip" android:textColor="?colorTextNormal" android:gravity="center_horizontal" android:id="@id/premium_upsell_body" android:layout_marginTop="8.0dip" android:lineSpacingMultiplier="1.0" style="@style/UiKit.TextView" />
 </LinearLayout>

com.discord/res/layout/widget_sticker_picker.xml

@@ -3,14 +3,14 @@
   xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.google.android.material.appbar.AppBarLayout android:id="@id/sticker_app_bar" android:background="@color/transparent" android:layout_width="fill_parent" android:layout_height="wrap_content" style="@style/AppTheme.AppBarLayout.Flat">
         <androidx.appcompat.widget.Toolbar android:id="@id/sticker_toolbar" android:layout_height="wrap_content" android:minHeight="0.0dip" app:contentInsetStart="0.0dip" style="@style/AppTheme.Toolbar.Transparent">
-            <RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:layout_marginBottom="8.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
+            <RelativeLayout android:id="@id/sticker_search_bar" android:background="@drawable/drawable_bg_corners_4dp" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginLeft="12.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="12.0dip" android:animateLayoutChanges="true" android:backgroundTint="?colorBackgroundTertiary">
-                <com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:visibility="gone" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
+                <com.google.android.material.textfield.TextInputEditText android:id="@id/sticker_search_input" android:background="@null" android:layout_height="wrap_content" android:hint="@string/search_for_stickers" style="@style/ExpressionSearchInput" />
                 <ImageView android:id="@id/sticker_search_clear" android:src="@drawable/ic_search_16dp" android:layout_centerVertical="true" android:contentDescription="@string/search_for_stickers" android:layout_alignParentEnd="true" app:tint="?colorTextMuted" style="@style/ExpressionSearchInputClear" />
             </RelativeLayout>
         </androidx.appcompat.widget.Toolbar>
     </com.google.android.material.appbar.AppBarLayout>
     <com.discord.app.AppViewFlipper android:id="@id/chat_input_sticker_picker_view_flipper" android:layout_marginBottom="@dimen/expression_picker_category_bar_height" android:inAnimation="@android:anim/fade_in" android:outAnimation="@android:anim/fade_out" style="@style/UiKit.ViewGroup.AppViewFlipper.InCoordinatorLayout">
-        <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:layout_height="fill_parent" android:layout_marginLeft="8.0dip" android:layout_marginRight="8.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
+        <androidx.recyclerview.widget.RecyclerView android:id="@id/chat_input_sticker_picker_recycler" android:layout_height="fill_parent" android:layout_marginLeft="8.0dip" android:layout_marginTop="12.0dip" android:layout_marginRight="8.0dip" app:layout_behavior="@string/appbar_scrolling_view_behavior" style="@style/UiKit.ViewGroup.RecyclerView" />
         <LinearLayout android:gravity="center" android:id="@id/chat_input_sticker_picker_empty_container" android:layout_height="fill_parent" style="@style/UiKit.ViewGroup.LinearLayout">
             <ImageView android:layout_gravity="center_horizontal" android:id="@id/chat_input_sticker_picker_empty_image" android:layout_width="72.0dip" android:layout_height="72.0dip" android:src="@drawable/ic_removed_sticker_72dp" android:importantForAccessibility="no" />
             <TextView android:textAppearance="@style/UiKit.TextAppearance.Bold" android:textSize="@dimen/uikit_textsize_xxlarge" android:textColor="?colorHeaderPrimary" android:id="@id/chat_input_sticker_picker_empty_title" android:layout_marginTop="8.0dip" style="@style/UiKit.TextView" />

com.discord/res/values/ids.xml

@@ -480,8 +480,10 @@
     <item type="id" name="chat_gating_input_guard_action" />
     <item type="id" name="chat_gating_input_guard_icon" />
     <item type="id" name="chat_gating_input_guard_text" />
+    <item type="id" name="chat_input_application_avatar" />
     <item type="id" name="chat_input_application_commands_option_description" />
     <item type="id" name="chat_input_application_commands_recycler" />
+    <item type="id" name="chat_input_application_name" />
     <item type="id" name="chat_input_container" />
     <item type="id" name="chat_input_context_bar" />
     <item type="id" name="chat_input_context_cancel" />
@@ -540,6 +542,7 @@
     <item type="id" name="chat_list_adapter_item_text_avatar" />
     <item type="id" name="chat_list_adapter_item_text_decorator" />
     <item type="id" name="chat_list_adapter_item_text_decorator_avatar" />
+    <item type="id" name="chat_list_adapter_item_text_decorator_reply_icon" />
     <item type="id" name="chat_list_adapter_item_text_decorator_reply_link_icon" />
     <item type="id" name="chat_list_adapter_item_text_decorator_reply_name" />
     <item type="id" name="chat_list_adapter_item_text_header" />
@@ -764,7 +767,6 @@
     <item type="id" name="dialog_chat_actions_pin" />
     <item type="id" name="dialog_chat_actions_profile" />
     <item type="id" name="dialog_chat_actions_publish" />
-    <item type="id" name="dialog_chat_actions_quote" />
     <item type="id" name="dialog_chat_actions_remove_all_reactions" />
     <item type="id" name="dialog_chat_actions_reply" />
     <item type="id" name="dialog_chat_actions_resend" />

com.discord/res/values/strings.xml

@@ -260,7 +260,7 @@
     <string name="announcement_guild_popout_name">Community Updates</string>
     <string name="answer">Answer</string>
     <string name="app_information">App Information</string>
-    <string name="app_name">firebase-perf</string>
+    <string name="app_name">KAPNG</string>
     <string name="app_not_opened">The Discord app could not be opened.</string>
     <string name="app_opened_body">"We've beamed the info to your Discord app. You can close this browser tab or continue with the web version."</string>
     <string name="app_opened_title">Discord App Launched</string>
@@ -876,8 +876,13 @@
     <string name="billing_tag_refunded">Refunded</string>
     <string name="billing_tag_reversed">Reversed</string>
     <string name="billing_third_party_eula_label">I agree to the [%1$s EULA](onClick)</string>
-    <string name="black_friday_2020_banner_content">"Between now and Monday, November 30th only when you subscribe to Nitro (%1$s/month) you'll get a free month of Nitro to give to a friend on us! [More Details](%2$s)."</string>
+    <string name="black_friday_2020_banner_title">Black Friday Deal: Get Nitro, Give Nitro</string>
-    <string name="black_friday_2020_banner_title">Black Friday: Give the gift of Nitro!</string>
+    <string name="black_friday_2020_upsell_content">Between now and Monday, November 30th only when you subscribe to Nitro (%1$s or %2$s) you’ll get a free month of Nitro to give to a friend on us! $[](detailsHook).</string>
+    <string name="black_friday_modal_upsell_body">**Get Nitro, Give Nitro** between now and Monday, November 30th only when you subscribe to Nitro (%1$s or %2$s) you’ll get a free month of Nitro to give to a friend on us! $[](detailsHook).</string>
+    <string name="black_friday_modal_upsell_title">Black Friday Deal</string>
+    <string name="black_friday_promotion_gift_inventory_title">Black Friday Deal</string>
+    <string name="black_friday_promotion_notice_action">Take me there!</string>
+    <string name="black_friday_promotion_notice_body">Don’t forget to head to your gift inventory to send your free month of Nitro to a friend!</string>
     <string name="block">Block</string>
     <string name="blocked">Blocked</string>
     <string name="blocked_message_count">%1$s</string>
@@ -1164,15 +1169,15 @@ We’re here to make a good impression."</string>
     <string name="channel_or_category">Channel or Category</string>
     <string name="channel_order_updated">Channel order updated.</string>
     <string name="channel_permissions">Channel Permissions</string>
-    <string name="channel_permissions_add_members_cta">Add a role or member</string>
+    <string name="channel_permissions_add_members_title">Add members or roles</string>
-    <string name="channel_permissions_add_members_cta_mobile">Add members</string>
+    <string name="channel_permissions_add_members_tooltip">Remove access to channel.</string>
-    <string name="channel_permissions_add_members_tooltip">Remove access to channel</string>
+    <string name="channel_permissions_add_members_tooltip_administrator">Cannot be removed due to Administrator access.</string>
-    <string name="channel_permissions_add_members_tooltip_administrator">Cannot be removed due to Administrator access</string>
+    <string name="channel_permissions_add_members_tooltip_owner">Server owner cannot be removed.</string>
-    <string name="channel_permissions_add_members_tooltip_owner">Server owner cannot be removed</string>
     <string name="channel_permissions_advanced_permissions">Advanced permissions</string>
     <string name="channel_permissions_advanced_view">Advanced View</string>
     <string name="channel_permissions_basic_view">Basic View</string>
-    <string name="channel_permissions_eveyone_is_admin_warning">All members can view this channel because @everyone has Administrator permissions. You can change this in Roles via Server Settings</string>
+    <string name="channel_permissions_everyone_can_not_view_warning">Heads up! In this server, members cannot view any channels by default unless they have a role with access to channels. You can give specific roles or members access to this channel in the Advanced View.</string>
+    <string name="channel_permissions_everyone_is_admin_warning">All members can view this channel because @everyone has Administrator permissions. You can change this in Roles via Server Settings.</string>
     <string name="channel_permissions_make_private_alert_subtitle">**#%1$s** will become private and visible to selected members and roles when enabled.</string>
     <string name="channel_permissions_make_private_alert_title">Make this channel private?</string>
     <string name="channel_permissions_make_public_alert_subtitle">**#%1$s** will become public and available to all members when disabled.</string>
@@ -1260,7 +1265,7 @@ We’re here to make a good impression."</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="com.crashlytics.android.build_id">d3897da06cd74a3dbcc401c14f6b4875</string>
+    <string name="com.crashlytics.android.build_id">8e069088722347b89d40f8ee7a7dfeba</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_giphy_query_description">Search for a GIF</string>
@@ -2429,6 +2434,8 @@ We’re here to make a good impression."</string>
     <string name="gift_embed_body_requires_verification">[Verify your account](onClick) before claiming this gift.</string>
     <string name="gift_embed_body_requires_verification_mobile">Verify your account before claiming this gift.</string>
     <string name="gift_embed_body_self">"If you want to claim this gift for yourself, go right ahead. We won't judge :)"</string>
+    <string name="gift_embed_body_self_not_redeemable">Thanks for giving the gift of %1$s.</string>
+    <string name="gift_embed_body_subscription_already_active">This gift cannot be redeemed with an existing subscription.</string>
     <string name="gift_embed_body_subscription_default_months">**%1$s** has gifted you %2$s for **%3$s**!</string>
     <string name="gift_embed_body_subscription_default_years">**%1$s** has gifted you %2$s for **%3$s**!</string>
     <string name="gift_embed_body_subscription_giveaway">"**%1$s** is giving away %2$s subscriptions to %3$s. Claim your gift before they're gone! Wahoooo!!!"</string>
@@ -2657,6 +2664,9 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
     <string name="guild_progress_steps">You have completed $[**%1$s out of %2$s steps**](stepsHook).</string>
     <string name="guild_progress_title">Finish setting up your server!</string>
     <string name="guild_role_actions_menu_label">Server Role Actions</string>
+    <string name="guild_rules_edit_link">Edit Server Rules</string>
+    <string name="guild_rules_header">Server Rules</string>
+    <string name="guild_rules_subheader">"By participating in this server, you have read and agreed to the server's rules."</string>
     <string name="guild_security_req_mfa_body">"When enabled, this requires members with moderation powers to have two-factor authentication enabled on their account in order to take moderation actions (e.g. kick, ban, and delete message). This can help prevent malicious people who compromise a mod or admin's account from taking destructive actions. **This setting can only be changed by the server owner if they have 2FA enabled on their account**."</string>
     <string name="guild_security_req_mfa_enable">[Enable on your account.](onClick)</string>
     <string name="guild_security_req_mfa_guild_disable">Disable 2FA Requirement</string>
@@ -3041,7 +3051,6 @@ Lost: %2$s"</string>
     <string name="guild_settings_member_verification_progress_will_save">Your changes are saved automatically.</string>
     <string name="guild_settings_member_verification_rejected">Rejected</string>
     <string name="guild_settings_member_verification_screen_title">Customize Screen</string>
-    <string name="guild_settings_member_verification_subtitle">If enabled, new members are required to pass requirements before they can join or talk in your server.</string>
     <string name="guild_settings_members_add_role">Add role</string>
     <string name="guild_settings_members_display_role">Display role:</string>
     <string name="guild_settings_members_remove_role">Remove role %1$s</string>
@@ -3992,7 +4001,7 @@ Want to know more about Discord?"</string>
     <string name="loading_line_6">Discord’s official birthday is May 13, 2015.</string>
     <string name="loading_line_7">We came up with the idea of Discord Nitro over morning breakfast potatoes.</string>
     <string name="loading_line_8">Our mascot, Wumpus, was originally created as a character with no friends :(</string>
-    <string name="loading_line_9">"In Discord's early days, light theme was the only theme. Scary times."</string>
+    <string name="loading_line_9">"In Discord's early days, light theme was the only theme. Dark theme didn't arrive until August 2015."</string>
     <string name="loading_messages_a11y_label">Loading more messages</string>
     <string name="loading_note">Loading Note</string>
     <string name="loading_tip_1">You can use Streamer Mode to hide personal details while streaming.</string>
@@ -4164,6 +4173,7 @@ Want to know more about Discord?"</string>
     <string name="member_verification_field_question">Question</string>
     <string name="member_verification_field_question_required_error">You must enter a question.</string>
     <string name="member_verification_form_fields_limit">You can only add up to %1$s form fields</string>
+    <string name="member_verification_form_incomplete">You have not completed all the required steps.</string>
     <string name="member_verification_form_item_coming_soon">Coming soon!</string>
     <string name="member_verification_form_item_email_verification_label">You must verify your email.</string>
     <string name="member_verification_form_item_file_upload">File Upload</string>
@@ -4175,9 +4185,10 @@ Want to know more about Discord?"</string>
     <string name="member_verification_form_item_verification">Connections</string>
     <string name="member_verification_form_required_item">This field is required</string>
     <string name="member_verification_form_rules_label">Read and agree to the server rules</string>
+    <string name="member_verification_form_verification_settings">To change this, [go to Moderation settings](onSettingsClick)</string>
     <string name="member_verification_get_started_button">Get Started</string>
-    <string name="member_verification_get_started_subtitle">Create server rules and ask pending members to agree to them.</string>
+    <string name="member_verification_get_started_subtitle">Create server rules and ask pending members to agree to them before they can talk.</string>
-    <string name="member_verification_get_started_title">Add some requirements to get started!</string>
+    <string name="member_verification_get_started_title">Set up server rules!</string>
     <string name="member_verification_modal_subtitle">You’ll need to complete the required steps below.</string>
     <string name="member_verification_modal_title">Before you can talk in this server…</string>
     <string name="member_verification_multiple_choice_add">Add an option</string>
@@ -4304,6 +4315,7 @@ Want to know more about Discord?"</string>
     <string name="modify_followed_news_header">Are you sure?</string>
     <string name="monthly">Monthly</string>
     <string name="more">More</string>
+    <string name="more_details">More Details</string>
     <string name="more_options">More Options</string>
     <string name="move_from_category_to">Move from %1$s to</string>
     <string name="move_members">Move Members</string>
@@ -5322,7 +5334,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="privacy_policy_url">https://discord.com/privacy</string>
     <string name="privacy_settings">Privacy Settings</string>
     <string name="private_category">Private Category</string>
-    <string name="private_category_note">By making a category private, all locked channels within it will inherit permissions</string>
+    <string name="private_category_note">By making a category private, all locked channels within it will inherit permissions.</string>
     <string name="private_channel">Private Channel</string>
     <string name="private_channel_access_info_members">%1$s</string>
     <string name="private_channel_access_info_members_overflow">%1$s+ Members</string>
@@ -5330,7 +5342,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="private_channel_access_info_roles_overflow">%1$s+ Roles</string>
     <string name="private_channel_access_info_title">Who can access</string>
     <string name="private_channel_access_info_title_with_colon">Who can access:</string>
-    <string name="private_channel_add_members_modal_no_result">Nothing here with the name **%1$s**.</string>
+    <string name="private_channel_add_members_modal_no_result">There are no members or roles with the name **%1$s**.</string>
     <string name="private_channel_add_members_modal_no_roles">"You haven't created any roles yet"</string>
     <string name="private_channel_add_members_modal_placeholder">e.g. Moderators, @wumpus</string>
     <string name="private_channel_add_members_modal_row_administrator">Administrator</string>
@@ -5341,7 +5353,6 @@ The changes to your subscription are reflected below:"</string>
     <string name="private_channel_add_members_modal_skip">Skip for now</string>
     <string name="private_channel_add_members_modal_subtitle">Add individual members by starting with @, or type a role name</string>
     <string name="private_channel_add_members_modal_subtitle_mobile">to #%1$s</string>
-    <string name="private_channel_add_members_modal_title">Add Members</string>
     <string name="private_channel_manage_channel_access_cta">Manage channel access</string>
     <string name="private_channel_members_added_toast_msg">%1$s added</string>
     <string name="private_channel_members_remove_yes_confirmation">Yes, remove now</string>
@@ -5355,7 +5366,7 @@ The changes to your subscription are reflected below:"</string>
     <string name="private_channel_modal_no_roles_create">You can always create Roles in Server Settings and add them after creating this channel via Channel Settings.</string>
     <string name="private_channel_modal_no_roles_edit">You can create your first role by going to the Roles page in your Server Settings.</string>
     <string name="private_channel_modal_note">By making a channel private, only selected members or roles will have access to this channel</string>
-    <string name="private_channel_note">By making a channel private, only selected roles will have access to read or connect to this channel</string>
+    <string name="private_channel_note">By making a channel private, only selected roles will have access to read or connect to this channel.</string>
     <string name="private_channel_roles_added_toast_msg">%1$s added</string>
     <string name="private_channels_a11y_label">Private channels</string>
     <string name="profile">Profile</string>
@@ -6670,7 +6681,12 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="user_settings_games_shortcuts_start_menu_note">When installing games from the Discord Store. Also makes your games discoverable via windows search.</string>
     <string name="user_settings_hypesquad">HypeSquad</string>
     <string name="user_settings_keybinds_action">Action</string>
+    <string name="user_settings_keybinds_chat_section_title">Chat</string>
     <string name="user_settings_keybinds_keybind">Keybind</string>
+    <string name="user_settings_keybinds_miscellaneous_section_title">Miscellaneous</string>
+    <string name="user_settings_keybinds_navigation_section_title">Navigation</string>
+    <string name="user_settings_keybinds_show_list_title">Show Keyboard Shortcuts List</string>
+    <string name="user_settings_keybinds_voice_and_video_section_title">Voice and Video</string>
     <string name="user_settings_label_current_password">Current Password</string>
     <string name="user_settings_label_discriminator">Discriminator</string>
     <string name="user_settings_label_email">Email</string>
@@ -6690,6 +6706,7 @@ You cannot take any moderation actions until you enable it."</string>
     <string name="user_settings_noise_cancellation">Noise Suppression</string>
     <string name="user_settings_noise_cancellation_description">Suppress background noise from your mic.</string>
     <string name="user_settings_noise_cancellation_model">Noise suppression model</string>
+    <string name="user_settings_notifications_preview_sound">Preview sound</string>
     <string name="user_settings_notifications_show_badge_body">Shows a red badge on the app icon when you have unread messages.</string>
     <string name="user_settings_notifications_show_badge_label">Enable Unread Message Badge</string>
     <string name="user_settings_notifications_show_flash_body">Flashes the app in your taskbar when you have new notifications.</string>

com.discord/smali/SpoilerSpan.smali

@@ -75,7 +75,7 @@
 
     const-string/jumbo v0, "textPaint"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-boolean v0, p0, LSpoilerSpan;->f:Z
 

com.discord/smali/WidgetFriendsAddUserRequestsModel.smali

@@ -42,11 +42,11 @@
 
     const-string v0, "outgoingIds"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "incomingIds"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -74,7 +74,7 @@
 
     iget-object v1, p1, LWidgetFriendsAddUserRequestsModel;->a:Ljava/util/Set;
 
-    invoke-static {v0, v1}, Ly/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lx/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -84,7 +84,7 @@
 
     iget-object p1, p1, LWidgetFriendsAddUserRequestsModel;->b:Ljava/util/Set;
 
-    invoke-static {v0, p1}, Ly/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, p1}, Lx/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result p1
 
@@ -144,7 +144,7 @@
 
     const-string v0, "WidgetFriendsAddUserRequestsModel(outgoingIds="
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali

@@ -28,7 +28,7 @@
 
     const-string v0, "handshakeToken"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 v0, 0x0
 
@@ -60,7 +60,7 @@
 
     iget-object v1, p1, LWidgetRemoteAuthViewModel$ViewState$b;->a:Ljava/lang/String;
 
-    invoke-static {v0, v1}, Ly/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+    invoke-static {v0, v1}, Lx/m/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
 
     move-result v0
 
@@ -144,7 +144,7 @@
 
     const-string v0, "Loaded(handshakeToken="
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
@@ -168,7 +168,7 @@
 
     const-string v2, ")"
 
-    invoke-static {v0, v1, v2}, Lf/e/c/a/a;->B(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, v2}, Lf/e/c/a/a;->C(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 

com.discord/smali/WidgetRemoteAuthViewModel$a.smali

@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel$a;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/models/domain/ModelRemoteAuthHandshake;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     const-string v0, "handshakeData"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, LWidgetRemoteAuthViewModel$a;->this$0:LWidgetRemoteAuthViewModel;
 
@@ -69,7 +69,7 @@
 
     const-string/jumbo v4, "temporaryBehaviorSubject"
 
-    invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {v3}, Lrx/subjects/BehaviorSubject;->i0()Ljava/lang/Object;
 
@@ -77,7 +77,7 @@
 
     const-string/jumbo v4, "temporaryBehaviorSubject.value"
 
-    invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, v4}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     check-cast v3, Ljava/lang/Boolean;
 
@@ -89,7 +89,7 @@
 
     invoke-direct {v1, v2, v3, v4}, LWidgetRemoteAuthViewModel$ViewState$b;-><init>(Ljava/lang/String;ZZ)V
 
-    invoke-virtual {v0, v1}, Lf/a/b/k0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {v0, v1}, Lf/a/b/l0;->updateViewState(Ljava/lang/Object;)V
 
     new-instance v0, Landroid/os/Handler;
 

com.discord/smali/WidgetRemoteAuthViewModel$b.smali

@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel$b;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "WidgetRemoteAuthViewModel.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function1<",
         "Lcom/discord/utilities/error/Error;",
         "Lkotlin/Unit;",
@@ -39,7 +39,7 @@
 
     const/4 p1, 0x1
 
-    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -53,7 +53,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response;
 
@@ -61,7 +61,7 @@
 
     const-string v0, "it.response"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getCode()I
 
@@ -78,7 +78,7 @@
 
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
 
-    invoke-virtual {p1, v0}, Lf/a/b/k0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p1, v0}, Lf/a/b/l0;->updateViewState(Ljava/lang/Object;)V
 
     :goto_0
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;

com.discord/smali/WidgetRemoteAuthViewModel$c.smali

@@ -27,7 +27,7 @@
 
     const-string v0, "fingerprint"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
@@ -52,7 +52,7 @@
 
     const-string v0, "modelClass"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, LWidgetRemoteAuthViewModel;
 

com.discord/smali/WidgetRemoteAuthViewModel.smali

@@ -1,5 +1,5 @@
 .class public final LWidgetRemoteAuthViewModel;
-.super Lf/a/b/k0;
+.super Lf/a/b/l0;
 .source "WidgetRemoteAuthViewModel.kt"
 
 
@@ -13,7 +13,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Lf/a/b/k0<",
+        "Lf/a/b/l0<",
         "LWidgetRemoteAuthViewModel$ViewState;",
         ">;"
     }
@@ -40,15 +40,15 @@
 
     const-string v0, "fingerprint"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "restAPI"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
     sget-object v0, LWidgetRemoteAuthViewModel$ViewState$c;->a:LWidgetRemoteAuthViewModel$ViewState$c;
 
-    invoke-direct {p0, v0}, Lf/a/b/k0;-><init>(Ljava/lang/Object;)V
+    invoke-direct {p0, v0}, Lf/a/b/l0;-><init>(Ljava/lang/Object;)V
 
     iput-object p2, p0, LWidgetRemoteAuthViewModel;->e:Lcom/discord/utilities/rest/RestAPI;
 
@@ -60,7 +60,7 @@
 
     iput-object v0, p0, LWidgetRemoteAuthViewModel;->d:Lrx/subjects/BehaviorSubject;
 
-    invoke-static {p1}, Ly/s/m;->isBlank(Ljava/lang/CharSequence;)Z
+    invoke-static {p1}, Lx/s/m;->isBlank(Ljava/lang/CharSequence;)Z
 
     move-result v0
 
@@ -68,7 +68,7 @@
 
     sget-object p1, LWidgetRemoteAuthViewModel$ViewState$a;->a:LWidgetRemoteAuthViewModel$ViewState$a;
 
-    invoke-virtual {p0, p1}, Lf/a/b/k0;->updateViewState(Ljava/lang/Object;)V
+    invoke-virtual {p0, p1}, Lf/a/b/l0;->updateViewState(Ljava/lang/Object;)V
 
     goto :goto_0
 

com.discord/smali/android/support/v4/media/RatingCompat.smali

@@ -64,7 +64,7 @@
 
     const-string v0, "Rating:style="
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali

@@ -129,7 +129,7 @@
 
     const-string v0, "MediaSession.QueueItem {Description="
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali

@@ -127,7 +127,7 @@
 
     const-string v0, "Action:mName=\'"
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$1;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelStore;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string/jumbo v1, "viewModelStore"
 
-    invoke-static {v0, v1}, Ly/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lx/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method

com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelProvider$Factory;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "defaultViewModelProviderFactory"
 
-    invoke-static {v0, v1}, Ly/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Lx/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method

com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali

@@ -26,7 +26,7 @@
 
     const-string v0, "$this$viewModels"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -38,7 +38,7 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Ly/m/c/j;->reifiedOperationMarker()V
+    invoke-static {}, Lx/m/c/j;->reifiedOperationMarker()V
 
     const/4 p0, 0x0
 
@@ -59,7 +59,7 @@
     :cond_0
     const-string p2, "$this$viewModels"
 
-    invoke-static {p0, p2}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p2}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_1
 
@@ -71,7 +71,7 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Ly/m/c/j;->reifiedOperationMarker()V
+    invoke-static {}, Lx/m/c/j;->reifiedOperationMarker()V
 
     throw p3
 .end method

com.discord/smali/androidx/activity/OnBackPressedDispatcherKt.smali

@@ -23,11 +23,11 @@
 
     const-string v0, "$this$addCallback"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "onBackPressed"
 
-    invoke-static {p3, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/activity/OnBackPressedDispatcherKt$addCallback$callback$1;
 

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

@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00ff
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final dialog_button:I = 0x7f0a0339
+.field public static final dialog_button:I = 0x7f0a033c
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0a8a
+.field public static final tag_accessibility_actions:I = 0x7f0a0a8c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0a8c
+.field public static final tag_accessibility_heading:I = 0x7f0a0a8e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0a8e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0a90
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
 
 # direct methods

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

@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

com.discord/smali/androidx/activity/ktx/R$id.smali

@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00ff
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final dialog_button:I = 0x7f0a0339
+.field public static final dialog_button:I = 0x7f0a033c
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0a8a
+.field public static final tag_accessibility_actions:I = 0x7f0a0a8c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0a8c
+.field public static final tag_accessibility_heading:I = 0x7f0a0a8e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0a8e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0a90
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
 
 # direct methods

com.discord/smali/androidx/activity/ktx/R$string.smali

@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

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

@@ -128,175 +128,175 @@
 
 .field public static final buttonPanel:I = 0x7f0a012f
 
-.field public static final checkbox:I = 0x7f0a0292
+.field public static final checkbox:I = 0x7f0a0295
 
-.field public static final checked:I = 0x7f0a0294
+.field public static final checked:I = 0x7f0a0297
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final content:I = 0x7f0a02f0
+.field public static final content:I = 0x7f0a02f3
 
-.field public static final contentPanel:I = 0x7f0a02f1
+.field public static final contentPanel:I = 0x7f0a02f4
 
-.field public static final custom:I = 0x7f0a031d
+.field public static final custom:I = 0x7f0a0320
 
-.field public static final customPanel:I = 0x7f0a031e
+.field public static final customPanel:I = 0x7f0a0321
 
-.field public static final decor_content_parent:I = 0x7f0a0328
+.field public static final decor_content_parent:I = 0x7f0a032b
 
-.field public static final default_activity_button:I = 0x7f0a0329
+.field public static final default_activity_button:I = 0x7f0a032c
 
-.field public static final dialog_button:I = 0x7f0a0339
+.field public static final dialog_button:I = 0x7f0a033c
 
-.field public static final edit_query:I = 0x7f0a0398
+.field public static final edit_query:I = 0x7f0a039a
 
-.field public static final expand_activities_button:I = 0x7f0a03e2
+.field public static final expand_activities_button:I = 0x7f0a03e4
 
-.field public static final expanded_menu:I = 0x7f0a03e3
+.field public static final expanded_menu:I = 0x7f0a03e5
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final group_divider:I = 0x7f0a04b6
+.field public static final group_divider:I = 0x7f0a04b8
 
-.field public static final home:I = 0x7f0a0564
+.field public static final home:I = 0x7f0a0566
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final image:I = 0x7f0a0586
+.field public static final image:I = 0x7f0a0588
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final listMode:I = 0x7f0a0643
+.field public static final listMode:I = 0x7f0a0645
 
-.field public static final list_item:I = 0x7f0a0644
+.field public static final list_item:I = 0x7f0a0646
 
-.field public static final message:I = 0x7f0a06a7
+.field public static final message:I = 0x7f0a06a9
 
-.field public static final multiply:I = 0x7f0a06ca
+.field public static final multiply:I = 0x7f0a06cc
 
-.field public static final none:I = 0x7f0a06f1
+.field public static final none:I = 0x7f0a06f3
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final off:I = 0x7f0a0732
+.field public static final off:I = 0x7f0a0734
 
-.field public static final on:I = 0x7f0a0736
+.field public static final on:I = 0x7f0a0738
 
-.field public static final parentPanel:I = 0x7f0a074b
+.field public static final parentPanel:I = 0x7f0a074d
 
-.field public static final progress_circular:I = 0x7f0a07ff
+.field public static final progress_circular:I = 0x7f0a0801
 
-.field public static final progress_horizontal:I = 0x7f0a0802
+.field public static final progress_horizontal:I = 0x7f0a0804
 
-.field public static final radio:I = 0x7f0a0812
+.field public static final radio:I = 0x7f0a0814
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final screen:I = 0x7f0a086d
+.field public static final screen:I = 0x7f0a086f
 
-.field public static final scrollIndicatorDown:I = 0x7f0a0873
+.field public static final scrollIndicatorDown:I = 0x7f0a0875
 
-.field public static final scrollIndicatorUp:I = 0x7f0a0874
+.field public static final scrollIndicatorUp:I = 0x7f0a0876
 
-.field public static final scrollView:I = 0x7f0a0875
+.field public static final scrollView:I = 0x7f0a0877
 
-.field public static final search_badge:I = 0x7f0a0878
+.field public static final search_badge:I = 0x7f0a087a
 
-.field public static final search_bar:I = 0x7f0a0879
+.field public static final search_bar:I = 0x7f0a087b
 
-.field public static final search_button:I = 0x7f0a087a
+.field public static final search_button:I = 0x7f0a087c
 
-.field public static final search_close_btn:I = 0x7f0a087b
+.field public static final search_close_btn:I = 0x7f0a087d
 
-.field public static final search_edit_frame:I = 0x7f0a087c
+.field public static final search_edit_frame:I = 0x7f0a087e
 
-.field public static final search_go_btn:I = 0x7f0a087e
+.field public static final search_go_btn:I = 0x7f0a0880
 
-.field public static final search_mag_icon:I = 0x7f0a087f
+.field public static final search_mag_icon:I = 0x7f0a0881
 
-.field public static final search_plate:I = 0x7f0a0880
+.field public static final search_plate:I = 0x7f0a0882
 
-.field public static final search_src_text:I = 0x7f0a0883
+.field public static final search_src_text:I = 0x7f0a0885
 
-.field public static final search_voice_btn:I = 0x7f0a088f
+.field public static final search_voice_btn:I = 0x7f0a0891
 
-.field public static final select_dialog_listview:I = 0x7f0a0892
+.field public static final select_dialog_listview:I = 0x7f0a0894
 
-.field public static final shortcut:I = 0x7f0a0a00
+.field public static final shortcut:I = 0x7f0a0a02
 
-.field public static final spacer:I = 0x7f0a0a10
+.field public static final spacer:I = 0x7f0a0a12
 
-.field public static final split_action_bar:I = 0x7f0a0a15
+.field public static final split_action_bar:I = 0x7f0a0a17
 
-.field public static final src_atop:I = 0x7f0a0a19
+.field public static final src_atop:I = 0x7f0a0a1b
 
-.field public static final src_in:I = 0x7f0a0a1a
+.field public static final src_in:I = 0x7f0a0a1c
 
-.field public static final src_over:I = 0x7f0a0a1b
+.field public static final src_over:I = 0x7f0a0a1d
 
-.field public static final submenuarrow:I = 0x7f0a0a6b
+.field public static final submenuarrow:I = 0x7f0a0a6d
 
-.field public static final submit_area:I = 0x7f0a0a6c
+.field public static final submit_area:I = 0x7f0a0a6e
 
-.field public static final tabMode:I = 0x7f0a0a7c
+.field public static final tabMode:I = 0x7f0a0a7e
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0a8a
+.field public static final tag_accessibility_actions:I = 0x7f0a0a8c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0a8c
+.field public static final tag_accessibility_heading:I = 0x7f0a0a8e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0a8e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0a90
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final textSpacerNoButtons:I = 0x7f0a0aa0
+.field public static final textSpacerNoButtons:I = 0x7f0a0aa2
 
-.field public static final textSpacerNoTitle:I = 0x7f0a0aa1
+.field public static final textSpacerNoTitle:I = 0x7f0a0aa3
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
-.field public static final titleDividerNoCustom:I = 0x7f0a0ab5
+.field public static final titleDividerNoCustom:I = 0x7f0a0ab7
 
-.field public static final title_template:I = 0x7f0a0ab6
+.field public static final title_template:I = 0x7f0a0ab8
 
-.field public static final topPanel:I = 0x7f0a0abe
+.field public static final topPanel:I = 0x7f0a0ac0
 
-.field public static final unchecked:I = 0x7f0a0ad9
+.field public static final unchecked:I = 0x7f0a0adb
 
-.field public static final uniform:I = 0x7f0a0adc
+.field public static final uniform:I = 0x7f0a0ade
 
-.field public static final up:I = 0x7f0a0ade
+.field public static final up:I = 0x7f0a0ae0
 
-.field public static final wrap_content:I = 0x7f0a0be8
+.field public static final wrap_content:I = 0x7f0a0bea
 
 
 # direct methods

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

@@ -68,9 +68,9 @@
 
 .field public static final abc_toolbar_collapse_description:I = 0x7f120020
 
-.field public static final search_menu_title:I = 0x7f121613
+.field public static final search_menu_title:I = 0x7f12161e
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

com.discord/smali/androidx/appcompat/app/AppCompatDelegateImpl.smali

@@ -1074,7 +1074,7 @@
 
     const-string v1, "AppCompat does not support the current theme features: { windowActionBar: "
 
-    invoke-static {v1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 
@@ -1114,7 +1114,7 @@
 
     const-string v3, " }"
 
-    invoke-static {v1, v2, v3}, Lf/e/c/a/a;->B(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+    invoke-static {v1, v2, v3}, Lf/e/c/a/a;->C(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v1
 

com.discord/smali/androidx/appcompat/app/AppCompatViewInflater$DeclaredOnClickListener.smali

@@ -134,7 +134,7 @@
     :cond_3
     const-string v0, " with id \'"
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
@@ -167,7 +167,7 @@
 
     const-string v1, "Could not find method "
 
-    invoke-static {v1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 

com.discord/smali/androidx/appcompat/app/WindowDecorActionBar.smali

@@ -534,7 +534,7 @@
 
     const-string v1, "Can\'t make a decor toolbar out of "
 
-    invoke-static {v1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 

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

@@ -94,59 +94,59 @@
 
 .field public static final blocking:I = 0x7f0a00ff
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final dialog_button:I = 0x7f0a0339
+.field public static final dialog_button:I = 0x7f0a033c
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0a8a
+.field public static final tag_accessibility_actions:I = 0x7f0a0a8c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0a8c
+.field public static final tag_accessibility_heading:I = 0x7f0a0a8e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0a8e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0a90
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
 
 # direct methods

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

@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

com.discord/smali/androidx/appcompat/view/SupportMenuInflater$InflatedOnMenuItemClickListener.smali

@@ -87,7 +87,7 @@
 
     const-string v3, " in class "
 
-    invoke-static {v2, p2, v3}, Lf/e/c/a/a;->L(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v2, p2, v3}, Lf/e/c/a/a;->M(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p2
 

com.discord/smali/androidx/appcompat/widget/ActionBarOverlayLayout.smali

@@ -374,7 +374,7 @@
 
     const-string v1, "Can\'t make a decor toolbar out of "
 
-    invoke-static {v1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 

com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$ActivityResolveInfo.smali

@@ -148,7 +148,7 @@
 
     const-string v1, "resolveInfo:"
 
-    invoke-static {v0, v1}, Lf/e/c/a/a;->K(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0, v1}, Lf/e/c/a/a;->L(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/ActivityChooserModel$HistoricalRecord.smali

@@ -189,7 +189,7 @@
 
     const-string v1, "; activity:"
 
-    invoke-static {v0, v1}, Lf/e/c/a/a;->K(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0, v1}, Lf/e/c/a/a;->L(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/AppCompatTextViewAutoSizeHelper.smali

@@ -2102,7 +2102,7 @@
 
     const-string v0, "None of the preset sizes is valid: "
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/LinearLayoutCompat.smali

@@ -4634,7 +4634,7 @@
 
     const-string v0, "base aligned child index out of range (0, "
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/ListPopupWindow.smali

@@ -522,7 +522,7 @@
 
     const-string v0, "Invalid hint position "
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/SearchView$SavedState.smali

@@ -80,7 +80,7 @@
 
     const-string v0, "SearchView.SavedState{"
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
@@ -102,7 +102,7 @@
 
     const-string/jumbo v2, "}"
 
-    invoke-static {v0, v1, v2}, Lf/e/c/a/a;->B(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, v2}, Lf/e/c/a/a;->C(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 

com.discord/smali/androidx/appcompat/widget/SuggestionsAdapter.smali

@@ -281,7 +281,7 @@
 
     const-string v2, " for "
 
-    invoke-static {v1, v4, v2}, Lf/e/c/a/a;->G(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1, v4, v2}, Lf/e/c/a/a;->H(Ljava/lang/String;ILjava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 

com.discord/smali/androidx/arch/core/internal/SafeIterableMap.smali

@@ -575,7 +575,7 @@
 
     const-string v0, "["
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

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

@@ -28,47 +28,47 @@
 
 .field public static final blocking:I = 0x7f0a00ff
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
 
 # direct methods

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

@@ -14,7 +14,7 @@
 
 
 # static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

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

@@ -104,59 +104,59 @@
 
 .field public static final browser_actions_menu_view:I = 0x7f0a012e
 
-.field public static final chronometer:I = 0x7f0a029f
+.field public static final chronometer:I = 0x7f0a02a2
 
-.field public static final dialog_button:I = 0x7f0a0339
+.field public static final dialog_button:I = 0x7f0a033c
 
-.field public static final forever:I = 0x7f0a0464
+.field public static final forever:I = 0x7f0a0466
 
-.field public static final icon:I = 0x7f0a0578
+.field public static final icon:I = 0x7f0a057a
 
-.field public static final icon_group:I = 0x7f0a057a
+.field public static final icon_group:I = 0x7f0a057c
 
-.field public static final info:I = 0x7f0a05a7
+.field public static final info:I = 0x7f0a05a9
 
-.field public static final italic:I = 0x7f0a05e4
+.field public static final italic:I = 0x7f0a05e6
 
-.field public static final line1:I = 0x7f0a063f
+.field public static final line1:I = 0x7f0a0641
 
-.field public static final line3:I = 0x7f0a0640
+.field public static final line3:I = 0x7f0a0642
 
-.field public static final normal:I = 0x7f0a06f2
+.field public static final normal:I = 0x7f0a06f4
 
-.field public static final notification_background:I = 0x7f0a06fc
+.field public static final notification_background:I = 0x7f0a06fe
 
-.field public static final notification_main_column:I = 0x7f0a06fd
+.field public static final notification_main_column:I = 0x7f0a06ff
 
-.field public static final notification_main_column_container:I = 0x7f0a06fe
+.field public static final notification_main_column_container:I = 0x7f0a0700
 
-.field public static final right_icon:I = 0x7f0a083a
+.field public static final right_icon:I = 0x7f0a083c
 
-.field public static final right_side:I = 0x7f0a083b
+.field public static final right_side:I = 0x7f0a083d
 
-.field public static final tag_accessibility_actions:I = 0x7f0a0a8a
+.field public static final tag_accessibility_actions:I = 0x7f0a0a8c
 
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0a8d
 
-.field public static final tag_accessibility_heading:I = 0x7f0a0a8c
+.field public static final tag_accessibility_heading:I = 0x7f0a0a8e
 
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0a8f
 
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0a8e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0a90
 
-.field public static final tag_transition_group:I = 0x7f0a0a8f
+.field public static final tag_transition_group:I = 0x7f0a0a91
 
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a90
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0a92
 
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a91
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0a93
 
-.field public static final text:I = 0x7f0a0a9c
+.field public static final text:I = 0x7f0a0a9e
 
-.field public static final text2:I = 0x7f0a0a9e
+.field public static final text2:I = 0x7f0a0aa0
 
-.field public static final time:I = 0x7f0a0ab3
+.field public static final time:I = 0x7f0a0ab5
 
-.field public static final title:I = 0x7f0a0ab4
+.field public static final title:I = 0x7f0a0ab6
 
 
 # direct methods

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

@@ -14,15 +14,15 @@
 
 
 # static fields
-.field public static final copy_toast_msg:I = 0x7f120547
+.field public static final copy_toast_msg:I = 0x7f12054c
 
-.field public static final fallback_menu_item_copy_link:I = 0x7f120733
+.field public static final fallback_menu_item_copy_link:I = 0x7f120738
 
-.field public static final fallback_menu_item_open_in_browser:I = 0x7f120734
+.field public static final fallback_menu_item_open_in_browser:I = 0x7f120739
 
-.field public static final fallback_menu_item_share_link:I = 0x7f120735
+.field public static final fallback_menu_item_share_link:I = 0x7f12073a
 
-.field public static final status_bar_notification_info_overflow:I = 0x7f1216d9
+.field public static final status_bar_notification_info_overflow:I = 0x7f1216e4
 
 
 # direct methods

com.discord/smali/androidx/browser/browseractions/BrowserServiceFileProvider.smali

@@ -281,7 +281,7 @@
 
     const-string v0, "_"
 
-    invoke-static {p2, v0}, Lf/e/c/a/a;->K(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {p2, v0}, Lf/e/c/a/a;->L(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p2
 

com.discord/smali/androidx/browser/trusted/ConnectionHolder.smali

@@ -182,7 +182,7 @@
     :goto_0
     const-string p1, "ConnectionHolder, state = "
 
-    invoke-static {p1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {p1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p1
 

com.discord/smali/androidx/browser/trusted/TrustedWebActivityServiceConnectionPool.smali

@@ -243,7 +243,7 @@
 
     const-string p4, "Found "
 
-    invoke-static {p4}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {p4}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p4
 

com.discord/smali/androidx/collection/ArrayMapKt.smali

@@ -43,7 +43,7 @@
 
     const-string v0, "pairs"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/ArrayMap;
 

com.discord/smali/androidx/collection/ArraySetKt.smali

@@ -37,7 +37,7 @@
 
     const-string/jumbo v0, "values"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/ArraySet;
 

com.discord/smali/androidx/collection/LongSparseArrayKt$keyIterator$1.smali

@@ -1,11 +1,11 @@
 .class public final Landroidx/collection/LongSparseArrayKt$keyIterator$1;
-.super Ly/h/p;
+.super Lx/h/p;
 .source "LongSparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/collection/LongSparseArrayKt;->keyIterator(Landroidx/collection/LongSparseArray;)Ly/h/p;
+    value = Landroidx/collection/LongSparseArrayKt;->keyIterator(Landroidx/collection/LongSparseArray;)Lx/h/p;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/collection/LongSparseArrayKt$keyIterator$1;->$this_keyIterator:Landroidx/collection/LongSparseArray;
 
-    invoke-direct {p0}, Ly/h/p;-><init>()V
+    invoke-direct {p0}, Lx/h/p;-><init>()V
 
     return-void
 .end method

com.discord/smali/androidx/collection/LongSparseArrayKt$valueIterator$1.smali

@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Ly/m/c/x/a;
+.implements Lx/m/c/x/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Ly/m/c/x/a;"
+        "Lx/m/c/x/a;"
     }
 .end annotation
 

com.discord/smali/androidx/collection/LongSparseArrayKt.smali

@@ -18,7 +18,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/LongSparseArray;->containsKey(J)Z
 
@@ -47,11 +47,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "action"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->size()I
 
@@ -98,7 +98,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->get(JLjava/lang/Object;)Ljava/lang/Object;
 
@@ -123,11 +123,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "defaultValue"
 
-    invoke-static {p3, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/LongSparseArray;->get(J)Ljava/lang/Object;
 
@@ -160,7 +160,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->size()I
 
@@ -183,7 +183,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/LongSparseArray;->isEmpty()Z
 
@@ -194,7 +194,7 @@
     return p0
 .end method
 
-.method public static final keyIterator(Landroidx/collection/LongSparseArray;)Ly/h/p;
+.method public static final keyIterator(Landroidx/collection/LongSparseArray;)Lx/h/p;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -203,13 +203,13 @@
             ">(",
             "Landroidx/collection/LongSparseArray<",
             "TT;>;)",
-            "Ly/h/p;"
+            "Lx/h/p;"
         }
     .end annotation
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArrayKt$keyIterator$1;
 
@@ -236,11 +236,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "other"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArray;
 
@@ -277,7 +277,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->remove(JLjava/lang/Object;)Z
 
@@ -300,7 +300,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2, p3}, Landroidx/collection/LongSparseArray;->put(JLjava/lang/Object;)V
 
@@ -323,7 +323,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LongSparseArrayKt$valueIterator$1;
 

com.discord/smali/androidx/collection/LruCacheKt$lruCache$1.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$1;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function2<",
         "TK;TV;",
         "Ljava/lang/Integer;",
@@ -49,7 +49,7 @@
 
     const/4 v0, 0x2
 
-    invoke-direct {p0, v0}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, v0}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -66,11 +66,11 @@
 
     const-string v0, "<anonymous parameter 0>"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p2, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x1
 

com.discord/smali/androidx/collection/LruCacheKt$lruCache$2.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$2;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function1<",
         "TK;TV;>;"
     }
@@ -47,7 +47,7 @@
 
     const/4 v0, 0x1
 
-    invoke-direct {p0, v0}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, v0}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -64,7 +64,7 @@
 
     const-string v0, "it"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const/4 p1, 0x0
 

com.discord/smali/androidx/collection/LruCacheKt$lruCache$3.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/collection/LruCacheKt$lruCache$3;
-.super Ly/m/c/k;
+.super Lx/m/c/k;
 .source "LruCache.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/m/c/k;",
+        "Lx/m/c/k;",
         "Lkotlin/jvm/functions/Function4<",
         "Ljava/lang/Boolean;",
         "TK;TV;TV;",
@@ -50,7 +50,7 @@
 
     const/4 v0, 0x4
 
-    invoke-direct {p0, v0}, Ly/m/c/k;-><init>(I)V
+    invoke-direct {p0, v0}, Lx/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -83,11 +83,11 @@
 
     const-string p1, "<anonymous parameter 1>"
 
-    invoke-static {p2, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "<anonymous parameter 2>"
 
-    invoke-static {p3, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-void
 .end method

com.discord/smali/androidx/collection/LruCacheKt$lruCache$4.smali

@@ -60,7 +60,7 @@
 
     const-string v0, "key"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$create:Lkotlin/jvm/functions/Function1;
 
@@ -81,11 +81,11 @@
 
     const-string v0, "key"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "oldValue"
 
-    invoke-static {p3, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$onEntryRemoved:Lkotlin/jvm/functions/Function4;
 
@@ -108,11 +108,11 @@
 
     const-string v0, "key"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string/jumbo v0, "value"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     iget-object v0, p0, Landroidx/collection/LruCacheKt$lruCache$4;->$sizeOf:Lkotlin/jvm/functions/Function2;
 

com.discord/smali/androidx/collection/LruCacheKt.smali

@@ -32,15 +32,15 @@
 
     const-string v0, "sizeOf"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "create"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "onEntryRemoved"
 
-    invoke-static {p3, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p3, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/LruCacheKt$lruCache$4;
 
@@ -93,15 +93,15 @@
 
     const-string p1, "sizeOf"
 
-    invoke-static {v1, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v1, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "create"
 
-    invoke-static {v2, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v2, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string p1, "onEntryRemoved"
 
-    invoke-static {v3, p1}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v3, p1}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance p1, Landroidx/collection/LruCacheKt$lruCache$4;
 

com.discord/smali/androidx/collection/SparseArrayKt$keyIterator$1.smali

@@ -1,11 +1,11 @@
 .class public final Landroidx/collection/SparseArrayKt$keyIterator$1;
-.super Ly/h/o;
+.super Lx/h/o;
 .source "SparseArray.kt"
 
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Landroidx/collection/SparseArrayKt;->keyIterator(Landroidx/collection/SparseArrayCompat;)Ly/h/o;
+    value = Landroidx/collection/SparseArrayKt;->keyIterator(Landroidx/collection/SparseArrayCompat;)Lx/h/o;
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,7 +33,7 @@
 
     iput-object p1, p0, Landroidx/collection/SparseArrayKt$keyIterator$1;->$this_keyIterator:Landroidx/collection/SparseArrayCompat;
 
-    invoke-direct {p0}, Ly/h/o;-><init>()V
+    invoke-direct {p0}, Lx/h/o;-><init>()V
 
     return-void
 .end method

com.discord/smali/androidx/collection/SparseArrayKt$valueIterator$1.smali

@@ -4,7 +4,7 @@
 
 # interfaces
 .implements Ljava/util/Iterator;
-.implements Ly/m/c/x/a;
+.implements Lx/m/c/x/a;
 
 
 # annotations
@@ -22,7 +22,7 @@
         "Ljava/lang/Object;",
         "Ljava/util/Iterator<",
         "TT;>;",
-        "Ly/m/c/x/a;"
+        "Lx/m/c/x/a;"
     }
 .end annotation
 

com.discord/smali/androidx/collection/SparseArrayKt.smali

@@ -18,7 +18,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/collection/SparseArrayCompat;->containsKey(I)Z
 
@@ -47,11 +47,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "action"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->size()I
 
@@ -98,7 +98,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->get(ILjava/lang/Object;)Ljava/lang/Object;
 
@@ -123,11 +123,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "defaultValue"
 
-    invoke-static {p2, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p2, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1}, Landroidx/collection/SparseArrayCompat;->get(I)Ljava/lang/Object;
 
@@ -160,7 +160,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->size()I
 
@@ -183,7 +183,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0}, Landroidx/collection/SparseArrayCompat;->isEmpty()Z
 
@@ -194,7 +194,7 @@
     return p0
 .end method
 
-.method public static final keyIterator(Landroidx/collection/SparseArrayCompat;)Ly/h/o;
+.method public static final keyIterator(Landroidx/collection/SparseArrayCompat;)Lx/h/o;
     .locals 1
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -203,13 +203,13 @@
             ">(",
             "Landroidx/collection/SparseArrayCompat<",
             "TT;>;)",
-            "Ly/h/o;"
+            "Lx/h/o;"
         }
     .end annotation
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayKt$keyIterator$1;
 
@@ -236,11 +236,11 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     const-string v0, "other"
 
-    invoke-static {p1, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p1, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayCompat;
 
@@ -277,7 +277,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->remove(ILjava/lang/Object;)Z
 
@@ -300,7 +300,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     invoke-virtual {p0, p1, p2}, Landroidx/collection/SparseArrayCompat;->put(ILjava/lang/Object;)V
 
@@ -323,7 +323,7 @@
 
     const-string v0, "receiver$0"
 
-    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Lx/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     new-instance v0, Landroidx/collection/SparseArrayKt$valueIterator$1;
 

com.discord/smali/androidx/concurrent/futures/AbstractResolvableFuture.smali

@@ -1409,7 +1409,7 @@
 
     const-string v10, " "
 
-    invoke-static {v9, p1, p2, v10}, Lf/e/c/a/a;->J(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v9, p1, p2, v10}, Lf/e/c/a/a;->K(Ljava/lang/String;JLjava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object p1
 
@@ -1657,7 +1657,7 @@
 
     const-string v1, "setFuture=["
 
-    invoke-static {v1}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v1}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v1
 
@@ -1671,7 +1671,7 @@
 
     const-string v2, "]"
 
-    invoke-static {v1, v0, v2}, Lf/e/c/a/a;->y(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    invoke-static {v1, v0, v2}, Lf/e/c/a/a;->z(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 
@@ -1684,7 +1684,7 @@
 
     const-string v0, "remaining delay=["
 
-    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
@@ -1957,7 +1957,7 @@
 
     const-string v3, "Exception thrown from implementation: "
 
-    invoke-static {v3}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v3}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v3
 

com.discord/smali/androidx/concurrent/futures/CallbackToFutureAdapter$Completer.smali

@@ -117,7 +117,7 @@
 
     const-string v2, "The completer object was garbage collected - this future would otherwise never complete. The tag was: "
 
-    invoke-static {v2}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v2}, Lf/e/c/a/a;->G(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v2