From 084bf4d03589886e35e652c8c81a2e0afdb99f09 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Jan 2020 03:27:13 +0100 Subject: [PATCH] Changes of com.discord v1022 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 31876 -> 31876 bytes .../res/drawable-xhdpi/bg_nitro_classic.png | Bin 64558 -> 64559 bytes .../bg_cloud_pattern_light.png | Bin 13712 -> 13704 bytes .../res/drawable/ic_hypesquad_house1_32dp.xml | 2 +- .../res/drawable/ic_hypesquad_house2_32dp.xml | 2 +- .../res/drawable/ic_hypesquad_house3_32dp.xml | 2 +- .../res/drawable/img_server_nitro_status.xml | 71 - com.discord/res/layout/guild_role_chip.xml | 2 +- ...um_guild_subscription_activated_dialog.xml | 3 +- .../layout/view_boost_status_no_boosts.xml | 7 - .../res/layout/widget_chat_overlay.xml | 2 +- .../res/layout/widget_settings_voice.xml | 1 - com.discord/res/values/ids.xml | 5 +- com.discord/res/values/plurals.xml | 10 +- com.discord/res/values/public.xml | 7959 +++++++++-------- com.discord/res/values/strings.xml | 18 +- com.discord/res/values/styles.xml | 10 +- .../smali/androidx/activity/R$drawable.smali | 24 +- .../smali/androidx/activity/R$id.smali | 28 +- .../smali/androidx/activity/R$string.smali | 2 +- .../smali/androidx/appcompat/R$drawable.smali | 28 +- .../smali/androidx/appcompat/R$id.smali | 100 +- .../smali/androidx/appcompat/R$string.smali | 4 +- .../appcompat/resources/R$drawable.smali | 24 +- .../androidx/appcompat/resources/R$id.smali | 28 +- .../appcompat/resources/R$string.smali | 2 +- .../asynclayoutinflater/R$drawable.smali | 24 +- .../androidx/asynclayoutinflater/R$id.smali | 18 +- .../asynclayoutinflater/R$string.smali | 2 +- .../smali/androidx/browser/R$drawable.smali | 24 +- com.discord/smali/androidx/browser/R$id.smali | 24 +- .../smali/androidx/browser/R$string.smali | 2 +- .../constraintlayout/widget/R$id.smali | 12 +- .../coordinatorlayout/R$drawable.smali | 24 +- .../androidx/coordinatorlayout/R$id.smali | 34 +- .../androidx/coordinatorlayout/R$string.smali | 2 +- .../smali/androidx/core/R$drawable.smali | 24 +- com.discord/smali/androidx/core/R$id.smali | 28 +- .../smali/androidx/core/R$string.smali | 2 +- .../smali/androidx/core/ktx/R$drawable.smali | 24 +- .../smali/androidx/core/ktx/R$id.smali | 28 +- .../smali/androidx/core/ktx/R$string.smali | 2 +- .../androidx/customview/R$drawable.smali | 24 +- .../smali/androidx/customview/R$id.smali | 28 +- .../smali/androidx/customview/R$string.smali | 2 +- .../androidx/drawerlayout/R$drawable.smali | 24 +- .../smali/androidx/drawerlayout/R$id.smali | 28 +- .../androidx/drawerlayout/R$string.smali | 2 +- .../dynamicanimation/R$drawable.smali | 24 +- .../androidx/dynamicanimation/R$id.smali | 28 +- .../androidx/dynamicanimation/R$string.smali | 2 +- .../smali/androidx/fragment/R$drawable.smali | 24 +- .../smali/androidx/fragment/R$id.smali | 28 +- .../smali/androidx/fragment/R$string.smali | 2 +- .../androidx/legacy/coreui/R$drawable.smali | 24 +- .../smali/androidx/legacy/coreui/R$id.smali | 24 +- .../androidx/legacy/coreui/R$string.smali | 2 +- .../legacy/coreutils/R$drawable.smali | 24 +- .../androidx/legacy/coreutils/R$id.smali | 18 +- .../androidx/legacy/coreutils/R$string.smali | 2 +- .../smali/androidx/legacy/v4/R$drawable.smali | 24 +- .../smali/androidx/legacy/v4/R$id.smali | 26 +- .../smali/androidx/legacy/v4/R$string.smali | 2 +- .../lifecycle/extensions/R$drawable.smali | 24 +- .../androidx/lifecycle/extensions/R$id.smali | 24 +- .../lifecycle/extensions/R$string.smali | 2 +- .../smali/androidx/loader/R$drawable.smali | 24 +- com.discord/smali/androidx/loader/R$id.smali | 18 +- .../smali/androidx/loader/R$string.smali | 2 +- .../smali/androidx/media/R$drawable.smali | 24 +- com.discord/smali/androidx/media/R$id.smali | 20 +- .../smali/androidx/media/R$string.smali | 2 +- .../androidx/preference/R$drawable.smali | 30 +- .../smali/androidx/preference/R$id.smali | 116 +- .../smali/androidx/preference/R$string.smali | 14 +- .../androidx/preference/ktx/R$drawable.smali | 30 +- .../smali/androidx/preference/ktx/R$id.smali | 116 +- .../androidx/preference/ktx/R$string.smali | 14 +- .../androidx/recyclerview/R$drawable.smali | 24 +- .../smali/androidx/recyclerview/R$id.smali | 28 +- .../androidx/recyclerview/R$string.smali | 2 +- .../smali/androidx/room/R$drawable.smali | 24 +- com.discord/smali/androidx/room/R$id.smali | 18 +- .../smali/androidx/room/R$string.smali | 2 +- .../slidingpanelayout/R$drawable.smali | 24 +- .../androidx/slidingpanelayout/R$id.smali | 18 +- .../androidx/slidingpanelayout/R$string.smali | 2 +- .../swiperefreshlayout/R$drawable.smali | 24 +- .../androidx/swiperefreshlayout/R$id.smali | 18 +- .../swiperefreshlayout/R$string.smali | 2 +- .../androidx/transition/R$drawable.smali | 24 +- .../smali/androidx/transition/R$id.smali | 32 +- .../smali/androidx/transition/R$string.smali | 2 +- .../androidx/vectordrawable/R$drawable.smali | 24 +- .../smali/androidx/vectordrawable/R$id.smali | 28 +- .../androidx/vectordrawable/R$string.smali | 2 +- .../vectordrawable/animated/R$drawable.smali | 24 +- .../vectordrawable/animated/R$id.smali | 28 +- .../vectordrawable/animated/R$string.smali | 2 +- .../smali/androidx/viewpager/R$drawable.smali | 24 +- .../smali/androidx/viewpager/R$id.smali | 18 +- .../smali/androidx/viewpager/R$string.smali | 2 +- .../androidx/viewpager2/R$drawable.smali | 24 +- .../smali/androidx/viewpager2/R$id.smali | 28 +- .../smali/androidx/viewpager2/R$string.smali | 2 +- .../smali/androidx/work/R$drawable.smali | 24 +- com.discord/smali/androidx/work/R$id.smali | 18 +- .../smali/androidx/work/R$string.smali | 2 +- .../smali/androidx/work/ktx/R$drawable.smali | 24 +- .../smali/androidx/work/ktx/R$id.smali | 18 +- .../smali/androidx/work/ktx/R$string.smali | 2 +- .../smali/com/angarron/colorpicker/R$a.smali | 88 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../smali/com/discord/app/AppFragment$c.smali | 2 +- .../com/discord/app/AppPermissions.smali | 8 +- .../discord/app/DiscordConnectService.smali | 2 +- .../com/discord/gateway/R$drawable.smali | 52 +- .../smali/com/discord/gateway/R$id.smali | 190 +- .../smali/com/discord/gateway/R$layout.smali | 2 +- .../smali/com/discord/gateway/R$plurals.smali | 2 +- .../smali/com/discord/gateway/R$string.smali | 96 +- .../smali/com/discord/overlay/R$c.smali | 30 +- .../smali/com/discord/overlay/R$d.smali | 106 +- .../com/discord/restapi/R$drawable.smali | 52 +- .../smali/com/discord/restapi/R$id.smali | 190 +- .../smali/com/discord/restapi/R$layout.smali | 2 +- .../smali/com/discord/restapi/R$plurals.smali | 2 +- .../smali/com/discord/restapi/R$string.smali | 96 +- ...AudioManager$MediaEngineAudioManager.smali | 156 +- ...MembersLazy$makeGroup$textResolver$1.smali | 4 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../StoreMediaNotification$init$3.smali | 2 +- ...ation$displayConnectionErrorNotice$2.smali | 4 +- .../stores/StoreUserGuildSettings.smali | 6 +- .../discord/stores/StoreUserSettings.smali | 8 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../auditlogs/AuditLogChangeUtils.smali | 46 +- .../utilities/channel/ChannelUtils.smali | 4 +- .../utilities/duration/DurationUtilsKt.smali | 18 +- .../com/discord/utilities/error/Error.smali | 26 +- .../utilities/fcm/NotificationData.smali | 30 +- .../utilities/fcm/NotificationRenderer.smali | 10 +- .../images/MGImages$requestAvatarCrop$1.smali | 2 +- .../utilities/intent/IntentUtils.smali | 2 +- .../utilities/media/AudioOutputMonitor.smali | 45 +- .../utilities/notices/NoticeBuilders.smali | 10 +- .../utilities/presence/PresenceUtils.smali | 30 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../discord/utilities/rest/SendUtils.smali | 6 +- .../strings/ContextSearchStringProvider.smali | 20 +- ...ulViews$FragmentOnBackPressedHandler.smali | 12 +- ...eyUtils$Survey$ConsoleResearchSurvey.smali | 192 + .../SurveyUtils$Survey$NoticeKeys.smali | 2 + .../surveys/SurveyUtils$Survey.smali | 1 + .../SurveyUtils$getGenericSurvey$2.smali | 35 +- .../utilities/surveys/SurveyUtils.smali | 2 + ...sageUnparser$getChannelMentionRule$1.smali | 4 +- ...MessageUnparser$getRoleMentionRule$1.smali | 4 +- ...MessageUnparser$getUserMentionRule$1.smali | 4 +- .../textprocessing/MessageUnparser.smali | 56 +- ...ssageUtils$cleanEmojisInQuotedText$1.smali | 120 + .../textprocessing/MessageUtils.smali | 310 +- .../Rules$createChannelMentionRule$1.smali | 18 +- .../Rules$createCustomEmojiRule$1.smali | 71 +- .../Rules$createInlineCodeRule$1.smali | 19 +- .../Rules$createMaskedLinkRule$1.smali | 30 +- .../Rules$createNamedEmojiRule$1.smali | 13 +- .../Rules$createNonMarkdownRule$1.smali | 27 +- .../Rules$createRoleMentionRule$1.smali | 18 +- .../Rules$createSpoilerRule$1.smali | 33 +- .../Rules$createUnescapeEmoticonRule$1.smali | 27 +- .../Rules$createUrlNoEmbedRule$1.smali | 17 +- .../Rules$createUrlRule$1.smali | 17 +- .../Rules$createUserMentionRule$1.smali | 47 +- .../utilities/textprocessing/Rules.smali | 67 +- .../discord/utilities/uri/UriHandler.smali | 6 +- .../CleanupViewAnimationListener.smali | 83 + .../view/extensions/ViewExtensions.smali | 24 + .../DiscordOverlayService$Companion.smali | 2 +- .../voice/DiscordOverlayService.smali | 6 +- ...oregroundService$NotificationBuilder.smali | 6 +- com.discord/smali/com/discord/utils/R$c.smali | 52 +- com.discord/smali/com/discord/utils/R$d.smali | 190 +- com.discord/smali/com/discord/utils/R$e.smali | 2 +- .../ActiveSubscriptionView$HeaderImage.smali | 4 +- .../views/ActiveSubscriptionView$b.smali | 2 +- .../smali/com/discord/views/BoxedButton.smali | 2 +- .../com/discord/views/ChatActionItem.smali | 2 +- .../com/discord/views/CheckedSetting.smali | 6 +- .../discord/views/CodeVerificationView.smali | 14 +- .../smali/com/discord/views/GuildView.smali | 2 +- .../com/discord/views/LoadingButton.smali | 2 +- .../com/discord/views/OverlayMenuView.smali | 12 +- .../com/discord/views/ServerFolderView.smali | 2 +- .../com/discord/views/StreamPreviewView.smali | 32 +- .../com/discord/views/TernaryCheckBox.smali | 8 +- .../discord/views/ToolbarTitleLayout.smali | 8 +- .../discord/views/UploadProgressView.smali | 30 +- .../com/discord/views/UserListItemView.smali | 10 +- .../com/discord/views/VoiceUserView.smali | 6 +- .../views/premium/AccountCreditView.smali | 12 +- .../PremiumGuildConfirmationView.smali | 14 +- .../PremiumGuildProgressView.smali | 32 +- .../PremiumGuildSubscriptionUpsellView.smali | 12 +- .../PremiumSubscriptionMarketingView.smali | 20 +- .../discord/views/steps/StepsView$b$a.smali | 4 +- .../com/discord/views/steps/StepsView.smali | 12 +- .../video/VideoCallParticipantView.smali | 2 +- .../widgets/auth/WidgetAuthCaptcha.smali | 2 +- .../widgets/auth/WidgetAuthInviteInfo.smali | 6 +- .../widgets/auth/WidgetAuthLanding.smali | 2 +- .../WidgetAuthLogin$onViewBound$5$1.smali | 2 +- .../auth/WidgetAuthLogin$onViewBound$5.smali | 6 +- .../WidgetAuthLogin$validationManager$2.smali | 2 +- .../widgets/auth/WidgetAuthLogin.smali | 2 +- .../discord/widgets/auth/WidgetAuthMfa.smali | 22 +- ...etAuthRegister$validationManager$2$1.smali | 2 +- ...dgetAuthRegister$validationManager$2.smali | 6 +- .../widgets/auth/WidgetAuthRegister.smali | 10 +- .../auth/WidgetAuthUndeleteAccount.smali | 2 +- ...auth2Authorize$validationManager$2$1.smali | 2 +- .../widgets/auth/WidgetOauth2Authorize.smali | 44 +- .../auth/WidgetOauth2AuthorizeSamsung.smali | 2 +- .../widgets/auth/WidgetRemoteAuth.smali | 14 +- .../WidgetChannelGroupDMSettings.smali | 16 +- .../WidgetChannelNotificationSettings.smali | 10 +- .../WidgetChannelSelector$Adapter.smali | 2 +- .../WidgetChannelSelector$Companion.smali | 8 +- .../channels/WidgetChannelSelector.smali | 2 +- ...WidgetChannelSettingsEditPermissions.smali | 2 +- ...tChannelSettingsPermissionsAddMember.smali | 2 +- ...getChannelSettingsPermissionsAddRole.smali | 2 +- ...etChannelSettingsPermissionsOverview.smali | 8 +- .../widgets/channels/WidgetChannelTopic.smali | 2 +- ...ateChannel$RolesAdapter$RoleListItem.smali | 4 +- .../channels/WidgetCreateChannel.smali | 10 +- .../channels/WidgetGroupInviteFriends.smali | 2 +- ...ter$WidgetGroupInviteFriendsListItem.smali | 2 +- .../WidgetGroupInviteFriendsAdapter.smali | 2 +- ...getTextChannelSettings$configureUI$6.smali | 2 +- .../channels/WidgetTextChannelSettings.smali | 4 +- .../list/WidgetChannelListUnreads.smali | 8 +- .../WidgetChannelsList$onViewBound$5$1.smali | 2 +- .../channels/list/WidgetChannelsList.smali | 2 +- ...annelsListAdapter$ItemChannelPrivate.smali | 4 +- ...WidgetChannelsListAdapter$ItemHeader.smali | 6 +- .../WidgetChannelsListAdapter$ItemMFA.smali | 2 +- .../list/WidgetChannelsListAdapter.smali | 18 +- ...ChannelsListItemChannelActions$Model.smali | 4 +- ...WidgetChannelsListItemChannelActions.smali | 4 +- .../WidgetChannelsListItemVoiceActions.smali | 20 +- ...tAdapter$WidgetCollapsedUserListItem.smali | 4 +- .../WidgetCollapsedUsersListAdapter.smali | 2 +- ...ivateChannelMembersListModelProvider.smali | 2 +- .../memberlist/WidgetChannelMembersList.smali | 2 +- .../adapter/ChannelMembersListAdapter.smali | 10 +- .../ChannelMembersListViewHolderLoading.smali | 2 +- ...elMembersListViewHolderMember$bind$3.smali | 2 +- .../widgets/chat/WidgetUrlActions.smali | 2 +- .../input/WidgetChatInput$chatInput$2.smali | 2 +- .../widgets/chat/input/WidgetChatInput.smali | 10 +- ...putAttachments$DiscordCameraFragment.smali | 4 +- ...nputAttachments$DiscordFilesFragment.smali | 2 +- ...putAttachments$DiscordPhotosFragment.smali | 2 +- ...achments$PermissionsEmptyListAdapter.smali | 2 +- .../WidgetChatInputCommandsAdapter.smali | 2 +- .../chat/input/WidgetChatInputModel.smali | 16 +- ...atInputSend$configureSendListeners$5.smali | 2 +- ...dgetChatInputEmojiAdapter$HeaderItem.smali | 2 +- .../emoji/WidgetChatInputEmojiPicker.smali | 16 +- .../chat/list/ViewEmbedGameInvite.smali | 22 +- .../widgets/chat/list/WidgetChatList$1.smali | 2 +- .../widgets/chat/list/WidgetChatList.smali | 2 +- .../chat/list/WidgetChatListAdapter.smali | 20 +- ...etChatListAdapterItemApplicationNews.smali | 2 +- .../WidgetChatListAdapterItemAttachment.smali | 2 +- .../WidgetChatListAdapterItemBlocked.smali | 2 +- ...WidgetChatListAdapterItemCallMessage.smali | 10 +- .../list/WidgetChatListAdapterItemEmbed.smali | 4 +- .../WidgetChatListAdapterItemEmptyPins.smali | 2 +- .../WidgetChatListAdapterItemGameInvite.smali | 2 +- .../list/WidgetChatListAdapterItemGift.smali | 2 +- ...idgetChatListAdapterItemGuildWelcome.smali | 10 +- .../WidgetChatListAdapterItemInvite.smali | 34 +- ...getChatListAdapterItemListenTogether.smali | 6 +- ...dgetChatListAdapterItemMentionFooter.smali | 4 +- .../WidgetChatListAdapterItemMessage.smali | 4 +- ...dgetChatListAdapterItemMessageHeader.smali | 2 +- ...WidgetChatListAdapterItemNewMessages.smali | 4 +- ...atListAdapterItemPrivateChannelStart.smali | 6 +- .../WidgetChatListAdapterItemReactions.smali | 2 +- ...ChatListAdapterItemSearchResultCount.smali | 4 +- .../list/WidgetChatListAdapterItemStart.smali | 4 +- ...ItemSystemMessage$getSystemMessage$1.smali | 24 +- ...dgetChatListAdapterItemSystemMessage.smali | 2 +- .../WidgetChatListAdapterItemTimestamp.smali | 2 +- ...getChatListAdapterItemUploadProgress.smali | 16 +- ...alogs$showPinMessageConfirmation$1$1.smali | 4 +- .../list/actions/MessageActionDialogs.smali | 12 +- .../WidgetChatListActions$adapter$1.smali | 2 +- .../WidgetChatListActions$configureUI$9.smali | 2 +- .../list/actions/WidgetChatListActions.smali | 102 +- ...mojisAdapter$ReactionEmojiViewHolder.smali | 2 +- ...ctionsResultsAdapter$ErrorViewHolder.smali | 2 +- ...ionsResultsAdapter$LoadingViewHolder.smali | 2 +- ...esultsAdapter$ReactionUserViewHolder.smali | 2 +- .../WidgetManageReactions.smali | 4 +- ...hatOverlay$TypingIndicatorViewHolder.smali | 8 +- .../chat/overlay/WidgetChatOverlay.smali | 2 +- .../WidgetChannelPinnedMessages$Model.smali | 4 +- .../pins/WidgetChannelPinnedMessages.smali | 4 +- .../widgets/client/WidgetClientOutdated.smali | 2 +- .../debugging/WidgetDebugging$Adapter.smali | 2 +- .../widgets/debugging/WidgetDebugging.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 6 +- .../feedback/WidgetFeedbackSheet.smali | 2 +- .../widgets/friends/WidgetFriendsAdd.smali | 2 +- ...FriendsAddUserAdapter$UserViewHolder.smali | 6 +- .../friends/WidgetFriendsFindNearby.smali | 2 +- .../friends/WidgetFriendsList$addTab$1.smali | 2 +- .../widgets/friends/WidgetFriendsList.smali | 2 +- .../WidgetFriendsListAdapter$ItemEmpty.smali | 2 +- .../WidgetFriendsListAdapter$ItemUser.smali | 6 +- .../actions/WidgetGuildActionsAdd.smali | 2 +- .../actions/WidgetGuildActionsSheet.smali | 10 +- .../WidgetGuildCreate$onViewBound$1$1.smali | 2 +- .../guilds/create/WidgetGuildCreate.smali | 2 +- .../create/WidgetGuildCreateViewModel.smali | 2 +- .../guilds/invite/GuildInviteUiHelperKt.smali | 4 +- ...SettingsSheet$ChannelsSpinnerAdapter.smali | 4 +- .../invite/ViewInviteSettingsSheet.smali | 16 +- .../guilds/invite/WidgetGuildInvite.smali | 2 +- ...viteShare$PrivateChannelAdapter$Item.smali | 2 +- .../invite/WidgetGuildInviteShare.smali | 10 +- ...dgetGuildInviteShareEmptySuggestions.smali | 14 +- .../guilds/invite/WidgetInviteInfo.smali | 16 +- .../join/WidgetGuildJoin$ToolbarButton.smali | 2 +- .../widgets/guilds/join/WidgetGuildJoin.smali | 2 +- .../guilds/list/GuildListViewHolder.smali | 2 +- .../guilds/list/WidgetGuildListAdapter.smali | 14 +- ...dgetGuildSearchAdapter$GuildListItem.smali | 2 +- .../guilds/list/WidgetGuildSelector.smali | 10 +- .../guilds/list/WidgetGuildsList.smali | 4 +- ...etGuildProfileSheet$EmojiViewAdapter.smali | 4 +- .../profile/WidgetGuildProfileSheet.smali | 8 +- .../main/WidgetMain$showSurvey$1.smali | 2 +- .../com/discord/widgets/main/WidgetMain.smali | 14 +- .../widgets/main/WidgetMainPanelNsfw.smali | 2 +- .../WidgetMainSurveyDialog$Companion.smali | 2 +- .../widgets/main/WidgetMainSurveyDialog.smali | 16 +- .../discord/widgets/media/WidgetMedia.smali | 4 +- .../widgets/media/WidgetQRScanner.smali | 68 +- ...iceDialog$Companion$showInputModal$1.smali | 2 +- ...iceDialog$Companion$showInputModal$3.smali | 2 +- .../notice/WidgetNoticeDialog$Companion.smali | 2 +- .../widgets/notice/WidgetNoticeDialog.smali | 2 +- .../notice/WidgetNoticeNuxOverlay.smali | 2 +- .../notice/WidgetNoticeNuxSamsungLink.smali | 2 +- .../widgets/notice/WidgetNoticePopup.smali | 2 +- .../notice/WidgetNoticePopupChannel.smali | 2 +- .../widgets/nux/WidgetNuxGuildUseCases.smali | 2 +- ...uxPostRegistrationJoin$onViewBound$2.smali | 4 +- .../nux/WidgetNuxPostRegistrationJoin.smali | 2 +- .../widgets/search/WidgetSearch$Model.smali | 6 +- .../discord/widgets/search/WidgetSearch.smali | 14 +- .../results/WidgetSearchResults$Model.smali | 2 +- .../search/results/WidgetSearchResults.smali | 4 +- .../suggestions/WidgetSearchSuggestions.smali | 4 +- ...hSuggestionsAdapter$FilterViewHolder.smali | 30 +- ...archSuggestionsAdapter$HasViewHolder.smali | 8 +- ...hSuggestionsAdapter$HeaderViewHolder.smali | 38 +- ...tionsAdapter$HistoryHeaderViewHolder.smali | 4 +- ...ggestionsAdapter$InChannelViewHolder.smali | 6 +- ...estionsAdapter$RecentQueryViewHolder.smali | 6 +- ...rchSuggestionsAdapter$UserViewHolder.smali | 4 +- .../NotificationsOverridesAdapter.smali | 4 +- ...sChannelListAdapter$CategoryListItem.smali | 2 +- .../servers/WidgetServerDeleteDialog.smali | 2 +- .../servers/WidgetServerNotifications.smali | 4 +- ...tServerNotificationsOverrideSelector.smali | 10 +- ...rverRegionSelectDialog$RegionAdapter.smali | 2 +- .../WidgetServerRegionSelectDialog.smali | 2 +- .../servers/WidgetServerSettings.smali | 4 +- ...rverSettingsBans$Adapter$BanListItem.smali | 2 +- .../servers/WidgetServerSettingsBans.smali | 8 +- .../WidgetServerSettingsChannels.smali | 4 +- ...erverSettingsChannelsFabMenuFragment.smali | 4 +- ...getServerSettingsChannelsSortActions.smali | 2 +- .../WidgetServerSettingsEditIntegration.smali | 10 +- .../WidgetServerSettingsEditMember.smali | 8 +- ...sEditMemberRolesAdapter$RoleListItem.smali | 6 +- .../WidgetServerSettingsEditRole.smali | 84 +- ...getServerSettingsEditRoleColorPicker.smali | 2 +- ...sEmojis$Adapter$EmojiEmptyViewHolder.smali | 2 +- ...Emojis$Adapter$EmojiHeaderViewHolder.smali | 6 +- ...gsEmojis$Adapter$EmojiItemViewHolder.smali | 2 +- ...mojis$Adapter$EmojiSectionViewHolder.smali | 4 +- ...rverSettingsEmojis$showMediaPicker$1.smali | 2 +- .../servers/WidgetServerSettingsEmojis.smali | 6 +- .../WidgetServerSettingsEmojisEdit.smali | 4 +- .../WidgetServerSettingsInstantInvites.smali | 4 +- ...ingsInstantInvitesActions$onResume$3.smali | 2 +- ...tServerSettingsInstantInvitesActions.smali | 2 +- ...ServerSettingsInstantInvitesListItem.smali | 6 +- .../WidgetServerSettingsIntegrations.smali | 4 +- ...etServerSettingsIntegrationsListItem.smali | 4 +- ...rSettingsMembers$RolesSpinnerAdapter.smali | 2 +- .../servers/WidgetServerSettingsMembers.smali | 4 +- ...ettingsMembersAdapter$MemberListItem.smali | 2 +- .../WidgetServerSettingsModeration.smali | 14 +- ...erverSettingsOverview$AfkBottomSheet.smali | 2 +- ...ngsOverview$configureBannerImage$1$2.smali | 2 +- ...erSettingsOverview$configureIcon$1$2.smali | 2 +- ...ngsOverview$configureSplashImage$1$2.smali | 2 +- ...ServerSettingsOverview$configureUI$2.smali | 2 +- ...ServerSettingsOverview$configureUI$4.smali | 2 +- .../WidgetServerSettingsOverview.smali | 14 +- .../WidgetServerSettingsRolesList.smali | 8 +- ...ettingsRolesListAdapter$RoleListItem.smali | 6 +- ...rverSettingsSecurity$ToggleMfaDialog.smali | 2 +- .../WidgetServerSettingsSecurity.smali | 4 +- ...idgetServerSettingsTransferOwnership.smali | 4 +- .../WidgetServerSettingsVanityUrl.smali | 6 +- .../WidgetServerSettingsAuditLog.smali | 2 +- ...itLogAdapter$AuditLogEntryViewHolder.smali | 2 +- ...LogAdapter$AuditLogLoadingViewHolder.smali | 2 +- ...apter$AuditLogFilterActionViewHolder.smali | 2 +- ...Adapter$AuditLogFilterUserViewHolder.smali | 2 +- ...getServerSettingsAuditLogFilterSheet.smali | 6 +- .../PremiumGuildSubscriptionPerkView.smali | 2 +- ...iptionPerkViewAdapter$PerkViewHolder.smali | 2 +- ...cription$PerksPagerAdapter$Companion.smali | 32 - ...mGuildSubscription$PerksPagerAdapter.smali | 138 +- ...uildSubscription$onActivityCreated$1.smali | 2 + .../WidgetPremiumGuildSubscription.smali | 44 +- ...PremiumGuildSubscriptionConfirmation.smali | 10 +- ...dgetPremiumGuildSubscriptionTransfer.smali | 12 +- .../widgets/settings/WidgetChangeLog.smali | 4 +- .../settings/WidgetMuteSettingsSheet.smali | 10 +- .../widgets/settings/WidgetSettings.smali | 16 +- ...dgetSettingsAppearance$configureUI$2.smali | 4 +- .../settings/WidgetSettingsAppearance.smali | 8 +- ...dgetSettingsAuthorizedApps$adapter$1.smali | 2 +- .../WidgetSettingsAuthorizedApps.smali | 2 +- .../settings/WidgetSettingsBehavior.smali | 4 +- .../settings/WidgetSettingsDeveloper.smali | 2 +- ...$configureUI$$inlined$apply$lambda$2.smali | 4 +- .../settings/WidgetSettingsGameActivity.smali | 10 +- .../settings/WidgetSettingsLanguage.smali | 44 +- ...WidgetSettingsLanguageSelect$Adapter.smali | 2 +- .../WidgetSettingsLanguageSelect.smali | 2 +- .../settings/WidgetSettingsMedia.smali | 8 +- .../WidgetSettingsNotifications.smali | 6 +- .../WidgetSettingsNotificationsOs.smali | 2 +- ...Privacy$configurePrivacyControls$1$1.smali | 8 +- ...Privacy$configurePrivacyControls$2$1.smali | 8 +- ...SettingsPrivacy$onRequestDataClick$1.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$2.smali | 2 +- ...SettingsPrivacy$onRequestDataClick$4.smali | 2 +- .../settings/WidgetSettingsPrivacy.smali | 22 +- ...gsUserConnections$Adapter$ViewHolder.smali | 2 +- ...idgetSettingsUserConnections$Adapter.smali | 2 +- .../WidgetSettingsUserConnections.smali | 4 +- ...etSettingsUserConnectionsAdd$Adapter.smali | 2 +- .../WidgetSettingsUserConnectionsAdd.smali | 2 +- ...WidgetSettingsUserConnectionsAddXbox.smali | 4 +- .../settings/WidgetSettingsVoice$Model.smali | 42 +- .../WidgetSettingsVoice$configureUI$10.smali | 81 - .../WidgetSettingsVoice$configureUI$5.smali | 2 +- .../WidgetSettingsVoice$configureUI$6.smali | 2 +- .../WidgetSettingsVoice$configureUI$7.smali | 2 +- .../WidgetSettingsVoice$configureUI$8.smali | 2 +- .../WidgetSettingsVoice$configureUI$9.smali | 2 +- .../settings/WidgetSettingsVoice.smali | 118 +- .../WidgetDisableDeleteAccountDialog.smali | 2 +- .../account/WidgetEnableSMSBackupDialog.smali | 10 +- .../WidgetSettingsAccount$configureUI$3.smali | 2 +- ...idgetSettingsAccount$configureUI$5$1.smali | 2 +- ...ttingsAccount$showRemove2FAModal$1$1.smali | 2 +- .../account/WidgetSettingsAccount.smali | 22 +- ...etSettingsAccountBackupCodes$Adapter.smali | 4 +- ...sAccountBackupCodes$getBackupCodes$1.smali | 4 +- .../WidgetSettingsAccountBackupCodes.smali | 12 +- ...ountChangePassword$saveNewPassword$1.smali | 2 +- .../WidgetSettingsAccountChangePassword.smali | 10 +- ...getSettingsAccountEdit$configureUI$1.smali | 2 +- ...WidgetSettingsAccountEdit$saveInfo$1.smali | 2 +- ...tingsAccountEdit$validationManager$2.smali | 10 +- .../account/WidgetSettingsAccountEdit.smali | 6 +- .../account/mfa/WidgetEnableMFADownload.smali | 4 +- .../account/mfa/WidgetEnableMFAInput.smali | 4 +- .../account/mfa/WidgetEnableMFAKey.smali | 8 +- .../account/mfa/WidgetEnableMFASteps.smali | 2 +- .../account/mfa/WidgetEnableMFASuccess.smali | 2 +- ...dapter$PaymentSourceHeaderViewHolder.smali | 2 +- .../settings/billing/PaymentSourceView.smali | 6 +- ...urceEditDialog$deletePaymentSource$1.smali | 2 +- ...ceEditDialog$initPaymentSourceInfo$2.smali | 6 +- ...urceEditDialog$updatePaymentSource$1.smali | 2 +- .../WidgetPaymentSourceEditDialog.smali | 8 +- .../billing/WidgetSettingsBilling.smali | 4 +- .../WidgetSettingsPaymentHistory.smali | 4 +- .../WidgetSettingsPaymentMethods.smali | 2 +- .../premium/WidgetSettingsGifting.smali | 6 +- ...gsGiftingAdapter$EntitlementListItem.smali | 2 +- ...ttingsGiftingAdapter$NoGiftsListItem.smali | 2 +- ...etSettingsGiftingAdapter$SkuListItem.smali | 2 +- ...idgetSettingsPremium$getHeaderText$1.smali | 4 +- .../premium/WidgetSettingsPremium.smali | 66 +- ...tionSampleGuildAdapter$GuildListItem.smali | 4 +- .../SettingsPremiumGuildViewModel.smali | 2 +- ...dgetSettingsPremiumGuildSubscription.smali | 8 +- ...ildSubscriptionAdapter$GuildListItem.smali | 6 +- ...ldSubscriptionAdapter$HeaderListItem.smali | 2 +- ...ptionAdapter$PremiumGuildSubListItem.smali | 12 +- .../share/WidgetIncomingShare$Adapter.smali | 2 +- .../widgets/share/WidgetIncomingShare.smali | 12 +- .../StreamFeedbackSheetViewModel.smali | 12 +- .../widgets/spectate/WidgetSpectate.smali | 16 +- ...ateReportProblemDialog$configureUI$1.smali | 4 +- .../WidgetSpectateReportProblemDialog.smali | 8 +- .../WidgetSpectateStreamFullDialog.smali | 4 +- .../discord/widgets/status/WidgetStatus.smali | 24 +- .../discord/widgets/tos/WidgetTosAccept.smali | 6 +- .../user/Badge$Companion$onBadgeClick$1.smali | 2 +- .../widgets/user/Badge$Companion.smali | 370 +- .../com/discord/widgets/user/Badge.smali | 213 +- .../discord/widgets/user/WidgetBanUser.smali | 2 +- ...etKickUser$onViewBoundOrOnResume$2$1.smali | 2 +- .../discord/widgets/user/WidgetKickUser.smali | 2 +- .../widgets/user/WidgetPruneUsers.smali | 22 +- ...UserMentions$WidgetUserMentionFilter.smali | 10 +- .../widgets/user/WidgetUserMentions.smali | 6 +- ...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 | 2 +- .../widgets/user/WidgetUserStatusSheet.smali | 30 +- .../account/WidgetUserAccountVerify.smali | 6 +- .../captcha/WidgetUserCaptchaVerify.smali | 8 +- .../user/email/WidgetUserEmailUpdate.smali | 2 +- .../user/email/WidgetUserEmailVerify.smali | 4 +- .../user/phone/WidgetUserPhoneAdd.smali | 10 +- .../user/phone/WidgetUserPhoneVerify.smali | 6 +- .../presence/ViewHolderGameRichPresence.smali | 2 +- .../ViewHolderMusicRichPresence.smali | 16 +- .../ViewHolderPlatformRichPresence.smali | 4 +- .../ViewHolderStreamRichPresence.smali | 6 +- ...ViewHolderUserRichPresence$Companion.smali | 8 +- .../presence/ViewHolderUserRichPresence.smali | 24 +- .../user/profile/UserAvatarPresenceView.smali | 6 +- .../user/profile/UserProfileAdminView.smali | 24 +- .../profile/UserProfileConnectionsView.smali | 6 +- ...serProfileHeaderView$BadgeViewHolder.smali | 2 +- .../user/profile/UserProfileHeaderView.smali | 10 +- .../UserStatusPresenceCustomView.smali | 8 +- .../WidgetUserProfileEmptyListItem.smali | 4 +- .../user/profile/WidgetUserProfileStrip.smali | 18 +- .../user/search/ViewGlobalSearchItem.smali | 2 +- .../search/WidgetGlobalSearch$Companion.smali | 8 +- .../user/search/WidgetGlobalSearch.smali | 12 +- ...GlobalSearchAdapter$HeaderViewHolder.smali | 2 +- ...GlobalSearchAdapter$SearchViewHolder.smali | 2 +- ...WidgetGlobalSearchGuildsAdapter$Item.smali | 4 +- .../WidgetGlobalSearchGuildsAdapter.smali | 6 +- .../WidgetGlobalSearchModel$Companion.smali | 6 +- .../UserProfileVoiceSettingsView.smali | 4 +- ...heet$configureProfileActionButtons$5.smali | 4 +- .../user/usersheet/WidgetUserSheet.smali | 54 +- ...erSheetViewModel$moveUserToChannel$1.smali | 2 +- .../widgets/voice/call/WidgetCallFailed.smali | 14 +- ...igureActionBar$$inlined$let$lambda$2.smali | 54 +- .../voice/call/WidgetPrivateCall.smali | 20 +- .../call/WidgetPrivateCallControlsView.smali | 8 +- .../voice/call/WidgetVoiceCallIncoming.smali | 10 +- ...dgetVoiceCallInline$Adapter$ItemUser.smali | 2 +- .../call/WidgetVoiceCallInline$Adapter.smali | 2 +- .../voice/call/WidgetVoiceCallInline.smali | 24 +- .../voice/feedback/FeedbackIssue.smali | 24 +- ...articipantsAdapter$ViewHolderDivider.smali | 2 +- ...ParticipantsAdapter$ViewHolderHeader.smali | 6 +- ...llParticipantsAdapter$ViewHolderUser.smali | 14 +- ...VoiceControlsView$Model$DefaultImpls.smali | 30 - .../fullscreen/VoiceControlsView$Model.smali | 3 - .../VoiceControlsView$configureUI$2.smali | 2 +- .../voice/fullscreen/VoiceControlsView.smali | 44 +- ...getGuildCall$onViewBoundOrOnResume$4.smali | 2 +- .../voice/fullscreen/WidgetGuildCall.smali | 2 +- .../voice/fullscreen/WidgetSpectators.smali | 4 +- .../voice/model/CallModel$Companion.smali | 6 +- .../widgets/voice/model/CallModel.smali | 10 - .../settings/WidgetVoiceChannelSettings.smali | 10 +- com.discord/smali/e/a/a/a/a$d.smali | 8 +- com.discord/smali/e/a/a/a/a.smali | 36 +- com.discord/smali/e/a/a/a/b.smali | 16 +- com.discord/smali/e/a/a/a/e.smali | 26 +- com.discord/smali/e/a/a/b/a.smali | 10 +- com.discord/smali/e/a/a/b/b$f.smali | 2 +- com.discord/smali/e/a/a/b/b.smali | 2 +- 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 | 88 +- com.discord/smali/e/a/a/c/c.smali | 134 +- com.discord/smali/e/a/a/c/d.smali | 2 +- com.discord/smali/e/a/a/d/a.smali | 4 +- com.discord/smali/e/a/a/h.smali | 4 +- com.discord/smali/e/a/a/l.smali | 16 +- com.discord/smali/e/a/j/d.smali | 36 +- com.discord/smali/e/a/j/e0.smali | 4 +- com.discord/smali/e/a/j/f0.smali | 8 +- com.discord/smali/e/a/j/p$c.smali | 2 +- com.discord/smali/e/a/j/p$d.smali | 2 +- .../WidgetRemoteAuthViewModel$d.smali | 0 .../WidgetRemoteAuthViewModel$e.smali | 0 .../google/android/material/R$drawable.smali | 50 +- .../com/google/android/material/R$id.smali | 160 +- .../google/android/material/R$plurals.smali | 2 +- .../google/android/material/R$string.smali | 86 +- .../com/lytefast/flexinput/R$d.smali | 50 +- .../com/lytefast/flexinput/R$e.smali | 184 +- .../com/lytefast/flexinput/R$f.smali | 8 +- .../com/lytefast/flexinput/R$g.smali | 94 +- .../miguelgaeta/media_picker/R$drawable.smali | 52 +- .../com/miguelgaeta/media_picker/R$id.smali | 128 +- .../miguelgaeta/media_picker/R$string.smali | 14 +- .../com/yalantis/ucrop/R$c.smali | 52 +- .../com/yalantis/ucrop/R$d.smali | 124 +- .../com/yalantis/ucrop/R$g.smali | 14 +- 635 files changed, 9262 insertions(+), 9073 deletions(-) delete mode 100644 com.discord/res/drawable/img_server_nitro_status.xml delete mode 100644 com.discord/res/layout/view_boost_status_no_boosts.xml create mode 100644 com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey.smali create mode 100644 com.discord/smali/com/discord/utilities/textprocessing/MessageUtils$cleanEmojisInQuotedText$1.smali create mode 100644 com.discord/smali/com/discord/utilities/view/extensions/CleanupViewAnimationListener.smali delete mode 100644 com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter$Companion.smali delete mode 100644 com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice$configureUI$10.smali rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$d.smali (100%) rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$e.smali (100%) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 96187a3b5f..40ff030a1a 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1021.apk +apkFileName: com.discord-1022.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1021' - versionName: 10.2.1 + versionCode: '1022' + versionName: 10.2.2 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 8764f6bebe..bec521f6c2 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! # -#Tue Jan 14 03:18:14 UTC 2020 -version_name=10.2.1 +#Thu Jan 16 01:05:19 UTC 2020 +version_name=10.2.2 package_name=com.discord -build_id=c1541b19-19b9-4651-8f2d-5c0350a9d04c -version_code=1021 +build_id=39eaa3d8-5432-4514-93b5-a53c24ca6bb9 +version_code=1022 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index e1019eb18f3f7308b6baabe63cd28d97ce0b652e..534bfa99d5ec54b53b82df4f1a92715629aa568f 100644 GIT binary patch delta 23 fcmZqq$=LFfaf1mbqtRwl&U8b@f1Br8J$D2EZ!rm1 delta 23 fcmZqq$=LFfaf1mbqv2*#&U8b@znkY;J$D2EZypI% diff --git a/com.discord/res/drawable-xhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xhdpi/bg_nitro_classic.png index 481d5dc477838ff4d59c72024c1e5b1dc597a16e..4ae051f19618eb12bfc172bfbf69c09b3eb99a26 100644 GIT binary patch delta 3168 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 F`(JHu8(jbZ diff --git a/com.discord/res/drawable-xxhdpi/bg_cloud_pattern_light.png b/com.discord/res/drawable-xxhdpi/bg_cloud_pattern_light.png index 9ce5bcca7c0b3a12886eaf4edf767424a4e44e66..fae1c35890e7731d36ac283f1106b2ffe77f4d14 100644 GIT binary patch delta 2870 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 delta 2871 zcmW+&dpy(YAK!+gTI(h%R7Z>y9n?m#j)+#Xj*cNUm0RO9n$4X#N2T&(7DLiOxfFBH zm|IG$Fl9?4X5?({_v0S>eZT(uzMjwXdEW2O`}27}-{+xkf^WhRs8g1XK7DzpLT}N+ z#2^87WV*Vyq;t`H-Fc#Hv1sRNqxo9P7XIYe%PR)nrBlOROVkJBUf+*Xrm$JK+ai`I8AcqO~cQ7?2TC!_tHIIk{focF6i;)s3?{bM(yhzB4J zC30-;IQnD?N0(6wdbA4aKdLwl~-)>cuYHt?#u$A637 z)0fkC`_qgTBnqOEvO|$<+o`>u^A=@PYqRz$B~X-4KM7)VSNqUVWAnmDPR&eR$iQ_i zEHBIhlWhitDB7W~2uH?eWOVK|(u4Ok72oTyS2T0j;CbG!P*oLE%;+l3K7CImaI2FG z=~%`Pikp$9mQ)6V0J8Q5Q{>dX!O%LckN$P(mmK!)IT&Pfg8!&_-ETR)B^Y|uNuzMA zzAw>NrUZyIaPN3ZYo0>CH$rv~Z{W%I#kuQ(rS5jLtTf^UU8@X}-NzsIq?v95Y3uiO z1+B0StR@{uQ;Yw-<-23c768-#R?hvora|~x_^NNfd+#(B)!R}wHG#v@| z%J!3pOP552lV0>XBBow83u%nB+lVIwENc`ul+JIeWGSn;EZdiuq5vcqymLZwrmw*p zk?mkrPr-P!xP-;WLjm1y4-?;XHxBYwgI{Rtx?Q%4FzNluTcdJFw8*-x{w=qJ*~s5c z7Ejgo4aGKjapC!=W2I$iq6YVSCtG2=A$WCXRmO^sE);P<$b zw~|U$a9fwSF51c_W*1aqrGjxc&1GjZS+2MO1Ey46PW<$S@{(-7gw@YzZyBs-&W=*a zd@d8!`1{UXS0bNpy1X0#b0_R=we1N1=4|NHBuRNI5y8RKglF?)saFks@R(&^R}UH6)zAVOzg9s z4q^VM1>LUn2441Sd%|ha*i_g72R9RUuXv zfv$*FA(khjxf>0<|bwIxZ(H{QREYFm%y5y|cZd&GO%5 zWi)_imFQ&EqFun0Da9kD1yZJo&RhhE3=9_zX4>Ld;A&P*_L<*VZ@quy>*)#^-B~k0 z0q~NkRXjp(>Rn5IjJ8t$7_~Z@@3R`AXAJ{FalloOadLWC|7rC3GhI(VtFfkVQZ_)Z zA%&~iXJNn^Ly-A!Q|q*`HZ}ZVRBHu zOp#uhKoF%9QnK1-9G%70cTii^cHr4aYmZHf8 zCE4??H2md~0Q&>5(?0wps<9*3q)JoOvoJ(bklbm57R}Dvj0`{jGO7&^aCqSr86`?;6(8h?-~k(v zqtaLUxZ@0|PsIq(1;jMRLO4Op85hqh0Eq4X<@(jX(rN|7HqV1ivFd~jL{_rFM&?kq zQ1eg17@ekbMy9?!Kq1^(>kMo0vg>_Cz$hkHL)bCAXFW_VH1e*|yzr>Uf=$|PfF(NG zf)U#!9FV9ysn&(XT%P<`-A8n7+wfvlx{z~#6xy*<>o0|?g#^59=z2np~i&V9KA^Re( zy39zB4%$fN>7`uOT(`iER}0CIMw*A!%Cf0_8=*(HX`w8EBkp+A=VX&ZLE6_d_#2EK zl1MuJ12@U`QTUXjF|#L-pr>FIYuk{nSVfK2GHSXly+CXNE`OoA-0h9~wDvU}!mC*a z203T0{h1OVg_l940Iy6ifHXL5jHn2F7Y0YT}vOEh{5LzJd- zSUaBQVIMY8NcO-qWj!kDslzUI0-K3Z?lnF%Y|ej@jiO8`k`Dg#OzxdiVJDDh6=2zQ zT_AnC#t!iyu1DN8quC%DrYhrg*jsf#lYX&NiK}6rAOV>ECgG#+%^l%Tpeg*MqJkPG zg+LF0h2LKep9wx*tr?oC1VrMJ0+(x;r&eT&XbzQbh?)cb&3w>{rX7HpYw!BfLV-{| zA@8kAp@<>Mn)yKd6DZ_1`^e93WVDQ!KiGvNLy}j{A z5hb%@WWO8Wg_PB;!}i4E<>iP^>5z=Ws@u)--KnUeq;|{$+prQSuwhwuQ5bhqz1bS>0rPX=`%-|8gP8$vv~<5*n!gtG zw$Ae>7wO=x3BYfio5-ItdRuvwKGze*V`y7G4){eLP~d3{9NLZ>V)!`~(&dBs^9=gW gjy1nx&ku6M-kc-#y2iOyE+W-In diff --git a/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml index aed64e082c..59c11e3083 100644 --- a/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house1_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml index e32a841202..addcf7bb69 100644 --- a/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house2_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml b/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml index d76aa30920..d3aaf580ee 100644 --- a/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml +++ b/com.discord/res/drawable/ic_hypesquad_house3_32dp.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/drawable/img_server_nitro_status.xml b/com.discord/res/drawable/img_server_nitro_status.xml deleted file mode 100644 index 076bcd7880..0000000000 --- a/com.discord/res/drawable/img_server_nitro_status.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 bfcda6fdd9..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/premium_guild_subscription_activated_dialog.xml b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml index e2d21ff8f0..f185e84c4b 100644 --- a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml +++ b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml @@ -3,7 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - + + diff --git a/com.discord/res/layout/view_boost_status_no_boosts.xml b/com.discord/res/layout/view_boost_status_no_boosts.xml deleted file mode 100644 index 80e6eccbe5..0000000000 --- a/com.discord/res/layout/view_boost_status_no_boosts.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_overlay.xml b/com.discord/res/layout/widget_chat_overlay.xml index 62309dd7c6..7379fda158 100644 --- a/com.discord/res/layout/widget_chat_overlay.xml +++ b/com.discord/res/layout/widget_chat_overlay.xml @@ -1,7 +1,7 @@ - + diff --git a/com.discord/res/layout/widget_settings_voice.xml b/com.discord/res/layout/widget_settings_voice.xml index ea8e2c52f9..a0ed4b3e6d 100644 --- a/com.discord/res/layout/widget_settings_voice.xml +++ b/com.discord/res/layout/widget_settings_voice.xml @@ -38,7 +38,6 @@ - diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 504eb35087..41d22004e9 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -1311,7 +1311,8 @@ - + + @@ -1522,7 +1523,6 @@ - @@ -1845,7 +1845,6 @@ - diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index ae0f755dbd..9e935e2fc8 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -499,10 +499,18 @@ %s Server Boosts %s Server Boost + + %s times + %s time + %s times %s time + + %s times + %s time + %s days a day @@ -863,5 +871,5 @@ %s People %s Person - false + false diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 4ecdb91439..f396a175f5 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -3030,53 +3030,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3265,18 +3264,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -3333,15 +3332,15 @@ - - - - - + + + + + - + @@ -3414,8 +3413,8 @@ - - + + @@ -4939,230 +4938,230 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5485,374 +5484,373 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6086,387 +6084,386 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6632,97 +6629,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12196,2852 +12195,2858 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 7182dd127c..49db5fee9e 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1025,7 +1025,7 @@ ONE MORE THING {fixed} OR Collapse Collapse Category - c1541b19-19b9-4651-8f2d-5c0350a9d04c + 39eaa3d8-5432-4514-93b5-a53c24ca6bb9 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -2470,7 +2470,8 @@ Lost: %2$s" Upgrade to Nitro and get %1$s with your subscription! Learn more about Discord Nitro Server Boosts start at **%1$s**. - Boosts are **%1$s** $[~~(%2$s)~~](originalPriceHook). + Boosts are **%1$s** $[~~(%2$s)~~](originalPriceHook). + Boosts are **%1$s** %2$s. "Thanks for being a Nitro Classic member. You get a %1$s discount on Server Boosts. Boosts are **%2$s** %3$s." @@ -2490,7 +2491,12 @@ Boosts are **%3$s** $[(%4$s)](originalPriceHook)." Nice! "Boost success! -You've succesfully Boosted %1$s **%2$s**." +You've successfully Boosted %1$s **%2$s**." + "Boost success! + +You've succesfully Boosted the server **%1$s**." + Boost success! + "You've successfully Boosted %1$s **%2$s**." "Sorry, we don't currently support buying Boosts with a [subscription through Apple](%1$s)." Server Boost(s) You get a discount as part of your **%1$s** subscription! @@ -2504,6 +2510,11 @@ You've succesfully Boosted %1$s **%2$s**." "Boost transfer success! You've Boosted %1$s." + "Boost transfer success! + +You've Boosted the server." + Boost transfer success!. + "You've Boosted %1$s." But no worries! Check back later to see if things smooth out. Please check back in a bit as we make more space. Unavailable @@ -3777,7 +3788,6 @@ To keep your sub, go to Settings and update your payment." Server Boost Status %1$s "(You've Boosted this server %1$s)" - "For each level achieved, you'll help unlock perks for everyone in this server. These perks are only in effect within the server. [Learn more about Server Boosting.](%1$s)" **%1$s/%2$s** Boosts Manage your Server Boosts in [User Settings](onUserSettingsTap). Manage your Boost diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index eaaa48753b..e9399e4a7a 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -929,8 +929,9 @@ true