From 823d77af6545bf8814e63c94ffe0351fd33c3a7c Mon Sep 17 00:00:00 2001 From: Juby210 Date: Fri, 1 Oct 2021 08:27:41 +0200 Subject: [PATCH] 95.5 - Alpha (95205) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/a/d/j.java | 3 +- .../events/TrackVideoInputToggled.java | 15 +- .../GuildRoleSubscriptionGroupListing.java | 24 +- ...ndleGuildRoleSubscriptionGroupFetch$1.java | 12 +- .../stores/StoreGuildRoleSubscriptions.java | 6 +- .../WidgetGuildRoleSubscriptionPlanSetup.java | 2 +- ...WidgetCreateGuildRoleSubscriptionTier.java | 2 +- ...RoleSubscriptionTierBenefit$guildId$2.java | 3 +- ...idgetGuildRoleSubscriptionTierBenefit.java | 3 +- ...riptionTierBenefits$benefitListType$2.java | 13 +- ...oleSubscriptionTierBenefits$guildId$2.java | 7 +- ...SubscriptionTierBenefits$hideHeader$2.java | 7 +- ...dgetGuildRoleSubscriptionTierBenefits.java | 3 +- .../tier/model/Benefit.java | 91 +- ...EventDetailsBottomSheet$configureUi$2.java | 2 +- ...etailsExtrasBottomSheet$configureUi$2.java | 2 +- ...getGuildScheduledEventListBottomSheet.java | 2 +- ...dScheduledEventSettings$onViewBound$9.java | 2 +- .../WidgetPreviewGuildScheduledEvent.java | 18 +- ...ettingsGuildRoleSubscriptionViewModel.java | 2 +- ...uildRoleSubscriptionEditTierViewModel.java | 6 +- ...ubscriptionEditTierBenefits$guildId$2.java | 7 +- ...GuildRoleSubscriptionEditTierBenefits.java | 2 +- ...ildRoleSubscriptionEditTier$guildId$2.java | 3 +- ...dRoleSubscriptionEditTier$viewModel$2.java | 2 +- ...SettingsGuildRoleSubscriptionEditTier.java | 3 +- .../widgets/settings/WidgetSettings.java | 2 +- .../start/WidgetModeratorStartStage.java | 2 +- ...n$configureEventPrompt$onStartEvent$1.java | 2 +- .../WidgetVoiceBottomSheet$onResume$2.java | 2 +- app/src/main/res/values-ar-rXB/plurals.xml | 12 +- app/src/main/res/values-ar-rXB/strings.xml | 28 +- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rXA/plurals.xml | 12 +- app/src/main/res/values-en-rXA/strings.xml | 28 +- app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv-rSE/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/plurals.xml | 12 +- app/src/main/res/values/public.xml | 12228 ++++++++-------- app/src/main/res/values/strings.xml | 30 +- 67 files changed, 6326 insertions(+), 6308 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index abf4baa1a8..8369bf534a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 95204 - versionName "95.4 - Alpha" + versionCode 95205 + versionName "95.5 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 47e5d894fe..2e8c7ab3f5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/d/j.java b/app/src/main/java/c/a/d/j.java index a66ddb8451..67602f12fe 100644 --- a/app/src/main/java/c/a/d/j.java +++ b/app/src/main/java/c/a/d/j.java @@ -32,6 +32,7 @@ import com.discord.widgets.auth.WidgetOauth2Authorize; import com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung; import com.discord.widgets.channels.permissions.WidgetChannelSettingsEditPermissions; import com.discord.widgets.channels.permissions.WidgetChannelSettingsPermissionsOverview; +import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventSettings; import com.discord.widgets.nux.WidgetNuxChannelPrompt; import com.discord.widgets.servers.WidgetServerNotifications; import com.discord.widgets.servers.WidgetServerSettingsBans; @@ -88,7 +89,7 @@ public final class j { /* renamed from: c reason: collision with root package name */ public static final List> f46c = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetOauth2Authorize.class), a0.getOrCreateKotlinClass(WidgetOauth2AuthorizeSamsung.class)}); - public static final List> d = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetSettingsAccount.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountBackupCodes.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountChangePassword.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountUsernameEdit.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountEmailEdit.class), a0.getOrCreateKotlinClass(WidgetUserPasswordVerify.class), a0.getOrCreateKotlinClass(WidgetEnableMFASteps.class), a0.getOrCreateKotlinClass(WidgetSettingsAppearance.class), a0.getOrCreateKotlinClass(WidgetSettingsBehavior.class), a0.getOrCreateKotlinClass(WidgetSettingsLanguage.class), a0.getOrCreateKotlinClass(WidgetSettingsMedia.class), a0.getOrCreateKotlinClass(WidgetSettingsPremium.class), a0.getOrCreateKotlinClass(WidgetSettingsNotifications.class), a0.getOrCreateKotlinClass(WidgetSettingsUserConnections.class), a0.getOrCreateKotlinClass(WidgetSettingsVoice.class), a0.getOrCreateKotlinClass(WidgetSettingsPrivacy.class), a0.getOrCreateKotlinClass(WidgetSettingsAuthorizedApps.class), a0.getOrCreateKotlinClass(WidgetServerNotifications.class), a0.getOrCreateKotlinClass(WidgetServerSettingsOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsChannels.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditMember.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditRole.class), a0.getOrCreateKotlinClass(WidgetServerSettingsIntegrations.class), a0.getOrCreateKotlinClass(WidgetServerSettingsModeration.class), a0.getOrCreateKotlinClass(WidgetServerSettingsVanityUrl.class), a0.getOrCreateKotlinClass(WidgetServerSettingsSecurity.class), a0.getOrCreateKotlinClass(WidgetServerSettingsMembers.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojis.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojisEdit.class), a0.getOrCreateKotlinClass(WidgetServerSettingsRoles.class), a0.getOrCreateKotlinClass(WidgetServerSettingsInstantInvites.class), a0.getOrCreateKotlinClass(WidgetServerSettingsBans.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsEditPermissions.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsPermissionsOverview.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterIdentity.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterAccountInformation.class), a0.getOrCreateKotlinClass(WidgetAuthBirthday.class), a0.getOrCreateKotlinClass(WidgetAuthAgeGated.class), a0.getOrCreateKotlinClass(WidgetAuthLogin.class), a0.getOrCreateKotlinClass(WidgetAuthPhoneVerify.class), a0.getOrCreateKotlinClass(WidgetAuthResetPassword.class), a0.getOrCreateKotlinClass(WidgetSettingsDeveloper.class), a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsers.class), a0.getOrCreateKotlinClass(WidgetNuxChannelPrompt.class), a0.getOrCreateKotlinClass(WidgetChoosePlan.class), a0.getOrCreateKotlinClass(WidgetServerSettingsCommunityOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunitySteps.class)}); + public static final List> d = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetSettingsAccount.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountBackupCodes.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountChangePassword.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountUsernameEdit.class), a0.getOrCreateKotlinClass(WidgetSettingsAccountEmailEdit.class), a0.getOrCreateKotlinClass(WidgetUserPasswordVerify.class), a0.getOrCreateKotlinClass(WidgetEnableMFASteps.class), a0.getOrCreateKotlinClass(WidgetSettingsAppearance.class), a0.getOrCreateKotlinClass(WidgetSettingsBehavior.class), a0.getOrCreateKotlinClass(WidgetSettingsLanguage.class), a0.getOrCreateKotlinClass(WidgetSettingsMedia.class), a0.getOrCreateKotlinClass(WidgetSettingsPremium.class), a0.getOrCreateKotlinClass(WidgetSettingsNotifications.class), a0.getOrCreateKotlinClass(WidgetSettingsUserConnections.class), a0.getOrCreateKotlinClass(WidgetSettingsVoice.class), a0.getOrCreateKotlinClass(WidgetSettingsPrivacy.class), a0.getOrCreateKotlinClass(WidgetSettingsAuthorizedApps.class), a0.getOrCreateKotlinClass(WidgetServerNotifications.class), a0.getOrCreateKotlinClass(WidgetServerSettingsOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsChannels.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditMember.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEditRole.class), a0.getOrCreateKotlinClass(WidgetServerSettingsIntegrations.class), a0.getOrCreateKotlinClass(WidgetServerSettingsModeration.class), a0.getOrCreateKotlinClass(WidgetServerSettingsVanityUrl.class), a0.getOrCreateKotlinClass(WidgetServerSettingsSecurity.class), a0.getOrCreateKotlinClass(WidgetServerSettingsMembers.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojis.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEmojisEdit.class), a0.getOrCreateKotlinClass(WidgetServerSettingsRoles.class), a0.getOrCreateKotlinClass(WidgetServerSettingsInstantInvites.class), a0.getOrCreateKotlinClass(WidgetServerSettingsBans.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsEditPermissions.class), a0.getOrCreateKotlinClass(WidgetChannelSettingsPermissionsOverview.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterIdentity.class), a0.getOrCreateKotlinClass(WidgetAuthRegisterAccountInformation.class), a0.getOrCreateKotlinClass(WidgetAuthBirthday.class), a0.getOrCreateKotlinClass(WidgetAuthAgeGated.class), a0.getOrCreateKotlinClass(WidgetAuthLogin.class), a0.getOrCreateKotlinClass(WidgetAuthPhoneVerify.class), a0.getOrCreateKotlinClass(WidgetAuthResetPassword.class), a0.getOrCreateKotlinClass(WidgetSettingsDeveloper.class), a0.getOrCreateKotlinClass(WidgetSettingsBlockedUsers.class), a0.getOrCreateKotlinClass(WidgetNuxChannelPrompt.class), a0.getOrCreateKotlinClass(WidgetChoosePlan.class), a0.getOrCreateKotlinClass(WidgetServerSettingsCommunityOverview.class), a0.getOrCreateKotlinClass(WidgetServerSettingsEnableCommunitySteps.class), a0.getOrCreateKotlinClass(WidgetGuildScheduledEventSettings.class)}); public static final List> e = n.listOf((Object[]) new c[]{a0.getOrCreateKotlinClass(WidgetUserAccountVerify.class), a0.getOrCreateKotlinClass(WidgetUserEmailVerify.class), a0.getOrCreateKotlinClass(WidgetUserEmailUpdate.class), a0.getOrCreateKotlinClass(WidgetUserPhoneManage.class), a0.getOrCreateKotlinClass(WidgetUserPhoneVerify.class), a0.getOrCreateKotlinClass(WidgetUserPasswordVerify.class)}); public static final List> f = m.listOf(a0.getOrCreateKotlinClass(WidgetTabsHost.class)); public static final j g = new j(); diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackVideoInputToggled.java b/app/src/main/java/com/discord/analytics/generated/events/TrackVideoInputToggled.java index cc8e905d98..5a022ab82c 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackVideoInputToggled.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackVideoInputToggled.java @@ -19,6 +19,7 @@ public final class TrackVideoInputToggled implements AnalyticsSchema, TrackBaseR private final Long guildId = null; private final CharSequence mediaSessionId = null; private final CharSequence nonce = null; + private final Boolean previewEnabled = null; private final Long shareGameId = null; private final CharSequence shareGameName = null; private final CharSequence soundshareSession = null; @@ -45,7 +46,7 @@ public final class TrackVideoInputToggled implements AnalyticsSchema, TrackBaseR return false; } TrackVideoInputToggled trackVideoInputToggled = (TrackVideoInputToggled) obj; - return m.areEqual(this.channelId, trackVideoInputToggled.channelId) && m.areEqual(this.channelType, trackVideoInputToggled.channelType) && m.areEqual(this.guildId, trackVideoInputToggled.guildId) && m.areEqual(this.nonce, trackVideoInputToggled.nonce) && m.areEqual(this.voiceStateCount, trackVideoInputToggled.voiceStateCount) && m.areEqual(this.videoStreamCount, trackVideoInputToggled.videoStreamCount) && m.areEqual(this.videoEnabled, trackVideoInputToggled.videoEnabled) && m.areEqual(this.gameName, trackVideoInputToggled.gameName) && m.areEqual(this.gameExeName, trackVideoInputToggled.gameExeName) && m.areEqual(this.gameId, trackVideoInputToggled.gameId) && m.areEqual(this.videoInputType, trackVideoInputToggled.videoInputType) && m.areEqual(this.videoInputResolution, trackVideoInputToggled.videoInputResolution) && m.areEqual(this.videoInputFrameRate, trackVideoInputToggled.videoInputFrameRate) && m.areEqual(this.soundshareSession, trackVideoInputToggled.soundshareSession) && m.areEqual(this.shareGameName, trackVideoInputToggled.shareGameName) && m.areEqual(this.shareGameId, trackVideoInputToggled.shareGameId) && m.areEqual(this.gamePlatform, trackVideoInputToggled.gamePlatform) && m.areEqual(this.source, trackVideoInputToggled.source) && m.areEqual(this.videoToggleSource, trackVideoInputToggled.videoToggleSource) && m.areEqual(this.mediaSessionId, trackVideoInputToggled.mediaSessionId) && m.areEqual(this.enabledInputs, trackVideoInputToggled.enabledInputs); + return m.areEqual(this.channelId, trackVideoInputToggled.channelId) && m.areEqual(this.channelType, trackVideoInputToggled.channelType) && m.areEqual(this.guildId, trackVideoInputToggled.guildId) && m.areEqual(this.nonce, trackVideoInputToggled.nonce) && m.areEqual(this.voiceStateCount, trackVideoInputToggled.voiceStateCount) && m.areEqual(this.videoStreamCount, trackVideoInputToggled.videoStreamCount) && m.areEqual(this.videoEnabled, trackVideoInputToggled.videoEnabled) && m.areEqual(this.gameName, trackVideoInputToggled.gameName) && m.areEqual(this.gameExeName, trackVideoInputToggled.gameExeName) && m.areEqual(this.gameId, trackVideoInputToggled.gameId) && m.areEqual(this.videoInputType, trackVideoInputToggled.videoInputType) && m.areEqual(this.videoInputResolution, trackVideoInputToggled.videoInputResolution) && m.areEqual(this.videoInputFrameRate, trackVideoInputToggled.videoInputFrameRate) && m.areEqual(this.soundshareSession, trackVideoInputToggled.soundshareSession) && m.areEqual(this.shareGameName, trackVideoInputToggled.shareGameName) && m.areEqual(this.shareGameId, trackVideoInputToggled.shareGameId) && m.areEqual(this.gamePlatform, trackVideoInputToggled.gamePlatform) && m.areEqual(this.source, trackVideoInputToggled.source) && m.areEqual(this.videoToggleSource, trackVideoInputToggled.videoToggleSource) && m.areEqual(this.mediaSessionId, trackVideoInputToggled.mediaSessionId) && m.areEqual(this.enabledInputs, trackVideoInputToggled.enabledInputs) && m.areEqual(this.previewEnabled, trackVideoInputToggled.previewEnabled); } public int hashCode() { @@ -91,10 +92,12 @@ public final class TrackVideoInputToggled implements AnalyticsSchema, TrackBaseR CharSequence charSequence10 = this.mediaSessionId; int hashCode20 = (hashCode19 + (charSequence10 != null ? charSequence10.hashCode() : 0)) * 31; List list = this.enabledInputs; - if (list != null) { - i = list.hashCode(); + int hashCode21 = (hashCode20 + (list != null ? list.hashCode() : 0)) * 31; + Boolean bool2 = this.previewEnabled; + if (bool2 != null) { + i = bool2.hashCode(); } - return hashCode20 + i; + return hashCode21 + i; } public String toString() { @@ -139,6 +142,8 @@ public final class TrackVideoInputToggled implements AnalyticsSchema, TrackBaseR P.append(", mediaSessionId="); P.append(this.mediaSessionId); P.append(", enabledInputs="); - return a.J(P, this.enabledInputs, ")"); + P.append(this.enabledInputs); + P.append(", previewEnabled="); + return a.C(P, this.previewEnabled, ")"); } } diff --git a/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionGroupListing.java b/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionGroupListing.java index 48ef51be77..8cd7d7e8c5 100644 --- a/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionGroupListing.java +++ b/app/src/main/java/com/discord/api/guildrolesubscription/GuildRoleSubscriptionGroupListing.java @@ -13,8 +13,8 @@ public final class GuildRoleSubscriptionGroupListing { /* renamed from: id reason: collision with root package name */ private final long f1576id; private final long imageAssetId; - private final List subscriptionListingIds; private final List subscriptionListings; + private final List subscriptionListingsIds; public GuildRoleSubscriptionGroupListing(long j, long j2, long j3, long j4, String str, List list, List list2) { this.f1576id = j; @@ -22,7 +22,7 @@ public final class GuildRoleSubscriptionGroupListing { this.applicationId = j3; this.imageAssetId = j4; this.description = str; - this.subscriptionListingIds = list; + this.subscriptionListingsIds = list; this.subscriptionListings = list2; } @@ -34,7 +34,7 @@ public final class GuildRoleSubscriptionGroupListing { List list3 = null; String str2 = (i & 16) != 0 ? guildRoleSubscriptionGroupListing.description : null; if ((i & 32) != 0) { - list3 = guildRoleSubscriptionGroupListing.subscriptionListingIds; + list3 = guildRoleSubscriptionGroupListing.subscriptionListingsIds; } List list4 = (i & 64) != 0 ? guildRoleSubscriptionGroupListing.subscriptionListings : list2; Objects.requireNonNull(guildRoleSubscriptionGroupListing); @@ -65,17 +65,17 @@ public final class GuildRoleSubscriptionGroupListing { return false; } GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing = (GuildRoleSubscriptionGroupListing) obj; - return this.f1576id == guildRoleSubscriptionGroupListing.f1576id && this.guildId == guildRoleSubscriptionGroupListing.guildId && this.applicationId == guildRoleSubscriptionGroupListing.applicationId && this.imageAssetId == guildRoleSubscriptionGroupListing.imageAssetId && m.areEqual(this.description, guildRoleSubscriptionGroupListing.description) && m.areEqual(this.subscriptionListingIds, guildRoleSubscriptionGroupListing.subscriptionListingIds) && m.areEqual(this.subscriptionListings, guildRoleSubscriptionGroupListing.subscriptionListings); + return this.f1576id == guildRoleSubscriptionGroupListing.f1576id && this.guildId == guildRoleSubscriptionGroupListing.guildId && this.applicationId == guildRoleSubscriptionGroupListing.applicationId && this.imageAssetId == guildRoleSubscriptionGroupListing.imageAssetId && m.areEqual(this.description, guildRoleSubscriptionGroupListing.description) && m.areEqual(this.subscriptionListingsIds, guildRoleSubscriptionGroupListing.subscriptionListingsIds) && m.areEqual(this.subscriptionListings, guildRoleSubscriptionGroupListing.subscriptionListings); } - public final List f() { - return this.subscriptionListingIds; - } - - public final List g() { + public final List f() { return this.subscriptionListings; } + public final List g() { + return this.subscriptionListingsIds; + } + public int hashCode() { long j = this.f1576id; long j2 = this.guildId; @@ -85,7 +85,7 @@ public final class GuildRoleSubscriptionGroupListing { String str = this.description; int i2 = 0; int hashCode = (i + (str != null ? str.hashCode() : 0)) * 31; - List list = this.subscriptionListingIds; + List list = this.subscriptionListingsIds; int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31; List list2 = this.subscriptionListings; if (list2 != null) { @@ -105,8 +105,8 @@ public final class GuildRoleSubscriptionGroupListing { P.append(this.imageAssetId); P.append(", description="); P.append(this.description); - P.append(", subscriptionListingIds="); - P.append(this.subscriptionListingIds); + P.append(", subscriptionListingsIds="); + P.append(this.subscriptionListingsIds); P.append(", subscriptionListings="); return a.J(P, this.subscriptionListings, ")"); } diff --git a/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions$handleGuildRoleSubscriptionGroupFetch$1.java b/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions$handleGuildRoleSubscriptionGroupFetch$1.java index 80259b9f28..bdaa4da838 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions$handleGuildRoleSubscriptionGroupFetch$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions$handleGuildRoleSubscriptionGroupFetch$1.java @@ -31,21 +31,21 @@ public final class StoreGuildRoleSubscriptions$handleGuildRoleSubscriptionGroupF StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionTiers$p(this.this$0).remove(Long.valueOf(this.$guildId)); } else { StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionGroups$p(this.this$0).put(Long.valueOf(this.$guildId), new StoreGuildRoleSubscriptions.GuildRoleSubscriptionGroupState.Loaded(GuildRoleSubscriptionGroupListing.a(this.$guildRoleSubscriptionGroupListing, 0, 0, 0, 0, null, null, null, 63))); - List f = this.$guildRoleSubscriptionGroupListing.f(); - if (f == null || f.isEmpty()) { + List g = this.$guildRoleSubscriptionGroupListing.g(); + if (g == null || g.isEmpty()) { StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionTiers$p(this.this$0).remove(Long.valueOf(this.$guildId)); } else { Map map = (Map) StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionTiers$p(this.this$0).get(Long.valueOf(this.$guildId)); if (map == null) { map = new LinkedHashMap(); } - List g = this.$guildRoleSubscriptionGroupListing.g(); - if (g != null) { - for (GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing : g) { + List f = this.$guildRoleSubscriptionGroupListing.f(); + if (f != null) { + for (GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing : f) { map.put(Long.valueOf(guildRoleSubscriptionTierListing.c()), guildRoleSubscriptionTierListing); } } - StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionTiers$p(this.this$0).put(Long.valueOf(this.$guildRoleSubscriptionGroupListing.d()), map); + StoreGuildRoleSubscriptions.access$getGuildRoleSubscriptionTiers$p(this.this$0).put(Long.valueOf(this.$guildId), map); } } this.this$0.markChanged(); diff --git a/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions.java b/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions.java index 6fa49dbc74..1912a1856b 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions.java +++ b/app/src/main/java/com/discord/stores/StoreGuildRoleSubscriptions.java @@ -299,7 +299,7 @@ public final class StoreGuildRoleSubscriptions extends StoreV2 { public final GuildRoleSubscriptionGroupState getGuildRoleSubscriptionState(long j) { ArrayList arrayList; - List f; + List g; GuildRoleSubscriptionGroupState guildRoleSubscriptionGroupState = (GuildRoleSubscriptionGroupState) this.guildRoleSubscriptionGroupsSnapshot.get(Long.valueOf(j)); GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing = null; if (guildRoleSubscriptionGroupState == null) { @@ -309,11 +309,11 @@ public final class StoreGuildRoleSubscriptions extends StoreV2 { return guildRoleSubscriptionGroupState; } GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing2 = ((GuildRoleSubscriptionGroupState.Loaded) guildRoleSubscriptionGroupState).getGuildRoleSubscriptionGroupListing(); - if (guildRoleSubscriptionGroupListing2 == null || (f = guildRoleSubscriptionGroupListing2.f()) == null) { + if (guildRoleSubscriptionGroupListing2 == null || (g = guildRoleSubscriptionGroupListing2.g()) == null) { arrayList = n.emptyList(); } else { ArrayList arrayList2 = new ArrayList(); - for (Number number : f) { + for (Number number : g) { long longValue = number.longValue(); Map map = (Map) this.guildRoleSubscriptionTiersSnapshot.get(Long.valueOf(j)); GuildRoleSubscriptionTierListing guildRoleSubscriptionTierListing = map != null ? (GuildRoleSubscriptionTierListing) map.get(Long.valueOf(longValue)) : null; diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java index 525ed7b0c2..5d499e7c8c 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java @@ -134,7 +134,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(getGuildId()))), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), false, false, false, 374)}); + List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionPlanDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$2(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId()))), new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$steps$5(this), false, false, false, 374)}); StepsView stepsView = getBinding().b; StepsView.d dVar = new StepsView.d(this, listOf); WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 widgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1 = new WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1(this, listOf); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java index 25d1d38467..618d1e3bc6 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java @@ -149,7 +149,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.CHANNEL)), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$2(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.INTANGIBLE)), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$5(this), false, false, false, 374)}); + List listOf = n.listOf((Object[]) new StepsView.b.a[]{new StepsView.b.a(WidgetGuildRoleSubscriptionTierDetails.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$1(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.CHANNEL)), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$2(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierBenefits.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(getGuildId())), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, GuildRoleSubscriptionTierBenefitListType.INTANGIBLE)), new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$3(this), null, null, false, false, false, 460), new StepsView.b.a(WidgetGuildRoleSubscriptionTierDesign.class, R.string.guild_role_subscription_create_tier_continue, 0, 0, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$4(this), null, null, false, false, false, 476), new StepsView.b.a(WidgetGuildRoleSubscriptionTierReview.class, 0, 0, R.string.guild_role_subscription_plan_finish, null, null, null, new WidgetCreateGuildRoleSubscriptionTier$onViewBound$steps$5(this), false, false, false, 374)}); StepsView stepsView = getBinding().b; StepsView.d dVar = new StepsView.d(this, listOf); WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 widgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1 = new WidgetCreateGuildRoleSubscriptionTier$onViewBound$$inlined$apply$lambda$1(this, listOf); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$guildId$2.java index f4d972326a..03823789d0 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$guildId$2.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$guildId$2.java @@ -1,6 +1,5 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits; -import com.discord.widgets.servers.WidgetServerSettingsChannels; import d0.z.d.o; import kotlin.jvm.functions.Function0; /* compiled from: WidgetGuildRoleSubscriptionTierBenefit.kt */ @@ -18,6 +17,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefit$guildId$2 extends o im @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Long mo1invoke() { - return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1); + return this.this$0.getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_GUILD_ID", -1); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java index 901ad2dc80..3847773178 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit.java @@ -51,7 +51,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefit extends AppFragment { public static final Companion Companion = new Companion(null); private static final String INTENT_EXTRA_BENEFIT_TYPE = "INTENT_EXTRA_BENEFIT_TYPE"; private static final String INTENT_EXTRA_EXISTING_BENEFIT = "INTENT_EXTRA_EXISTING_BENEFIT"; - private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_TIER_NAME = "INTENT_EXTRA_TIER_NAME"; private static final int MAX_EMOJI_SIZE = 64; private static final String REQUEST_KEY_CHANNEL_PICKER = "REQUEST_KEY_CHANNEL_PICKER"; @@ -84,7 +83,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefit extends AppFragment { m.checkNotNullParameter(guildRoleSubscriptionBenefitType, "benefitType"); j jVar = j.g; Intent intent = new Intent(); - intent.putExtra("INTENT_EXTRA_GUILD_ID", j); + intent.putExtra("com.discord.intent.extra.EXTRA_GUILD_ID", j); intent.putExtra(WidgetGuildRoleSubscriptionTierBenefit.INTENT_EXTRA_EXISTING_BENEFIT, benefit); intent.putExtra(WidgetGuildRoleSubscriptionTierBenefit.INTENT_EXTRA_BENEFIT_TYPE, guildRoleSubscriptionBenefitType); intent.putExtra(WidgetGuildRoleSubscriptionTierBenefit.INTENT_EXTRA_TIER_NAME, str); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$benefitListType$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$benefitListType$2.java index d0697cce6e..a1479f4efa 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$benefitListType$2.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$benefitListType$2.java @@ -1,6 +1,5 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits; -import android.os.Bundle; import d0.z.d.o; import java.io.Serializable; import kotlin.jvm.functions.Function0; @@ -17,13 +16,11 @@ public final class WidgetGuildRoleSubscriptionTierBenefits$benefitListType$2 ext @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final GuildRoleSubscriptionTierBenefitListType mo1invoke() { - Bundle arguments = this.this$0.getArguments(); - GuildRoleSubscriptionTierBenefitListType guildRoleSubscriptionTierBenefitListType = null; - Serializable serializable = arguments != null ? arguments.getSerializable(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE) : null; - if (serializable instanceof GuildRoleSubscriptionTierBenefitListType) { - guildRoleSubscriptionTierBenefitListType = serializable; + Serializable serializable = this.this$0.requireArguments().getSerializable(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE); + if (!(serializable instanceof GuildRoleSubscriptionTierBenefitListType)) { + serializable = null; } - GuildRoleSubscriptionTierBenefitListType guildRoleSubscriptionTierBenefitListType2 = guildRoleSubscriptionTierBenefitListType; - return guildRoleSubscriptionTierBenefitListType2 != null ? guildRoleSubscriptionTierBenefitListType2 : GuildRoleSubscriptionTierBenefitListType.ALL; + GuildRoleSubscriptionTierBenefitListType guildRoleSubscriptionTierBenefitListType = (GuildRoleSubscriptionTierBenefitListType) serializable; + return guildRoleSubscriptionTierBenefitListType != null ? guildRoleSubscriptionTierBenefitListType : GuildRoleSubscriptionTierBenefitListType.ALL; } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java index 5227e93708..b6f4f79d30 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$guildId$2.java @@ -1,6 +1,5 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits; -import android.os.Bundle; import d0.z.d.o; import kotlin.jvm.functions.Function0; /* compiled from: WidgetGuildRoleSubscriptionTierBenefits.kt */ @@ -18,10 +17,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefits$guildId$2 extends o i @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Long mo1invoke() { - Bundle arguments = this.this$0.getArguments(); - if (arguments != null) { - return arguments.getLong(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, 0); - } - return null; + return this.this$0.requireArguments().getLong("com.discord.intent.extra.EXTRA_GUILD_ID", -1); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$hideHeader$2.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$hideHeader$2.java index 4d9634d86d..b3d0112d9d 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$hideHeader$2.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits$hideHeader$2.java @@ -1,6 +1,5 @@ package com.discord.widgets.guild_role_subscriptions.tier.create.benefits; -import android.os.Bundle; import d0.z.d.o; import kotlin.jvm.functions.Function0; /* compiled from: WidgetGuildRoleSubscriptionTierBenefits.kt */ @@ -18,10 +17,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefits$hideHeader$2 extends @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Boolean mo1invoke() { - Bundle arguments = this.this$0.getArguments(); - if (arguments != null) { - return arguments.getBoolean("INTENT_EXTRA_BENEFITS_HIDE_HEADER", false); - } - return null; + return this.this$0.requireArguments().getBoolean("INTENT_EXTRA_BENEFITS_HIDE_HEADER", false); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java index db56ebaa11..1144e518fb 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java @@ -39,7 +39,6 @@ import kotlin.reflect.KProperty; public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetGuildRoleSubscriptionTierBenefits.class, "binding", "getBinding()Lcom/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding;", 0)}; public static final Companion Companion = new Companion(null); - public static final String INTENT_EXTRA_BENEFITS_GUILD_ID = "INTENT_EXTRA_BENEFITS_GUILD_ID"; private static final String INTENT_EXTRA_BENEFITS_HIDE_HEADER = "INTENT_EXTRA_BENEFITS_HIDE_HEADER"; public static final String INTENT_EXTRA_BENEFIT_LIST_TYPE = "INTENT_EXTRA_BENEFIT_LIST_TYPE"; private final ActivityResultLauncher benefitLauncher; @@ -71,7 +70,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment { public final WidgetGuildRoleSubscriptionTierBenefits newInstance(long j, GuildRoleSubscriptionTierBenefitListType guildRoleSubscriptionTierBenefitListType, boolean z2) { m.checkNotNullParameter(guildRoleSubscriptionTierBenefitListType, "benefitListType"); WidgetGuildRoleSubscriptionTierBenefits widgetGuildRoleSubscriptionTierBenefits = new WidgetGuildRoleSubscriptionTierBenefits(); - widgetGuildRoleSubscriptionTierBenefits.setArguments(BundleKt.bundleOf(o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_GUILD_ID, Long.valueOf(j)), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_HIDE_HEADER, Boolean.valueOf(z2)), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, guildRoleSubscriptionTierBenefitListType))); + widgetGuildRoleSubscriptionTierBenefits.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(j)), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFITS_HIDE_HEADER, Boolean.valueOf(z2)), o.to(WidgetGuildRoleSubscriptionTierBenefits.INTENT_EXTRA_BENEFIT_LIST_TYPE, guildRoleSubscriptionTierBenefitListType))); return widgetGuildRoleSubscriptionTierBenefits; } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java index afb90619e9..5985cba0b3 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/model/Benefit.java @@ -105,16 +105,15 @@ public abstract class Benefit implements Parcelable { return 0; } - @Override // java.lang.Object + @Override // com.discord.widgets.guild_role_subscriptions.tier.model.Benefit, java.lang.Object public boolean equals(Object obj) { - if (this == obj) { - return true; + if (Benefit.super.equals(obj) && (obj instanceof ChannelBenefit)) { + ChannelBenefit channelBenefit = (ChannelBenefit) obj; + if (m.areEqual(this.channelIconResId, channelBenefit.channelIconResId) && this.channelId == channelBenefit.channelId) { + return true; + } } - if (!(obj instanceof ChannelBenefit)) { - return false; - } - ChannelBenefit channelBenefit = (ChannelBenefit) obj; - return m.areEqual(getName(), channelBenefit.getName()) && m.areEqual(getEmoji(), channelBenefit.getEmoji()) && m.areEqual(getDescription(), channelBenefit.getDescription()) && m.areEqual(this.channelIconResId, channelBenefit.channelIconResId) && this.channelId == channelBenefit.channelId; + return false; } public final Integer getChannelIconResId() { @@ -142,18 +141,15 @@ public abstract class Benefit implements Parcelable { @Override // java.lang.Object public int hashCode() { - String name = getName(); - int i = 0; - int hashCode = (name != null ? name.hashCode() : 0) * 31; - Emoji emoji = getEmoji(); - int hashCode2 = (hashCode + (emoji != null ? emoji.hashCode() : 0)) * 31; + int hashCode = (getEmoji().hashCode() + (getName().hashCode() * 31)) * 31; String description = getDescription(); - int hashCode3 = (hashCode2 + (description != null ? description.hashCode() : 0)) * 31; + int i = 0; + int hashCode2 = (hashCode + (description != null ? description.hashCode() : 0)) * 31; Integer num = this.channelIconResId; if (num != null) { - i = num.hashCode(); + i = num.intValue(); } - return b.a(this.channelId) + ((hashCode3 + i) * 31); + return b.a(this.channelId) + ((hashCode2 + i) * 31); } @Override // com.discord.widgets.guild_role_subscriptions.tier.model.Benefit @@ -280,16 +276,9 @@ public abstract class Benefit implements Parcelable { return 0; } - @Override // java.lang.Object + @Override // com.discord.widgets.guild_role_subscriptions.tier.model.Benefit, java.lang.Object public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof IntangibleBenefit)) { - return false; - } - IntangibleBenefit intangibleBenefit = (IntangibleBenefit) obj; - return m.areEqual(getName(), intangibleBenefit.getName()) && m.areEqual(getEmoji(), intangibleBenefit.getEmoji()) && m.areEqual(getDescription(), intangibleBenefit.getDescription()); + return Benefit.super.equals(obj) && (obj instanceof IntangibleBenefit); } @Override // com.discord.widgets.guild_role_subscriptions.tier.model.Benefit @@ -309,16 +298,9 @@ public abstract class Benefit implements Parcelable { @Override // java.lang.Object public int hashCode() { - String name = getName(); - int i = 0; - int hashCode = (name != null ? name.hashCode() : 0) * 31; - Emoji emoji = getEmoji(); - int hashCode2 = (hashCode + (emoji != null ? emoji.hashCode() : 0)) * 31; + int hashCode = (getEmoji().hashCode() + (getName().hashCode() * 31)) * 31; String description = getDescription(); - if (description != null) { - i = description.hashCode(); - } - return hashCode2 + i; + return hashCode + (description != null ? description.hashCode() : 0); } @Override // com.discord.widgets.guild_role_subscriptions.tier.model.Benefit @@ -369,6 +351,47 @@ public abstract class Benefit implements Parcelable { this(); } + @Override // java.lang.Object + public boolean equals(Object obj) { + if (obj instanceof Benefit) { + Benefit benefit = (Benefit) obj; + if (m.areEqual(getName(), benefit.getName()) && m.areEqual(getDescription(), benefit.getDescription())) { + Emoji emoji = getEmoji(); + String str = null; + if (!(emoji instanceof ModelEmojiCustom)) { + emoji = null; + } + ModelEmojiCustom modelEmojiCustom = (ModelEmojiCustom) emoji; + Long valueOf = modelEmojiCustom != null ? Long.valueOf(modelEmojiCustom.getId()) : null; + Emoji emoji2 = benefit.getEmoji(); + if (!(emoji2 instanceof ModelEmojiCustom)) { + emoji2 = null; + } + ModelEmojiCustom modelEmojiCustom2 = (ModelEmojiCustom) emoji2; + if (m.areEqual(valueOf, modelEmojiCustom2 != null ? Long.valueOf(modelEmojiCustom2.getId()) : null)) { + Emoji emoji3 = getEmoji(); + if (!(emoji3 instanceof ModelEmojiUnicode)) { + emoji3 = null; + } + ModelEmojiUnicode modelEmojiUnicode = (ModelEmojiUnicode) emoji3; + String surrogates = modelEmojiUnicode != null ? modelEmojiUnicode.getSurrogates() : null; + Emoji emoji4 = benefit.getEmoji(); + if (!(emoji4 instanceof ModelEmojiUnicode)) { + emoji4 = null; + } + ModelEmojiUnicode modelEmojiUnicode2 = (ModelEmojiUnicode) emoji4; + if (modelEmojiUnicode2 != null) { + str = modelEmojiUnicode2.getSurrogates(); + } + if (m.areEqual(surrogates, str)) { + return true; + } + } + } + } + return false; + } + public abstract String getDescription(); public abstract Emoji getEmoji(); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2.java index ddba7ad2a6..4cea2adb48 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2.java @@ -25,6 +25,6 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2 ext WidgetPreviewGuildScheduledEvent.Companion companion = WidgetPreviewGuildScheduledEvent.Companion; Context requireContext = this.this$0.requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - companion.launch(requireContext, GuildScheduledEventModelKt.toModel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), WidgetGuildScheduledEventDetailsBottomSheet.access$getPreviewLauncher$p(this.this$0)); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(companion, requireContext, GuildScheduledEventModelKt.toModel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), WidgetGuildScheduledEventDetailsBottomSheet.access$getPreviewLauncher$p(this.this$0), false, 16, null); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$2.java index c188447cb5..5aa6a8f9fb 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$2.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$2.java @@ -20,6 +20,6 @@ public final class WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi WidgetPreviewGuildScheduledEvent.Companion companion = WidgetPreviewGuildScheduledEvent.Companion; Context requireContext = this.this$0.requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - companion.launch(requireContext, GuildScheduledEventModelKt.toModel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), WidgetGuildScheduledEventDetailsExtrasBottomSheet.access$getPreviewLauncher$p(this.this$0)); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(companion, requireContext, GuildScheduledEventModelKt.toModel(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(((GuildScheduledEventDetailsViewModel.ViewState.Initialized) this.$viewState).getGuildScheduledEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), WidgetGuildScheduledEventDetailsExtrasBottomSheet.access$getPreviewLauncher$p(this.this$0), false, 16, null); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java index 7152da04bf..2d9d19f761 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventListBottomSheet.java @@ -170,7 +170,7 @@ public final class WidgetGuildScheduledEventListBottomSheet extends AppBottomShe WidgetPreviewGuildScheduledEvent.Companion companion = WidgetPreviewGuildScheduledEvent.Companion; Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - companion.launch(requireContext, GuildScheduledEventModelKt.toModel(event.getEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(event.getEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), this.previewLauncher); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(companion, requireContext, GuildScheduledEventModelKt.toModel(event.getEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(event.getEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), this.previewLauncher, false, 16, null); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$9.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$9.java index c3d75c1d66..1f7bcacef6 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$9.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$9.java @@ -29,7 +29,7 @@ public final class WidgetGuildScheduledEventSettings$onViewBound$9 implements Vi Context requireContext = this.this$0.requireContext(); GuildScheduledEventModel eventModel = access$getCurrentViewState$p.getEventModel(); Long access$getExistingGuildScheduledEventId$p = WidgetGuildScheduledEventSettings.access$getExistingGuildScheduledEventId$p(this.this$0); - companion.launch(requireContext, eventModel, access$getExistingGuildScheduledEventId$p != null ? new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(access$getExistingGuildScheduledEventId$p.longValue(), WidgetPreviewGuildScheduledEvent.Companion.Action.EDIT_EVENT) : null, WidgetGuildScheduledEventSettings.access$getPreviewLauncher$p(this.this$0)); + companion.launch(requireContext, eventModel, access$getExistingGuildScheduledEventId$p != null ? new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(access$getExistingGuildScheduledEventId$p.longValue(), WidgetPreviewGuildScheduledEvent.Companion.Action.EDIT_EVENT) : null, WidgetGuildScheduledEventSettings.access$getPreviewLauncher$p(this.this$0), true); } } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java index e1e99f256b..04d5e17d88 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent.java @@ -19,6 +19,7 @@ import c.a.d.j; import c.d.b.a.a; import com.discord.R; import com.discord.app.AppFragment; +import com.discord.app.AppTransitionActivity; import com.discord.databinding.WidgetPreviewGuildScheduledEventBinding; import com.discord.utilities.dimen.DimenUtils; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -139,16 +140,8 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment { this(); } - /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: com.discord.widgets.guildscheduledevent.WidgetPreviewGuildScheduledEvent$Companion */ - /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ void launch$default(Companion companion, Context context, GuildScheduledEventModel guildScheduledEventModel, ExistingEventData existingEventData, ActivityResultLauncher activityResultLauncher, int i, Object obj) { - if ((i & 4) != 0) { - existingEventData = null; - } - if ((i & 8) != 0) { - activityResultLauncher = null; - } - companion.launch(context, guildScheduledEventModel, existingEventData, activityResultLauncher); + public static /* synthetic */ void launch$default(Companion companion, Context context, GuildScheduledEventModel guildScheduledEventModel, ExistingEventData existingEventData, ActivityResultLauncher activityResultLauncher, boolean z2, int i, Object obj) { + companion.launch(context, guildScheduledEventModel, (i & 4) != 0 ? null : existingEventData, (i & 8) != 0 ? null : activityResultLauncher, (i & 16) != 0 ? false : z2); } /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.guildscheduledevent.WidgetPreviewGuildScheduledEvent$Companion */ @@ -168,7 +161,7 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment { return registerForActivityResult; } - public final void launch(Context context, GuildScheduledEventModel guildScheduledEventModel, ExistingEventData existingEventData, ActivityResultLauncher activityResultLauncher) { + public final void launch(Context context, GuildScheduledEventModel guildScheduledEventModel, ExistingEventData existingEventData, ActivityResultLauncher activityResultLauncher, boolean z2) { m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(guildScheduledEventModel, "eventModel"); Intent intent = new Intent(); @@ -176,6 +169,9 @@ public final class WidgetPreviewGuildScheduledEvent extends AppFragment { if (existingEventData != null) { intent.putExtra(WidgetPreviewGuildScheduledEvent.EXTRA_EXISTING_EVENT_DATA, existingEventData); } + if (z2) { + intent.putExtra("transition", AppTransitionActivity.Transition.TYPE_SLIDE_HORIZONTAL); + } if (activityResultLauncher != null) { j.g.f(context, activityResultLauncher, WidgetPreviewGuildScheduledEvent.class, intent); } else { diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java index cd088fdf7a..317c364248 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java @@ -455,7 +455,7 @@ public final class ServerSettingsGuildRoleSubscriptionViewModel extends AppViewM return; } this.guildRoleSubscriptionGroupListing = guildRoleSubscriptionGroupListing; - updateViewState(new ViewState.Loaded(false, false, guildRoleSubscriptionGroupListing.d(), guildRoleSubscriptionGroupListing.b(), ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.generateServerSettingsGuildRoleSubscriptionTierListItems(guildRoleSubscriptionGroupListing.g(), 3), guildRoleSubscriptionGroupListing.c(), Long.valueOf(guildRoleSubscriptionGroupListing.e()), null, 131, null)); + updateViewState(new ViewState.Loaded(false, false, guildRoleSubscriptionGroupListing.d(), guildRoleSubscriptionGroupListing.b(), ServerSettingsGuildRoleSubscriptionTierListItemGeneratorKt.generateServerSettingsGuildRoleSubscriptionTierListItems(guildRoleSubscriptionGroupListing.f(), 3), guildRoleSubscriptionGroupListing.c(), Long.valueOf(guildRoleSubscriptionGroupListing.e()), null, 131, null)); } else if (guildRoleSubscriptionGroupState instanceof StoreGuildRoleSubscriptions.GuildRoleSubscriptionGroupState.Failed) { updateViewState(ViewState.Failed.INSTANCE); } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java index c3c00575e0..f574aff81a 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java @@ -489,15 +489,15 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends } private final void handleLoadedStoreState(StoreGuildRoleSubscriptions.GuildRoleSubscriptionGroupState.Loaded loaded, Map map, EmojiSet emojiSet) { - List g; + List f; ViewState.Loaded loaded2; int i; Object obj; String str; boolean z2; GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing = loaded.getGuildRoleSubscriptionGroupListing(); - if (!(guildRoleSubscriptionGroupListing == null || (g = guildRoleSubscriptionGroupListing.g()) == null)) { - Iterator it = g.iterator(); + if (!(guildRoleSubscriptionGroupListing == null || (f = guildRoleSubscriptionGroupListing.f()) == null)) { + Iterator it = f.iterator(); while (true) { loaded2 = null; i = 0; diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$guildId$2.java index a76d09d9fc..21db01471d 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$guildId$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits$guildId$2.java @@ -1,5 +1,6 @@ package com.discord.widgets.servers.guild_role_subscription.edit_tier; +import android.os.Bundle; import d0.z.d.o; import kotlin.jvm.functions.Function0; /* compiled from: WidgetGuildRoleSubscriptionEditTierBenefits.kt */ @@ -17,6 +18,10 @@ public final class WidgetGuildRoleSubscriptionEditTierBenefits$guildId$2 extends @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Long mo1invoke() { - return this.this$0.getMostRecentIntent().getLongExtra(WidgetGuildRoleSubscriptionEditTierBenefits.INTENT_EXTRA_EDIT_BENEFITS_GUILD_ID, 0); + Bundle arguments = this.this$0.getArguments(); + if (arguments != null) { + return arguments.getLong("com.discord.intent.extra.EXTRA_GUILD_ID", -1); + } + return -1; } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java index 1cfb7c13ad..860387cab5 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetGuildRoleSubscriptionEditTierBenefits.java @@ -36,7 +36,7 @@ public final class WidgetGuildRoleSubscriptionEditTierBenefits extends AppFragme public final WidgetGuildRoleSubscriptionEditTierBenefits newInstance(long j) { WidgetGuildRoleSubscriptionEditTierBenefits widgetGuildRoleSubscriptionEditTierBenefits = new WidgetGuildRoleSubscriptionEditTierBenefits(); - widgetGuildRoleSubscriptionEditTierBenefits.setArguments(BundleKt.bundleOf(o.to(WidgetGuildRoleSubscriptionEditTierBenefits.INTENT_EXTRA_EDIT_BENEFITS_GUILD_ID, Long.valueOf(j)))); + widgetGuildRoleSubscriptionEditTierBenefits.setArguments(BundleKt.bundleOf(o.to("com.discord.intent.extra.EXTRA_GUILD_ID", Long.valueOf(j)))); return widgetGuildRoleSubscriptionEditTierBenefits; } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$guildId$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$guildId$2.java index 6a524221c0..62c3e2f38a 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$guildId$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$guildId$2.java @@ -1,6 +1,5 @@ package com.discord.widgets.servers.guild_role_subscription.edit_tier; -import com.discord.widgets.servers.WidgetServerSettingsChannels; import d0.z.d.o; import kotlin.jvm.functions.Function0; /* compiled from: WidgetServerSettingsGuildRoleSubscriptionEditTier.kt */ @@ -18,6 +17,6 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier$guildId$2 e @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Long mo1invoke() { - return this.this$0.getMostRecentIntent().getLongExtra(WidgetServerSettingsChannels.INTENT_EXTRA_GUILD_ID, -1); + return this.this$0.getMostRecentIntent().getLongExtra("com.discord.intent.extra.EXTRA_GUILD_ID", -1); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$viewModel$2.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$viewModel$2.java index 600faa9508..57db2c226f 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$viewModel$2.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier$viewModel$2.java @@ -17,6 +17,6 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier$viewModel$2 @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new ServerSettingsGuildRoleSubscriptionEditTierViewModel(WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildId$p(this.this$0), WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildRoleSubscriptionGroupListingId$p(this.this$0), WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildRoleSubscriptionTierListingId$p(this.this$0), null, null, null, null, null, 248, null); + return new ServerSettingsGuildRoleSubscriptionEditTierViewModel(WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildId$p(this.this$0), WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildRoleSubscriptionTierListingId$p(this.this$0), WidgetServerSettingsGuildRoleSubscriptionEditTier.access$getGuildRoleSubscriptionGroupListingId$p(this.this$0), null, null, null, null, null, 248, null); } } diff --git a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java index 41d479f628..db4615713f 100644 --- a/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java +++ b/app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java @@ -38,7 +38,6 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetServerSettingsGuildRoleSubscriptionEditTier.class, "binding", "getBinding()Lcom/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding;", 0)}; public static final Companion Companion = new Companion(null); private static final int DRAFT_TIER_PAGE_SIZE = 3; - private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID"; private static final String INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_GROUP_LISTING_ID = "INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_GROUP_LISTING_ID"; private static final String INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_TIER_LISTING_ID = "INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_TIER_LISTING_ID"; private static final int PUBLISHED_TIER_PAGE_SIZE = 2; @@ -64,7 +63,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App public final void launch(Context context, long j, long j2, long j3) { m.checkNotNullParameter(context, "context"); Intent intent = new Intent(); - intent.putExtra("INTENT_EXTRA_GUILD_ID", j); + intent.putExtra("com.discord.intent.extra.EXTRA_GUILD_ID", j); intent.putExtra(WidgetServerSettingsGuildRoleSubscriptionEditTier.INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_GROUP_LISTING_ID, j2); intent.putExtra(WidgetServerSettingsGuildRoleSubscriptionEditTier.INTENT_EXTRA_GUILD_ROLE_SUBSCRIPTION_TIER_LISTING_ID, j3); j.d(context, WidgetServerSettingsGuildRoleSubscriptionEditTier.class, intent); diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 7c93969d7b..5162835320 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -314,7 +314,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 95.4 - Alpha (95204)"); + textView.setText(string + " - 95.5 - Alpha (95205)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java index a95448f923..162156ed4d 100644 --- a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java +++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java @@ -133,7 +133,7 @@ public final class WidgetModeratorStartStage extends AppFragment { WidgetGuildScheduledEventLocationSelect.Companion.launch(requireContext(), getGuildId(), Long.valueOf(getChannelId())); } else if (moderatorStartStageItem instanceof ModeratorStartStageItem.ListItem.Event) { ModeratorStartStageItem.ListItem.Event event = (ModeratorStartStageItem.ListItem.Event) moderatorStartStageItem; - WidgetPreviewGuildScheduledEvent.Companion.launch(requireContext(), GuildScheduledEventModelKt.toModel(event.getEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(event.getEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), this.previewLauncher); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(WidgetPreviewGuildScheduledEvent.Companion, requireContext(), GuildScheduledEventModelKt.toModel(event.getEvent()), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(event.getEvent().g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), this.previewLauncher, false, 16, null); } else if (moderatorStartStageItem instanceof ModeratorStartStageItem.Continue) { launchStageCall(getChannelId()); } diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartEvent$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartEvent$1.java index 67e69189ca..d598c87791 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartEvent$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartEvent$1.java @@ -22,7 +22,7 @@ public final class WidgetCallFullscreen$configureEventPrompt$onStartEvent$1 exte /* renamed from: invoke */ public final void mo1invoke() { if (this.$startableEvent != null) { - WidgetPreviewGuildScheduledEvent.Companion.launch$default(WidgetPreviewGuildScheduledEvent.Companion, this.this$0.requireContext(), GuildScheduledEventModelKt.toModel(this.$startableEvent), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(this.$startableEvent.g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), null, 8, null); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(WidgetPreviewGuildScheduledEvent.Companion, this.this$0.requireContext(), GuildScheduledEventModelKt.toModel(this.$startableEvent), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(this.$startableEvent.g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), null, false, 24, null); } } } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.java index 718a28b645..543f2a9339 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheet$onResume$2.java @@ -37,6 +37,6 @@ public final class WidgetVoiceBottomSheet$onResume$2 extends o implements Functi m.checkNotNullExpressionValue(coordinatorLayout, "binding.root"); Context context = coordinatorLayout.getContext(); m.checkNotNullExpressionValue(context, "binding.root.context"); - WidgetPreviewGuildScheduledEvent.Companion.launch$default(companion, context, GuildScheduledEventModelKt.toModel(guildScheduledEvent), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(guildScheduledEvent.g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), null, 8, null); + WidgetPreviewGuildScheduledEvent.Companion.launch$default(companion, context, GuildScheduledEventModelKt.toModel(guildScheduledEvent), new WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData(guildScheduledEvent.g(), WidgetPreviewGuildScheduledEvent.Companion.Action.START_EVENT), null, false, 24, null); } } diff --git a/app/src/main/res/values-ar-rXB/plurals.xml b/app/src/main/res/values-ar-rXB/plurals.xml index f915220386..348a553994 100644 --- a/app/src/main/res/values-ar-rXB/plurals.xml +++ b/app/src/main/res/values-ar-rXB/plurals.xml @@ -1184,9 +1184,17 @@ ‏‮in‬‏ ‏‮{#}‬‏ ‏‮day‬‏ ‏‮in‬‏ ‏‮{#}‬‏ ‏‮days‬‏ + + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮day‬‏ + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮days‬‏ + - ‏‮{#}‬‏ ‏‮day‬‏ - ‏‮{#}‬‏ ‏‮days‬‏ + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮day‬‏ + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮days‬‏ + + + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮day‬‏ + ‏‮in‬‏ ‏‮{#}‬‏ ‏‮days‬‏ ‏‮{#}‬‏ ‏‮day‬‏ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index e8deaa2d5b..6ec553446c 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -1126,6 +1126,8 @@ ‏‮Turn‬‏ ‏‮Off‬‏ ‏‮Camera‬‏ ‏‮Turn‬‏ ‏‮On‬‏ ‏‮Camera‬‏ ‏‮Camera‬‏ ‏‮Permission‬‏ ‏‮Required‬‏ + ‏‮Always‬‏ ‏‮preview‬‏ ‏‮video‬‏ + ‏‮Pops‬‏ ‏‮up‬‏ ‏‮preview‬‏ ‏‮modal‬‏ ‏‮every‬‏ ‏‮time‬‏ ‏‮you‬‏ ‏‮turn‬‏ ‏‮on‬‏ ‏‮video‬‏ ‏‮Camera‬‏ ‏‮Preview‬‏ ‏‮Camera‬‏ ‏‮Turn‬‏ ‏‮on‬‏ ‏‮camera‬‏ @@ -3570,7 +3572,6 @@ ‏‮Write‬‏ ‏‮a‬‏ ‏‮description‬‏ ‏‮Select‬‏ ‏‮a‬‏ ‏‮format‬‏ ‏‮Enable‬‏ ‏‮monetization‬‏ - ‏‮Create‬‏ ‏‮a‬‏ ‏‮team‬‏ ‏‮Fill‬‏ ‏‮out‬‏ ‏‮the‬‏ ‏‮basics‬‏ ‏‮Set‬‏ ‏‮visual‬‏ ‏‮flair‬‏ ‏‮Select‬‏ ‏‮perks‬‏ @@ -3589,11 +3590,11 @@ ‏‮Access‬‏ ‏‮to‬‏ ‏‮exclusive‬‏ ‏‮channels‬‏ ‏‮is‬‏ ‏‮just‬‏ ‏‮one‬‏ ‏‮way‬‏ ‏‮to‬‏ ‏‮reward‬‏ ‏‮premium‬‏ ‏‮subscribers.‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮also‬‏ ‏‮offer‬‏ ‏‮other‬‏ ‏‮perks.‬‏ ‏‮Any‬‏ ‏‮other‬‏ ‏‮benefits?‬‏ ‏‮Step‬‏ ‏‮{number}‬‏ ‏‮of‬‏ ‏‮{total}‬‏ - ‏‮Vitae‬‏ ‏‮quis‬‏ ‏‮facilisi‬‏ ‏‮integer‬‏ ‏‮nec‬‏ ‏‮lobortis‬‏ ‏‮et‬‏ ‏‮purus.‬‏ ‏‮Sed‬‏ ‏‮arcu‬‏ ‏‮odio‬‏ ‏‮leo‬‏ ‏‮vel‬‏ ‏‮gravida‬‏ ‏‮faucibus‬‏ ‏‮aliquet.‬‏ ‏‮Dolor‬‏ ‏‮velit‬‏ ‏‮viverra‬‏ ‏‮mauris‬‏ ‏‮rhoncus‬‏ ‏‮tortor‬‏ ‏‮vulputate‬‏ ‏‮quam‬‏ ‏‮erat‬‏ ‏‮quis.‬‏ ‏‮Senectus‬‏ ‏‮morbi‬‏ ‏‮vitae‬‏ ‏‮ut‬‏ ‏‮justo‬‏ ‏‮ut‬‏ ‏‮ultrices.‬‏ + ‏‮Aliquet‬‏ ‏‮augue‬‏ ‏‮condimentum‬‏ ‏‮leo‬‏ ‏‮egestas.‬‏ ‏‮Justo,‬‏ ‏‮tellus‬‏ ‏‮mattis‬‏ ‏‮nibh‬‏ ‏‮donec‬‏ ‏‮velit.‬‏ ‏‮Vitae‬‏ ‏‮quis‬‏ ‏‮facilisi‬‏ ‏‮integer‬‏ ‏‮nec‬‏ ‏‮lobortis‬‏ ‏‮et‬‏ ‏‮purus.‬‏ ‏‮Sed‬‏ ‏‮arcu‬‏ ‏‮odio‬‏ ‏‮leo‬‏ ‏‮vel‬‏ ‏‮gravida‬‏ ‏‮faucibus‬‏ ‏‮aliquet.‬‏ ‏‮Dolor‬‏ ‏‮velit‬‏ ‏‮viverra‬‏ ‏‮mauris‬‏ ‏‮rhoncus‬‏ ‏‮tortor‬‏ ‏‮vulputate‬‏ ‏‮quam‬‏ ‏‮erat‬‏ ‏‮quis.‬‏ ‏‮Senectus‬‏ ‏‮morbi‬‏ ‏‮vitae‬‏ ‏‮ut‬‏ ‏‮justo‬‏ ‏‮ut‬‏ ‏‮ultrices.‬‏ ‏‮Transaction‬‏ ‏‮History‬‏ ‏‮[Edit‬‏ ‏‮Payment‬‏ ‏‮Info](‬‏‏‮{url}‬‏‏‮)‬‏ - ‏‮Manage‬‏ ‏‮Payment‬‏ + ‏‮Payment‬‏ ‏‮Overview‬‏ ‏‮Next‬‏ ‏‮Payment‬‏ ‏‮Revenue‬‏ ‏‮Total‬‏ ‏‮Members‬‏ @@ -3654,7 +3655,6 @@ ‏‮Search‬‏ ‏‮channels‬‏ ‏‮(PLACEHOLDER)‬‏ ‏‮Basic‬‏ ‏‮Info‬‏ - ‏‮Members‬‏ ‏‮Payment‬‏ ‏‮Tiers‬‏ ‏‮Premium‬‏ ‏‮Membership‬‏ @@ -3723,6 +3723,7 @@ ‏‮{count}‬‏ ‏‮Member‬‏ ‏‮Color‬‏ ‏‮&‬‏ ‏‮Badge‬‏ ‏‮Subscribe‬‏ + ‏‮Subscribed‬‏ ‏‮Subscribe‬‏ ‏‮You‬‏ ‏‮have‬‏ ‏‮**‬‏‏‮{numSubscriptions}‬‏ ‏‮active‬‏ ‏‮{numSubscriptions}‬‏‏‮**‬‏ ‏‮Premium‬‏ ‏‮Membership‬‏ @@ -4236,7 +4237,7 @@ ‏‮Display‬‏ ‏‮role:‬‏ ‏‮Remove‬‏ ‏‮role‬‏ ‏‮!!‬‏‏‮{roleName}‬‏‏‮!!‬‏ ‏‮Server‬‏ ‏‮Members‬‏ - ‏‮We\'re‬‏ ‏‮no‬‏ ‏‮strangers‬‏ ‏‮to‬‏ ‏‮love‬‏ + ‏‮Server‬‏ ‏‮Monetization‬‏ ‏‮{boosts}‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮Tier‬‏ ‏‮{tier}‬‏ ‏‮perk‬‏ ‏‮unlocked‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮a‬‏ ‏‮Tier‬‏ ‏‮{tier}‬‏ ‏‮Nitro‬‏ ‏‮Feature.‬‏ ‏‮[Check‬‏ ‏‮your‬‏ ‏‮tier‬‏ ‏‮status](‬‏‏‮{tierStatusUrl}‬‏‏‮)‬‏ @@ -4336,7 +4337,6 @@ ‏‮Welcome‬‏ ‏‮to‬‏ ‏‮**!!‬‏‏‮{guildName}‬‏‏‮!!!**‬‏ ‏‮You‬‏ ‏‮must‬‏ ‏‮remove‬‏ ‏‮all‬‏ ‏‮invalid‬‏ ‏‮channels‬‏ ‏‮first‬‏ ‏‮before‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮save.‬‏ ‏‮Manage‬‏ ‏‮Roles‬‏ - ‏‮Manage‬‏ ‏‮Payment‬‏ ‏‮Create‬‏ ‏‮a‬‏ ‏‮new‬‏ ‏‮tier‬‏ ‏‮You‬‏ ‏‮may‬‏ ‏‮want‬‏ ‏‮to‬‏ ‏‮grant‬‏ ‏‮members‬‏ ‏‮of‬‏ ‏‮premium‬‏ ‏‮tiers‬‏ ‏‮additional‬‏ ‏‮privileges‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮server.‬‏ ‏‮Only‬‏ ‏‮mess‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮stuff‬‏ ‏‮if‬‏ ‏‮you’re‬‏ ‏‮a‬‏ ‏‮Discord‬‏ ‏‮professional.‬‏ ‏‮Perks‬‏ @@ -4346,10 +4346,10 @@ ‏‮Edit‬‏ ‏‮Roles‬‏ ‏‮Permissions‬‏ ‏‮Publish‬‏ ‏‮And‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮ask‬‏ ‏‮me‬‏ ‏‮how‬‏ ‏‮I\'m‬‏ ‏‮feeling,‬‏ ‏‮Don\'t‬‏ ‏‮tell‬‏ ‏‮me‬‏ ‏‮you\'re‬‏ ‏‮too‬‏ ‏‮blind‬‏ ‏‮to‬‏ ‏‮see‬‏ - ‏‮Never‬‏ ‏‮gonna‬‏ + ‏‮Premium‬‏ ‏‮Tier‬‏ ‏‮Some‬‏ ‏‮helpful‬‏ ‏‮info‬‏ ‏‮about‬‏ ‏‮what‬‏ ‏‮a‬‏ ‏‮tier‬‏ ‏‮is‬‏ ‏‮goes‬‏ ‏‮here.‬‏ ‏‮Manage‬‏ ‏‮Tiers‬‏ - ‏‮You‬‏ ‏‮know‬‏ ‏‮the‬‏ ‏‮rules‬‏ ‏‮and‬‏ ‏‮so‬‏ ‏‮do‬‏ ‏‮I‬‏ + ‏‮Premium‬‏ ‏‮Membership‬‏ ‏‮Server‬‏ ‏‮Banner‬‏ ‏‮Server‬‏ ‏‮Invite‬‏ ‏‮Background‬‏ ‏‮Set‬‏ ‏‮Up‬‏ ‏‮Discovery‬‏ @@ -7080,9 +7080,12 @@ ‏‮You‬‏ ‏‮will‬‏ ‏‮have‬‏ ‏‮premium‬‏ ‏‮chat,‬‏ ‏‮**‬‏‏‮{num}‬‏‏‮**‬‏ ‏‮Boosts,‬‏ ‏‮and‬‏ ‏‮a‬‏ ‏‮Boost‬‏ ‏‮discount‬‏ ‏‮**as‬‏ ‏‮soon‬‏ ‏‮as‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮processes.**‬‏ ‏‮We‬‏ ‏‮will‬‏ ‏‮send‬‏ ‏‮you‬‏ ‏‮an‬‏ ‏‮email‬‏ ‏‮as‬‏ ‏‮soon‬‏ ‏‮as‬‏ ‏‮it‬‏ ‏‮does‬‏ ‏‮Add‬‏ ‏‮Payment‬‏ ‏‮Your‬‏ ‏‮Nitro‬‏ ‏‮subscription‬‏ ‏‮ends‬‏ ‏‮{daysLeft}‬‏‏‮.‬‏ ‏‮Add‬‏ ‏‮a‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮to‬‏ ‏‮keep‬‏ ‏‮using‬‏ ‏‮profile‬‏ ‏‮customization‬‏ ‏‮and‬‏ ‏‮more.‬‏ + ‏‮Add‬‏ ‏‮Payment‬‏ + ‏‮Your‬‏ ‏‮Nitro‬‏ ‏‮Classic‬‏ ‏‮sub‬‏ ‏‮ends‬‏ ‏‮{daysLeft}‬‏‏‮.‬‏ ‏‮Add‬‏ ‏‮a‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮to‬‏ ‏‮keep‬‏ ‏‮using‬‏ ‏‮custom‬‏ ‏‮emojis‬‏ ‏‮and‬‏ ‏‮more.‬‏ ‏‮Learn‬‏ ‏‮More‬‏ - ‏‮You’ll‬‏ ‏‮lose‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮profile‬‏ ‏‮customization,‬‏ ‏‮bigger‬‏ ‏‮file‬‏ ‏‮uploads,‬‏ ‏‮better‬‏ ‏‮screen‬‏ ‏‮share,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮in‬‏ ‏‮{daysLeft}‬‏‏‮.‬‏ - ‏‮You’re‬‏ ‏‮going‬‏ ‏‮to‬‏ ‏‮lose‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮profile‬‏ ‏‮customization,‬‏ ‏‮bigger‬‏ ‏‮file‬‏ ‏‮uploads,‬‏ ‏‮better‬‏ ‏‮screen‬‏ ‏‮share,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮today.‬‏ + ‏‮You’ll‬‏ ‏‮lose‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮profile‬‏ ‏‮customization,‬‏ ‏‮bigger‬‏ ‏‮file‬‏ ‏‮uploads,‬‏ ‏‮better‬‏ ‏‮screen‬‏ ‏‮share,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮{daysLeft}‬‏‏‮.‬‏ + ‏‮Manage‬‏ ‏‮Plan‬‏ + ‏‮Your‬‏ ‏‮Nitro‬‏ ‏‮Classic‬‏ ‏‮access‬‏ ‏‮ends‬‏ ‏‮{daysLeft}‬‏‏‮.‬‏ ‏‮Renew‬‏ ‏‮now‬‏ ‏‮to‬‏ ‏‮keep‬‏ ‏‮custom‬‏ ‏‮emoji,‬‏ ‏‮bigger‬‏ ‏‮uploads,‬‏ ‏‮and‬‏ ‏‮more.‬‏ ‏‮Your‬‏ ‏‮Nitro‬‏ ‏‮access‬‏ ‏‮ends‬‏ ‏‮today.‬‏ ‏‮Dismiss‬‏ ‏‮Keep‬‏ ‏‮Nitro‬‏ @@ -7544,15 +7547,14 @@ ‏‮Audio‬‏ ‏‮Quality‬‏ ‏‮Screen‬‏ ‏‮Share‬‏ ‏‮Quality‬‏ ‏‮Compare‬‏ ‏‮Plans‬‏ - ‏‮Perks‬‏ - ‏‮Hover‬‏ ‏‮for‬‏ ‏‮info‬‏ + ‏‮Rewards‬‏ + ‏‮Hover‬‏ ‏‮on‬‏ ‏‮rewards‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮info‬‏ ‏‮Threads‬‏ ‏‮Archive‬‏ ‏‮{resolution}‬‏‏‮/‬‏‏‮{framerate}‬‏‏‮fps‬‏ ‏‮1‬‏ ‏‮hour,‬‏ ‏‮1‬‏ ‏‮day‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮3‬‏ ‏‮days‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮7‬‏ ‏‮days‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮7‬‏ ‏‮days‬‏ - ‏‮Hover‬‏ ‏‮for‬‏ ‏‮info‬‏ ‏‮You‬‏ ‏‮did‬‏ ‏‮it!‬‏ ‏‮You‬‏ ‏‮are‬‏ ‏‮here!‬‏ ‏‮{numSubscriptionsApplied}‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 7210384826..a0cc762c42 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -6494,7 +6494,6 @@ Твоят абонамент за Nitro изтича {daysLeft}. Добави метод на плащане, за да продължиш да използваш персонализирането на профила и др. Научи повече Ще изгубиш достъп до персонализирането на профила, качването на по-големи файлове, по-доброто споделяне на екрана и още след {daysLeft}. - Ще изгубиш достъп до персонализирането на профила, качването на по-големи файлове, по-доброто споделяне на екрана и други още днес. Достъпът ти до Nitro приключва днес. Затваряне Задръж Nitro diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a5c2351c60..73100847d1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -6497,7 +6497,6 @@ Tvé předplatné Nitro {daysLeft} skončí. Jestli chceš dál využívat přizpůsobení profilu a další výhody, přidej platební metodu. Zjistit více Za {daysLeft} přijdeš o možnost přizpůsobení profilu, nahrávání větších souborů, lepšího sdílení obrazovky a další výhody. - Dnes přijdeš o možnost přizpůsobení profilu, nahrávání větších souborů, lepšího sdílení obrazovky a další výhody. Tvůj přístup k Nitru dnes končí. Zahodit Zachovat Nitro diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 544a1db9bf..042d085696 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -6497,7 +6497,6 @@ Dit Nitro-abonnement ophører {daysLeft}.Tilføj en betalingsmetode for fortsat at kunne bruge profiltilpasning med mere. Få mere at vide Du mister adgangen til profiltilpasning, større filuploads, bedre skærmdeling, og meget mere i {daysLeft}. - Du mister adgangen til profiltilpasning, større filuploads, bedre skærmdeling og meget mere i dag. Din Nitro-adgang ophører i dag. Afvis Behold Nitro diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eba3a9ae73..1bedd1d313 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -6506,7 +6506,6 @@ Dein Nitro-Abonnement läuft {daysLeft} ab. Füge eine Zahlungsmethode hinzu, um weiterhin die Profilanpassung und viele andere Vorteile nutzen zu können. Mehr erfahren In {daysLeft} verlierst du Zugriff auf Profilanpassung, größere Datei-Uploads, bessere Bildschirmübertragungen und mehr. - Heute verlierst du Zugriff auf Profilanpassung, größere Datei-Uploads, bessere Bildschirmübertragungen und mehr. Dein Nitro-Abo läuft heute aus. Verwerfen Nitro behalten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b0b56615cb..bfc6e7b7f4 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -6492,7 +6492,6 @@ Η συνδρομή σου στο Nitro θα λήξει {daysLeft}. Πρόσθεσε έναν τρόπο πληρωμής για να συνεχίσεις να χρησιμοποιείς την προσαρμογή προφίλ και πολλά άλλα. Μάθε περισσότερα Θα χάσεις την πρόσβαση σε προσαρμογή προφίλ, μεταφόρτωση μεγαλύτερων αρχείων, καλύτερη κοινή χρήση οθόνης και πολλά άλλα σε {daysLeft}. - Θα χάσεις την πρόσβαση σε προσαρμογή προφίλ, μεταφόρτωση μεγαλύτερων αρχείων, καλύτερη κοινή χρήση οθόνης και πολλά άλλα σήμερα. Η πρόσβασή σου στο Nitro λήγει σήμερα. Απόρριψη Διατήρηση Nitro diff --git a/app/src/main/res/values-en-rXA/plurals.xml b/app/src/main/res/values-en-rXA/plurals.xml index baa4bf1020..a97f2861f0 100644 --- a/app/src/main/res/values-en-rXA/plurals.xml +++ b/app/src/main/res/values-en-rXA/plurals.xml @@ -1184,9 +1184,17 @@ [îñ »{#}« ðåý one two] [îñ »{#}« ðåýš one two] + + [îñ »{#}« ðåý one two] + [îñ »{#}« ðåýš one two] + - [»{#}« ðåý one] - [»{#}« ðåýš one] + [îñ »{#}« ðåý one two] + [îñ »{#}« ðåýš one two] + + + [îñ »{#}« ðåý one two] + [îñ »{#}« ðåýš one two] [»{#}« ðåý one] diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index a54c61d253..723218d0aa 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -1126,6 +1126,8 @@ [Ţûŕñ Öƒƒ Çåḿéŕå one two three] [Ţûŕñ Öñ Çåḿéŕå one two three] [Çåḿéŕå Þéŕḿîššîöñ ŔéQûîŕéð one two three four] + [Åļŵåýš þŕéVîéŵ Vîðéö one two three] + [Þöþš ûþ þŕéVîéŵ ḿöðåļ éVéŕý ţîḿé ýöû ţûŕñ öñ Vîðéö one two three four five six] [Çåḿéŕå one two] [ÞŕéVîéŵ Çåḿéŕå one two three] [Ţûŕñ öñ çåḿéŕå one two three] @@ -3570,7 +3572,6 @@ [Ŵŕîţé å ðéšçŕîþţîöñ one two three] [Šéļéçţ å ƒöŕḿåţ one two three] [Éñåɓļé ḿöñéţîžåţîöñ one two three] - [Çŕéåţé å ţéåḿ one two] [Fîļļ öûţ ţĥé ɓåšîçš one two three] [Šéţ Vîšûåļ ƒļåîŕ one two three] [Šéļéçţ þéŕķš one two] @@ -3589,11 +3590,11 @@ [Åççéšš ţö éхçļûšîVé çĥåññéļš îš ĵûšţ öñé ŵåý ţö ŕéŵåŕð þŕéḿîûḿ šûɓšçŕîɓéŕš. Ýöû çåñ åļšö öƒƒéŕ öţĥéŕ þéŕķš. one two three four five six seven eight nine ten eleven] [Åñý öţĥéŕ ɓéñéƒîţš¿ one two three] [Šţéþ »{number}« öƒ »{total}« one two] - [νîţåé Qûîš ƒåçîļîšî îñţéĝéŕ ñéç ļöɓöŕţîš éţ þûŕûš. Šéð åŕçû öðîö ļéö Véļ ĝŕåVîðå ƒåûçîɓûš åļîQûéţ. Ðöļöŕ Véļîţ VîVéŕŕå ḿåûŕîš ŕĥöñçûš ţöŕţöŕ Vûļþûţåţé Qûåḿ éŕåţ Qûîš. Šéñéçţûš ḿöŕɓî Vîţåé ûţ ĵûšţö ûţ ûļţŕîçéš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] + [ÅļîQûéţ åûĝûé çöñðîḿéñţûḿ ļéö éĝéšţåš. Ĵûšţö, ţéļļûš ḿåţţîš ñîɓĥ ðöñéç Véļîţ. one two three four five six seven eight] [νîţåé Qûîš ƒåçîļîšî îñţéĝéŕ ñéç ļöɓöŕţîš éţ þûŕûš. Šéð åŕçû öðîö ļéö Véļ ĝŕåVîðå ƒåûçîɓûš åļîQûéţ. Ðöļöŕ Véļîţ VîVéŕŕå ḿåûŕîš ŕĥöñçûš ţöŕţöŕ Vûļþûţåţé Qûåḿ éŕåţ Qûîš. Šéñéçţûš ḿöŕɓî Vîţåé ûţ ĵûšţö ûţ ûļţŕîçéš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [Ţŕåñšåçţîöñ Ĥîšţöŕý one two three] [[Éðîţ Þåýḿéñţ Îñƒö](»{url}«) one two three] - [Ḿåñåĝé Þåýḿéñţ one two three] + [Þåýḿéñţ ÖVéŕVîéŵ one two three] [Ñéхţ Þåýḿéñţ one two] [ŔéVéñûé one two] [Ţöţåļ Ḿéḿɓéŕš one two] @@ -3654,7 +3655,6 @@ [Šéåŕçĥ çĥåññéļš one two three] [(ÞĻÅÇÉĤÖĻÐÉŔ) one two] [βåšîç Îñƒö one two] - [Ḿéḿɓéŕš one two] [Þåýḿéñţ one two] [Ţîéŕš one] [Þŕéḿîûḿ Ḿéḿɓéŕšĥîþ one two three] @@ -3723,6 +3723,7 @@ [»{count}«] [Ḿéḿɓéŕ Çöļöŕ & βåðĝé one two three] [Šûɓšçŕîɓé one two] + [Šûɓšçŕîɓéð one two] [Šûɓšçŕîɓé one two] [Ýöû ĥåVé **»{numSubscriptions}« åçţîVé »{numSubscriptions}«** one two three] [Þŕéḿîûḿ Ḿéḿɓéŕšĥîþ one two three] @@ -4236,7 +4237,7 @@ [Ðîšþļåý ŕöļé: one two] [ŔéḿöVé ŕöļé ¡¡»{roleName}«¡¡ one two three] [ŠéŕVéŕ Ḿéḿɓéŕš one two three] - [Ŵé\'ŕé ñö šţŕåñĝéŕš ţö ļöVé one two three four] + [ŠéŕVéŕ Ḿöñéţîžåţîöñ one two three] [»{boosts}« ţö ûñļöçķ one two] [Ţîéŕ »{tier}« þéŕķ ûñļöçķéð one two three] [Ţĥîš îš å Ţîéŕ »{tier}« Ñîţŕö Féåţûŕé. [Çĥéçķ ýöûŕ ţîéŕ šţåţûš](»{tierStatusUrl}«) one two three four five six seven eight nine ten eleven twelve] @@ -4336,7 +4337,6 @@ [Ŵéļçöḿé ţö **¡¡»{guildName}«¡¡¡** one two three] [Ýöû ḿûšţ ŕéḿöVé åļļ îñVåļîð çĥåññéļš ƒîŕšţ ɓéƒöŕé ýöû çåñ šåVé. one two three four five six seven] [Ḿåñåĝé Ŕöļéš one two] - [Ḿåñåĝé Þåýḿéñţ one two three] [Çŕéåţé å ñéŵ ţîéŕ one two three] [Ýöû ḿåý ŵåñţ ţö ĝŕåñţ ḿéḿɓéŕš öƒ þŕéḿîûḿ ţîéŕš åððîţîöñåļ þŕîVîļéĝéš öñ ýöûŕ šéŕVéŕ. Öñļý ḿéšš ŵîţĥ ţĥîš šţûƒƒ îƒ ýöû’ŕé å Ðîšçöŕð þŕöƒéššîöñåļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Þéŕķš one] @@ -4346,10 +4346,10 @@ [Éðîţ Ŕöļéš Þéŕḿîššîöñš one two three] [Þûɓļîšĥ one two] [Åñð îƒ ýöû åšķ ḿé ĥöŵ Î\'ḿ ƒééļîñĝ, Ðöñ\'ţ ţéļļ ḿé ýöû\'ŕé ţöö ɓļîñð ţö šéé one two three four five six seven eight nine ten eleven twelve thirteen fourteen] - [ÑéVéŕ ĝöññå one two] + [Þŕéḿîûḿ Ţîéŕ one two] [Šöḿé ĥéļþƒûļ îñƒö åɓöûţ ŵĥåţ å ţîéŕ îš ĝöéš ĥéŕé. one two three four five six] [Ḿåñåĝé Ţîéŕš one two] - [Ýöû ķñöŵ ţĥé ŕûļéš åñð šö ðö Î one two three four] + [Þŕéḿîûḿ Ḿéḿɓéŕšĥîþ one two three] [ŠéŕVéŕ βåññéŕ one two] [ŠéŕVéŕ ÎñVîţé βåçķĝŕöûñð one two three] [Šéţ Ûþ ÐîšçöVéŕý one two three] @@ -7080,9 +7080,12 @@ [Ýöû ŵîļļ ĥåVé þŕéḿîûḿ çĥåţ, **»{num}«** βööšţš, åñð å βööšţ ðîšçöûñţ **åš šööñ åš ýöûŕ þåýḿéñţ þŕöçéššéš.** Ŵé ŵîļļ šéñð ýöû åñ éḿåîļ åš šööñ åš îţ ðöéš one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five] [Åðð Þåýḿéñţ one two] [Ýöûŕ Ñîţŕö šûɓšçŕîþţîöñ éñðš »{daysLeft}«. Åðð å þåýḿéñţ ḿéţĥöð ţö ķééþ ûšîñĝ þŕöƒîļé çûšţöḿîžåţîöñ åñð ḿöŕé. one two three four five six seven eight nine ten eleven] + [Åðð Þåýḿéñţ one two] + [Ýöûŕ Ñîţŕö Çļåššîç šûɓ éñðš »{daysLeft}«. Åðð å þåýḿéñţ ḿéţĥöð ţö ķééþ ûšîñĝ çûšţöḿ éḿöĵîš åñð ḿöŕé. one two three four five six seven eight nine ten] [Ļéåŕñ Ḿöŕé one two] - [Ýöû’ļļ ļöšé åççéšš ţö þŕöƒîļé çûšţöḿîžåţîöñ, ɓîĝĝéŕ ƒîļé ûþļöåðš, ɓéţţéŕ šçŕééñ šĥåŕé, åñð ḿöŕé îñ »{daysLeft}«. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] - [Ýöû’ŕé ĝöîñĝ ţö ļöšé åççéšš ţö þŕöƒîļé çûšţöḿîžåţîöñ, ɓîĝĝéŕ ƒîļé ûþļöåðš, ɓéţţéŕ šçŕééñ šĥåŕé, åñð ḿöŕé ţöðåý. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen] + [Ýöû’ļļ ļöšé åççéšš ţö þŕöƒîļé çûšţöḿîžåţîöñ, ɓîĝĝéŕ ƒîļé ûþļöåðš, ɓéţţéŕ šçŕééñ šĥåŕé, åñð ḿöŕé »{daysLeft}«. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] + [Ḿåñåĝé Þļåñ one two] + [Ýöûŕ Ñîţŕö Çļåššîç åççéšš éñðš »{daysLeft}«. Ŕéñéŵ ñöŵ ţö ķééþ çûšţöḿ éḿöĵî, ɓîĝĝéŕ ûþļöåðš, åñð ḿöŕé. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Ýöûŕ Ñîţŕö åççéšš éñðš ţöðåý. one two three four] [Ðîšḿîšš one two] [Ķééþ Ñîţŕö one two] @@ -7544,15 +7547,14 @@ [Åûðîö qûåļîţý one two] [Šçŕééñ Šĥåŕé qûåļîţý one two three] [Çöḿþåŕé Þļåñš one two] - [Þéŕķš one] - [ĤöVéŕ ƒöŕ îñƒö one two three] + [Ŕéŵåŕðš one two] + [ĤöVéŕ öñ ŕéŵåŕðš ƒöŕ ḿöŕé îñƒö one two three four] [Ţĥŕéåðš ÅŕçĥîVé one two three] [»{resolution}«/»{framerate}«ƒþš one] [1 ĥöûŕ, 1 ðåý one two] [ûþ ţö 3 ðåýš one two] [ûþ ţö 7 ðåýš one two] [ûþ ţö 7 ðåýš one two] - [ĤöVéŕ ƒöŕ îñƒö one two three] [Ýöû ðîð îţ¡ one two] [Ýöû åŕé ĥéŕé¡ one two] [»{numSubscriptionsApplied}«] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index bd61fdb156..0b425a8ef4 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -6345,7 +6345,6 @@ Tu suscripción Nitro acaba {daysLeft}. Añade un método de pago para seguir usando la personalización de perfil y más. Más información Perderás el acceso a la personalización del perfil, las subidas de archivos más grandes, compartir pantalla mejorado y más en {daysLeft}. - Vas a perder el acceso a la personalización del perfil, las subidas de archivos más grandes, compartir pantalla mejorado y más hoy. Tu acceso Nitro acaba hoy. Rechazar Conservar Nitro diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 593c7ed4c1..c460650d13 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -6492,7 +6492,6 @@ Nitro-tilauksesi päättyy {daysLeft} kuluttua. Jos haluat käyttää profiilin mukautusta ja muita etuja myös jatkossa, lisää maksutapa. Lue lisää {daysLeft} kuluttua menetät oikeuden profiilin mukautukseen, suurempiin tiedostojen latauskokoihin, parempaan ruudunjakoon ja moneen muuhun etuun. - Olet menettämässä tänään oikeuden profiilin mukautukseen, suurempiin tiedostojen latauskokoihin, parempaan ruudunjakoon ja moneen muuhun etuun. Nitro-käyttöoikeutesi päättyy tänään. Sulje Pidä Nitro diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3374649724..5e02ca8482 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -6502,7 +6502,6 @@ Ton abonnement Nitro se termine {daysLeft}. Ajoute un mode de paiement pour continuer à utiliser la personnalisation de profil et les autres avantages. En savoir plus Tu perdras accès à la personnalisation de ton profil, au chargement de fichiers plus volumineux, au partage d\'écran en meilleure qualité et à bien plus dans {daysLeft}. - Tu perdras accès à la personnalisation de ton profil, au chargement de fichiers plus volumineux, au partage d\'écran en meilleure qualité et à bien plus aujourd\'hui. Ton accès à Nitro se termine aujourd\'hui. Ignorer Conserver l\'abonnement Nitro diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3b1069e04b..9653ab700c 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -6492,7 +6492,6 @@ आपका Nitro सब्सक्रिप्शन {daysLeft} खत्म हो रहा है. प्रोफ़ाइल कस्टमाइज़ेशन और भी बहुत कुछ का इस्तेमाल जारी रखने के लिए पेमेंट का तरीका ऐड करें. और ज़्यादा जानें आप {daysLeft} में प्रोफ़ाइल कस्टमाइज़ेशन, बड़ी फ़ाइल को अपलोड करने, बेहतर स्क्रीन शेयर, और भी बहुत कुछ का एक्सेस खो देंगे. - आप आज प्रोफ़ाइल कस्टमाइज़ेशन, बड़ी फ़ाइल को अपलोड करने, बेहतर स्क्रीन शेयर, और भी बहुत कुछ का एक्सेस खो देंगे. Nitro का एक्सेस आज खत्म हो रहा है. हटा दें Nitro को बनाए रखें diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d283e0163b..25e16ffb41 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -6492,7 +6492,6 @@ Nitro pretplata će ti isteći {daysLeft}. Dodaj način plaćanja kako bi nastavio koristiti prilagođavanje profila i ostalo. Saznaj više Za {daysLeft} izgubit ćeš pristup prilagođavanjima profila, prenošenju većih datoteka, boljem dijeljenju zaslona i drugome. - Danas ćeš izgubiti pristup prilagođavanjima profila, prenošenju većih datoteka, boljem dijeljenju zaslona i drugome. Tvoj pristup Nitru završit će danas. Odbaci Zadrži Nitro diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1441e46c9e..113dd734d4 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -6492,7 +6492,6 @@ A Nitro-előfizetésed {daysLeft} lejár. Adj hozzá fizetési módot, hogy tovább használhasd a profil testreszabását és más funkciókat. További tájékoztatás {daysLeft} múlva elveszíted a lehetőséget a profil testreszabására, a nagyobb fájlfeltöltésekre, a jobb képernyőmegosztásra és egyéb funkciókra. - Ma elveszíted a lehetőséget a profil testreszabására, a nagyobb fájlfeltöltésekre, a jobb képernyőmegosztásra és egyéb funkciókra. A Nitro-hozzáférésed ma lejár. Elvetés Nitro-előfizetés megtartása diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 36047497da..4154ff03ab 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -6502,7 +6502,6 @@ Il tuo abbonamento a Nitro finisce {daysLeft}. Inserisci un metodo di pagamento per continuare a usare la personalizzazione del profilo e molto altro. Scopri di più Tra {daysLeft}, perderai l\'accesso alla personalizzazione del profilo, all\'upload di file di grandi dimensioni, alla condivisione schermo migliorata e a molto altro. - Oggi perderai l\'accesso alla personalizzazione del profilo, all\'upload di file di grandi dimensioni, alla condivisione schermo migliorata e a molto altro. Il tuo accesso a Nitro finisce oggi. Chiudi Conserva Nitro diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 5ffb1d32bc..3c6013ea50 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -6507,7 +6507,6 @@ お客様の Nitro サブスクリプションは{daysLeft}終了します。プロフィールのカスタマイズなどをこれからも利用するには、お支払い方法を追加してください。 詳細 あと {daysLeft}で、プロフィールのカスタマイズ、大容量ファイルのアップロード、高品質な画面共有などがご利用できなくなります。 - 本日以降、プロフィールのカスタマイズ、大容量ファイルのアップロード、高品質な画面共有などがご利用できなくなります。 Nitro のご利用が本日終了します。 Nitro をやめる Nitro を継続 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 8a312c3e78..fa22462928 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -6502,7 +6502,6 @@ Nitro 구독이 {daysLeft} 끝나요. 프로필 맞춤 설정 등을 계속 이용하시려면 결제 수단을 추가하세요. 자세히 알아보기 {daysLeft} 후면 프로필 맞춤 설정, 대용량 파일 업로드, 고품질 화면 공유 등을 이용할 수 없게 돼요. - 오늘부터 프로필 맞춤 설정, 대용량 파일 업로드, 고품질 화면 공유 등을 이용할 수 없게 돼요. Nitro 이용이 오늘 종료돼요. 닫기 Nitro 유지하기 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 0f5baae798..988cdeb3b1 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -6492,7 +6492,6 @@ Tavo Nitro prenumerata baigiasi {daysLeft}. Kad galėtum ir toliau naudotis profilio tinkinimų ir kitais pranašumais, pridėk mokėjimo būdą. Sužinoti daugiau Po {daysLeft} prarasi prieigą prie profilio tinkinimo, didesnių failų įkėlimo, aukštesnės kokybės ekrano bendrinimo ir kt. - Šiandien neteksi prieigos prie profilio tinkinimo, didesnių failų įkėlimo, aukštesnės kokybės ekrano bendrinimo ir kt. Tavo Nitro prieiga baigiasi šiandien. Atmesti Pasilikti Nitro diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b6223a357e..0f7faeac64 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -6502,7 +6502,6 @@ Je Nitro-abonnement verloopt {daysLeft}. Voeg een betalingsmethode toe om te blijven profiteren van onder andere profielaanpassing. Meer informatie Je verliest over {daysLeft} toegang tot profielaanpassing, het uploaden van grotere bestanden, beter gedeeld scherm en meer. - Je verliest vandaag toegang tot profielaanpassing, het uploaden van grotere bestanden, beter gedeeld scherm en meer. Je toegang tot Nitro verloopt vandaag. Afwijzen Nitro behouden diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index a8367791e3..8a50f00adf 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -6337,7 +6337,6 @@ Nitro-abonnementet ditt avsluttes {daysLeft}. Legg til en betalingsmåte for å fortsatt ha tilgang til profiltilpasning og annet. Mer informasjon Du mister tilpassing av profilen din, opplasting av større filer, bedre skjermdeling og annet om {daysLeft}. - I dag kommer du til å miste tilpassing av profilen din, opplasting av større filer, bedre skjermdeling og annet. Du mister Nitro-tilgangen i dag. Avvis Behold Nitro diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 00e5e487d6..a26fcb47bd 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -6508,7 +6508,6 @@ Twoja subskrypcja Nitro kończy się {daysLeft}. Aby móc nadal korzystać m.in. z możliwości personalizacji profilu, dodaj metodę płatności. Dowiedz się więcej Za {daysLeft} stracisz m.in. dostęp do personalizacji profilu, możliwość przesyłania większych plików oraz większe możliwości w zakresie współdzielenia ekranu. - Dziś stracisz m.in. dostęp do personalizacji profilu, możliwość przesyłania większych plików oraz większe możliwości w zakresie współdzielenia ekranu. Twój dostęp do Nitro kończy się dzisiaj. Odrzuć Zachowaj Nitro diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 0bdfbe75e0..3687a3d5d6 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -6453,7 +6453,6 @@ Sua assinatura Nitro termina em {daysLeft}. Adicione um método de pagamento para continuar usando funções como a personalização de perfil. Saiba mais Você perderá acesso à personalização do perfil, envio de arquivos maiores, compartilhamento de tela melhor, entre outras coisas, em {daysLeft}. - Você perderá acesso à personalização do perfil, envio de arquivos maiores, compartilhamento de tela melhor, entre outras coisas hoje. Seu acesso ao Nitro acaba hoje. Ignorar Manter o Nitro diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2d0c9e18cb..0279d8bc07 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -6492,7 +6492,6 @@ Abonamentul Nitro expiră {daysLeft}. Adaugă o metodă de plată pentru a avea în continuare acces la personalizarea profilului și multe altele. Află mai multe În {daysLeft}, vei pierde accesul la personalizarea profilului, la încărcarea fișierelor mai mari, la partajarea ecranului îmbunătățită și la multe altele. - Astăzi vei pierde accesul la personalizarea profilului, la încărcarea fișierelor mai mari, la partajarea ecranului îmbunătățită și la multe altele. Accesul tău la Nitro se încheie astăzi. Ignoră Păstrează Nitro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 594e5f776c..80d3261f10 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -6507,7 +6507,6 @@ Ваша подписка Nitro закончится {daysLeft}. Добавьте способ оплаты, чтобы сохранить доступ к персонализации профиля и другим возможностям. Подробнее Вы потеряете доступ к персонализации профиля, возможности загружать файлы большего размера, более высокому качеству видео при показе экрана и многому другому через {daysLeft}. - Сегодня вы потеряете доступ к персонализации профиля, возможности загружать файлы большего размера, более высокому качеству видео при показе экрана и многому другому. Ваша подписка Nitro завершается сегодня. Отклонить Не отменять Nitro diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 84f3e86151..b53eb91102 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -6345,7 +6345,6 @@ Din Nitro-prenumeration upphör {daysLeft} Lägg till en betalningsmetod för att kunna fortsätta med profilanpassning och annat. Läs mer Om {daysLeft} kommer du att förlora åtkomsten till profilanpassning, större filuppladdningar, bättre skärmdelning och annat. - Idag kommer du att förlora åtkomsten till profilanpassning, större filuppladdningar, bättre skärmdelning och annat. Din åtkomst till Nitro upphör idag. Avvisa Behåll Nitro diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 684c37505d..7e8205e01d 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -6492,7 +6492,6 @@ การสมัครสมาชิก Nitro ของคุณกำลังจะหมดอายุลง{daysLeft} เพิ่มวิธีการชำระเงินเพื่อใช้การปรับแต่งโปรไฟล์และอื่น ๆ ต่อ เรียนรู้เพิ่มเติม คุณจะสูญเสียสิทธิ์การเข้าถึงการปรับแต่งโปรไฟล์ การอัปโหลดไฟล์ที่ใหญ่ขึ้น การแบ่งปันหน้าจอที่ดีขึ้น และอื่น ๆ ใน {daysLeft} - คุณจะสูญเสียสิทธิ์การเข้าถึงการปรับแต่งโปรไฟล์ การอัปโหลดไฟล์ที่ใหญ่ขึ้น การแบ่งปันหน้าจอที่ดีขึ้น และอื่น ๆ ในวันนี้ สิทธิ์การเข้าถึง Nitro ของคุณจะสิ้นสุดลงวันนี้ ยกเลิก เก็บ Nitro diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4b51a919c1..271e5f1229 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -6508,7 +6508,6 @@ Nitro aboneliğin {daysLeft} sona eriyor. Profil özelleştirmeleri ve daha fazlasını kullanmaya devam etmek için bir ödeme yöntemi ekle. Daha Fazla Bilgi Edin {daysLeft} içinde profil özelleştirmeleri, daha büyük dosya yükleme, daha iyi ekran paylaşımı gibi birçok özelliğe erişimini kaybedeceksin. - Bugün profil özelleştirmeleri, daha büyük dosya yükleme, daha iyi ekran paylaşımı gibi birçok özelliğe erişimini kaybedeceksin. Nitro erişimin bugün sona eriyor. Kapat Nitro\'yu Bırakma diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 21b4535d3d..a1526f5b8c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -6492,7 +6492,6 @@ Термін дії вашої передплати Nitro спливає {daysLeft}. Додайте спосіб оплати, щоб і далі використовувати персоналізацію профілю та інші вигоди. Дізнатися більше Ви втратите персоналізацію профілю, завантаження більших файлів, кращу якість демонстрації екрана та інші вигоди за {daysLeft}. - Ви можете втратити персоналізацію профілю, завантаження більших файлів, кращу якість демонстрації екрана та інші вигоди вже сьогодні. Доступ до Nitro завершується сьогодні. Відхилити Зберегти Nitro diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3036c05468..1960526ec0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -6494,7 +6494,6 @@ Gói đăng ký Nitro của bạn kết thúc vào {daysLeft}. Thêm phương thức thanh toán để tiếp tục sử dụng tùy chỉnh hồ sơ và các tính năng khác. Tìm hiểu thêm Bạn sẽ mất quyền tùy chỉnh hồ sơ, tải lên tệp lớn hơn, chia sẻ màn hình chất lượng cao và hơn thế nữa trong {daysLeft}. - Bạn sẽ mất quyền tùy chỉnh hồ sơ, tải lên tệp lớn hơn, chia sẻ màn hình chất lượng cao và hơn thế nữa ngay hôm nay. Quyền truy cập Nitro của bạn kết thúc vào hôm nay. Hủy bỏ Giữ lại gói Nitro diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bcd3e6884f..98abe52f35 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -6501,7 +6501,6 @@ 您的 Nitro 订阅将于{daysLeft}到期。添加付款方式，继续使用个人资料自定义及更多特权吧。 了解更多 {daysLeft}后，您将失去个人资料自定义、更大的文件上传尺寸、更好的屏幕分享体验等权限。 - 就在今天，您即将失去个人资料自定义、更大的文件上传尺寸、更好的屏幕分享体验等权限。 您的 Nitro 访问权限将于今天到期。 解除 保留 Nitro diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e48f47bbb2..cc28b0114e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -6496,7 +6496,6 @@ 您的 Nitro 訂閱將在{daysLeft}結束。只要新增付款方式，就能繼續使用個人資料自訂等功能。 瞭解更多 {daysLeft}後，您將無法使用個人資料自訂、更大的檔案上傳量和更好的畫面分享效能等福利。 - 您今天將無法使用個人資料自訂、更大的檔案上傳量和更好的畫面分享效能等福利。 您的 Nitro 存取權限將在今天結束。 取消 保留 Nitro diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index b2e673c1dc..215d4bc73c 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -1184,9 +1184,17 @@ in {#} day in {#} days + + in {#} day + in {#} days + - {#} day - {#} days + in {#} day + in {#} days + + + in {#} day + in {#} days {#} day diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index ae8126b4bf..4ba2076346 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -10774,90 +10774,92 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15539,2549 +15541,2549 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18150,620 +18152,620 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21517,2877 +21519,2879 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 042868b257..419c688b84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1128,6 +1128,8 @@ Turn Off Camera Turn On Camera Camera Permission Required + Always preview video + Pops up preview modal every time you turn on video Camera Preview Camera Turn on camera @@ -1427,7 +1429,7 @@ Select a color Transparency Use Default - 0890219c5c134764b083b3ddb5afd89a + 8bfaf5263cc849c98ec207e87ff2b910 Coming Soon Slash command application {applicationName} {applicationName} application @@ -3586,7 +3588,6 @@ Write a description Select a format Enable monetization - Create a team Fill out the basics Set visual flair Select perks @@ -3605,11 +3606,11 @@ Access to exclusive channels is just one way to reward premium subscribers. You can also offer other perks. Any other benefits? Step {number} of {total} - Vitae quis facilisi integer nec lobortis et purus. Sed arcu odio leo vel gravida faucibus aliquet. Dolor velit viverra mauris rhoncus tortor vulputate quam erat quis. Senectus morbi vitae ut justo ut ultrices. + Aliquet augue condimentum leo egestas. Justo, tellus mattis nibh donec velit. Vitae quis facilisi integer nec lobortis et purus. Sed arcu odio leo vel gravida faucibus aliquet. Dolor velit viverra mauris rhoncus tortor vulputate quam erat quis. Senectus morbi vitae ut justo ut ultrices. Transaction History [Edit Payment Info]({url}) - Manage Payment + Payment Overview Next Payment Revenue Total Members @@ -3670,7 +3671,6 @@ Search channels (PLACEHOLDER) Basic Info - Members Payment Tiers Premium Membership @@ -3739,6 +3739,7 @@ {count} Member Color & Badge Subscribe + Subscribed Subscribe You have **{numSubscriptions} active {numSubscriptions}** Premium Membership @@ -4252,7 +4253,7 @@ Display role: Remove role !!{roleName}!! Server Members - We\'re no strangers to love + Server Monetization {boosts} to unlock Tier {tier} perk unlocked This is a Tier {tier} Nitro Feature. [Check your tier status]({tierStatusUrl}) @@ -4352,7 +4353,6 @@ Welcome to **!!{guildName}!!!** You must remove all invalid channels first before you can save. Manage Roles - Manage Payment Create a new tier You may want to grant members of premium tiers additional privileges on your server. Only mess with this stuff if you’re a Discord professional. Perks @@ -4362,10 +4362,10 @@ Edit Roles Permissions Publish And if you ask me how I\'m feeling, Don\'t tell me you\'re too blind to see - Never gonna + Premium Tier Some helpful info about what a tier is goes here. Manage Tiers - You know the rules and so do I + Premium Membership Server Banner Server Invite Background Set Up Discovery @@ -7106,9 +7106,12 @@ You will have premium chat, **{num}** Boosts, and a Boost discount **as soon as your payment processes.** We will send you an email as soon as it does Add Payment Your Nitro subscription ends {daysLeft}. Add a payment method to keep using profile customization and more. + Add Payment + Your Nitro Classic sub ends {daysLeft}. Add a payment method to keep using custom emojis and more. Learn More - You’ll lose access to profile customization, bigger file uploads, better screen share, and more in {daysLeft}. - You’re going to lose access to profile customization, bigger file uploads, better screen share, and more today. + You’ll lose access to profile customization, bigger file uploads, better screen share, and more {daysLeft}. + Manage Plan + Your Nitro Classic access ends {daysLeft}. Renew now to keep custom emoji, bigger uploads, and more. Your Nitro access ends today. Dismiss Keep Nitro @@ -7571,15 +7574,14 @@ Audio Quality Screen Share Quality Compare Plans - Perks - Hover for info + Rewards + Hover on rewards for more info Threads Archive {resolution}/{framerate}fps 1 hour, 1 day up to 3 days up to 7 days up to 7 days - Hover for info You did it! You are here! {numSubscriptionsApplied}