From 5f28d4259a4ef80059630f11e3fe78e13fbb74b4 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 1 Mar 2020 22:12:02 +0100 Subject: [PATCH] Changes of com.discord v1048 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 34496 -> 34484 bytes .../ic_add_person_16dp.xml | 8 - .../res/drawable-anydpi-v24/ic_book_16dp.xml | 5 - .../drawable-anydpi-v24/ic_status_24dp.xml | 6 - .../res/drawable-hdpi/ic_add_person_16dp.png | Bin 237 -> 0 bytes .../res/drawable-hdpi/ic_book_16dp.png | Bin 229 -> 0 bytes .../res/drawable-hdpi/ic_status_24dp.png | Bin 534 -> 0 bytes .../res/drawable-ldpi/ic_add_person_16dp.png | Bin 163 -> 0 bytes .../res/drawable-ldpi/ic_book_16dp.png | Bin 167 -> 0 bytes .../res/drawable-ldpi/ic_status_24dp.png | Bin 314 -> 0 bytes .../res/drawable-mdpi/ic_add_person_16dp.png | Bin 205 -> 0 bytes .../res/drawable-mdpi/ic_book_16dp.png | Bin 191 -> 0 bytes .../res/drawable-mdpi/ic_status_24dp.png | Bin 382 -> 0 bytes .../res/drawable-xhdpi/ic_add_person_16dp.png | Bin 333 -> 0 bytes .../res/drawable-xhdpi/ic_book_16dp.png | Bin 297 -> 0 bytes .../res/drawable-xhdpi/ic_status_24dp.png | Bin 677 -> 0 bytes .../drawable-xxhdpi/ic_add_person_16dp.png | Bin 380 -> 0 bytes .../res/drawable-xxhdpi/ic_book_16dp.png | Bin 367 -> 0 bytes .../res/drawable-xxhdpi/ic_status_24dp.png | Bin 1009 -> 0 bytes .../drawable-xxxhdpi/ic_add_person_16dp.png | Bin 589 -> 0 bytes .../res/drawable-xxxhdpi/ic_book_16dp.png | Bin 466 -> 0 bytes .../res/drawable-xxxhdpi/ic_status_24dp.png | Bin 1384 -> 0 bytes .../drawable_circle_background_secondary.xml | 5 - .../drawable_guild_template_create.xml | 10 - .../drawable_guild_template_creator.xml | 10 - .../drawable_guild_template_friend.xml | 10 - .../drawable_guild_template_gaming.xml | 10 - .../drawable_guild_template_hobby.xml | 10 - .../drawable_guild_template_study.xml | 10 - .../drawable/guild_use_cases_gaming_32dp.xml | 2 +- .../drawable/ic_add_circle_filled_16dp.xml | 5 - .../res/drawable/ic_content_creator_16dp.xml | 5 - .../res/drawable/ic_friend_wave_16dp.xml | 5 - .../res/drawable/ic_game_controller_16dp.xml | 5 - .../ic_game_controller_white_16dp.xml | 5 + com.discord/res/drawable/ic_hobby_16dp.xml | 7 - com.discord/res/drawable/ic_tab_friends.xml | 5 - com.discord/res/drawable/ic_tab_home.xml | 6 - com.discord/res/drawable/ic_tab_mentions.xml | 5 - com.discord/res/drawable/ic_tab_search.xml | 5 - .../res/layout-v22/widget_notice_popup.xml | 2 +- .../widget_notice_popup_channel.xml | 6 +- .../layout/audio_output_selection_dialog.xml | 8 +- com.discord/res/layout/guild_role_chip.xml | 2 +- com.discord/res/layout/guild_role_item.xml | 2 +- com.discord/res/layout/layout_search.xml | 4 +- .../tabs_host_bottom_navigation_view.xml | 21 - .../res/layout/user_profile_header_view.xml | 2 +- .../user_profile_voice_settings_view.xml | 9 +- .../res/layout/view_channel_override_item.xml | 2 +- .../res/layout/view_global_search_item.xml | 2 +- .../layout/view_server_settings_icon_name.xml | 4 +- ...erver_settings_public_setting_selector.xml | 12 - .../view_server_settings_upload_banner.xml | 2 +- .../view_server_settings_upload_splash.xml | 2 +- .../res/layout/view_setting_switch.xml | 2 +- com.discord/res/layout/view_toolbar_title.xml | 4 +- ...view.xml => view_user_avatar_presence.xml} | 4 +- .../widget_channel_group_dm_settings.xml | 4 +- .../widget_channel_members_list_item_add.xml | 6 - ...idget_channel_members_list_item_header.xml | 2 +- .../widget_channel_settings_cannot_delete.xml | 2 +- .../res/layout/widget_friends_list_v2.xml | 2 +- com.discord/res/layout/widget_friends_tab.xml | 9 - ...t_guild_invite_share_empty_suggestions.xml | 4 +- .../layout/widget_guild_invite_share_item.xml | 2 +- .../layout/widget_guild_profile_sheet_v2.xml | 28 - .../widget_main_panel_center_content.xml | 2 +- .../res/layout/widget_main_panel_left.xml | 2 +- .../res/layout/widget_notice_popup.xml | 2 +- .../layout/widget_notice_popup_channel.xml | 6 +- .../res/layout/widget_nux_guild_template.xml | 38 - .../layout/widget_premium_guild_transfer.xml | 6 +- .../widget_remote_auth_pending_login.xml | 2 +- .../res/layout/widget_server_settings.xml | 5 - ...widget_server_settings_public_overview.xml | 16 - com.discord/res/layout/widget_settings.xml | 9 +- .../res/layout/widget_settings_account.xml | 4 +- ...widget_settings_item_connected_account.xml | 6 +- com.discord/res/layout/widget_tabs_host.xml | 12 - .../res/layout/widget_user_account_verify.xml | 6 +- .../res/layout/widget_user_phone_add.xml | 2 +- .../res/layout/widget_user_phone_verify.xml | 2 +- .../res/layout/widget_user_profile_strip.xml | 2 +- com.discord/res/values/attrs.xml | 2 - com.discord/res/values/ids.xml | 63 +- com.discord/res/values/plurals.xml | 46 +- com.discord/res/values/public.xml | 19075 ++++++++-------- com.discord/res/values/strings.xml | 107 +- com.discord/res/values/styles.xml | 144 +- .../smali/androidx/activity/R$attr.smali | 2 +- .../smali/androidx/activity/R$drawable.smali | 24 +- .../smali/androidx/activity/R$id.smali | 48 +- .../smali/androidx/activity/R$string.smali | 2 +- .../smali/androidx/activity/R$style.smali | 14 +- .../smali/androidx/activity/R$styleable.smali | 2 +- .../smali/androidx/appcompat/R$attr.smali | 174 +- .../smali/androidx/appcompat/R$drawable.smali | 28 +- .../smali/androidx/appcompat/R$id.smali | 142 +- .../smali/androidx/appcompat/R$string.smali | 4 +- .../smali/androidx/appcompat/R$style.smali | 376 +- .../androidx/appcompat/R$styleable.smali | 128 +- .../androidx/appcompat/resources/R$attr.smali | 2 +- .../appcompat/resources/R$drawable.smali | 24 +- .../androidx/appcompat/resources/R$id.smali | 48 +- .../appcompat/resources/R$string.smali | 2 +- .../appcompat/resources/R$style.smali | 14 +- .../appcompat/resources/R$styleable.smali | 2 +- .../androidx/asynclayoutinflater/R$attr.smali | 2 +- .../asynclayoutinflater/R$drawable.smali | 24 +- .../androidx/asynclayoutinflater/R$id.smali | 38 +- .../asynclayoutinflater/R$string.smali | 2 +- .../asynclayoutinflater/R$style.smali | 14 +- .../asynclayoutinflater/R$styleable.smali | 2 +- .../smali/androidx/browser/R$attr.smali | 4 +- .../smali/androidx/browser/R$drawable.smali | 24 +- com.discord/smali/androidx/browser/R$id.smali | 48 +- .../smali/androidx/browser/R$string.smali | 2 +- .../smali/androidx/browser/R$style.smali | 16 +- .../smali/androidx/browser/R$styleable.smali | 4 +- .../constraintlayout/widget/R$id.smali | 24 +- .../androidx/coordinatorlayout/R$attr.smali | 4 +- .../coordinatorlayout/R$drawable.smali | 24 +- .../androidx/coordinatorlayout/R$id.smali | 58 +- .../androidx/coordinatorlayout/R$string.smali | 2 +- .../androidx/coordinatorlayout/R$style.smali | 16 +- .../coordinatorlayout/R$styleable.smali | 4 +- com.discord/smali/androidx/core/R$attr.smali | 2 +- .../smali/androidx/core/R$drawable.smali | 24 +- com.discord/smali/androidx/core/R$id.smali | 48 +- .../smali/androidx/core/R$string.smali | 2 +- com.discord/smali/androidx/core/R$style.smali | 14 +- .../smali/androidx/core/R$styleable.smali | 2 +- .../smali/androidx/core/ktx/R$attr.smali | 2 +- .../smali/androidx/core/ktx/R$drawable.smali | 24 +- .../smali/androidx/core/ktx/R$id.smali | 48 +- .../smali/androidx/core/ktx/R$string.smali | 2 +- .../smali/androidx/core/ktx/R$style.smali | 14 +- .../smali/androidx/core/ktx/R$styleable.smali | 2 +- .../smali/androidx/customview/R$attr.smali | 2 +- .../androidx/customview/R$drawable.smali | 24 +- .../smali/androidx/customview/R$id.smali | 48 +- .../smali/androidx/customview/R$string.smali | 2 +- .../smali/androidx/customview/R$style.smali | 14 +- .../androidx/customview/R$styleable.smali | 2 +- .../smali/androidx/drawerlayout/R$attr.smali | 2 +- .../androidx/drawerlayout/R$drawable.smali | 24 +- .../smali/androidx/drawerlayout/R$id.smali | 48 +- .../androidx/drawerlayout/R$string.smali | 2 +- .../smali/androidx/drawerlayout/R$style.smali | 14 +- .../androidx/drawerlayout/R$styleable.smali | 2 +- .../androidx/dynamicanimation/R$attr.smali | 2 +- .../dynamicanimation/R$drawable.smali | 24 +- .../androidx/dynamicanimation/R$id.smali | 48 +- .../androidx/dynamicanimation/R$string.smali | 2 +- .../androidx/dynamicanimation/R$style.smali | 14 +- .../dynamicanimation/R$styleable.smali | 2 +- .../smali/androidx/fragment/R$attr.smali | 2 +- .../smali/androidx/fragment/R$drawable.smali | 24 +- .../smali/androidx/fragment/R$id.smali | 48 +- .../smali/androidx/fragment/R$string.smali | 2 +- .../smali/androidx/fragment/R$style.smali | 14 +- .../smali/androidx/fragment/R$styleable.smali | 2 +- .../smali/androidx/legacy/coreui/R$attr.smali | 4 +- .../androidx/legacy/coreui/R$drawable.smali | 24 +- .../smali/androidx/legacy/coreui/R$id.smali | 48 +- .../androidx/legacy/coreui/R$string.smali | 2 +- .../androidx/legacy/coreui/R$style.smali | 16 +- .../androidx/legacy/coreui/R$styleable.smali | 4 +- .../androidx/legacy/coreutils/R$attr.smali | 2 +- .../legacy/coreutils/R$drawable.smali | 24 +- .../androidx/legacy/coreutils/R$id.smali | 38 +- .../androidx/legacy/coreutils/R$string.smali | 2 +- .../androidx/legacy/coreutils/R$style.smali | 14 +- .../legacy/coreutils/R$styleable.smali | 2 +- .../smali/androidx/legacy/v4/R$attr.smali | 4 +- .../smali/androidx/legacy/v4/R$drawable.smali | 24 +- .../smali/androidx/legacy/v4/R$id.smali | 52 +- .../smali/androidx/legacy/v4/R$string.smali | 2 +- .../smali/androidx/legacy/v4/R$style.smali | 26 +- .../androidx/legacy/v4/R$styleable.smali | 4 +- .../lifecycle/extensions/R$attr.smali | 4 +- .../lifecycle/extensions/R$drawable.smali | 24 +- .../androidx/lifecycle/extensions/R$id.smali | 48 +- .../lifecycle/extensions/R$string.smali | 2 +- .../lifecycle/extensions/R$style.smali | 16 +- .../lifecycle/extensions/R$styleable.smali | 4 +- .../smali/androidx/loader/R$attr.smali | 2 +- .../smali/androidx/loader/R$drawable.smali | 24 +- com.discord/smali/androidx/loader/R$id.smali | 38 +- .../smali/androidx/loader/R$string.smali | 2 +- .../smali/androidx/loader/R$style.smali | 14 +- .../smali/androidx/loader/R$styleable.smali | 2 +- com.discord/smali/androidx/media/R$attr.smali | 2 +- .../smali/androidx/media/R$drawable.smali | 24 +- com.discord/smali/androidx/media/R$id.smali | 42 +- .../smali/androidx/media/R$string.smali | 2 +- .../smali/androidx/media/R$style.smali | 24 +- .../smali/androidx/media/R$styleable.smali | 2 +- .../smali/androidx/preference/R$attr.smali | 214 +- .../androidx/preference/R$drawable.smali | 32 +- .../smali/androidx/preference/R$id.smali | 164 +- .../smali/androidx/preference/R$string.smali | 18 +- .../smali/androidx/preference/R$style.smali | 440 +- .../androidx/preference/R$styleable.smali | 186 +- .../androidx/preference/ktx/R$attr.smali | 214 +- .../androidx/preference/ktx/R$drawable.smali | 32 +- .../smali/androidx/preference/ktx/R$id.smali | 164 +- .../androidx/preference/ktx/R$string.smali | 18 +- .../androidx/preference/ktx/R$style.smali | 440 +- .../androidx/preference/ktx/R$styleable.smali | 186 +- .../smali/androidx/recyclerview/R$attr.smali | 10 +- .../androidx/recyclerview/R$drawable.smali | 24 +- .../smali/androidx/recyclerview/R$id.smali | 50 +- .../androidx/recyclerview/R$string.smali | 2 +- .../smali/androidx/recyclerview/R$style.smali | 14 +- .../androidx/recyclerview/R$styleable.smali | 8 +- com.discord/smali/androidx/room/R$attr.smali | 2 +- .../smali/androidx/room/R$drawable.smali | 24 +- com.discord/smali/androidx/room/R$id.smali | 38 +- .../smali/androidx/room/R$string.smali | 2 +- com.discord/smali/androidx/room/R$style.smali | 14 +- .../smali/androidx/room/R$styleable.smali | 2 +- .../androidx/slidingpanelayout/R$attr.smali | 2 +- .../slidingpanelayout/R$drawable.smali | 24 +- .../androidx/slidingpanelayout/R$id.smali | 38 +- .../androidx/slidingpanelayout/R$string.smali | 2 +- .../androidx/slidingpanelayout/R$style.smali | 14 +- .../slidingpanelayout/R$styleable.smali | 2 +- .../androidx/swiperefreshlayout/R$attr.smali | 2 +- .../swiperefreshlayout/R$drawable.smali | 24 +- .../androidx/swiperefreshlayout/R$id.smali | 38 +- .../swiperefreshlayout/R$string.smali | 2 +- .../androidx/swiperefreshlayout/R$style.smali | 14 +- .../swiperefreshlayout/R$styleable.smali | 2 +- .../smali/androidx/transition/R$attr.smali | 2 +- .../androidx/transition/R$drawable.smali | 24 +- .../smali/androidx/transition/R$id.smali | 58 +- .../smali/androidx/transition/R$string.smali | 2 +- .../smali/androidx/transition/R$style.smali | 14 +- .../androidx/transition/R$styleable.smali | 2 +- .../androidx/vectordrawable/R$attr.smali | 2 +- .../androidx/vectordrawable/R$drawable.smali | 24 +- .../smali/androidx/vectordrawable/R$id.smali | 48 +- .../androidx/vectordrawable/R$string.smali | 2 +- .../androidx/vectordrawable/R$style.smali | 14 +- .../androidx/vectordrawable/R$styleable.smali | 2 +- .../vectordrawable/animated/R$attr.smali | 2 +- .../vectordrawable/animated/R$drawable.smali | 24 +- .../vectordrawable/animated/R$id.smali | 48 +- .../vectordrawable/animated/R$string.smali | 2 +- .../vectordrawable/animated/R$style.smali | 14 +- .../vectordrawable/animated/R$styleable.smali | 2 +- .../smali/androidx/viewpager/R$attr.smali | 2 +- .../smali/androidx/viewpager/R$drawable.smali | 24 +- .../smali/androidx/viewpager/R$id.smali | 38 +- .../smali/androidx/viewpager/R$string.smali | 2 +- .../smali/androidx/viewpager/R$style.smali | 14 +- .../androidx/viewpager/R$styleable.smali | 2 +- .../smali/androidx/viewpager2/R$attr.smali | 10 +- .../androidx/viewpager2/R$drawable.smali | 24 +- .../smali/androidx/viewpager2/R$id.smali | 50 +- .../smali/androidx/viewpager2/R$string.smali | 2 +- .../smali/androidx/viewpager2/R$style.smali | 14 +- .../androidx/viewpager2/R$styleable.smali | 8 +- com.discord/smali/androidx/work/R$attr.smali | 2 +- .../smali/androidx/work/R$drawable.smali | 24 +- com.discord/smali/androidx/work/R$id.smali | 38 +- .../smali/androidx/work/R$string.smali | 2 +- com.discord/smali/androidx/work/R$style.smali | 14 +- .../smali/androidx/work/R$styleable.smali | 2 +- .../smali/androidx/work/ktx/R$attr.smali | 2 +- .../smali/androidx/work/ktx/R$drawable.smali | 24 +- .../smali/androidx/work/ktx/R$id.smali | 38 +- .../smali/androidx/work/ktx/R$string.smali | 2 +- .../smali/androidx/work/ktx/R$style.smali | 14 +- .../smali/androidx/work/ktx/R$styleable.smali | 2 +- com.discord/smali/com/airbnb/lottie/R$a.smali | 130 +- .../smali/com/angarron/colorpicker/R$a.smali | 122 +- .../smali/com/discord/BuildConfig.smali | 6 +- com.discord/smali/com/discord/R$a.smali | 532 +- .../discord/app/AppActivity$AppAction.smali | 14 +- .../app/AppActivity$IncomingCall.smali | 12 +- .../smali/com/discord/app/AppActivity$a.smali | 2 +- .../smali/com/discord/app/AppActivity$c.smali | 34 +- .../smali/com/discord/app/AppActivity$h.smali | 22 +- .../smali/com/discord/app/AppActivity$j.smali | 43 +- .../smali/com/discord/app/AppActivity$k.smali | 63 +- .../smali/com/discord/app/AppActivity$l.smali | 78 - .../smali/com/discord/app/AppActivity.smali | 320 +- .../com/discord/app/AppBottomSheet.smali | 37 +- .../smali/com/discord/app/AppDialog.smali | 49 +- .../smali/com/discord/app/AppFragment$b.smali | 2 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- .../smali/com/discord/app/AppFragment.smali | 49 +- .../com/discord/app/AppPermissions.smali | 8 +- .../discord/app/DiscordConnectService.smali | 12 +- .../discord/dialogs/ImageUploadDialog.smali | 50 +- .../smali/com/discord/gateway/R$attr.smali | 420 +- .../com/discord/gateway/R$drawable.smali | 80 +- .../smali/com/discord/gateway/R$id.smali | 322 +- .../smali/com/discord/gateway/R$layout.smali | 26 +- .../smali/com/discord/gateway/R$plurals.smali | 2 +- .../smali/com/discord/gateway/R$string.smali | 160 +- .../smali/com/discord/gateway/R$style.smali | 972 +- .../com/discord/gateway/R$styleable.smali | 324 +- .../models/domain/Model$JsonReader.smali | 15 + .../domain/Model$TypeAdapterFactory$1.smali | 3 + .../models/domain/ModelActivityMetaData.smali | 9 + .../domain/ModelAuditLogEntry$Options.smali | 3 + .../models/domain/ModelAuditLogEntry.smali | 26 + .../discord/models/domain/ModelChannel.smali | 5 + .../domain/ModelExperiment$Context.smali | 6 + .../models/domain/ModelExperiment.smali | 22 + .../discord/models/domain/ModelGuild.smali | 1388 +- .../domain/ModelGuildMember$Chunk.smali | 6 + .../domain/ModelGuildMember$Computed.smali | 17 + .../models/domain/ModelGuildMember.smali | 37 + .../models/domain/ModelGuildPreview.smali | 16 - .../models/domain/ModelGuildRole.smali | 22 + .../models/domain/ModelGuildTemplate.smali | 22 +- .../discord/models/domain/ModelInvite.smali | 6 + .../ModelMessage$MessageReference.smali | 9 + .../discord/models/domain/ModelMessage.smali | 59 + .../models/domain/ModelMessageEmbed.smali | 7 + .../domain/ModelMessageReaction$Emoji.smali | 3 + ...NotificationSettings$ChannelOverride.smali | 3 + .../domain/ModelNotificationSettings.smali | 7 + .../models/domain/ModelSearchResponse.smali | 10 +- .../discord/models/domain/ModelSession.smali | 3 + .../com/discord/models/domain/ModelUrl.smali | 3 + .../discord/models/domain/ModelUser$Me.smali | 4 + .../domain/ModelUser$RequiredAction.smali | 4 + .../models/domain/ModelUser$Typing.smali | 3 + .../com/discord/models/domain/ModelUser.smali | 80 + .../models/domain/ModelUserProfile.smali | 15 + .../models/domain/ModelUserRelationship.smali | 8 + .../models/domain/ModelUserSettings.smali | 8 + .../models/domain/ModelVoice$Server.smali | 8 + .../models/domain/ModelVoice$State.smali | 3 + .../discord/models/domain/ModelWebhook.smali | 3 + .../ModelActivity$ActionConfirmation.smali | 3 + .../domain/activity/ModelActivity.smali | 63 + .../domain/activity/ModelActivityAssets.smali | 20 + .../activity/ModelActivityMetadata.smali | 21 + .../domain/activity/ModelActivityParty.smali | 3 + .../activity/ModelActivityTimestamps.smali | 10 + .../domain/emoji/ModelEmojiCustom.smali | 11 + .../domain/emoji/ModelEmojiUnicode.smali | 8 + .../smali/com/discord/overlay/R$c.smali | 34 +- .../smali/com/discord/overlay/R$d.smali | 148 +- .../smali/com/discord/overlay/R$e.smali | 2 +- .../smali/com/discord/restapi/R$attr.smali | 420 +- .../com/discord/restapi/R$drawable.smali | 80 +- .../smali/com/discord/restapi/R$id.smali | 322 +- .../smali/com/discord/restapi/R$layout.smali | 26 +- .../smali/com/discord/restapi/R$plurals.smali | 2 +- .../smali/com/discord/restapi/R$string.smali | 158 +- .../smali/com/discord/restapi/R$style.smali | 972 +- .../com/discord/restapi/R$styleable.smali | 324 +- .../discord/restapi/RestAPIInterface.smali | 26 - .../restapi/RestAPIParams$AuthRegister.smali | 8 +- .../restapi/RestAPIParams$CreateGuild.smali | 39 +- .../RestAPIParams$CreateGuildChannel.smali | 13 +- .../RestAPIParams$UpdatePublicGuild.smali | 89 - .../com/discord/restapi/RestAPIParams.smali | 1 - .../io/Payloads$Protocol$CodecInfo.smali | 10 +- ...StoreAuditLog$getPermissionUserIds$1.smali | 8 +- ...toreAuthentication$AuthRequestParams.smali | 210 - .../StoreAuthentication$register$1$1.smali | 187 +- .../StoreAuthentication$register$1$2.smali | 169 - .../StoreAuthentication$register$1.smali | 91 +- ...i => StoreAuthentication$register$2.smali} | 20 +- ...hentication$sam$rx_functions_Func2$0.smali | 36 - .../discord/stores/StoreAuthentication.smali | 43 +- .../com/discord/stores/StoreChangeLog.smali | 6 +- .../discord/stores/StoreChannelMembers.smali | 20 +- .../stores/StoreChannels$delete$2.smali | 4 +- ...StoreChannelsSelected$findAndSet$4$2.smali | 2 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../StoreDynamicLink$DynamicLinkData.smali | 93 +- ...StoreDynamicLink$storeLinkIfExists$1.smali | 146 +- ...StoreDynamicLink$storeLinkIfExists$2.smali | 12 +- .../com/discord/stores/StoreDynamicLink.smali | 104 +- .../stores/StoreExperiments$Experiment.smali | 53 +- ...toreGifting$GiftState$RedeemedFailed.smali | 10 +- .../stores/StoreGuildMemberRequester.smali | 4 - ...$clearDynamicLinkGuildTemplateCode$1.smali | 68 - ...uildTemplates$observeGuildTemplate$1.smali | 14 +- ...uildTemplates$observeGuildTemplate$2.smali | 2 +- ...ldTemplates$requestGuildTemplate$1$1.smali | 6 +- ...uildTemplates$requestGuildTemplate$1.smali | 8 +- ...ldTemplates$requestGuildTemplate$2$1.smali | 6 +- ...uildTemplates$requestGuildTemplate$2.smali | 8 +- ...es$setDynamicLinkGuildTemplateCode$1.smali | 72 - .../discord/stores/StoreGuildTemplates.smali | 185 +- .../com/discord/stores/StoreGuilds.smali | 2 +- ...reMediaNotification$NotificationData.smali | 16 +- .../StoreMediaNotification$init$3.smali | 2 +- ...reMessages$sendMessage$request$1$2$1.smali | 4 - ...reMessages$sendMessage$request$1$3$1.smali | 4 - .../com/discord/stores/StoreMessages.smali | 10 +- ...cycleCallbacks$ModelGlobalNavigation.smali | 138 +- ...eCallbacks$getGlobalNavigationData$1.smali | 39 +- ...acks$guildTemplateCodeNavHandler$1$1.smali | 106 - ...lbacks$guildTemplateCodeNavHandler$1.smali | 138 - ...leCallbacks$inviteCodeNavHandler$1$1.smali | 10 +- ...ycleCallbacks$nuxStateNavHandler$1$1.smali | 10 +- ...ecycleCallbacks$nuxStateNavHandler$1.smali | 112 +- ...ActivityNavigationLifecycleCallbacks.smali | 105 +- ...ation$displayConnectionErrorNotice$1.smali | 2 +- ...ation$displayConnectionErrorNotice$2.smali | 6 +- .../com/discord/stores/StoreNavigation.smali | 2 +- ...avigationKt$sam$rx_functions_Func9$0.smali | 56 + .../discord/stores/StoreNotifications.smali | 6 +- .../discord/stores/StoreNux$NuxState.smali | 231 +- .../stores/StoreNux$setFirstOpen$1.smali | 14 +- .../stores/StoreNux$setPostRegister$1.smali | 14 +- ...toreNux$setPremiumGuildHintGuildId$1.smali | 12 +- .../stores/StoreNux$updateNux$1$inExp$2.smali | 98 - .../discord/stores/StoreNux$updateNux$1.smali | 73 +- .../smali/com/discord/stores/StoreNux.smali | 70 +- .../stores/StoreStream$Companion.smali | 14 - .../stores/StoreStream$deferredInit$1.smali | 14 - .../com/discord/stores/StoreStream.smali | 34 +- .../StoreTabsNavigation$selectTab$1.smali | 78 - .../discord/stores/StoreTabsNavigation.smali | 181 - .../smali/com/discord/stores/StoreUser.smali | 28 +- ...eUserGuildSettings$setChannelMuted$1.smali | 8 +- .../stores/StoreUserGuildSettings.smali | 10 +- .../discord/stores/StoreUserSettings.smali | 8 +- .../StoreVideoStreams$UserStreams.smali | 10 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../analytics/AnalyticsTracker.smali | 461 +- .../utilities/analytics/Traits$Location.smali | 10 +- .../utilities/analytics/Traits$Source.smali | 10 +- .../attachments/AttachmentUtilsKt.smali | 8 +- .../auditlogs/AuditLogChangeUtils.smali | 262 +- .../utilities/auditlogs/AuditLogUtils.smali | 402 +- .../utilities/billing/PremiumUtilsKt.smali | 12 +- ...Helper$ensurePlayServicesAvailable$2.smali | 2 +- .../captcha/CaptchaHelper$showCaptcha$2.smali | 2 +- .../utilities/captcha/CaptchaHelper.smali | 10 +- .../utilities/channel/ChannelUtils.smali | 8 +- .../collections/SparseMutableList$Chunk.smali | 4 - .../utilities/duration/DurationUtilsKt.smali | 18 +- .../utilities/embed/EmbedResourceUtils.smali | 2 +- .../discord/utilities/embed/FileType.smali | 66 +- .../com/discord/utilities/error/Error.smali | 26 +- .../SimpleDraweeViewExtensionsKt.smali | 2 +- .../utilities/fcm/NotificationData.smali | 56 +- .../utilities/fcm/NotificationRenderer.smali | 20 +- .../GameDetectionService$Companion.smali | 8 +- .../discord/utilities/icon/IconUtils.smali | 212 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../discord/utilities/images/MGImages.smali | 2 +- ...er$launchAlbum$$inlined$let$lambda$1.smali | 4 - .../intent/IntentUtils$RouteBuilders.smali | 105 +- .../utilities/intent/IntentUtils.smali | 44 +- ...lers$wildCardMatcher$actualHandler$3.smali | 121 - .../utilities/intent/RouteHandlers.smali | 117 +- .../Keyboard$ActivityLifecycleCallbacks.smali | 27 + ...oard$KeyboardHeightsCache$Companion.smali} | 8 +- ...Cache$keyboardHeightsCache$1$value$1.smali | 96 + ...dHeightsCache$keyboardHeightsCache$2.smali | 82 + ...he$keyboardHeightsCache$serialized$1.smali | 153 + .../Keyboard$KeyboardHeightsCache.smali | 422 + ...utListener$onKeyboardHeightChanged$1.smali | 83 + .../Keyboard$init$1$LayoutListener.smali | 321 + .../utilities/keyboard/Keyboard$init$1.smali | 188 + .../discord/utilities/keyboard/Keyboard.smali | 442 + .../utilities/messagesend/MessageQueue.smali | 8 - .../messagesend/MessageRequest$Send.smali | 6 +- .../mg_recycler/MGRecyclerAdapter.smali | 2 +- .../notices/NoticeBuilders$DialogData.smali | 10 +- .../utilities/notices/NoticeBuilders.smali | 22 +- .../persister/Persister$Preloader.smali | 2 +- .../discord/utilities/platform/Platform.smali | 54 +- .../PremiumGuildSubscriptionUtils.smali | 4 - .../utilities/premium/PremiumUtils.smali | 6 +- .../utilities/presence/PresenceUtils.smali | 57 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../com/discord/utilities/rest/RestAPI.smali | 46 - .../utilities/rest/RestAPIAbortMessages.smali | 10 +- .../discord/utilities/rest/SendUtils.smali | 18 +- .../strings/ContextSearchStringProvider.smali | 20 +- ...ulViews$FragmentOnBackPressedHandler.smali | 16 +- .../textprocessing/MessageRenderContext.smali | 4 +- .../textprocessing/MessageUtils.smali | 78 +- ...pans$createHeaderClassSpanProvider$1.smali | 8 +- ...pans$createHeaderStyleSpanProvider$1.smali | 2 +- .../textprocessing/node/BlockQuoteNode.smali | 2 +- .../textprocessing/node/CodeNode.smali | 6 +- .../node/EmojiNode$Companion.smali | 4 - .../textprocessing/node/EmojiNode.smali | 2 +- .../discord/utilities/uri/UriHandler.smali | 6 +- .../view/extensions/ViewExtensions.smali | 79 +- .../grid/FrameGridLayout$PositionSpec.smali | 16 - .../RxViewController$bind$1.smali | 72 - .../RxViewController$connectViewRx$1.smali | 81 - .../RxViewController$connectViewRx$2.smali | 80 - .../RxViewController$connectViewRx$3.smali | 72 - .../viewcontroller/RxViewController.smali | 218 - .../ViewDetachedFromWindowObservable.smali | 87 - ...erItemDecoration$StickyHeaderAdapter.smali | 2 +- .../views/StickyHeaderItemDecoration.smali | 44 +- .../DiscordOverlayService$Companion.smali | 2 +- ...rdOverlayService$createVoiceBubble$1.smali | 2 +- .../voice/DiscordOverlayService.smali | 14 +- ...oregroundService$NotificationBuilder.smali | 22 +- .../utilities/voice/VoiceViewUtils.smali | 24 +- com.discord/smali/com/discord/utils/R$c.smali | 80 +- com.discord/smali/com/discord/utils/R$d.smali | 322 +- com.discord/smali/com/discord/utils/R$e.smali | 26 +- com.discord/smali/com/discord/utils/R$f.smali | 324 +- ...scriptionView$ActiveSubscriptionType.smali | 24 +- .../views/ActiveSubscriptionView.smali | 358 +- .../smali/com/discord/views/BoxedButton.smali | 2 +- .../com/discord/views/ChatActionItem.smali | 4 +- .../com/discord/views/CheckedSetting.smali | 14 +- .../discord/views/CodeVerificationView.smali | 16 +- .../smali/com/discord/views/GuildView.smali | 6 +- .../com/discord/views/LoadingButton.smali | 6 +- .../discord/views/OAuthPermissionViews.smali | 68 +- .../com/discord/views/OverlayMenuView.smali | 54 +- .../com/discord/views/ServerFolderView.smali | 12 +- .../smali/com/discord/views/StatusView.smali | 40 +- .../com/discord/views/StreamPreviewView.smali | 34 +- .../com/discord/views/TernaryCheckBox.smali | 16 +- .../discord/views/ToolbarTitleLayout.smali | 8 +- .../discord/views/UploadProgressView.smali | 36 +- .../com/discord/views/UserListItemView.smali | 10 +- .../com/discord/views/VoiceUserView.smali | 10 +- .../views/premium/AccountCreditView.smali | 58 +- .../PremiumGuildConfirmationView.smali | 60 +- .../PremiumGuildProgressView.smali | 38 +- .../PremiumGuildSubscriptionUpsellView.smali | 20 +- .../PremiumSubscriptionMarketingView.smali | 32 +- .../discord/views/steps/StepsView$b$a.smali | 12 +- .../com/discord/views/steps/StepsView.smali | 67 +- .../views/user/UserAvatarPresenceView$a.smali | 199 - .../views/user/UserAvatarPresenceView.smali | 478 - .../UserAvatarPresenceViewController$a.smali | 94 - .../UserAvatarPresenceViewController.smali | 263 - .../views/video/ApplicationStreamView.smali | 6 +- .../video/VideoCallParticipantView.smali | 85 +- ...llowSheet$configureChannelSelector$1.smali | 2 +- ...FollowSheet$configureGuildSelector$1.smali | 2 +- .../WidgetChannelFollowSheet.smali | 6 +- ...ollowSheetViewModel$ViewState$Loaded.smali | 10 +- .../WidgetChannelFollowSheetViewModel.smali | 4 +- .../WidgetChannelFollowSuccessDialog.smali | 22 +- .../widgets/auth/WidgetAuthCaptcha.smali | 2 +- .../widgets/auth/WidgetAuthInviteInfo.smali | 12 +- .../widgets/auth/WidgetAuthLanding.smali | 2 +- .../WidgetAuthLogin$onViewBound$5$1.smali | 2 +- .../auth/WidgetAuthLogin$onViewBound$5.smali | 8 +- .../WidgetAuthLogin$validationManager$2.smali | 6 +- .../widgets/auth/WidgetAuthLogin.smali | 6 +- .../WidgetAuthMfa$onActivityCreated$1.smali | 2 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 24 +- ...etAuthRegister$validationManager$2$1.smali | 2 +- ...dgetAuthRegister$validationManager$2.smali | 10 +- .../widgets/auth/WidgetAuthRegister.smali | 58 +- .../auth/WidgetAuthUndeleteAccount.smali | 2 +- ...2Authorize$OAuthPermissionViewHolder.smali | 4 +- ...auth2Authorize$validationManager$2$2.smali | 2 +- .../widgets/auth/WidgetOauth2Authorize.smali | 40 +- ...zeSamsung$samsungCallbackHandshake$2.smali | 2 +- .../auth/WidgetOauth2AuthorizeSamsung.smali | 6 +- .../widgets/auth/WidgetRemoteAuth.smali | 14 +- ...mpleMembersAdapter$MemberAdapterItem.smali | 4 +- .../SimpleRolesAdapter$RoleAdapterItem.smali | 2 +- .../WidgetChannelGroupDMSettings.smali | 44 +- ...ttings$configureNotificationRadios$1.smali | 2 +- .../WidgetChannelNotificationSettings.smali | 64 +- ...tChannelSelector$Adapter$ItemChannel.smali | 2 +- .../WidgetChannelSelector$Adapter.smali | 2 +- .../WidgetChannelSelector$Companion.smali | 8 +- .../channels/WidgetChannelSelector.smali | 4 +- ...SettingsEditPermissions$ModelForRole.smali | 4 +- ...SettingsEditPermissions$ModelForUser.smali | 4 +- ...WidgetChannelSettingsEditPermissions.smali | 62 +- ...tChannelSettingsPermissionsAddMember.smali | 2 +- ...getChannelSettingsPermissionsAddRole.smali | 2 +- ...etChannelSettingsPermissionsOverview.smali | 12 +- ...etChannelTopic$Model$Companion$get$1.smali | 92 + ...etChannelTopic$Model$Companion$get$2.smali | 98 + ...ChannelTopic$Model$Companion$get$3$1.smali | 214 + ...l$Companion$get$3$2$renderContext$1.smali} | 14 +- ...el$Companion$get$3$2$renderContext$2.smali | 118 + ...ChannelTopic$Model$Companion$get$3$2.smali | 200 + ...etChannelTopic$Model$Companion$get$3.smali | 234 + .../WidgetChannelTopic$Model$Companion.smali | 256 + .../channels/WidgetChannelTopic$Model.smali | 241 + .../WidgetChannelTopic$RenderedTopic.smali | 201 - ...gureUI$renderedTopic$renderContext$2.smali | 112 - ...ChannelTopic$onViewBoundOrOnResume$1.smali | 64 +- .../widgets/channels/WidgetChannelTopic.smali | 368 +- .../WidgetChannelTopicViewModel$1.smali | 80 - ...annelTopicViewModel$Factory$create$1.smali | 110 - ...ory$mapChannelTopicToStoreStateObs$1.smali | 162 - ...iewModel$Factory$observeStoreState$1.smali | 152 - .../WidgetChannelTopicViewModel$Factory.smali | 431 - ...picViewModel$StoreState$DefaultTopic.smali | 42 - ...nelTopicViewModel$StoreState$NoTopic.smali | 42 - ...annelTopicViewModel$StoreState$Topic.smali | 828 - ...dgetChannelTopicViewModel$StoreState.smali | 40 - ...opicViewModel$ViewState$DefaultTopic.smali | 42 - ...annelTopicViewModel$ViewState$Loaded.smali | 798 - ...picViewModel$ViewState$Uninitialized.smali | 42 - ...idgetChannelTopicViewModel$ViewState.smali | 40 - .../WidgetChannelTopicViewModel.smali | 657 - .../WidgetChannelTopicViewModelKt.smali | 3 - ...ateChannel$RolesAdapter$RoleListItem.smali | 4 +- .../channels/WidgetCreateChannel.smali | 52 +- ...dgetGroupInviteFriends$configureUI$1.smali | 2 +- .../WidgetGroupInviteFriends$setupFAB$1.smali | 2 +- .../channels/WidgetGroupInviteFriends.smali | 20 +- ...ter$WidgetGroupInviteFriendsListItem.smali | 2 +- .../WidgetGroupInviteFriendsAdapter.smali | 2 +- ...getTextChannelSettings$configureUI$1.smali | 2 +- ...getTextChannelSettings$configureUI$2.smali | 2 +- ...getTextChannelSettings$configureUI$6.smali | 2 +- ...getTextChannelSettings$saveChannel$1.smali | 4 +- .../channels/WidgetTextChannelSettings.smali | 439 +- ...el$Companion$getPrivateChannelList$1.smali | 29 +- .../list/WidgetChannelListUnreads.smali | 16 +- .../WidgetChannelsList$onViewBound$5$1.smali | 2 +- .../channels/list/WidgetChannelsList.smali | 155 +- ...sListAdapter$ItemChannelAnnouncement.smali | 119 +- ...dapter$ItemChannelCategory$Companion.smali | 4 +- ...nnelsListAdapter$ItemChannelCategory.smali | 118 +- ...annelsListAdapter$ItemChannelPrivate.smali | 418 +- ...tChannelsListAdapter$ItemChannelText.smali | 119 +- ...ChannelsListAdapter$ItemChannelVoice.smali | 108 +- ...idgetChannelsListAdapter$ItemFriends.smali | 46 +- ...WidgetChannelsListAdapter$ItemHeader.smali | 6 +- .../WidgetChannelsListAdapter$ItemMFA.smali | 2 +- ...getChannelsListAdapter$ItemVoiceUser.smali | 120 +- .../list/WidgetChannelsListAdapter.smali | 18 +- ...ChannelsListItemChannelActions$Model.smali | 4 +- ...WidgetChannelsListItemChannelActions.smali | 121 +- .../WidgetChannelsListItemVoiceActions.smali | 245 +- ...tAdapter$WidgetCollapsedUserListItem.smali | 6 +- .../WidgetCollapsedUsersListAdapter.smali | 2 +- ...rateGuildMemberListItems$listItems$1.smali | 2 +- .../GuildMemberListItemGeneratorKt.smali | 131 +- ...annelMembersList$configureLoadedUI$2.smali | 80 - .../memberlist/WidgetChannelMembersList.smali | 97 +- ...$Factory$observeStoreStateForGuild$1.smali | 36 +- ...tChannelMembersListViewModel$Factory.smali | 113 +- ...embersListViewModel$StoreState$Guild.smali | 114 +- .../WidgetChannelMembersListViewModel.smali | 56 +- ...nelMembersListAdapter$Item$AddMember.smali | 200 - .../ChannelMembersListAdapter$Item.smali | 1 - ...bersListAdapter$StickyHeadersManager.smali | 33 +- .../ChannelMembersListAdapter$ViewType.smali | 16 +- ...annelMembersListAdapter$WhenMappings.smali | 12 - ...embersListAdapter$onBindViewHolder$2.smali | 77 - .../adapter/ChannelMembersListAdapter.smali | 155 +- ...annelMembersListViewHolderAdd$bind$1.smali | 45 - .../ChannelMembersListViewHolderAdd.smali | 73 - .../ChannelMembersListViewHolderHeader.smali | 8 +- .../ChannelMembersListViewHolderLoading.smali | 2 +- ...elMembersListViewHolderMember$bind$3.smali | 2 +- .../ChannelMembersListViewHolderMember.smali | 188 +- ...annelMembersListViewHolderRoleHeader.smali | 2 +- .../WidgetUrlActions$onViewCreated$3.smali | 2 +- .../widgets/chat/WidgetUrlActions.smali | 16 +- .../input/WidgetChatInput$chatInput$2.smali | 2 +- ...li => WidgetChatInput$configureUI$1.smali} | 12 +- ...li => WidgetChatInput$configureUI$2.smali} | 12 +- .../widgets/chat/input/WidgetChatInput.smali | 297 +- ...putAttachments$DiscordCameraFragment.smali | 6 +- ...nputAttachments$DiscordFilesFragment.smali | 2 +- ...putAttachments$DiscordPhotosFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 4 +- ...utFragment$$inlined$apply$lambda$2$1.smali | 49 + ...nputFragment$$inlined$apply$lambda$2.smali | 25 +- ...nputFragment$$inlined$apply$lambda$3.smali | 3 + .../input/WidgetChatInputAttachments.smali | 52 +- .../WidgetChatInputCommandsAdapter.smali | 2 +- .../chat/input/WidgetChatInputEditText.smali | 24 +- .../chat/input/WidgetChatInputModel.smali | 18 +- ...atInputSend$configureSendListeners$5.smali | 6 +- .../chat/input/WidgetChatInputSend.smali | 72 +- ...hatInputEmojiAdapter$EmojiViewHolder.smali | 6 +- ...dgetChatInputEmojiAdapter$HeaderItem.smali | 62 +- ...atInputEmojiAdapter$HeaderViewHolder.smali | 2 +- .../emoji/WidgetChatInputEmojiAdapter.smali | 8 +- .../WidgetChatInputEmojiPicker$Model.smali | 10 +- .../emoji/WidgetChatInputEmojiPicker.smali | 132 +- .../chat/list/ViewEmbedGameInvite.smali | 194 +- .../widgets/chat/list/WidgetChatList$1.smali | 6 +- .../widgets/chat/list/WidgetChatList.smali | 2 +- .../chat/list/WidgetChatListAdapter.smali | 20 +- .../WidgetChatListAdapterItemAttachment.smali | 308 +- .../WidgetChatListAdapterItemBlocked.smali | 4 +- ...WidgetChatListAdapterItemCallMessage.smali | 18 +- .../list/WidgetChatListAdapterItemEmbed.smali | 278 +- .../WidgetChatListAdapterItemEmptyPins.smali | 2 +- .../WidgetChatListAdapterItemGameInvite.smali | 4 +- .../list/WidgetChatListAdapterItemGift.smali | 330 +- ...apterItemGuildTemplate$ModelProvider.smali | 18 +- ...dgetChatListAdapterItemGuildTemplate.smali | 28 +- ...idgetChatListAdapterItemGuildWelcome.smali | 181 +- .../WidgetChatListAdapterItemInvite.smali | 70 +- ...getChatListAdapterItemListenTogether.smali | 121 +- ...dgetChatListAdapterItemMentionFooter.smali | 4 +- .../WidgetChatListAdapterItemMessage.smali | 14 +- ...dgetChatListAdapterItemMessageHeader.smali | 2 +- ...WidgetChatListAdapterItemNewMessages.smali | 4 +- ...atListAdapterItemPrivateChannelStart.smali | 10 +- .../WidgetChatListAdapterItemReactions.smali | 2 +- ...ChatListAdapterItemSearchResultCount.smali | 4 +- .../list/WidgetChatListAdapterItemStart.smali | 18 +- ...ItemSystemMessage$getSystemMessage$1.smali | 28 +- ...dgetChatListAdapterItemSystemMessage.smali | 20 +- .../WidgetChatListAdapterItemTimestamp.smali | 2 +- ...getChatListAdapterItemUploadProgress.smali | 245 +- .../chat/list/WidgetChatListItem.smali | 2 +- ...alogs$showPinMessageConfirmation$1$1.smali | 4 +- .../list/actions/MessageActionDialogs.smali | 26 +- .../actions/WidgetChatListActions$Model.smali | 8 +- .../WidgetChatListActions$adapter$1.smali | 2 +- .../WidgetChatListActions$configureUI$9.smali | 2 +- .../list/actions/WidgetChatListActions.smali | 572 +- .../model/WidgetChatListModel$Messages.smali | 4 +- ...mojisAdapter$ReactionEmojiViewHolder.smali | 8 +- ...ctionsResultsAdapter$ErrorViewHolder.smali | 4 +- ...ionsResultsAdapter$LoadingViewHolder.smali | 2 +- ...esultsAdapter$ReactionUserViewHolder.smali | 68 +- .../WidgetManageReactions.smali | 8 +- ...hatOverlay$TypingIndicatorViewHolder.smali | 58 +- ...tChatOverlay$onViewBoundOrOnResume$2.smali | 14 +- .../chat/overlay/WidgetChatOverlay.smali | 2 +- .../WidgetChannelPinnedMessages$Model.smali | 4 +- .../pins/WidgetChannelPinnedMessages.smali | 6 +- .../widgets/client/WidgetClientOutdated.smali | 2 +- .../debugging/WidgetDebugging$Adapter.smali | 2 +- .../WidgetDebugging$configureUI$1.smali | 2 +- .../WidgetDebugging$configureUI$2.smali | 2 +- .../widgets/debugging/WidgetDebugging.smali | 4 +- .../widgets/debugging/WidgetFatalCrash.smali | 18 +- .../WidgetFeedbackSheet$handleEvent$1.smali | 2 +- .../feedback/WidgetFeedbackSheet.smali | 2 +- .../widgets/friends/FriendsListRouter.smali | 2 +- .../friends/FriendsListViewModel$1.smali | 2 +- .../FriendsListViewModel$Factory.smali | 30 +- ...sListViewModel$acceptFriendRequest$2.smali | 2 +- ...iendsListViewModel$launchVoiceCall$2.smali | 2 +- ...sListViewModel$removeFriendRequest$2.smali | 2 +- .../friends/FriendsListViewModel.smali | 93 +- ...sAdd$Companion$UserNameDiscriminator.smali | 10 +- ...WidgetFriendsAdd$sendFriendRequest$1.smali | 32 +- ...WidgetFriendsAdd$sendFriendRequest$2.smali | 4 +- .../widgets/friends/WidgetFriendsAdd.smali | 8 +- ...FriendsAddUserAdapter$UserViewHolder.smali | 102 +- ...FriendsFindNearby$Model$Disconnected.smali | 10 +- ...getFriendsFindNearby$onViewBound$2$1.smali | 2 +- .../friends/WidgetFriendsFindNearby.smali | 30 +- ...nion$getConsideringSelectedChannel$1.smali | 46 +- .../friends/WidgetFriendsList$addTab$1.smali | 2 +- .../WidgetFriendsList$configure$4$1.smali | 2 +- .../widgets/friends/WidgetFriendsList.smali | 82 +- .../WidgetFriendsListAdapter$ItemEmpty.smali | 2 +- .../WidgetFriendsListAdapter$ItemUser.smali | 260 +- ...idgetFriendsListAdapterV2$ItemHeader.smali | 2 +- ...iendsListAdapterV2$ItemPendingHeader.smali | 10 +- ...FriendsListAdapterV2$ItemPendingUser.smali | 6 +- .../WidgetFriendsListAdapterV2$ItemUser.smali | 2 +- .../widgets/friends/WidgetFriendsListV2.smali | 2 +- .../widgets/friends/WidgetFriendsTab.smali | 106 - ...idgetGuildSelector$Adapter$ItemGuild.smali | 8 +- .../guilds/WidgetGuildSelector$Adapter.smali | 2 +- .../widgets/guilds/WidgetGuildSelector.smali | 4 +- .../WidgetGuildActionsAdd$onResume$1.smali | 20 +- .../WidgetGuildActionsAdd$onResume$2.smali | 6 +- .../actions/WidgetGuildActionsAdd.smali | 12 +- .../actions/WidgetGuildActionsSheet.smali | 237 +- ...mplateChannelsView$ChannelViewHolder.smali | 10 +- .../create/GuildTemplateChannelsView.smali | 2 +- .../StockGuildTemplate$WhenMappings.smali | 96 - .../guilds/create/StockGuildTemplate.smali | 758 - .../guilds/create/StockGuildTemplateKt.smali | 97 - .../create/WidgetGuildClone$Companion.smali | 31 +- .../guilds/create/WidgetGuildClone.smali | 48 +- .../create/WidgetGuildCreate$Companion.smali | 55 +- .../WidgetGuildCreate$onViewBound$1$1.smali | 4 +- .../WidgetGuildCreate$onViewBound$1.smali | 14 +- .../WidgetGuildCreate$onViewBound$3.smali | 14 +- .../guilds/create/WidgetGuildCreate.smali | 71 +- .../create/WidgetGuildCreateViewModel$1.smali | 2 +- .../WidgetGuildCreateViewModel$Factory.smali | 169 +- ...etGuildCreateViewModel$createGuild$1.smali | 2 +- ...etGuildCreateViewModel$createGuild$2.smali | 2 +- .../create/WidgetGuildCreateViewModel.smali | 362 +- .../guilds/invite/GuildInviteUiHelperKt.smali | 4 +- ...SettingsSheet$ChannelsSpinnerAdapter.smali | 4 +- .../invite/ViewInviteSettingsSheet.smali | 46 +- .../guilds/invite/WidgetGuildInvite.smali | 10 +- ...viteShare$PrivateChannelAdapter$Item.smali | 246 +- ...WidgetGuildInviteShare$onViewBound$2.smali | 42 +- .../invite/WidgetGuildInviteShare.smali | 63 +- ...reCompact$PrivateChannelAdapter$Item.smali | 246 +- ...uildInviteShareCompact$onViewBound$2.smali | 42 +- .../WidgetGuildInviteShareCompact.smali | 58 +- ...dgetGuildInviteShareEmptySuggestions.smali | 26 +- .../guilds/invite/WidgetInviteInfo.smali | 262 +- .../join/WidgetGuildJoin$Companion.smali | 25 +- .../join/WidgetGuildJoin$ToolbarButton.smali | 6 +- .../widgets/guilds/join/WidgetGuildJoin.smali | 6 +- ...GuildListViewHolder$FolderViewHolder.smali | 258 +- ...uildListViewHolder$FriendsViewHolder.smali | 56 +- .../GuildListViewHolder$GuildViewHolder.smali | 171 +- ...tViewHolder$PrivateChannelViewHolder.smali | 4 +- .../guilds/list/GuildListViewHolder.smali | 2 +- .../guilds/list/WidgetGuildListAdapter.smali | 16 +- ...dgetGuildSearchAdapter$GuildListItem.smali | 6 +- .../WidgetGuildSelector$onViewBound$3.smali | 38 +- .../guilds/list/WidgetGuildSelector.smali | 12 +- ...etGuildsList$configureAddGuildHint$1.smali | 10 +- .../guilds/list/WidgetGuildsList.smali | 8 +- ...etGuildProfileSheet$EmojiViewAdapter.smali | 4 +- ...getGuildProfileSheet$EmojiViewHolder.smali | 2 +- .../profile/WidgetGuildProfileSheet.smali | 34 +- .../WidgetGuildProfileSheetV2$Companion.smali | 77 - ...dgetGuildProfileSheetV2$WhenMappings.smali | 48 - ...tGuildProfileSheetV2$onViewCreated$1.smali | 104 - .../profile/WidgetGuildProfileSheetV2.smali | 1553 -- .../WidgetGuildProfileSheetViewModel$1.smali | 80 - ...ildProfileSheetViewModel$Banner$Type.smali | 109 - ...getGuildProfileSheetViewModel$Banner.smali | 295 - ...eetViewModel$Factory$observeStores$1.smali | 84 - ...etGuildProfileSheetViewModel$Factory.smali | 123 - ...uildProfileSheetViewModel$StoreState.smali | 214 - ...fileSheetViewModel$ViewState$Invalid.smali | 42 - ...ofileSheetViewModel$ViewState$Loaded.smali | 786 - ...fileSheetViewModel$ViewState$Loading.smali | 42 - ...GuildProfileSheetViewModel$ViewState.smali | 40 - .../WidgetGuildProfileSheetViewModel.smali | 504 - ...WidgetPublicAnnouncementProfileSheet.smali | 2 +- .../main/FriendsListTabsProvider.smali | 8 - .../WidgetMain$configureFirstOpen$2$1.smali | 14 +- ...ain$configureLeftPanelBottomMargin$1.smali | 108 - .../WidgetMain$onViewBoundOrOnResume$8.smali | 80 - .../main/WidgetMain$showSurvey$1.smali | 2 +- .../com/discord/widgets/main/WidgetMain.smali | 583 +- ...Layout$LockableActionBarDrawerToggle.smali | 37 +- .../WidgetMainHeaderManager$HeaderData.smali | 10 +- ...HeaderManager$getOnConfigureAction$1.smali | 28 +- ...nHeaderManager$getOnSelectedAction$1.smali | 14 +- .../main/WidgetMainHeaderManager.smali | 20 +- .../WidgetMainModel$Companion$get$1.smali | 12 - .../widgets/main/WidgetMainPanelLoading.smali | 4 +- .../main/WidgetMainPanelNoChannels.smali | 10 +- .../widgets/main/WidgetMainPanelNsfw.smali | 8 +- .../WidgetMainSurveyDialog$Companion.smali | 2 +- .../widgets/main/WidgetMainSurveyDialog.smali | 16 +- ...getMedia$onViewBoundOrOnResume$1$1$1.smali | 2 +- ...getMedia$onViewBoundOrOnResume$1$1$2.smali | 2 +- .../WidgetMedia$onViewBoundOrOnResume$1.smali | 2 +- .../discord/widgets/media/WidgetMedia.smali | 8 +- .../widgets/media/WidgetQRScanner.smali | 26 +- .../notice/WidgetNoticeDialog$Builder.smali | 4 +- ...iceDialog$Companion$showInputModal$1.smali | 2 +- ...iceDialog$Companion$showInputModal$3.smali | 2 +- .../notice/WidgetNoticeDialog$Companion.smali | 10 +- .../widgets/notice/WidgetNoticeDialog.smali | 509 +- ...WidgetNoticeNuxOverlay$onViewBound$1.smali | 2 +- .../notice/WidgetNoticeNuxOverlay.smali | 2 +- ...etNoticeNuxSamsungLink$onViewBound$4.smali | 12 +- .../notice/WidgetNoticeNuxSamsungLink.smali | 2 +- .../widgets/notice/WidgetNoticePopup.smali | 16 +- ...$Companion$getMessageRenderContext$1.smali | 2 +- .../WidgetNoticePopupChannel$Companion.smali | 40 +- .../notice/WidgetNoticePopupChannel.smali | 22 +- .../discord/widgets/nux/NuxAnalytics.smali | 124 - ...WidgetNavigationHelp$NuxPageFragment.smali | 6 +- .../widgets/nux/WidgetNavigationHelp.smali | 8 +- ...idgetNuxGuildTemplates$onViewBound$1.smali | 85 - ...ViewBound$guildCreateClickListener$1.smali | 162 - ...onViewBound$guildJoinClickListener$1.smali | 74 - .../widgets/nux/WidgetNuxGuildTemplates.smali | 578 - ...WidgetNuxGuildUseCases$onViewBound$1.smali | 85 - ...idgetNuxGuildUseCases$onViewBound$3.smali} | 6 +- ...ViewBound$guildCreateClickListener$1.smali | 36 +- ...onViewBound$guildJoinClickListener$1.smali | 12 - .../widgets/nux/WidgetNuxGuildUseCases.smali | 222 +- ...uxPostRegistrationJoin$onViewBound$2.smali | 4 +- .../nux/WidgetNuxPostRegistrationJoin.smali | 4 +- .../widgets/search/WidgetSearch$Model.smali | 8 +- .../discord/widgets/search/WidgetSearch.smali | 59 +- .../results/WidgetSearchResults$Model.smali | 6 +- .../search/results/WidgetSearchResults.smali | 8 +- .../WidgetSearchSuggestions$Model.smali | 4 +- .../suggestions/WidgetSearchSuggestions.smali | 8 +- ...hSuggestionsAdapter$FilterViewHolder.smali | 42 +- ...archSuggestionsAdapter$HasViewHolder.smali | 24 +- ...hSuggestionsAdapter$HeaderViewHolder.smali | 16 +- ...tionsAdapter$HistoryHeaderViewHolder.smali | 8 +- ...ggestionsAdapter$InChannelViewHolder.smali | 10 +- ...estionsAdapter$RecentQueryViewHolder.smali | 10 +- ...rchSuggestionsAdapter$UserViewHolder.smali | 8 +- .../NotificationMuteSettingsView.smali | 247 +- ...ewHolder$CategoryOverridesViewHolder.smali | 2 +- ...iewHolder$ChannelOverridesViewHolder.smali | 8 +- ...ficationsOverridesAdapter$ViewHolder.smali | 6 +- .../NotificationsOverridesAdapter.smali | 4 +- ...sChannelListAdapter$CategoryListItem.smali | 46 +- ...gsChannelListAdapter$ChannelListItem.smali | 58 +- .../servers/WidgetServerDeleteDialog.smali | 28 +- .../servers/WidgetServerNotifications.smali | 191 +- ...tServerNotificationsOverrideSelector.smali | 12 +- ...electDialog$RegionAdapter$ItemRegion.smali | 6 +- ...rverRegionSelectDialog$RegionAdapter.smali | 2 +- .../WidgetServerRegionSelectDialog.smali | 4 +- ...getServerSettings$configureToolbar$1.smali | 2 +- .../WidgetServerSettings$configureUI$10.smali | 2 +- .../WidgetServerSettings$configureUI$11.smali | 22 +- .../WidgetServerSettings$configureUI$12.smali | 4 +- .../WidgetServerSettings$configureUI$13.smali | 63 - .../WidgetServerSettings$configureUI$8.smali | 22 +- .../WidgetServerSettings$configureUI$9.smali | 2 +- .../servers/WidgetServerSettings.smali | 641 +- ...rverSettingsBans$Adapter$BanListItem.smali | 2 +- .../servers/WidgetServerSettingsBans.smali | 18 +- .../WidgetServerSettingsChannels.smali | 18 +- ...erverSettingsChannelsFabMenuFragment.smali | 4 +- ...getServerSettingsChannelsSortActions.smali | 8 +- .../WidgetServerSettingsEditIntegration.smali | 10 +- .../WidgetServerSettingsEditMember.smali | 12 +- ...sEditMemberRolesAdapter$RoleListItem.smali | 6 +- .../WidgetServerSettingsEditRole.smali | 94 +- ...getServerSettingsEditRoleColorPicker.smali | 2 +- ...sEmojis$Adapter$EmojiEmptyViewHolder.smali | 2 +- ...Emojis$Adapter$EmojiHeaderViewHolder.smali | 8 +- ...gsEmojis$Adapter$EmojiItemViewHolder.smali | 12 +- ...mojis$Adapter$EmojiSectionViewHolder.smali | 8 +- ...ServerSettingsEmojis$Model$Companion.smali | 4 +- ...rverSettingsEmojis$showMediaPicker$1.smali | 4 +- .../servers/WidgetServerSettingsEmojis.smali | 8 +- ...erSettingsEmojisEdit$configureMenu$1.smali | 2 +- ...ingsEmojisEdit$showKeyboardDelayed$1.smali | 49 + .../WidgetServerSettingsEmojisEdit.smali | 50 +- .../WidgetServerSettingsInstantInvites.smali | 8 +- ...ingsInstantInvitesActions$onResume$3.smali | 2 +- ...tServerSettingsInstantInvitesActions.smali | 10 +- ...ServerSettingsInstantInvitesListItem.smali | 20 +- .../WidgetServerSettingsIntegrations.smali | 8 +- ...etServerSettingsIntegrationsListItem.smali | 102 +- ...rSettingsMembers$RolesSpinnerAdapter.smali | 2 +- .../servers/WidgetServerSettingsMembers.smali | 20 +- ...ettingsMembersAdapter$MemberListItem.smali | 16 +- .../WidgetServerSettingsModeration.smali | 30 +- ...erverSettingsOverview$AfkBottomSheet.smali | 12 +- ...ngsOverview$configureBannerImage$1$2.smali | 4 +- ...erSettingsOverview$configureIcon$1$2.smali | 4 +- ...ngsOverview$configureSplashImage$1$2.smali | 4 +- ...ServerSettingsOverview$configureUI$2.smali | 2 +- ...ServerSettingsOverview$configureUI$4.smali | 2 +- ...rview$initChannelSelectedHandler$1$1.smali | 4 +- ...RegionDialog$$inlined$apply$lambda$1.smali | 6 +- .../WidgetServerSettingsOverview.smali | 361 +- .../WidgetServerSettingsRolesList.smali | 10 +- ...ettingsRolesListAdapter$RoleListItem.smali | 14 +- ...rverSettingsSecurity$ToggleMfaDialog.smali | 12 +- .../WidgetServerSettingsSecurity.smali | 12 +- ...idgetServerSettingsTransferOwnership.smali | 14 +- .../WidgetServerSettingsVanityUrl.smali | 28 +- ...ttingsAuditLog$Model$Companion$get$1.smali | 2 +- ...rverSettingsAuditLog$onViewBound$1$1.smali | 2 +- ...ServerSettingsAuditLog$onViewBound$1.smali | 2 +- .../WidgetServerSettingsAuditLog.smali | 16 +- ...itLogAdapter$AuditLogEntryViewHolder.smali | 83 +- ...LogAdapter$AuditLogLoadingViewHolder.smali | 2 +- ...apter$AuditLogFilterActionViewHolder.smali | 2 +- ...Adapter$AuditLogFilterUserViewHolder.smali | 55 +- ...LogFilterSheet$Model$Companion$get$2.smali | 2 +- ...getServerSettingsAuditLogFilterSheet.smali | 32 +- ...uildSubscriptionPerkView$configure$1.smali | 2 +- .../PremiumGuildSubscriptionPerkView.smali | 657 +- ...iptionPerkViewAdapter$PerkViewHolder.smali | 4 +- ...emiumGuildSubscription$onViewBound$1.smali | 2 +- .../WidgetPremiumGuildSubscription.smali | 38 +- ...PremiumGuildSubscriptionConfirmation.smali | 153 +- ...dgetPremiumGuildSubscriptionTransfer.smali | 396 +- .../PublicServerSettingSelectorView.smali | 206 - ...rverSettingsPublicOverview$Companion.smali | 79 - ...ngsPublicOverview$configureValidUI$1.smali | 71 - ...ngsPublicOverview$configureValidUI$2.smali | 71 - ...ngsPublicOverview$configureValidUI$3.smali | 49 - ...ngsPublicOverview$onActivityResult$1.smali | 98 - ...ngsPublicOverview$onActivityResult$2.smali | 98 - ...ngsPublicOverview$onActivityResult$3.smali | 91 - ...SettingsPublicOverview$onViewBound$1.smali | 104 - ...SettingsPublicOverview$onViewBound$2.smali | 113 - .../WidgetServerSettingsPublicOverview.smali | 718 - ...verSettingsPublicOverviewViewModel$1.smali | 104 - ...sPublicOverviewViewModel$Event$Error.smali | 42 - ...cOverviewViewModel$Event$SaveSuccess.smali | 42 - ...ettingsPublicOverviewViewModel$Event.smali | 39 - ...wModel$Factory$observeStoreState$1$1.smali | 98 - ...iewModel$Factory$observeStoreState$1.smali | 183 - ...tingsPublicOverviewViewModel$Factory.smali | 255 - ...OverviewViewModel$StoreState$Invalid.smali | 42 - ...icOverviewViewModel$StoreState$Valid.smali | 475 - ...gsPublicOverviewViewModel$StoreState.smali | 39 - ...cOverviewViewModel$ViewState$Invalid.smali | 42 - ...icOverviewViewModel$ViewState$Loaded.smali | 299 - ...iewViewModel$ViewState$Uninitialized.smali | 42 - ...ngsPublicOverviewViewModel$ViewState.smali | 40 - ...wViewModel$savePublicGuildSettings$1.smali | 80 - ...wViewModel$savePublicGuildSettings$2.smali | 86 - ...erverSettingsPublicOverviewViewModel.smali | 416 - ...ngeLog$thumbnailControllerListener$1.smali | 14 +- .../widgets/settings/WidgetChangeLog.smali | 119 +- .../settings/WidgetMuteSettingsSheet.smali | 26 +- ...WidgetSettings$Model$Companion$get$1.smali | 36 +- .../WidgetSettings$Model$Companion.smali | 24 +- .../settings/WidgetSettings$Model.smali | 125 +- .../WidgetSettings$onViewBound$1.smali | 2 +- .../WidgetSettings$onViewBound$10.smali | 4 +- .../WidgetSettings$onViewBound$11.smali | 4 +- .../WidgetSettings$onViewBound$12.smali | 4 +- .../WidgetSettings$onViewBound$13.smali | 4 +- .../WidgetSettings$onViewBound$14.smali | 14 +- .../WidgetSettings$onViewBound$15.smali | 61 +- .../WidgetSettings$onViewBound$16.smali | 51 +- .../WidgetSettings$onViewBound$17.smali | 4 +- .../WidgetSettings$onViewBound$18.smali | 20 +- .../WidgetSettings$onViewBound$19.smali | 24 +- .../WidgetSettings$onViewBound$20.smali | 2 +- .../WidgetSettings$onViewBound$21.smali | 20 +- .../WidgetSettings$onViewBound$22.smali | 67 - ...i => WidgetSettings$onViewBound$3$1.smali} | 14 +- ...ali => WidgetSettings$onViewBound$3.smali} | 12 +- .../WidgetSettings$onViewBound$4.smali | 42 +- .../WidgetSettings$onViewBound$5.smali | 10 +- .../WidgetSettings$onViewBound$6.smali | 4 +- .../WidgetSettings$onViewBound$7.smali | 4 +- .../WidgetSettings$onViewBound$8.smali | 20 +- .../WidgetSettings$onViewBound$9.smali | 20 +- ...etSettings$sam$rx_functions_Func3$0.smali} | 16 +- .../widgets/settings/WidgetSettings.smali | 553 +- ...dgetSettingsAppearance$configureUI$2.smali | 4 +- .../settings/WidgetSettingsAppearance.smali | 42 +- ...thorizedApps$AuthorizedAppViewHolder.smali | 93 +- ...dgetSettingsAuthorizedApps$adapter$1.smali | 2 +- .../WidgetSettingsAuthorizedApps.smali | 10 +- .../settings/WidgetSettingsBehavior.smali | 16 +- ...ttingsDeveloper$ExperimentViewHolder.smali | 14 +- ...perimentSection$experimentsAdapter$1.smali | 2 +- .../settings/WidgetSettingsDeveloper.smali | 4 +- ...$configureUI$$inlined$apply$lambda$2.smali | 10 +- .../settings/WidgetSettingsGameActivity.smali | 106 +- .../settings/WidgetSettingsLanguage.smali | 274 +- ...geSelect$Adapter$AdapterItemLocale$1.smali | 24 +- ...uageSelect$Adapter$AdapterItemLocale.smali | 4 +- ...WidgetSettingsLanguageSelect$Adapter.smali | 14 +- ...dgetSettingsLanguageSelect$Companion.smali | 89 +- .../WidgetSettingsLanguageSelect.smali | 88 +- .../settings/WidgetSettingsMedia.smali | 18 +- ...otifications$onViewBoundOrOnResume$1.smali | 14 +- .../WidgetSettingsNotifications.smali | 20 +- .../WidgetSettingsNotificationsOs.smali | 8 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- ...Privacy$configurePrivacyControls$2$1.smali | 8 +- ...Privacy$configureRequestDataButton$1.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$1.smali | 6 +- ...SettingsPrivacy$onRequestDataClick$2.smali | 6 +- ...SettingsPrivacy$onRequestDataClick$4.smali | 8 +- .../settings/WidgetSettingsPrivacy.smali | 76 +- ...gsUserConnections$Adapter$ViewHolder.smali | 122 +- ...idgetSettingsUserConnections$Adapter.smali | 2 +- ...ettingsUserConnections$onViewBound$2.smali | 2 +- .../WidgetSettingsUserConnections.smali | 50 +- ...etSettingsUserConnectionsAdd$Adapter.smali | 2 +- .../WidgetSettingsUserConnectionsAdd.smali | 2 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 8 +- .../WidgetSettingsVoice$onViewBound$1.smali | 14 +- .../settings/WidgetSettingsVoice.smali | 169 +- ...idgetDisableDeleteAccountDialog$Mode.smali | 12 +- .../WidgetDisableDeleteAccountDialog.smali | 16 +- .../account/WidgetEnableSMSBackupDialog.smali | 34 +- .../WidgetSettingsAccount$configureUI$3.smali | 2 +- ...idgetSettingsAccount$configureUI$5$1.smali | 4 +- ...ttingsAccount$showRemove2FAModal$1$1.smali | 2 +- .../account/WidgetSettingsAccount.smali | 363 +- ...s$Adapter$BackupCodeHeaderViewHolder.smali | 2 +- ...r$BackupCodeViewHolder$onConfigure$1.smali | 2 +- ...upCodes$Adapter$BackupCodeViewHolder.smali | 6 +- ...etSettingsAccountBackupCodes$Adapter.smali | 4 +- ...sAccountBackupCodes$getBackupCodes$1.smali | 4 +- ...wPasswordModal$$inlined$let$lambda$1.smali | 10 +- .../WidgetSettingsAccountBackupCodes.smali | 18 +- ...ountChangePassword$saveNewPassword$1.smali | 2 +- .../WidgetSettingsAccountChangePassword.smali | 42 +- ...getSettingsAccountEdit$configureUI$1.smali | 2 +- ...WidgetSettingsAccountEdit$saveInfo$1.smali | 2 +- ...tingsAccountEdit$validationManager$2.smali | 14 +- .../account/WidgetSettingsAccountEdit.smali | 26 +- .../account/WidgetSettingsBlockedUsers.smali | 4 +- ...edUsersAdapter$BlockedUserViewHolder.smali | 2 +- .../WidgetSettingsBlockedUsersAdapter.smali | 2 +- ...ockedUsersViewModel$onClickUnblock$1.smali | 2 +- ...ockedUsersViewModel$onClickUnblock$2.smali | 2 +- .../account/mfa/WidgetEnableMFADownload.smali | 6 +- .../account/mfa/WidgetEnableMFAInput.smali | 4 +- .../account/mfa/WidgetEnableMFAKey.smali | 10 +- .../account/mfa/WidgetEnableMFASteps.smali | 4 +- .../account/mfa/WidgetEnableMFASuccess.smali | 4 +- .../WidgetEnableMFAViewModel$ViewState.smali | 10 +- ...dapter$PaymentSourceHeaderViewHolder.smali | 2 +- ...eAdapter$PaymentSourceItemViewHolder.smali | 4 +- .../settings/billing/PaymentSourceView.smali | 78 +- ...urceEditDialog$deletePaymentSource$1.smali | 2 +- ...ceEditDialog$initPaymentSourceInfo$2.smali | 6 +- ...urceEditDialog$updatePaymentSource$1.smali | 2 +- .../WidgetPaymentSourceEditDialog.smali | 60 +- .../billing/WidgetSettingsBilling.smali | 12 +- .../WidgetSettingsPaymentHistory.smali | 4 +- .../WidgetSettingsPaymentMethods.smali | 10 +- .../PaymentSourcesSpinnerAdapter.smali | 6 +- .../PremiumSwitchPlanPagerAdapter.smali | 24 +- .../premium/SettingsPremiumViewModel.smali | 4 +- .../premium/WidgetSettingsGifting.smali | 60 +- ...gsGiftingAdapter$EntitlementListItem.smali | 136 +- ...ttingsGiftingAdapter$NoGiftsListItem.smali | 2 +- ...etSettingsGiftingAdapter$SkuListItem.smali | 26 +- .../premium/WidgetSettingsPremium.smali | 386 +- .../WidgetSettingsPremiumSwitchPlan.smali | 72 +- ...tionSampleGuildAdapter$GuildListItem.smali | 22 +- .../SettingsPremiumGuildViewModel.smali | 2 +- ...dgetSettingsPremiumGuildSubscription.smali | 30 +- ...ildSubscriptionAdapter$GuildListItem.smali | 19 +- ...ldSubscriptionAdapter$HeaderListItem.smali | 2 +- ...ptionAdapter$PremiumGuildSubListItem.smali | 18 +- .../share/WidgetIncomingShare$Adapter.smali | 2 +- .../WidgetIncomingShare$configureUi$2.smali | 2 +- .../widgets/share/WidgetIncomingShare.smali | 82 +- .../StreamFeedbackSheetViewModel.smali | 12 +- .../WidgetSpectate$configureActionBar$1.smali | 2 +- .../widgets/spectate/WidgetSpectate.smali | 26 +- ...ateReportProblemDialog$configureUI$1.smali | 4 +- .../WidgetSpectateReportProblemDialog.smali | 8 +- .../WidgetSpectateStreamFullDialog.smali | 4 +- .../discord/widgets/status/WidgetStatus.smali | 84 +- ...NavViewObserver$Companion$INSTANCE$2.smali | 76 - .../BottomNavViewObserver$Companion.smali | 96 - .../widgets/tabs/BottomNavViewObserver.smali | 120 - .../discord/widgets/tabs/NavigationTab.smali | 142 - ...TabsFeatureFlag$Companion$INSTANCE$2.smali | 76 - .../tabs/TabsFeatureFlag$Companion.smali | 96 - .../TabsFeatureFlag$fetchExperiment$1.smali | 96 - .../TabsFeatureFlag$fetchExperiment$2.smali | 89 - .../widgets/tabs/TabsFeatureFlag.smali | 194 - ...NavigationView$HeightChangedListener.smali | 19 - ...stBottomNavigationView$updateView$10.smali | 51 - ...stBottomNavigationView$updateView$11.smali | 51 - ...ostBottomNavigationView$updateView$2.smali | 47 - ...ostBottomNavigationView$updateView$3.smali | 47 - ...ostBottomNavigationView$updateView$4.smali | 47 - ...ostBottomNavigationView$updateView$5.smali | 47 - ...ostBottomNavigationView$updateView$6.smali | 47 - ...ostBottomNavigationView$updateView$7.smali | 51 - ...ostBottomNavigationView$updateView$8.smali | 51 - ...ostBottomNavigationView$updateView$9.smali | 51 - .../tabs/TabsHostBottomNavigationView.smali | 1361 -- .../widgets/tabs/TabsHostViewModel$1.smali | 80 - .../widgets/tabs/TabsHostViewModel$2.smali | 73 - .../tabs/TabsHostViewModel$Companion.smali | 70 - ...iewModel$Event$TrackFriendsListShown.smali | 42 - .../tabs/TabsHostViewModel$Event.smali | 38 - ...iewModel$Factory$observeStoreState$1.smali | 108 - .../tabs/TabsHostViewModel$Factory.smali | 217 - .../tabs/TabsHostViewModel$StoreState.smali | 277 - .../tabs/TabsHostViewModel$ViewState.smali | 354 - .../widgets/tabs/TabsHostViewModel.smali | 522 - .../tabs/WidgetTabsHost$onViewBound$1.smali | 77 - ...dgetTabsHost$onViewBoundOrOnResume$1.smali | 73 - ...dgetTabsHost$onViewBoundOrOnResume$2.smali | 104 - .../tabs/WidgetTabsHost$updateViews$1.smali | 104 - .../discord/widgets/tabs/WidgetTabsHost.smali | 973 - .../tos/WidgetTosAccept$onViewBound$2.smali | 2 +- .../discord/widgets/tos/WidgetTosAccept.smali | 6 +- .../user/Badge$Companion$onBadgeClick$1.smali | 2 +- .../widgets/user/Badge$Companion.smali | 102 +- .../user/WidgetBanUser$onViewBound$3$1.smali | 2 +- .../discord/widgets/user/WidgetBanUser.smali | 2 +- ...etKickUser$onViewBoundOrOnResume$2$1.smali | 2 +- .../discord/widgets/user/WidgetKickUser.smali | 12 +- .../widgets/user/WidgetPruneUsers.smali | 24 +- ...UserMentions$WidgetUserMentionFilter.smali | 10 +- .../WidgetUserMentions$configureUI$1.smali | 2 +- .../widgets/user/WidgetUserMentions.smali | 37 +- ...ends$MutualFriendsAdapter$ViewHolder.smali | 14 +- ...erMutualFriends$MutualFriendsAdapter.smali | 6 +- .../user/WidgetUserMutualFriends.smali | 8 +- ...tUserMutualGuilds$Adapter$ViewHolder.smali | 8 +- .../user/WidgetUserMutualGuilds$Adapter.smali | 6 +- .../widgets/user/WidgetUserMutualGuilds.smali | 8 +- .../user/WidgetUserSetCustomStatus.smali | 68 +- .../WidgetUserSetCustomStatusViewModel.smali | 4 +- .../widgets/user/WidgetUserStatusSheet.smali | 38 +- .../account/WidgetUserAccountVerify.smali | 6 +- ...erAccountVerifyBase$setOptionsMenu$1.smali | 2 +- .../captcha/WidgetUserCaptchaVerify.smali | 8 +- .../user/email/WidgetUserEmailUpdate.smali | 2 +- .../user/email/WidgetUserEmailVerify.smali | 4 +- .../user/phone/WidgetUserPhoneAdd.smali | 120 +- .../user/phone/WidgetUserPhoneVerify.smali | 120 +- .../presence/ViewHolderGameRichPresence.smali | 2 +- .../ViewHolderMusicRichPresence.smali | 350 +- ...erPlatformRichPresence$configureUi$3.smali | 14 +- .../ViewHolderPlatformRichPresence.smali | 247 +- .../ViewHolderStreamRichPresence.smali | 6 +- ...ViewHolderUserRichPresence$Companion.smali | 8 +- .../presence/ViewHolderUserRichPresence.smali | 305 +- .../UserAvatarPresenceView$ViewState.smali | 299 + .../user/profile/UserAvatarPresenceView.smali | 282 + .../user/profile/UserProfileAdminView.smali | 193 +- .../profile/UserProfileConnectionsView.smali | 82 +- .../profile/UserProfileHeaderView$1.smali | 2 +- ...serProfileHeaderView$BadgeViewHolder.smali | 2 +- .../user/profile/UserProfileHeaderView.smali | 75 +- .../UserStatusPresenceCustomView.smali | 66 +- .../WidgetUserProfileEmptyListItem.smali | 4 +- .../user/profile/WidgetUserProfileStrip.smali | 22 +- .../user/search/ViewGlobalSearchItem.smali | 95 +- .../search/WidgetGlobalSearch$Companion.smali | 8 +- .../WidgetGlobalSearch$onViewBound$7.smali | 4 +- .../user/search/WidgetGlobalSearch.smali | 203 +- ...GlobalSearchAdapter$HeaderViewHolder.smali | 4 +- ...GlobalSearchAdapter$SearchViewHolder.smali | 2 +- ...WidgetGlobalSearchGuildsAdapter$Item.smali | 2 +- ...earchGuildsAdapter$ItemDirectMessage.smali | 4 +- ...tGlobalSearchGuildsAdapter$ItemGuild.smali | 71 +- .../WidgetGlobalSearchGuildsAdapter.smali | 6 +- ...GlobalSearchModel$Companion$create$2.smali | 4 - .../WidgetGlobalSearchModel$Companion.smali | 6 +- ...erProfileVoiceSettingsView$ViewState.smali | 144 +- ...oundButton_OnCheckedChangeListener$0.smali | 44 + ...iceSettingsView$setOnDeafenChecked$1.smali | 49 - ...VoiceSettingsView$setOnMuteChecked$1.smali | 49 - .../UserProfileVoiceSettingsView.smali | 343 +- ...heet$configureProfileActionButtons$5.smali | 12 +- .../WidgetUserSheet$onViewCreated$10.smali | 48 +- .../WidgetUserSheet$onViewCreated$11.smali | 22 +- .../WidgetUserSheet$onViewCreated$12.smali | 78 - .../WidgetUserSheet$onViewCreated$2.smali | 42 +- .../WidgetUserSheet$onViewCreated$3.smali | 36 +- .../WidgetUserSheet$onViewCreated$4.smali | 45 +- .../WidgetUserSheet$onViewCreated$5.smali | 2 +- .../WidgetUserSheet$onViewCreated$6.smali | 2 +- .../WidgetUserSheet$onViewCreated$7.smali | 2 +- .../WidgetUserSheet$onViewCreated$8.smali | 2 +- .../WidgetUserSheet$onViewCreated$9.smali | 2 +- .../user/usersheet/WidgetUserSheet.smali | 501 +- .../WidgetUserSheetViewModel$StoreState.smali | 252 +- ...UserSheetViewModel$addRelationship$2.smali | 2 +- ...UserSheetViewModel$guildDeafenUser$2.smali | 2 +- ...etUserSheetViewModel$guildMuteUser$2.smali | 2 +- ...UserSheetViewModel$launchVideoCall$2.smali | 2 +- ...UserSheetViewModel$launchVoiceCall$2.smali | 2 +- ...erSheetViewModel$moveUserToChannel$1.smali | 2 +- ...erSheetViewModel$moveUserToChannel$2.smali | 2 +- ...rSheetViewModel$removeRelationship$2.smali | 2 +- .../usersheet/WidgetUserSheetViewModel.smali | 185 +- ...ewModelFactory$observeStoreState$3$2.smali | 80 +- ...ViewModelFactory$observeStoreState$3.smali | 64 +- ...PrivateCallUsersAdapter$CallUserItem.smali | 0 ...allUsersAdapter$CallUserViewHolder$1.smali | 0 ...eCallUsersAdapter$CallUserViewHolder.smali | 0 .../PrivateCallUsersAdapter$Companion.smali | 0 .../voice/call/PrivateCallUsersAdapter.smali | 0 .../call/WidgetCallFailed$Companion.smali | 0 ...ed$configureUI$$inlined$let$lambda$1.smali | 0 .../call/WidgetCallFailed$onViewBound$1.smali | 0 ...etCallFailed$onViewBoundOrOnResume$1.smali | 0 ...WidgetCallFailed$sendFriendRequest$1.smali | 2 +- .../widgets/voice/call/WidgetCallFailed.smali | 18 +- ...rivateCall$Companion$callAndLaunch$1.smali | 0 ...rivateCall$Companion$callAndLaunch$2.smali | 0 ...vateCall$Companion$callAndLaunch$3$1.smali | 0 ...vateCall$Companion$callAndLaunch$3$2.smali | 0 ...vateCall$Companion$callAndLaunch$3$3.smali | 0 ...vateCall$Companion$callAndLaunch$3$4.smali | 0 ...vateCall$Companion$callAndLaunch$3$5.smali | 0 ...teCall$Companion$callAndLaunch$3$6$1.smali | 0 ...vateCall$Companion$callAndLaunch$3$6.smali | 0 ...vateCall$Companion$callAndLaunch$3$7.smali | 0 ...rivateCall$Companion$callAndLaunch$3.smali | 0 .../call/WidgetPrivateCall$Companion.smali | 0 .../call/WidgetPrivateCall$UiState.smali | 0 .../call/WidgetPrivateCall$WhenMappings.smali | 0 ...igureActionBar$$inlined$let$lambda$1.smali | 2 +- ...etPrivateCall$configureActionBar$2$2.smali | 8 +- ...Call$configureConnectionStatusText$1.smali | 0 ...Call$configureConnectionStatusText$2.smali | 0 .../WidgetPrivateCall$configureUI$1.smali | 0 .../WidgetPrivateCall$configureUI$2.smali | 0 .../WidgetPrivateCall$configureUI$4.smali | 0 .../WidgetPrivateCall$configureUI$5$1.smali | 0 .../WidgetPrivateCall$configureUI$5.smali | 0 ...teCall$initializeSystemUiListeners$1.smali | 0 ...Call$initializeSystemUiListeners$2$1.smali | 0 ...teCall$initializeSystemUiListeners$2.smali | 0 ...Call$initializeSystemUiListeners$3$1.smali | 0 ...teCall$initializeSystemUiListeners$3.smali | 0 ...$onViewBound$$inlined$apply$lambda$1.smali | 0 .../WidgetPrivateCall$onViewBound$2.smali | 0 .../WidgetPrivateCall$onViewBound$3$1.smali | 0 .../WidgetPrivateCall$onViewBound$3.smali | 0 .../WidgetPrivateCall$onViewBound$4.smali | 0 .../WidgetPrivateCall$onViewBound$5.smali | 0 .../WidgetPrivateCall$onViewBound$6.smali | 0 ...tPrivateCall$onViewBoundOrOnResume$1.smali | 0 ...tPrivateCall$onViewBoundOrOnResume$2.smali | 0 .../voice/call/WidgetPrivateCall.smali | 128 +- ...CallControlsView$OutputSelectorState.smali | 10 +- ...$configureUI$$inlined$apply$lambda$1.smali | 0 ...$configureUI$$inlined$apply$lambda$2.smali | 0 ...onfigureUI$$inlined$apply$lambda$3$1.smali | 0 ...$configureUI$$inlined$apply$lambda$3.smali | 0 ...vateCallControlsView$configureUI$1$2.smali | 0 .../call/WidgetPrivateCallControlsView.smali | 139 +- .../call/WidgetPrivateCallViewModel$1.smali | 0 ...WidgetPrivateCallViewModel$Companion.smali | 0 ...Event$ShowAudioOutputSelectionDialog.smali | 0 .../WidgetPrivateCallViewModel$Event.smali | 0 ...iewModel$Factory$observeStoreState$1.smali | 0 ...iewModel$Factory$observeStoreState$2.smali | 0 ...iewModel$Factory$observeStoreState$3.smali | 0 .../WidgetPrivateCallViewModel$Factory.smali | 0 ...idgetPrivateCallViewModel$StoreState.smali | 0 ...rivateCallViewModel$ViewState$Loaded.smali | 0 ...allViewModel$ViewState$Uninitialized.smali | 0 ...WidgetPrivateCallViewModel$ViewState.smali | 0 ...getPrivateCallViewModel$WhenMappings.smali | 0 ...handleStoreState$$inlined$sortedBy$1.smali | 0 ...ateCallViewModel$hideChromeDelayed$1.smali | 0 ...ateCallViewModel$hideChromeDelayed$2.smali | 0 .../call/WidgetPrivateCallViewModel.smali | 0 ...llIncoming$Model$Companion$get$1$1$1.smali | 0 ...CallIncoming$Model$Companion$get$1$1.smali | 0 ...ceCallIncoming$Model$Companion$get$1.smali | 0 ...getVoiceCallIncoming$Model$Companion.smali | 0 .../call/WidgetVoiceCallIncoming$Model.smali | 0 ...g$SystemCallIncoming$onViewCreated$1.smali | 0 ...VoiceCallIncoming$SystemCallIncoming.smali | 0 ...idgetVoiceCallIncoming$configureUI$1.smali | 0 ...idgetVoiceCallIncoming$configureUI$2.smali | 0 ...idgetVoiceCallIncoming$configureUI$3.smali | 0 ...idgetVoiceCallIncoming$configureUI$4.smali | 0 ...CallIncoming$onViewBoundOrOnResume$1.smali | 0 .../voice/call/WidgetVoiceCallIncoming.smali | 160 +- .../call/WidgetVoiceCallIncomingRinger.smali | 0 ...dgetVoiceCallInline$Adapter$ItemUser.smali | 2 +- .../call/WidgetVoiceCallInline$Adapter.smali | 2 +- ...oiceCallInline$Model$Companion$get$1.smali | 23 +- ...idgetVoiceCallInline$Model$Companion.smali | 20 +- ...ne$Model$OngoingCall$Companion$get$1.smali | 0 ...$Model$OngoingCall$Companion$get$2$1.smali | 0 ...$Model$OngoingCall$Companion$get$2$2.smali | 0 ...$Model$OngoingCall$Companion$get$2$3.smali | 0 ...ne$Model$OngoingCall$Companion$get$2.smali | 0 ...llInline$Model$OngoingCall$Companion.smali | 0 ...getVoiceCallInline$Model$OngoingCall.smali | 0 ...l$VoiceConnected$Companion$get$1$1$1.smali | 0 ...l$VoiceConnected$Companion$get$1$1$2.smali | 0 ...del$VoiceConnected$Companion$get$1$1.smali | 0 ...del$VoiceConnected$Companion$get$1$2.smali | 0 ...Model$VoiceConnected$Companion$get$1.smali | 0 ...nline$Model$VoiceConnected$Companion.smali | 0 ...$Model$VoiceConnected$Item$Companion.smali | 0 ...CallInline$Model$VoiceConnected$Item.smali | 0 ...VoiceCallInline$Model$VoiceConnected.smali | 0 .../call/WidgetVoiceCallInline$Model.smali | 80 +- ...iceCallInline$configureOngoingCall$1.smali | 0 ...CallInline$configureVoiceConnected$1.smali | 0 ...CallInline$configureVoiceConnected$2.smali | 0 .../WidgetVoiceCallInline$onViewBound$1.smali | 0 .../WidgetVoiceCallInline$onViewBound$2.smali | 0 ...ceCallInline$onViewBoundOrOnResume$1.smali | 0 ...CallInline$sam$rx_functions_Func3$0.smali} | 16 +- ...eCallInline$sam$rx_functions_Func7$0.smali | 0 .../voice/call/WidgetVoiceCallInline.smali | 223 +- ...Notice$showCallFeedbackSheetNotice$1.smali | 0 .../feedback/CallFeedbackSheetNavigator.smali | 0 ...CallFeedbackSheetViewModel$Companion.smali | 0 ...eedbackSheetViewModel$Config$CREATOR.smali | 0 .../CallFeedbackSheetViewModel$Config.smali | 0 .../CallFeedbackSheetViewModel$Factory.smali | 0 ...lFeedbackSheetViewModel$WhenMappings.smali | 0 .../feedback/CallFeedbackSheetViewModel.smali | 12 +- .../voice/feedback/FeedbackIssue.smali | 44 +- .../voice/feedback/FeedbackRating.smali | 0 ...ckView$IssueViewHolder$onConfigure$1.smali | 0 .../FeedbackView$IssueViewHolder.smali | 0 ...ackView$IssuesAdapter$onIssueClick$1.smali | 0 .../feedback/FeedbackView$IssuesAdapter.smali | 0 .../feedback/FeedbackView$updateView$1.smali | 0 .../feedback/FeedbackView$updateView$2.smali | 0 .../feedback/FeedbackView$updateView$3.smali | 0 .../widgets/voice/feedback/FeedbackView.smali | 83 +- .../CallParticipantsAdapter$Companion.smali | 0 ...lParticipantsAdapter$ListItemDivider.smali | 0 ...llParticipantsAdapter$ListItemHeader.smali | 10 +- ...llParticipantsAdapter$ListItemInvite.smali | 0 ...antsAdapter$ListItemSpectatorsHeader.smali | 0 ...articipantsAdapter$ListItemVoiceUser.smali | 0 ...articipantsAdapter$ViewHolderDivider.smali | 2 +- ...ParticipantsAdapter$ViewHolderHeader.smali | 6 +- ...apter$ViewHolderInvite$onConfigure$1.smali | 0 ...ParticipantsAdapter$ViewHolderInvite.smali | 4 +- ...Adapter$ViewHolderUser$onConfigure$1.smali | 0 ...Adapter$ViewHolderUser$onConfigure$2.smali | 0 ...llParticipantsAdapter$ViewHolderUser.smali | 14 +- ...antsAdapter$onStreamPreviewClicked$1.smali | 0 ...icipantsAdapter$onVoiceUserClicked$1.smali | 0 .../fullscreen/CallParticipantsAdapter.smali | 0 .../fullscreen/VoiceControlsView$1.smali | 0 ...VoiceControlsView$Model$DefaultImpls.smali | 0 .../fullscreen/VoiceControlsView$Model.smali | 0 .../VoiceControlsView$WhenMappings.smali | 0 ...ceControlsView$configureBackground$1.smali | 0 .../VoiceControlsView$configureUI$1.smali | 0 .../VoiceControlsView$configureUI$2.smali | 2 +- .../VoiceControlsView$configureUI$3.smali | 0 .../VoiceControlsView$configureUI$4.smali | 0 .../VoiceControlsView$configureUI$5.smali | 0 ...VoiceControlsView$disableWithToast$1.smali | 0 .../voice/fullscreen/VoiceControlsView.smali | 36 +- .../WidgetGuildCall$Companion.smali | 0 .../WidgetGuildCall$configureMenu$1.smali | 2 +- .../WidgetGuildCall$configureMenu$2.smali | 6 +- .../WidgetGuildCall$configureUI$1.smali | 0 .../WidgetGuildCall$configureUI$2$1.smali | 0 .../WidgetGuildCall$configureUI$2.smali | 0 .../WidgetGuildCall$configureUI$3.smali | 0 .../WidgetGuildCall$configureUI$4.smali | 0 ...getGuildCall$onViewBoundOrOnResume$1.smali | 0 ...getGuildCall$onViewBoundOrOnResume$2.smali | 0 ...getGuildCall$onViewBoundOrOnResume$3.smali | 2 +- ...getGuildCall$onViewBoundOrOnResume$4.smali | 2 +- ...getGuildCall$onViewBoundOrOnResume$5.smali | 0 .../WidgetGuildCall$tryConnectToVoice$1.smali | 0 .../voice/fullscreen/WidgetGuildCall.smali | 10 +- .../WidgetSpectators$Companion.smali | 0 .../WidgetSpectators$configureUI$1.smali | 0 .../WidgetSpectators$configureUI$2$1.smali | 0 .../WidgetSpectators$configureUI$2.smali | 0 ...etSpectators$onViewBoundOrOnResume$1.smali | 0 .../voice/fullscreen/WidgetSpectators.smali | 4 +- .../model/CallModel$Companion$Chunk.smali | 0 .../CallModel$Companion$WhenMappings.smali | 0 .../model/CallModel$Companion$get$1$1.smali | 0 .../model/CallModel$Companion$get$1$2.smali | 0 .../model/CallModel$Companion$get$1.smali | 0 .../CallModel$Companion$observeChunk$1.smali | 0 .../CallModel$Companion$observeChunk$2.smali | 0 ...odel$Companion$userItemsComparator$1.smali | 0 .../voice/model/CallModel$Companion.smali | 6 +- .../model/CallModel$ParticipantsType.smali | 0 .../widgets/voice/model/CallModel.smali | 0 com.discord/smali/e/a/a/a/a$d.smali | 8 +- com.discord/smali/e/a/a/a/a.smali | 276 +- com.discord/smali/e/a/a/b/a$e.smali | 230 +- com.discord/smali/e/a/a/b/a.smali | 12 +- com.discord/smali/e/a/a/b/b$f.smali | 2 +- com.discord/smali/e/a/a/b/b.smali | 8 +- com.discord/smali/e/a/a/c/a$c.smali | 10 +- com.discord/smali/e/a/a/c/a.smali | 12 +- com.discord/smali/e/a/a/c/b$c.smali | 10 +- com.discord/smali/e/a/a/c/b.smali | 12 +- com.discord/smali/e/a/a/c/c$a.smali | 8 +- com.discord/smali/e/a/a/c/c.smali | 8 +- com.discord/smali/e/a/a/c/d$d$c.smali | 10 +- com.discord/smali/e/a/a/c/d.smali | 2 +- com.discord/smali/e/a/a/d/a/a.smali | 2 +- com.discord/smali/e/a/a/e/a.smali | 58 +- com.discord/smali/e/a/a/f.smali | 148 +- com.discord/smali/e/a/a/i$a.smali | 2 +- com.discord/smali/e/a/a/i.smali | 10 +- com.discord/smali/e/a/a/m.smali | 16 +- com.discord/smali/e/a/b/f0/a.smali | 336 +- com.discord/smali/e/a/b/h.smali | 23 +- com.discord/smali/e/a/b/j.smali | 4 +- com.discord/smali/e/a/e/l/a.smali | 10 +- com.discord/smali/e/a/j/c0.smali | 101 +- com.discord/smali/e/a/j/d0.smali | 8 +- com.discord/smali/e/a/j/k.smali | 8 +- com.discord/smali/e/a/j/n$c.smali | 2 +- com.discord/smali/e/a/j/n$d.smali | 2 +- com.discord/smali/e/a/j/q.smali | 14 +- com.discord/smali/e/a/j/t.smali | 2 +- com.discord/smali/e/a/j/z.smali | 2 +- com.discord/smali/e/a/k/b/a/g0/b.smali | 16 +- com.discord/smali/e/a/k/b/a/g0/c.smali | 28 +- com.discord/smali/e/a/k/b/a/g0/d.smali | 32 +- com.discord/smali/e/a/k/b/a/g0/e.smali | 34 +- com.discord/smali/e/a/k/b/a/g0/f.smali | 14 +- com.discord/smali/e/a/k/b/a/g0/g.smali | 2 +- com.discord/smali/e/a/k/b/a/g0/h.smali | 28 +- com.discord/smali/e/a/k/b/a/g0/i.smali | 32 +- com.discord/smali/e/a/k/b/a/g0/j.smali | 52 +- com.discord/smali/e/a/k/b/a/g0/k.smali | 34 +- com.discord/smali/e/a/k/b/a/g0/l.smali | 8 +- com.discord/smali/e/a/k/b/a/g0/m.smali | 8 +- com.discord/smali/e/a/k/b/a/g0/n.smali | 8 +- com.discord/smali/e/a/k/b/a/g0/o.smali | 8 +- com.discord/smali/e/a/k/b/a/g0/p.smali | 10 +- com.discord/smali/e/a/k/b/a/g0/q.smali | 18 +- com.discord/smali/e/a/k/b/a/g0/r.smali | 42 + com.discord/smali/e/a/k/b/a/s.smali | 38 +- com.discord/smali/e/a/k/b/a/t.smali | 36 +- com.discord/smali/e/a/k/d/j.smali | 6 +- com.discord/smali/e/a/k/d/k.smali | 8 +- com.discord/smali/e/a/k/d/l.smali | 12 +- com.discord/smali/e/a/k/d/m.smali | 38 +- com.discord/smali/e/a/k/d/n.smali | 54 + com.discord/smali/e/a/k/d/n/a.smali | 70 - com.discord/smali/e/a/k/d/n/b.smali | 36 - com.discord/smali/e/a/k/d/o/a.smali | 54 +- com.discord/smali/e/a/k/d/o/b.smali | 24 +- com.discord/smali/e/a/k/d/p/a.smali | 36 + com.discord/smali/e/a/k/d/p/b.smali | 42 + com.discord/smali/e/a/k/d/{o => p}/c.smali | 10 +- com.discord/smali/e/a/k/d/{o => p}/d.smali | 10 +- com.discord/smali/e/a/k/d/{o => p}/e.smali | 6 +- com.discord/smali/e/a/k/d/{o => p}/f.smali | 10 +- com.discord/smali/e/a/k/d/{o => p}/g.smali | 10 +- com.discord/smali/e/a/k/d/{o => p}/h.smali | 10 +- com.discord/smali/e/a/k/f/d.smali | 40 - com.discord/smali/e/a/k/g/v/c.smali | 8 +- com.discord/smali/e/a/k/g/v/d.smali | 8 +- com.discord/smali/e/a/k/g/v/e.smali | 18 +- com.discord/smali/e/a/k/g/v/f.smali | 20 +- com.discord/smali/e/a/k/g/v/g.smali | 4 +- com.discord/smali/e/a/k/g/v/h.smali | 8 +- com.discord/smali/e/a/k/g/v/i.smali | 14 +- com.discord/smali/e/a/k/g/v/j.smali | 34 + com.discord/smali/e/a/k/g/v/k.smali | 38 + com.discord/smali/e/e/b/a/a.smali | 14 - ...idgetFriendsAddUserRequestsModel$a$a.smali | 0 ...idgetFriendsAddUserRequestsModel$a$b.smali | 0 .../WidgetFriendsAddUserRequestsModel$a.smali | 0 .../WidgetFriendsAddUserRequestsModel.smali | 0 ...idgetRemoteAuthViewModel$ViewState$a.smali | 0 ...idgetRemoteAuthViewModel$ViewState$b.smali | 0 ...idgetRemoteAuthViewModel$ViewState$c.smali | 0 ...idgetRemoteAuthViewModel$ViewState$d.smali | 0 .../WidgetRemoteAuthViewModel$ViewState.smali | 0 .../WidgetRemoteAuthViewModel$a$a.smali | 0 .../WidgetRemoteAuthViewModel$a.smali | 0 .../WidgetRemoteAuthViewModel$b.smali | 0 .../WidgetRemoteAuthViewModel$c.smali | 0 .../WidgetRemoteAuthViewModel$d.smali | 0 .../WidgetRemoteAuthViewModel$e.smali | 0 .../WidgetRemoteAuthViewModel$f.smali | 0 .../WidgetRemoteAuthViewModel.smali | 0 com.discord/smali_classes2/a0/p.smali | 31 +- .../com/discord/app/AppBottomSheet$a.smali | 0 .../discord/dialogs/ImageUploadDialog$a.smali | 0 .../views/ActiveSubscriptionView$a.smali | 0 .../com/discord/views/steps/StepsView$a.smali | 0 ...etVoiceChannelSettings$configureUI$1.smali | 2 +- ...etVoiceChannelSettings$saveChannel$1.smali | 2 +- .../settings/WidgetVoiceChannelSettings.smali | 178 +- .../com/facebook/drawee/R$a.smali | 24 +- .../persistentcookiejar/R$string.smali | 2 +- .../com/google/android/flexbox/R$a.smali | 4 +- .../com/google/android/gms/base/R$a.smali | 4 +- .../com/google/android/gms/base/R$b.smali | 34 +- .../com/google/android/gms/common/R$a.smali | 2 +- .../com/google/android/material/R$attr.smali | 346 +- .../google/android/material/R$drawable.smali | 72 +- .../com/google/android/material/R$id.smali | 282 +- .../google/android/material/R$layout.smali | 24 +- .../google/android/material/R$plurals.smali | 2 +- .../google/android/material/R$string.smali | 108 +- .../com/google/android/material/R$style.smali | 900 +- .../google/android/material/R$styleable.smali | 242 +- .../com/lytefast/flexinput/R$b.smali | 380 +- .../com/lytefast/flexinput/R$d.smali | 120 +- .../com/lytefast/flexinput/R$e.smali | 334 +- .../com/lytefast/flexinput/R$f.smali | 34 +- .../com/lytefast/flexinput/R$g.smali | 150 +- .../com/lytefast/flexinput/R$h.smali | 900 +- .../com/lytefast/flexinput/R$i.smali | 268 +- .../flexinput/fragment/CameraFragment$a.smali | 0 .../com/miguelgaeta/media_picker/R$attr.smali | 206 +- .../miguelgaeta/media_picker/R$drawable.smali | 52 +- .../com/miguelgaeta/media_picker/R$id.smali | 188 +- .../miguelgaeta/media_picker/R$layout.smali | 14 +- .../miguelgaeta/media_picker/R$string.smali | 14 +- .../miguelgaeta/media_picker/R$style.smali | 382 +- .../media_picker/R$styleable.smali | 138 +- .../com/miguelgaeta/super_bar/R$attr.smali | 28 +- .../miguelgaeta/super_bar/R$styleable.smali | 4 +- .../com/yalantis/ucrop/R$c.smali | 52 +- .../com/yalantis/ucrop/R$d.smali | 182 +- .../com/yalantis/ucrop/R$e.smali | 14 +- .../com/yalantis/ucrop/R$g.smali | 14 +- .../com/yalantis/ucrop/R$h.smali | 138 +- .../e/a/a/c/b$a.smali | 0 .../e/a/a/e/a$a.smali | 0 .../{smali => smali_classes2}/e/a/a/f$a.smali | 2 +- .../e/b/a/a/a$a.smali | 0 .../smali_classes2/e/k/a/c/e/p/g.smali | 95 +- com.discord/{smali => smali_classes2}/f.smali | 0 com.discord/{smali => smali_classes2}/g.smali | 0 com.discord/{smali => smali_classes2}/h.smali | 0 .../{smali => smali_classes2}/i$a$a.smali | 0 .../{smali => smali_classes2}/i$a$b.smali | 0 .../{smali => smali_classes2}/i$a$c.smali | 0 .../{smali => smali_classes2}/i$a.smali | 0 .../{smali => smali_classes2}/i$b.smali | 0 .../{smali => smali_classes2}/i$c.smali | 0 .../{smali => smali_classes2}/i$d.smali | 0 .../{smali => smali_classes2}/i$e.smali | 0 .../{smali => smali_classes2}/i$f.smali | 0 .../{smali => smali_classes2}/i$g.smali | 0 .../{smali => smali_classes2}/i$h.smali | 0 .../{smali => smali_classes2}/i$i.smali | 0 com.discord/{smali => smali_classes2}/i.smali | 0 com.discord/{smali => smali_classes2}/j.smali | 0 com.discord/{smali => smali_classes2}/k.smali | 0 .../kotlin/jvm/functions/Function9.smali | 47 + com.discord/{smali => smali_classes2}/l.smali | 0 com.discord/{smali => smali_classes2}/m.smali | 0 .../me/dm7/barcodescanner/core/R$c.smali | 10 +- com.discord/{smali => smali_classes2}/n.smali | 0 com.discord/{smali => smali_classes2}/o.smali | 0 .../webrtc/VideoEncoder$ScalingSettings.smali | 10 +- com.discord/smali_classes2/w/u/b/y.smali | 53 +- 1640 files changed, 38445 insertions(+), 64963 deletions(-) delete mode 100644 com.discord/res/drawable-anydpi-v24/ic_add_person_16dp.xml delete mode 100644 com.discord/res/drawable-anydpi-v24/ic_book_16dp.xml delete mode 100644 com.discord/res/drawable-anydpi-v24/ic_status_24dp.xml delete mode 100644 com.discord/res/drawable-hdpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-hdpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-hdpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable-ldpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-ldpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-ldpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable-mdpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-mdpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-mdpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable-xhdpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-xhdpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-xhdpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable-xxhdpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-xxhdpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-xxhdpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable-xxxhdpi/ic_add_person_16dp.png delete mode 100644 com.discord/res/drawable-xxxhdpi/ic_book_16dp.png delete mode 100644 com.discord/res/drawable-xxxhdpi/ic_status_24dp.png delete mode 100644 com.discord/res/drawable/drawable_circle_background_secondary.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_create.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_creator.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_friend.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_gaming.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_hobby.xml delete mode 100644 com.discord/res/drawable/drawable_guild_template_study.xml delete mode 100644 com.discord/res/drawable/ic_add_circle_filled_16dp.xml delete mode 100644 com.discord/res/drawable/ic_content_creator_16dp.xml delete mode 100644 com.discord/res/drawable/ic_friend_wave_16dp.xml delete mode 100644 com.discord/res/drawable/ic_game_controller_16dp.xml create mode 100644 com.discord/res/drawable/ic_game_controller_white_16dp.xml delete mode 100644 com.discord/res/drawable/ic_hobby_16dp.xml delete mode 100644 com.discord/res/drawable/ic_tab_friends.xml delete mode 100644 com.discord/res/drawable/ic_tab_home.xml delete mode 100644 com.discord/res/drawable/ic_tab_mentions.xml delete mode 100644 com.discord/res/drawable/ic_tab_search.xml delete mode 100644 com.discord/res/layout/tabs_host_bottom_navigation_view.xml delete mode 100644 com.discord/res/layout/view_server_settings_public_setting_selector.xml rename com.discord/res/layout/{user_avatar_presence_view.xml => view_user_avatar_presence.xml} (68%) delete mode 100644 com.discord/res/layout/widget_channel_members_list_item_add.xml delete mode 100644 com.discord/res/layout/widget_friends_tab.xml delete mode 100644 com.discord/res/layout/widget_guild_profile_sheet_v2.xml delete mode 100644 com.discord/res/layout/widget_nux_guild_template.xml delete mode 100644 com.discord/res/layout/widget_server_settings_public_overview.xml delete mode 100644 com.discord/res/layout/widget_tabs_host.xml delete mode 100644 com.discord/smali/com/discord/app/AppActivity$l.smali delete mode 100644 com.discord/smali/com/discord/restapi/RestAPIParams$UpdatePublicGuild.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreAuthentication$AuthRequestParams.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreAuthentication$register$1$2.smali rename com.discord/smali/com/discord/stores/{StoreAuthentication$register$1$3.smali => StoreAuthentication$register$2.smali} (81%) delete mode 100644 com.discord/smali/com/discord/stores/StoreAuthentication$sam$rx_functions_Func2$0.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreGuildTemplates$clearDynamicLinkGuildTemplateCode$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreGuildTemplates$setDynamicLinkGuildTemplateCode$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$guildTemplateCodeNavHandler$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreNavigationKt$sam$rx_functions_Func9$0.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreNux$updateNux$1$inExp$2.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreTabsNavigation$selectTab$1.smali delete mode 100644 com.discord/smali/com/discord/stores/StoreTabsNavigation.smali delete mode 100644 com.discord/smali/com/discord/utilities/intent/RouteHandlers$wildCardMatcher$actualHandler$3.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$ActivityLifecycleCallbacks.smali rename com.discord/smali/com/discord/{widgets/channels/memberlist/WidgetChannelMembersList$Companion.smali => utilities/keyboard/Keyboard$KeyboardHeightsCache$Companion.smali} (61%) create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardHeightsCache$keyboardHeightsCache$1$value$1.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardHeightsCache$keyboardHeightsCache$2.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardHeightsCache$keyboardHeightsCache$serialized$1.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardHeightsCache.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener$onKeyboardHeightChanged$1.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1$LayoutListener.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard$init$1.smali create mode 100644 com.discord/smali/com/discord/utilities/keyboard/Keyboard.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$bind$1.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$1.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$2.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/RxViewController$connectViewRx$3.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/RxViewController.smali delete mode 100644 com.discord/smali/com/discord/utilities/viewcontroller/ViewDetachedFromWindowObservable.smali delete mode 100644 com.discord/smali/com/discord/views/user/UserAvatarPresenceView$a.smali delete mode 100644 com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali delete mode 100644 com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController$a.smali delete mode 100644 com.discord/smali/com/discord/views/user/UserAvatarPresenceViewController.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$1.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$1.smali rename com.discord/smali/com/discord/widgets/channels/{WidgetChannelTopic$configureUI$renderedTopic$renderContext$1.smali => WidgetChannelTopic$Model$Companion$get$3$2$renderContext$1.smali} (74%) create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2$renderContext$2.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3$2.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$3.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali create mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$RenderedTopic.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$configureUI$renderedTopic$renderContext$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$create$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$mapChannelTopicToStoreStateObs$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory$observeStoreState$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$Factory.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$DefaultTopic.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$NoTopic.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState$Topic.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$StoreState.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$DefaultTopic.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Loaded.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState$Uninitialized.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel$ViewState.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModel.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/WidgetChannelTopicViewModelKt.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/memberlist/WidgetChannelMembersList$configureLoadedUI$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$onBindViewHolder$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd$bind$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali rename com.discord/smali/com/discord/widgets/chat/input/{WidgetChatInput$configureUI$3.smali => WidgetChatInput$configureUI$1.smali} (88%) rename com.discord/smali/com/discord/widgets/chat/input/{WidgetChatInput$configureUI$4.smali => WidgetChatInput$configureUI$2.smali} (88%) create mode 100644 com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$$inlined$apply$lambda$2$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/friends/WidgetFriendsTab.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate$WhenMappings.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplate.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/create/StockGuildTemplateKt.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$WhenMappings.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2$onViewCreated$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetV2.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner$Type.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Banner.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory$observeStores$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$Factory.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$StoreState.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Invalid.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loaded.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState$Loading.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel$ViewState.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheetViewModel.smali delete mode 100644 com.discord/smali/com/discord/widgets/main/FriendsListTabsProvider.smali delete mode 100644 com.discord/smali/com/discord/widgets/main/WidgetMain$configureLeftPanelBottomMargin$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/main/WidgetMain$onViewBoundOrOnResume$8.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/NuxAnalytics.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildCreateClickListener$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates$onViewBound$guildJoinClickListener$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildTemplates.smali delete mode 100644 com.discord/smali/com/discord/widgets/nux/WidgetNuxGuildUseCases$onViewBound$1.smali rename com.discord/smali/com/discord/widgets/nux/{WidgetNuxGuildUseCases$onViewBound$4.smali => WidgetNuxGuildUseCases$onViewBound$3.smali} (89%) delete mode 100644 com.discord/smali/com/discord/widgets/servers/WidgetServerSettings$configureUI$13.smali create mode 100644 com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit$showKeyboardDelayed$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/PublicServerSettingSelectorView.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$configureValidUI$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$configureValidUI$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$configureValidUI$3.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$onActivityResult$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$onActivityResult$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$onActivityResult$3.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$onViewBound$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview$onViewBound$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverview.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Event$Error.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Event$SaveSuccess.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Event.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Factory$observeStoreState$1$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Factory$observeStoreState$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$Factory.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$StoreState$Invalid.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$StoreState$Valid.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$StoreState.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$ViewState$Invalid.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$ViewState$Loaded.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$ViewState$Uninitialized.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$ViewState.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$savePublicGuildSettings$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel$savePublicGuildSettings$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/publicguild/WidgetServerSettingsPublicOverviewViewModel.smali delete mode 100644 com.discord/smali/com/discord/widgets/settings/WidgetSettings$onViewBound$22.smali rename com.discord/smali/com/discord/widgets/settings/{WidgetSettings$onViewBound$4$1.smali => WidgetSettings$onViewBound$3$1.smali} (82%) rename com.discord/smali/com/discord/widgets/settings/{WidgetSettings$onViewBound$2.smali => WidgetSettings$onViewBound$3.smali} (63%) rename com.discord/smali/com/discord/widgets/settings/{WidgetSettings$sam$rx_functions_Func4$0.smali => WidgetSettings$sam$rx_functions_Func3$0.smali} (59%) delete mode 100644 com.discord/smali/com/discord/widgets/tabs/BottomNavViewObserver$Companion$INSTANCE$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/BottomNavViewObserver$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/BottomNavViewObserver.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/NavigationTab.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsFeatureFlag$Companion$INSTANCE$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsFeatureFlag$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsFeatureFlag$fetchExperiment$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsFeatureFlag$fetchExperiment$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsFeatureFlag.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$HeightChangedListener.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$10.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$11.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$3.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$4.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$5.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$6.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$7.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$8.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView$updateView$9.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostBottomNavigationView.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$Event$TrackFriendsListShown.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$Event.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$Factory$observeStoreState$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$Factory.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$StoreState.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel$ViewState.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/TabsHostViewModel.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$onViewBound$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$onViewBoundOrOnResume$2.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost$updateViews$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/tabs/WidgetTabsHost.smali create mode 100644 com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView$ViewState.smali create mode 100644 com.discord/smali/com/discord/widgets/user/profile/UserAvatarPresenceView.smali create mode 100644 com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$sam$android_widget_CompoundButton_OnCheckedChangeListener$0.smali delete mode 100644 com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnDeafenChecked$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/user/usersheet/UserProfileVoiceSettingsView$setOnMuteChecked$1.smali delete mode 100644 com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$onViewCreated$12.smali rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserItem.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/PrivateCallUsersAdapter$CallUserViewHolder.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/PrivateCallUsersAdapter$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/PrivateCallUsersAdapter.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed$configureUI$$inlined$let$lambda$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed$onViewBound$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetCallFailed.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$5.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$6.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3$7.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion$callAndLaunch$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$UiState.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$WhenMappings.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$$inlined$let$lambda$1.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureActionBar$2$2.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureConnectionStatusText$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$5$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$configureUI$5.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$$inlined$apply$lambda$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$5.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBound$6.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall$onViewBoundOrOnResume$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCall.smali (97%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$OutputSelectorState.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$3$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$$inlined$apply$lambda$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali (93%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Event$ShowAudioOutputSelectionDialog.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Event.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Factory$observeStoreState$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Factory$observeStoreState$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Factory$observeStoreState$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$Factory.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$StoreState.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$ViewState$Loaded.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$ViewState$Uninitialized.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$ViewState.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$WhenMappings.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$handleStoreState$$inlined$sortedBy$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$hideChromeDelayed$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel$hideChromeDelayed$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetPrivateCallViewModel.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion$get$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$Model.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming$onViewCreated$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$SystemCallIncoming.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$configureUI$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali (94%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallIncomingRinger.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter$ItemUser.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Adapter.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion$get$1.smali (73%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$Companion.smali (76%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion$get$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$OngoingCall.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion$get$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected$Item.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model$VoiceConnected.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$Model.smali (79%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureOngoingCall$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$configureVoiceConnected$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBound$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func2$0.smali => smali/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func3$0.smali} (60%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline$sam$rx_functions_Func7$0.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali (92%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator$enqueueNotice$showCallFeedbackSheetNotice$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetNavigator.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config$CREATOR.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Config.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$Factory.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel$WhenMappings.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackIssue.smali (97%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackRating.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder$onConfigure$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$IssueViewHolder.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter$onIssueClick$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$IssuesAdapter.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$updateView$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$updateView$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView$updateView$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/feedback/FeedbackView.smali (95%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemDivider.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader.smali (93%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemInvite.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemSpectatorsHeader.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemVoiceUser.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderDivider.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderHeader.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderInvite$onConfigure$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderInvite.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser$onConfigure$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser$onConfigure$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ViewHolderUser.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$onStreamPreviewClicked$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter$onVoiceUserClicked$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/CallParticipantsAdapter.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model$DefaultImpls.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$Model.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$WhenMappings.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureBackground$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$2.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$5.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView$disableWithToast$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$1.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureMenu$2.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$3.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$configureUI$4.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$3.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$4.smali (98%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$onViewBoundOrOnResume$5.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall$tryConnectToVoice$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetGuildCall.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators$Companion.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$2$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators$configureUI$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators$onViewBoundOrOnResume$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/fullscreen/WidgetSpectators.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$Chunk.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$WhenMappings.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$get$1$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$get$1$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$get$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$observeChunk$2.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion$userItemsComparator$1.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$Companion.smali (99%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel$ParticipantsType.smali (100%) rename com.discord/{smali_classes2 => smali}/com/discord/widgets/voice/model/CallModel.smali (100%) create mode 100644 com.discord/smali/e/a/k/b/a/g0/r.smali create mode 100644 com.discord/smali/e/a/k/d/n.smali delete mode 100644 com.discord/smali/e/a/k/d/n/a.smali delete mode 100644 com.discord/smali/e/a/k/d/n/b.smali create mode 100644 com.discord/smali/e/a/k/d/p/a.smali create mode 100644 com.discord/smali/e/a/k/d/p/b.smali rename com.discord/smali/e/a/k/d/{o => p}/c.smali (78%) rename com.discord/smali/e/a/k/d/{o => p}/d.smali (79%) rename com.discord/smali/e/a/k/d/{o => p}/e.smali (84%) rename com.discord/smali/e/a/k/d/{o => p}/f.smali (80%) rename com.discord/smali/e/a/k/d/{o => p}/g.smali (77%) rename com.discord/smali/e/a/k/d/{o => p}/h.smali (79%) delete mode 100644 com.discord/smali/e/a/k/f/d.smali create mode 100644 com.discord/smali/e/a/k/g/v/j.smali create mode 100644 com.discord/smali/e/a/k/g/v/k.smali rename com.discord/{smali => smali_classes2}/WidgetFriendsAddUserRequestsModel$a$a.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetFriendsAddUserRequestsModel$a$b.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetFriendsAddUserRequestsModel$a.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetFriendsAddUserRequestsModel.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$ViewState$a.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$ViewState$b.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$ViewState$c.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$ViewState$d.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$ViewState.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$a$a.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$a.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$b.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$c.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$d.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$e.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$f.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel.smali (100%) rename com.discord/{smali => smali_classes2}/com/discord/app/AppBottomSheet$a.smali (100%) rename com.discord/{smali => smali_classes2}/com/discord/dialogs/ImageUploadDialog$a.smali (100%) rename com.discord/{smali => smali_classes2}/com/discord/views/ActiveSubscriptionView$a.smali (100%) rename com.discord/{smali => smali_classes2}/com/discord/views/steps/StepsView$a.smali (100%) rename com.discord/{smali => smali_classes2}/com/lytefast/flexinput/fragment/CameraFragment$a.smali (100%) rename com.discord/{smali => smali_classes2}/e/a/a/c/b$a.smali (100%) rename com.discord/{smali => smali_classes2}/e/a/a/e/a$a.smali (100%) rename com.discord/{smali => smali_classes2}/e/a/a/f$a.smali (99%) rename com.discord/{smali => smali_classes2}/e/b/a/a/a$a.smali (100%) rename com.discord/{smali => smali_classes2}/f.smali (100%) rename com.discord/{smali => smali_classes2}/g.smali (100%) rename com.discord/{smali => smali_classes2}/h.smali (100%) rename com.discord/{smali => smali_classes2}/i$a$a.smali (100%) rename com.discord/{smali => smali_classes2}/i$a$b.smali (100%) rename com.discord/{smali => smali_classes2}/i$a$c.smali (100%) rename com.discord/{smali => smali_classes2}/i$a.smali (100%) rename com.discord/{smali => smali_classes2}/i$b.smali (100%) rename com.discord/{smali => smali_classes2}/i$c.smali (100%) rename com.discord/{smali => smali_classes2}/i$d.smali (100%) rename com.discord/{smali => smali_classes2}/i$e.smali (100%) rename com.discord/{smali => smali_classes2}/i$f.smali (100%) rename com.discord/{smali => smali_classes2}/i$g.smali (100%) rename com.discord/{smali => smali_classes2}/i$h.smali (100%) rename com.discord/{smali => smali_classes2}/i$i.smali (100%) rename com.discord/{smali => smali_classes2}/i.smali (100%) rename com.discord/{smali => smali_classes2}/j.smali (100%) rename com.discord/{smali => smali_classes2}/k.smali (100%) create mode 100644 com.discord/smali_classes2/kotlin/jvm/functions/Function9.smali rename com.discord/{smali => smali_classes2}/l.smali (100%) rename com.discord/{smali => smali_classes2}/m.smali (100%) rename com.discord/{smali => smali_classes2}/n.smali (100%) rename com.discord/{smali => smali_classes2}/o.smali (100%) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 50324d7fd9..6f6a7d2858 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1047.apk +apkFileName: com.discord-1048.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1047' - versionName: 12.0-alpha1 + versionCode: '1048' + versionName: '11.6' diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 4eb5389493..12e1e5c075 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Sun Mar 01 06:09:59 UTC 2020 -version_name=12.0-alpha1 +#Sun Mar 01 19:30:31 UTC 2020 +version_name=11.6 package_name=com.discord -build_id=3c92e1ef-e60a-486b-ac71-6014623c2631 -version_code=1047 +build_id=a0a22f8d-660e-4708-ad11-65a7fd655175 +version_code=1048 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 9da51220a2d19c436ba8dec95fd0c6f3581a8cfc..ecb638be5627d8f3cdc7fec6f3937f913dd522b6 100644 GIT binary patch delta 752 zcmWO3Pe_w-9LMp`Gw0mOm8-RMTaR;1Q(H^dT+P517?OAp@njw(Mu&*-)TQF_5GI1r z9}xmw zFmgiL#Y{*_oRn6PZlpoPnrNoUk{ZHN7#TSDf^RS*(iC2yger!j(pzjGeM)+O6>KAE z(j`{mX(l<8;EGW=rcg$a<_iY}WeR z>gGu)Yrph8&e&$3$1oc0)+-UO@#)3Yfy+k8emL;XFq-Y2>%RlMI&MS)M$W!==YIG< D{P%+O delta 766 zcmWO3Pe_w-9LMp`Gj&aUX4_iMIW=8YYENrh)7*+RA}}F3c#?vsP9r2#ItWG2B?=0K z{vaMILOg^-mnZBZW2_ydlSp{z)WII2!wx1ABGmiv`u(2g$MfU+{eGTLv!3#-$6qI( z%8w;O9cp{-|7Y(vNLRhm4NT(^R#8Ld0B2an779LT5xW5@z4(j@9nQXD%dS~LxvqA(Ucz10rtW7$ zq**DYl~9sNZfQc3Dzc}XXN^xXPB>q07!fCWA?7oxF9%1?8DE^Kk - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_book_16dp.xml b/com.discord/res/drawable-anydpi-v24/ic_book_16dp.xml deleted file mode 100644 index 4a51349862..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_book_16dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-anydpi-v24/ic_status_24dp.xml b/com.discord/res/drawable-anydpi-v24/ic_status_24dp.xml deleted file mode 100644 index 24569b72f7..0000000000 --- a/com.discord/res/drawable-anydpi-v24/ic_status_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable-hdpi/ic_add_person_16dp.png b/com.discord/res/drawable-hdpi/ic_add_person_16dp.png deleted file mode 100644 index c4f0da8aca5fc0096323a26d3c1b12e6c308756a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjTRdGHLn>}1CoIqlV0iRDz(?4? zMAyMgL|Tm_rJ=%1AfD~fXNNodN0_c`Vp#IiR?PSNMIA-!j%$w#BkfIfD*BH%eZI2c zfw3I7Ua)fOn`6lbbFv~57>?}UDDh8j)-H(^sVDO?3ih_U?O{3`z_6fX9^aAGjX%sx z-ZpXLn>}1CrGd^Y54#D|9Q4Y zcOBk1w8hmc*zp`W`$I&r`R|bk7SkU#o7|Fg4`d6PHJ{wdkS7?@%fQ!skZ<9UrvCw^ zTt8|&e7Or)WlMDqEV|B^rCF-$U^e5Dha0~VPxH!L#<2uohU)mXxoMrns$UI^&}vg?)X;n=U)d;XR@>CCo+4!AADfG=@ic3fCmp dE?UXNaHa9`0e9Zkzd(00c)I$ztaD0e0sz@jSN;G1 diff --git a/com.discord/res/drawable-hdpi/ic_status_24dp.png b/com.discord/res/drawable-hdpi/ic_status_24dp.png deleted file mode 100644 index dbe3549f12c877941b2b537510d589a91bef27a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)|B$v0xMRdxW`3wWg%iZp~ORaX)KhY)O5^ux@kuVVv5F_He zY7=$BAy&i=WJwIGFw-MG1x8e2;@XxO_W&bVQsVy5Eeb4|$>NzBda1z79`Q=u37U35 zT=3*QfK8uDda6OJfud9XuBsL>2OHg56MqpWni?JA8>llxR%Zhg3V;WjgIliE4cI#_ zU}y~1(kA*VSY!eiiojZ=z|A;Mnmq2e zJkF9DiA_Vu(>olRXUrA%O`O^OLal{=xZob}nSgHv2~TX9`rNmLih;-v_&UvenSK>GL#q4D&5FJbS#Av2q|sIY-Acf4DEw%w(|El|$wC83d%#%<2L`R5^4$M;k4U|c`c$aV_OOO+7b8O_i~8$%-LFmqZDsIu L^>bP0l+XkK7Hv1a diff --git a/com.discord/res/drawable-ldpi/ic_book_16dp.png b/com.discord/res/drawable-ldpi/ic_book_16dp.png deleted file mode 100644 index 9a94131f88f1a8fe638203ed4efeb39ba0983733..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4JWm(LkcwN$2@33g{{N3>?%@4! z;x@xZo=pya>p3F&*9e{{V|es8U}sg1RDyzR$L)o0{s#0`m^S?Q?8r4SN6C+QqhC{| zgWzHhXG1}$NfS*sFl@9piKti3{K0pmyYYr(yh<0tMm~Yr42Jy7OBooBJuy7)JNv&4 P&}IftS3j3^P6-6pT=PrR+r7kqSzTpJ{gOAJvP_;MpJYhOW?o85@sk75RD^XIgr%IV6p5!G&bR& z9!H?g24V#u)&b)6IMl=wW6*!7cOFAs14}1Cn)g0VSn_KM}%P! z&jiLKULC3bixbx@knud2sBo>ZYd3SDjX->R*YV`bIt)kdU(C7b+a>;Iqs3>dSyB_c za|$FEG#q7px}pKBJqPv$LGcw%=6Qj75??O z8XLv+o^LqJVsdzcxgPUA;YS$ diff --git a/com.discord/res/drawable-mdpi/ic_book_16dp.png b/com.discord/res/drawable-mdpi/ic_book_16dp.png deleted file mode 100644 index 93a61e555b0cf2e49864cc340859bb871bf8c0d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ZJsWUAr-fh6C_L?{Qv*|dE*ZG z4%H7U0vR9ubl4+3TZN~_-JHYoasCXY8a4ow=BJf!9`7upHPs~=+!C}4P0q0%c8 zu=Tg6=>f)7ZcMNCzF#6Gz<1fhOF}`qfst)F<9bhn2UcdxE(-!n<@y=h8!aR|DmhfM nnKM?*b`TCS)-W~V@nT>wce|&^#J83M=pqJBS3j3^P6m17>N6U*ntwmy@B{T5dSBDK^EJP>gr}93`WMkfjFC33%W@( z92pa|BpiV@>J9Ly$C|p<sO><1-Mq1F-@S3jlFGG(vHyzfYyZ`_I07*qoM6N<$fL-^ABeMo*nnORU;*NKApVWTkoiC?fTrFZ zi1#Dm>qzR)BZ(6Yx(WDXKP}UM2@ap5<8)d%pqj||JWMMGtS8a|_wks4oF)uNb--dG z9dMdfc{-U$2lUg*0W8q0gU|B!KrBPck_{AZk8xQ38HoMqQM`f*o5?_Y8EWx&AYKi` z3JfCw2tcz^IkZRy6~FCJwm&W7A7uD;B1^*4(9)2F8Wu|c@oplsA3DAcExySH8hBDX zvG_B&4G&`SJh7OpvLT&Hmc#IDQXO!Z$_@ZU1rI3>_)KL7{D-C~qQQR}V3HE!ei~o{ fhEXsI1}gvnD`_dm!CjC<00000NkvXXu0mjfqs4`$ diff --git a/com.discord/res/drawable-xhdpi/ic_book_16dp.png b/com.discord/res/drawable-xhdpi/ic_book_16dp.png deleted file mode 100644 index d2ee69e5e45a74ee5f56d7e6947b8ee2f8f87e68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmV+^0oMMBP)t3cJn)5`%U79**lxdX6T zOiu^Q$6+1|)biVObpX1>)XoJs9e~SXdN^P)K8xw$0HVOC14bP%BpmRYh7R~lj03u9 z=zwfun^QJGJR9U}-G#eekI|p}v>=+hXSm}f`T0M2|JN{5OD#1idjvE9L%@rg(S6QdW?-?zzbcNGj z(H};4Vx5N`W5ucpyfp@IgBpAuaES5HO&FCWP3%5nm1+e3X9j1J_rj3am9&bBYtwpR|S0ioRf{>N8&@EZl~XHX{Umz%tj2J2F)jIzrK>YX$Tf zd`DVfwOITWg)U zd!R1fFs1|?gFin=Rp4AJFCiD=bv3va)YWPVBp@kO+@wn`oq)$}c}oqarl8hZaSvWz zBZ=_K+E^ojp6>9G=-*Y1dqzP*D>aGTX)Sc`9vFg_$2oCSbY8#ky=Rq&9_FyL^vY5()TDjw`zsNXvg4+N>DmKxYEIJwW%RTNt%00000 LNkvXXu0mjfde$Jb diff --git a/com.discord/res/drawable-xxhdpi/ic_add_person_16dp.png b/com.discord/res/drawable-xxhdpi/ic_add_person_16dp.png deleted file mode 100644 index 897ccbc326dc01bbe5bd5dd6ca484ff6d2e6486f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmV-?0fYXDP);Vvyh)IrsKvW`;h>7t?-V)L*q-)pq zExbSZ%}oEVeXo5>653jTTg{Ua126ysOa!1WsHqvC(-M3FU%?7pgA4GSGC&G0!Of3F zUI;=CAjMraT})DIVqvjk1r>mm<&nP(dLjsbaH!jY0)TP=s3`!n4p#pH;8hO?fGY(6 z=>Tw|0FYaTZ*c4&p~?cFq%;O+;M>6KGo?1mXND&sD2CU2LTa~@!r-ff#p=}zyv5wu_=she#SZ;x#2toeEXQeyFu}DMcx{@D6zfpCE=CNlzsz1oi%-p7JcZZ) zm%Y3bRea0KMbZt}Lw#vJ4Cx1_lPx!VkzdCZ- zBo!IHc4s4}4$CbqVHZqI-WHaz-MzM1_3(}7O6m)rNkuJTth=5z-A>$?HFgQ}A7LLx z6G7<@6PWHP={>0Bi0J;&@Lh93N5*w8+XGL%mq<80$X56>XIIl}8AA?@2Zo$mnvN@6 z;Pi_;z%^%0!{I-Rep(9mHt@;yHgL|_b3ngf6VtW_BKMvA9vIenZD8Prq6V2?3MvI3 z1tT2iv#>nrjrk$>w|9Z`i%N#ZRr@+6uQ9&i+0}lJiR*;(M%fafPjBMpZPH!n{({@l zVcko{S^OW>I|`5LuoQ%|R3GJGdKk`;j`zQ26ta4|3-89ZJ6 KT-G@yGywp=laieP diff --git a/com.discord/res/drawable-xxhdpi/ic_status_24dp.png b/com.discord/res/drawable-xxhdpi/ic_status_24dp.png deleted file mode 100644 index 2c3323c20901fc3373aedc08009f7c27e43dd8f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1009 zcmV`SgSL^;L}5p(c9zqxvEru1xuL>tcOe{^7N~zg;uzmt;-zv_iJcz(!i}XS3Gu; zz?HN@_iiKL*UM|f@c@jYjS{B-3~CIB2bH)tD68ZrP@qRZJau3^U4(ssJl2zzt>_Qk zU>?DB2m&c^Oj`Es&_aQd;Fw-?8d9{EoB#-v2gkI~aR|}9P#I*-q2p2-DK!`Z82|+0 zuvwl|0{OuZ$X4hL0Eg_~ zVKUsLcMXjm!%5-if{d^aNDla5Gc)5)o&2FGiQN7oENts z`Ey{X8BJ;CLKXH=OWed==qMb{32K>FA{59vNAVciS16E&6v%HSenlV5j92i-8mOseHgOC+i49r~vDvV}@G> zT#Ky?HQAqvNkqkc>WXd^xV1`A`PsRE4eqH1GQnJnJ= z&Gia-++hX*=e9s5Wa93fXojspoc!Ph1?-FVcA!#T)9MT2)nw^;v%Tkd^o*Lg(0@SS f;Nalk;Gm8_Mp}=ictWi(00000NkvXXu0mjf6#>UX diff --git a/com.discord/res/drawable-xxxhdpi/ic_add_person_16dp.png b/com.discord/res/drawable-xxxhdpi/ic_add_person_16dp.png deleted file mode 100644 index 8fae27a883b974ff5f0a15c8840ebc96c680d387..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T013T{sfbl%;9!mA>oylV6Y!=>N6Xd+(hPX6h9jgzSp~i2*PG2EYIq z00S@>Kvck_W&m006zqb}!8LHX2moyG5WI}|^ELPddzEg^05?qmP)T@^ z8*n$q@3+9-KmLgL?b(6vqTKme%Dd8`ybVq?JeI#;havz+J;plL<`YE#Q;jbt={h9< za_z4)1L#o#(9j${P&EP>0Br;SOG*Gd1OT52uO+HZXkr6sAplrV>d@*40G_F}sb87_ zTu}os)EHhCR8?vKWWWET3BZ`@wB}kv_;1xwl9ivb5o%B$TFSC`l<>}opvH&p2Y53hXiTYA3X&iH5 zxsM5;lk@O_TApZnBmf}5oFvVO0O()=SP=nmg9RWU;&IUd_zVC^9ucFT|Fc*u7K_DV bu}sn*KQXCqXBYM400000NkvXXu0mjf(xLiU diff --git a/com.discord/res/drawable-xxxhdpi/ic_book_16dp.png b/com.discord/res/drawable-xxxhdpi/ic_book_16dp.png deleted file mode 100644 index 80bcbf2025165782dba064eec8409d79744e5e16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Ugc;uunK>+P(yLCl6Ct>Ga+ z@J+CSL2kjiO-zk0N`f{FLY*sKD2FHrigKt3H9CZZDO5CY9Vs$8Tq2fMK0D=oUf!hQ zw7!)mp8ZzaUO#zJf<#-QL|dk3_<8Z+@4Vq3KE99A-^uZVIWAJWl5y(;OO6ay|HuZ>iY}%( z2ZDtju+E#*u=9Cb`U~c&6J8Fo6=F=c4ontHV4k;xLHxrKmLCo3iVL_a-Z1IyZhHQ$ zcm|V311fTeIiQ%tSk1|JyMuL&D$AKw|2MmKp+qd1OtJ0H?!Y7hC#j$*xmc%{bqi}ao}$EZg+2Y?*Ir02nYxW2nYxW2netX z8O0;TQ^lHMUGYKjS+S=$M0OS1icQ5E{NJ+Tp<+6SaWm{IUZ9Y_6z4l~s@PJjqCx{! zAg}lvSMr>ZGsRcMOT}yuJHVM@pIPYZs1<(l69s>QHhgXgU(nZhj{@5ExrNl`>Csoy zbbynaSt|TRYR7-CxaX6(89N~OWezZmbs86rton5!Y{f;vr|?iT_kc4z+&P0ijJ4;U zvE{<4T1Pp5JrsV#9tITFrVs`m3x81wX&Y_++Yb=_qB*h(e}0hgBUgjPQX(n2BX38w-^0u#7p9Dhq-{9UfWmxLmp5~BjDLUUk= zi0)h-yznBrACu zICrsVlLdbY9g>BkDG-$|E5Zu+U_8Z7gy%w1E4VOFZQ`gjT^X21*_9m1s$GyG6n+NG zv`5xlvzv>2AT&K4LvtYUXQl?Pc}+0>hQaYSDHQN-a01azNNs6$Oy5OlyOIG-;uAJ; z%r&s1OOGToYEv)H2in!*(up~XiMCs?t37h)n*zA_iN5XzPs>I4-*XgE|Lqql`88p2 zXGEcZv8O_xqJJrG>0|UMSKsn{g75D$lk9*G&jdfl=!&}NUtggJ5(T_?BKR4Gq?}!B z(PhNNR`#9oXn}ox!dEZBncmp>GuPEw@C@)uvnLDLnb^(zH7UrXHYW?0O$y3U)mQLw$LpBe5HH z$%9n?SShl>aAk|#V z)|?BN9J~5qtk#fxa1miJrQKMl)7E&ri&Bu(RAiN87-DKaEGGJBU#GK?Z zoaALg>z=zmWX>H8A->5=`vQsEGd-}ly|T<0m!Bp0{sQxE9D&8p+b_k<34)sCoQ?r8b*qt9*O qXNO;94G0Jb2nYxW2nYz+8vg*Z4L59vIVSl40000 - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_create.xml b/com.discord/res/drawable/drawable_guild_template_create.xml deleted file mode 100644 index 736c7acf54..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_create.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_creator.xml b/com.discord/res/drawable/drawable_guild_template_creator.xml deleted file mode 100644 index 40d54ca3fe..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_creator.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_friend.xml b/com.discord/res/drawable/drawable_guild_template_friend.xml deleted file mode 100644 index 223e448f02..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_friend.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_gaming.xml b/com.discord/res/drawable/drawable_guild_template_gaming.xml deleted file mode 100644 index 3e0336417b..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_gaming.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_hobby.xml b/com.discord/res/drawable/drawable_guild_template_hobby.xml deleted file mode 100644 index abffa90e1e..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_hobby.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/drawable_guild_template_study.xml b/com.discord/res/drawable/drawable_guild_template_study.xml deleted file mode 100644 index 1ad7beed2d..0000000000 --- a/com.discord/res/drawable/drawable_guild_template_study.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/guild_use_cases_gaming_32dp.xml b/com.discord/res/drawable/guild_use_cases_gaming_32dp.xml index ac7e5348a5..62095076d8 100644 --- a/com.discord/res/drawable/guild_use_cases_gaming_32dp.xml +++ b/com.discord/res/drawable/guild_use_cases_gaming_32dp.xml @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_add_circle_filled_16dp.xml b/com.discord/res/drawable/ic_add_circle_filled_16dp.xml deleted file mode 100644 index 9d9ffc1685..0000000000 --- a/com.discord/res/drawable/ic_add_circle_filled_16dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_content_creator_16dp.xml b/com.discord/res/drawable/ic_content_creator_16dp.xml deleted file mode 100644 index 8ede103d46..0000000000 --- a/com.discord/res/drawable/ic_content_creator_16dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_friend_wave_16dp.xml b/com.discord/res/drawable/ic_friend_wave_16dp.xml deleted file mode 100644 index dfb9fa0db6..0000000000 --- a/com.discord/res/drawable/ic_friend_wave_16dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_game_controller_16dp.xml b/com.discord/res/drawable/ic_game_controller_16dp.xml deleted file mode 100644 index 9d95ad833f..0000000000 --- a/com.discord/res/drawable/ic_game_controller_16dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_game_controller_white_16dp.xml b/com.discord/res/drawable/ic_game_controller_white_16dp.xml new file mode 100644 index 0000000000..1654fdbd8e --- /dev/null +++ b/com.discord/res/drawable/ic_game_controller_white_16dp.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hobby_16dp.xml b/com.discord/res/drawable/ic_hobby_16dp.xml deleted file mode 100644 index 9b736c2fd1..0000000000 --- a/com.discord/res/drawable/ic_hobby_16dp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_tab_friends.xml b/com.discord/res/drawable/ic_tab_friends.xml deleted file mode 100644 index 6f8269cb3a..0000000000 --- a/com.discord/res/drawable/ic_tab_friends.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_tab_home.xml b/com.discord/res/drawable/ic_tab_home.xml deleted file mode 100644 index 29d6b92fcb..0000000000 --- a/com.discord/res/drawable/ic_tab_home.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_tab_mentions.xml b/com.discord/res/drawable/ic_tab_mentions.xml deleted file mode 100644 index 5880104de7..0000000000 --- a/com.discord/res/drawable/ic_tab_mentions.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_tab_search.xml b/com.discord/res/drawable/ic_tab_search.xml deleted file mode 100644 index 69ea8923ed..0000000000 --- a/com.discord/res/drawable/ic_tab_search.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/com.discord/res/layout-v22/widget_notice_popup.xml b/com.discord/res/layout-v22/widget_notice_popup.xml index ad7e3f4454..43cb18be5b 100644 --- a/com.discord/res/layout-v22/widget_notice_popup.xml +++ b/com.discord/res/layout-v22/widget_notice_popup.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout-v22/widget_notice_popup_channel.xml b/com.discord/res/layout-v22/widget_notice_popup_channel.xml index d5e362ead0..6a6847ea03 100644 --- a/com.discord/res/layout-v22/widget_notice_popup_channel.xml +++ b/com.discord/res/layout-v22/widget_notice_popup_channel.xml @@ -4,9 +4,9 @@ - - - + + + diff --git a/com.discord/res/layout/audio_output_selection_dialog.xml b/com.discord/res/layout/audio_output_selection_dialog.xml index a6c9039d30..5454739e85 100644 --- a/com.discord/res/layout/audio_output_selection_dialog.xml +++ b/com.discord/res/layout/audio_output_selection_dialog.xml @@ -3,9 +3,9 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - - - - + + + + \ No newline at end of file diff --git a/com.discord/res/layout/guild_role_chip.xml b/com.discord/res/layout/guild_role_chip.xml index 8c132a9783..5c24548ec9 100644 --- a/com.discord/res/layout/guild_role_chip.xml +++ b/com.discord/res/layout/guild_role_chip.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/guild_role_item.xml b/com.discord/res/layout/guild_role_item.xml index c787d95668..02f0b5905a 100644 --- a/com.discord/res/layout/guild_role_item.xml +++ b/com.discord/res/layout/guild_role_item.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/layout_search.xml b/com.discord/res/layout/layout_search.xml index 08c3d76c5b..4ceeb0edf1 100644 --- a/com.discord/res/layout/layout_search.xml +++ b/com.discord/res/layout/layout_search.xml @@ -1,8 +1,8 @@ - - + + diff --git a/com.discord/res/layout/tabs_host_bottom_navigation_view.xml b/com.discord/res/layout/tabs_host_bottom_navigation_view.xml deleted file mode 100644 index f85f0f4da5..0000000000 --- a/com.discord/res/layout/tabs_host_bottom_navigation_view.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/user_profile_header_view.xml b/com.discord/res/layout/user_profile_header_view.xml index 9fb1eed56b..a29c36ec2f 100644 --- a/com.discord/res/layout/user_profile_header_view.xml +++ b/com.discord/res/layout/user_profile_header_view.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/user_profile_voice_settings_view.xml b/com.discord/res/layout/user_profile_voice_settings_view.xml index 184fd4509d..5abe6b11ec 100644 --- a/com.discord/res/layout/user_profile_voice_settings_view.xml +++ b/com.discord/res/layout/user_profile_voice_settings_view.xml @@ -1,12 +1,11 @@ - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + - - + \ No newline at end of file diff --git a/com.discord/res/layout/view_channel_override_item.xml b/com.discord/res/layout/view_channel_override_item.xml index 68ebcb2424..2af8fcd9a7 100644 --- a/com.discord/res/layout/view_channel_override_item.xml +++ b/com.discord/res/layout/view_channel_override_item.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_global_search_item.xml b/com.discord/res/layout/view_global_search_item.xml index df9a1e5901..55066e147e 100644 --- a/com.discord/res/layout/view_global_search_item.xml +++ b/com.discord/res/layout/view_global_search_item.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_server_settings_icon_name.xml b/com.discord/res/layout/view_server_settings_icon_name.xml index 245c48b8bf..ed80c3c33b 100644 --- a/com.discord/res/layout/view_server_settings_icon_name.xml +++ b/com.discord/res/layout/view_server_settings_icon_name.xml @@ -4,8 +4,8 @@ - - + + diff --git a/com.discord/res/layout/view_server_settings_public_setting_selector.xml b/com.discord/res/layout/view_server_settings_public_setting_selector.xml deleted file mode 100644 index 91016b32f9..0000000000 --- a/com.discord/res/layout/view_server_settings_public_setting_selector.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/view_server_settings_upload_banner.xml b/com.discord/res/layout/view_server_settings_upload_banner.xml index abf1bed659..185c570e73 100644 --- a/com.discord/res/layout/view_server_settings_upload_banner.xml +++ b/com.discord/res/layout/view_server_settings_upload_banner.xml @@ -8,7 +8,7 @@ - + diff --git a/com.discord/res/layout/view_server_settings_upload_splash.xml b/com.discord/res/layout/view_server_settings_upload_splash.xml index b7e4061aea..206d09cf4c 100644 --- a/com.discord/res/layout/view_server_settings_upload_splash.xml +++ b/com.discord/res/layout/view_server_settings_upload_splash.xml @@ -8,7 +8,7 @@ - + diff --git a/com.discord/res/layout/view_setting_switch.xml b/com.discord/res/layout/view_setting_switch.xml index 596081d5d9..4339f2c351 100644 --- a/com.discord/res/layout/view_setting_switch.xml +++ b/com.discord/res/layout/view_setting_switch.xml @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/view_toolbar_title.xml b/com.discord/res/layout/view_toolbar_title.xml index 137c9419be..33b5b48bbd 100644 --- a/com.discord/res/layout/view_toolbar_title.xml +++ b/com.discord/res/layout/view_toolbar_title.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/layout/user_avatar_presence_view.xml b/com.discord/res/layout/view_user_avatar_presence.xml similarity index 68% rename from com.discord/res/layout/user_avatar_presence_view.xml rename to com.discord/res/layout/view_user_avatar_presence.xml index c430590c73..4142dd369f 100644 --- a/com.discord/res/layout/user_avatar_presence_view.xml +++ b/com.discord/res/layout/view_user_avatar_presence.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_group_dm_settings.xml b/com.discord/res/layout/widget_channel_group_dm_settings.xml index 6b0492dc5e..464e5d4374 100644 --- a/com.discord/res/layout/widget_channel_group_dm_settings.xml +++ b/com.discord/res/layout/widget_channel_group_dm_settings.xml @@ -9,8 +9,8 @@ - - + + diff --git a/com.discord/res/layout/widget_channel_members_list_item_add.xml b/com.discord/res/layout/widget_channel_members_list_item_add.xml deleted file mode 100644 index 6d1e2c7419..0000000000 --- a/com.discord/res/layout/widget_channel_members_list_item_add.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_members_list_item_header.xml b/com.discord/res/layout/widget_channel_members_list_item_header.xml index bb9dd8b65f..32dbd94719 100644 --- a/com.discord/res/layout/widget_channel_members_list_item_header.xml +++ b/com.discord/res/layout/widget_channel_members_list_item_header.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/widget_channel_settings_cannot_delete.xml b/com.discord/res/layout/widget_channel_settings_cannot_delete.xml index 66e43086e3..b42bc10558 100644 --- a/com.discord/res/layout/widget_channel_settings_cannot_delete.xml +++ b/com.discord/res/layout/widget_channel_settings_cannot_delete.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_friends_list_v2.xml b/com.discord/res/layout/widget_friends_list_v2.xml index c31720b41b..0e3597576b 100644 --- a/com.discord/res/layout/widget_friends_list_v2.xml +++ b/com.discord/res/layout/widget_friends_list_v2.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/widget_friends_tab.xml b/com.discord/res/layout/widget_friends_tab.xml deleted file mode 100644 index 9df57e3dc7..0000000000 --- a/com.discord/res/layout/widget_friends_tab.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml index b2670f626f..ccaa44b26c 100644 --- a/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml +++ b/com.discord/res/layout/widget_guild_invite_share_empty_suggestions.xml @@ -2,10 +2,10 @@ - + - + diff --git a/com.discord/res/layout/widget_guild_invite_share_item.xml b/com.discord/res/layout/widget_guild_invite_share_item.xml index 5699ea9978..84fd06000e 100644 --- a/com.discord/res/layout/widget_guild_invite_share_item.xml +++ b/com.discord/res/layout/widget_guild_invite_share_item.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml b/com.discord/res/layout/widget_guild_profile_sheet_v2.xml deleted file mode 100644 index cd5ca0c2fa..0000000000 --- a/com.discord/res/layout/widget_guild_profile_sheet_v2.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_main_panel_center_content.xml b/com.discord/res/layout/widget_main_panel_center_content.xml index b00f607527..c84d132db4 100644 --- a/com.discord/res/layout/widget_main_panel_center_content.xml +++ b/com.discord/res/layout/widget_main_panel_center_content.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/widget_main_panel_left.xml b/com.discord/res/layout/widget_main_panel_left.xml index 5d231978ed..c5c7648ab1 100644 --- a/com.discord/res/layout/widget_main_panel_left.xml +++ b/com.discord/res/layout/widget_main_panel_left.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_notice_popup.xml b/com.discord/res/layout/widget_notice_popup.xml index 96e5bb8541..52db0ab693 100644 --- a/com.discord/res/layout/widget_notice_popup.xml +++ b/com.discord/res/layout/widget_notice_popup.xml @@ -4,7 +4,7 @@ - + diff --git a/com.discord/res/layout/widget_notice_popup_channel.xml b/com.discord/res/layout/widget_notice_popup_channel.xml index 51657f80aa..8529e88887 100644 --- a/com.discord/res/layout/widget_notice_popup_channel.xml +++ b/com.discord/res/layout/widget_notice_popup_channel.xml @@ -4,9 +4,9 @@ - - - + + + diff --git a/com.discord/res/layout/widget_nux_guild_template.xml b/com.discord/res/layout/widget_nux_guild_template.xml deleted file mode 100644 index 8f91db3cf9..0000000000 --- a/com.discord/res/layout/widget_nux_guild_template.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_premium_guild_transfer.xml b/com.discord/res/layout/widget_premium_guild_transfer.xml index 5d1f4dbd01..8a4bc6d423 100644 --- a/com.discord/res/layout/widget_premium_guild_transfer.xml +++ b/com.discord/res/layout/widget_premium_guild_transfer.xml @@ -8,10 +8,10 @@ - - + + - + diff --git a/com.discord/res/layout/widget_remote_auth_pending_login.xml b/com.discord/res/layout/widget_remote_auth_pending_login.xml index 61d661fd01..edcda05e98 100644 --- a/com.discord/res/layout/widget_remote_auth_pending_login.xml +++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml @@ -5,7 +5,7 @@ - + diff --git a/com.discord/res/layout/widget_server_settings.xml b/com.discord/res/layout/widget_server_settings.xml index dad9a7064d..4af2a1093c 100644 --- a/com.discord/res/layout/widget_server_settings.xml +++ b/com.discord/res/layout/widget_server_settings.xml @@ -26,11 +26,6 @@ - - - - - diff --git a/com.discord/res/layout/widget_server_settings_public_overview.xml b/com.discord/res/layout/widget_server_settings_public_overview.xml deleted file mode 100644 index be3988b742..0000000000 --- a/com.discord/res/layout/widget_server_settings_public_overview.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_settings.xml b/com.discord/res/layout/widget_settings.xml index 45858a526e..2111322e8b 100644 --- a/com.discord/res/layout/widget_settings.xml +++ b/com.discord/res/layout/widget_settings.xml @@ -2,19 +2,14 @@ - + - + - - - - - diff --git a/com.discord/res/layout/widget_settings_account.xml b/com.discord/res/layout/widget_settings_account.xml index 6e203e9c22..6f67f98c5f 100644 --- a/com.discord/res/layout/widget_settings_account.xml +++ b/com.discord/res/layout/widget_settings_account.xml @@ -6,9 +6,9 @@ - + - + diff --git a/com.discord/res/layout/widget_settings_item_connected_account.xml b/com.discord/res/layout/widget_settings_item_connected_account.xml index 0900132b94..45e0425cac 100644 --- a/com.discord/res/layout/widget_settings_item_connected_account.xml +++ b/com.discord/res/layout/widget_settings_item_connected_account.xml @@ -8,9 +8,9 @@ - - - + + + diff --git a/com.discord/res/layout/widget_tabs_host.xml b/com.discord/res/layout/widget_tabs_host.xml deleted file mode 100644 index 7d9e27068c..0000000000 --- a/com.discord/res/layout/widget_tabs_host.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_user_account_verify.xml b/com.discord/res/layout/widget_user_account_verify.xml index 2cfc6f4a90..4908be071b 100644 --- a/com.discord/res/layout/widget_user_account_verify.xml +++ b/com.discord/res/layout/widget_user_account_verify.xml @@ -10,21 +10,21 @@ - + - + - + diff --git a/com.discord/res/layout/widget_user_phone_add.xml b/com.discord/res/layout/widget_user_phone_add.xml index cc36fc7c06..81a8a36d12 100644 --- a/com.discord/res/layout/widget_user_phone_add.xml +++ b/com.discord/res/layout/widget_user_phone_add.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/widget_user_phone_verify.xml b/com.discord/res/layout/widget_user_phone_verify.xml index 1e90165fa1..79fb5383f1 100644 --- a/com.discord/res/layout/widget_user_phone_verify.xml +++ b/com.discord/res/layout/widget_user_phone_verify.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/widget_user_profile_strip.xml b/com.discord/res/layout/widget_user_profile_strip.xml index 25c01a6efc..9c2609da58 100644 --- a/com.discord/res/layout/widget_user_profile_strip.xml +++ b/com.discord/res/layout/widget_user_profile_strip.xml @@ -6,7 +6,7 @@ - + diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index 659f8e77c7..a95984cf50 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -1362,8 +1362,6 @@ - - diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index b0ddd14303..4e6b1a104c 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -287,7 +287,6 @@ - @@ -334,6 +333,7 @@ + @@ -787,6 +787,7 @@ + @@ -878,21 +879,14 @@ - - - - - - - @@ -1257,17 +1251,6 @@ - - - - - - - - - - - @@ -1400,13 +1383,10 @@ - - - @@ -1737,15 +1717,6 @@ - - - - - - - - - @@ -1754,8 +1725,6 @@ - - @@ -1913,7 +1882,6 @@ - @@ -1931,8 +1899,6 @@ - - @@ -2018,17 +1984,6 @@ - - - - - - - - - - - @@ -2118,7 +2073,9 @@ + + @@ -2160,7 +2117,6 @@ - @@ -2184,8 +2140,6 @@ - - @@ -2294,9 +2248,7 @@ - - @@ -2307,13 +2259,6 @@ - - - - - - - diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index c4089ece04..50fe67fc52 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -536,10 +536,6 @@ %s times %s time - - %s unused Boosts - %s unused Boost - %s days a day @@ -721,50 +717,10 @@ %s Boosts %s Boost - - %s Boosts are - This Boost is - - - Boosts - Boost - - - Boost %s times - Boost - %s days %s day - - these Boosts - this Boost - - - The current servers - The current server - - - these Server Boosts - this Server Boost - - - servers - server - - - boosts - boost - - - boosts - boost - - - Boosts - Boost - %s Boosts %s Boost @@ -948,5 +904,5 @@ %s People %s Person - false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 19260744b8..d750e0506c 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -1046,351 +1046,349 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2676,689 +2674,674 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3374,210 +3357,207 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3631,18 +3611,18 @@ - - - - - - - - + + + + + + + + - - + + @@ -3653,70 +3633,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3725,57 +3705,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3788,21 +3768,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -4151,53 +4131,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4686,1617 +4666,1562 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6504,449 +6429,441 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7120,109 +7037,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10380,5325 +10286,5275 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16034,729 +15890,720 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 833944e730..db18ae9b1f 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -120,6 +120,8 @@ Add a Role Add a Server Tap to add a server! + Tap to create your first group! + Tap to create your first Discord! Add Friends Add a Channel or Category Add a channel to override its default notification settings @@ -179,7 +181,6 @@ Allow playback and usage of /tts command. Already have an account? Amount - You must designate another inside Server Settings before this channel can be deleted. Unknown view holder type: %1$s. Play animated emoji. I want emoji to move and groove. @@ -609,7 +610,7 @@ You do not have permission to view the message history of **#%1$s**. Welcome to the beginning of the chat. This is the very beginning of your legendary conversation with %1$s. - Added from your contacts: $[](nicknameHook) + In your contacts as %1$s This is the beginning of your direct message history with **@%1$s**. Welcome to the beginning of the **%1$s** group. "You will automatically leave this group when you're done. GLHF!" @@ -1005,7 +1006,7 @@ ONE MORE THING {fixed} OR Collapse Collapse Category - 3c92e1ef-e60a-486b-ac71-6014623c2631 + a0a22f8d-660e-4708-ad11-65a7fd655175 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -1104,14 +1105,14 @@ ONE MORE THING {fixed} Verify your phone number Something went wrong while syncing your contacts. Please wait a moment and try again. Uh oh something went wrong. - You cannot enable contact sync without a verified phone number. - No Verified Phone - Add Friends - "By turning on Friend Sync, we’ll automatically add your phone contacts as friends on Discord if: + "Let's do it" + "By turning on Friend Sync, Discord will keep your friends list up to date with your contacts if: - 1. You both have each other’s phone numbers + 1. You’re both on Discord - 2. You both have Friend Sync turned on" + 2. You both have each other's phone numbers + + 3. You both have Friend Sync turned on" Discord is more fun with friends None of your friends have synced their contacts on Discord yet, but we’ll let you know when they do. Got It @@ -1172,7 +1173,7 @@ ONE MORE THING {fixed} Create a server Create a new Server Make a server, invite your friends, throw a party! - "%1$s's server" + "%1$s's Server" By creating a server, you will have access to **free** voice and text chat to use amongst your friends. Your server is where your gaming group hangs out. Make one to start chatting with your friends for free. Your server is where your group hangs out. Make one to start chatting with your friends for free. @@ -2489,10 +2490,8 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)." Public "This is the channel where Discord will send announcements and updates relevant to Public server admins and moderators, like new moderation features and the server's eligibility in Discovery." Moderators-only Channel - None Selected Public servers must have clearly posted server rules and/or guidelines for members. Please select the channel that hosts this. Public Server - Failed to update your settings. Please try again. Server Banner Server Invite Background This image will display when users receive an invite to the server. @@ -2527,16 +2526,12 @@ You've Boosted %1$s." You've Boosted the server." Boost transfer success! "You've Boosted %1$s **%2$s**." - "Looks like you have %1$s. We'll add 'em to this server for you." Working… Text Channels Voice Channels Create Server You can ask the owner to make a new one though Invalid server template - Tap to learn more - "This template link is invalid or has expired. -Want to know more about Discord?" Use channels to organize your chatroom by specific topics. You can always edit the channels after creating the server. Whoops… @@ -2544,26 +2539,6 @@ Want to know more about Discord?" Roles and Permissions Create a server based on: You received a server template based on: - announcements - Text Channels - Voice Channels - events - games - new-games - game-room-%1$s - general - giveaways - homework - meetups - memes - music - notes-resources - off-topic - random - social-posts - strategy-discussion - welcome - welcome-and-rules Open Template Channels are places in your server where people can talk about different things. You can always edit the channels after creating the server. @@ -2571,13 +2546,6 @@ Want to know more about Discord?" Server template from Loading server template A server is a superpowered group chat where people come together around a topic or to hang out. - Create my own - Content Creator - Friend Group Chat - Gaming Group - Start from a template - Hobby Group - Study Group "Don't see what you're looking for? [Let us know if you have any suggestions.](%1$s)" Create Your Server Kick-start a friend’s new server by sharing a template based on your own server setup. @@ -2870,8 +2838,6 @@ Want to know more about Discord?" Spectate Game Spectate via Desktop App The watching party is over! - "Share this link with friends and they'll automatically join your server." - Invite a friend to your server! • expires in %1$s Your invite link expires in 1 day. Your invite link expires in 1 day, or after %1$s. @@ -3250,9 +3216,12 @@ Want to know more about Discord?" "Discord cannot launch this game for you because you've lost entitlement to it. This can be for a variety of reasons, such as a lapsed Nitro subscription, a refund, or if the game has been removed from the Discord store. [Please see this help article for more information or support.](%1$s)" Unable to launch %1$s Unable to launch game + Public servers are required to have a rules channel. You must designate another before this channel can be deleted. + Public servers are required to have a moderator-only channel where Discord can send relevant public server updates. You must designate another before this channel can be deleted. You must designate another inside [Server Settings > Public Server Settings](onClick) before this channel can be deleted. Enable Hardware Scaling Experimental feature that may improve performance in video calls. Beware, may cause jank. + Sorry, designating another channel is not yet available on mobile. Please visit the desktop app. Moderation Are you sure? Monthly @@ -3408,7 +3377,6 @@ Want to know more about Discord?" Mute all background noise. Powered by Noise Cancellation - Learn More Mic Test Stop Test @@ -3447,7 +3415,6 @@ Want to know more about Discord?" Oh no, an error has occurred. Code %1$s Discord has to install some stuff before we can launch your game. Installing (%1$s of %2$s). Discord has to install some stuff before we can launch your game. Installing %1$s (%2$s of %3$s). - Get tailored features and tools that can help grow your community! Hey Nitro subscriber, congrats! You get a month of Funimation on us. Redeem Well, it looks like the **%1$s %2$s** microphone hardware mute switch is on. @@ -3521,7 +3488,7 @@ Want to know more about Discord?" No invite code? No worries! Start a Discord server for you and your friends. We’ll provide the voice and text chat - it’s 100%% free. Create Server Invalid server name - By creating a server, you agree to our [Community Guidelines](%1$s). + By creating a server, you agree to our [Community Guidelines](https://discordapp.com/guidelines). **PROTIP:** You can always edit the channels, roles, and permissions after creating the server. Create a Server Download our desktop app for easier access to your servers, and app-only features (including Push to Talk)! @@ -3924,35 +3891,29 @@ To keep your sub, go to Settings and update your payment." Boosted servers get everything previous, and — $[Protip:](protipHook) Discord Nitro includes %1$s! [Learn more.](onLearnMore) **PROTIP:** Discord Nitro includes %1$s! [Learn more.](%2$s) - Boost to **%1$s** Get cool rewards for becoming a Booster! Server Boost Monthly Server Boost Yearly You need **%1$s** to unlock %2$s %1$s/%2$s Ready to Boost this server? - %1$s pending cancellation and will automatically be removed from this server on %2$s. - %1$s - Select this server. It will take a moment for your %1$s to take effect. - Boosting this server will prevent transferring %1$s to another server for %2$s. - Are you sure you want to transfer %1$s? %2$s will lose progress if you continue. - Current %1$s + This Boost is pending cancellation and will automatically be removed from this server on %1$s. + Boost + Select this server. It will take a moment for your boost to take effect. + Boosting this server will prevent transferring this Boost to another server for %1$s. + Are you sure you want to transfer this Server Boost? The current server will lose progress if you continue. + Current server Transfer Server Boost? - Move %1$s to + Move boost to Search servers Select a Server Select a server to transfer to Okay! Thanks for the Boost! - Yes, Transfer %1$s - Transfer %1$s to this server. It will take a moment for your %1$s to take effect. + Yes, Transfer Boost + Transfer Boost to this server. It will take a moment for your boost to take effect. There was an error with the Boost transfer. Please try again. Transfer Error - Cancel - Server Boost(s) - You have some unused Boosts. How many do you want to use for this server? - Unused Boosts - Next Show off with a new Member List icon New profile badge that evolves over time Get an exclusive Booster role @@ -3984,7 +3945,6 @@ The changes to your subscription are reflected below:" "Looks like you're on cooldown. Please wait **%1$s** before trying again" Support your top server with a boost and get a special badge! Boost This Server - Unlock perks for your favorite server and get a special badge! You Boosted %1$s Got it Server Boosting @@ -4080,7 +4040,7 @@ The changes to your subscription are reflected below:" Update your payment information. Nitro Settings Billing Information - Your subscription will end on **%1$s**. + Your **%1$s** subscription will end on **%2$s**. Get Nitro Manage Nitro Your **%1$s** subscription is past due. Please update your payment info or your subscription will end on **%2$s**. @@ -4192,22 +4152,13 @@ The changes to your subscription are reflected below:" Select a Rules Channel Public Server Settings Public - **Create [Announcement Channels](%1$s)** so users can follow and get your announcements in their own servers. - "Here's what you should do next:" + Set up [Announcement Channels](%1$s) to deliver updates beyond your server. + *Airhorn sound effects* Check if you qualify to be in Server Discovery so more people can find you. - **Enable Server Discovery** so new people can find you directly on Discord. Your server is now public! - "**More features and tools to come!** We'll let you know directly in your moderators-only channel." This is the channel where Discord will send announcements specific to Public server admins or mods. This is also where system messages about your server will show up, like changes to your Discovery eligibility. Mod-only Channel Select a Mod-only Channel - **$[Create Announcement channels](focusHook)** so users can follow and get your announcements in their own servers. - If so, set your server to Public and get tailored features and tools that can help grow your community! - Set my server to Public - **$[Unlock the ability to apply to Server Discovery](focusHook)** so new people can find you directly on Discord. - Is this server a public community? - **$[Stay informed of new moderator features and updates](focusHook)** from Discord inside your server. - And **$[more to come](focusHook)**, like moderation tools and server analytics! This message will be sent to all servers following this channel. You can edit or delete this message later, and it will update correspondingly in each following server. This message will be sent to **%1$s servers** following this channel. You can edit or delete this message later, and it will update correspondingly in each following server. See more stats in Server Settings. @@ -5258,7 +5209,7 @@ You cannot take any moderation actions until you enable it." HypeSquad Action Keybind - Learn more about Krisp + [Learn more about Krisp](%1$s) Current Password Discriminator Email @@ -5497,5 +5448,5 @@ You cannot take any moderation actions until you enable it." "You're viewing older messages" Chinese, China Chinese, Taiwan - false + false diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index df11b817b5..953debfa40 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -992,8 +992,8 @@ ?actionBarSize pin @style/AppTheme.Toolbar.Popup - @style/UiKit.TextAppearance.Toolbar.Subtitle - @style/UiKit.TextAppearance.Toolbar.Title + @style/UiKit.Toolbar.TextAppearance.Subtitle + @style/UiKit.Toolbar.TextAppearance.Title - - - - - - - - - + - - - - - - - - + + + + +