From 5efb8661df57d480b04f80577cc56f96b112cb37 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Wed, 17 Nov 2021 19:04:44 +0100 Subject: [PATCH] 103.3 - Alpha (103203) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- ...StoreContactSync$clearDismissStates$1.java | 22 + ...ontactSync$dismissFriendsListUpsell$1.java | 22 + .../StoreContactSync$dismissUpsell$1.java | 22 + ...tSync$setContactSyncUploadTimestamp$1.java | 25 + .../com/discord/stores/StoreContactSync.java | 28 +- ...reGifPicker$fetchGifsForSearchQuery$2.java | 43 +- ...GifPicker$fetchSuggestedSearchTerms$1.java | 43 +- ...GifPicker$fetchSuggestedSearchTerms$2.java | 7 +- .../com/discord/stores/StoreGifPicker.java | 8 +- ...GuildScheduledEvents$fetchRsvpUsers$1.java | 25 +- ...GuildScheduledEvents$fetchRsvpUsers$2.java | 51 +- ...GuildScheduledEvents$fetchRsvpUsers$3.java | 65 + .../stores/StoreGuildScheduledEvents.java | 6 +- ...ells$dismissPushNotificationsUpsell$1.java | 21 + .../stores/StoreNotificationUpsells.java | 15 +- .../java/com/discord/stores/StoreStream.java | 4 +- ...toreUserSettingsSystem$setFontScale$2.java | 27 + .../stores/StoreUserSettingsSystem.java | 17 +- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 14 +- app/src/main/res/values-en-rXA/strings.xml | 14 +- app/src/main/res/values/public.xml | 13286 ++++++++-------- app/src/main/res/values/strings.xml | 16 +- 25 files changed, 7032 insertions(+), 6757 deletions(-) create mode 100644 app/src/main/java/com/discord/stores/StoreContactSync$clearDismissStates$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreContactSync$dismissFriendsListUpsell$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreContactSync$dismissUpsell$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreContactSync$setContactSyncUploadTimestamp$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$3.java create mode 100644 app/src/main/java/com/discord/stores/StoreNotificationUpsells$dismissPushNotificationsUpsell$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setFontScale$2.java diff --git a/app/build.gradle b/app/build.gradle index 8077cb16ce..6a4f8a13e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 103202 - versionName "103.2 - Alpha" + versionCode 103203 + versionName "103.3 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a44e03506..b932f6d254 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/stores/StoreContactSync$clearDismissStates$1.java b/app/src/main/java/com/discord/stores/StoreContactSync$clearDismissStates$1.java new file mode 100644 index 0000000000..44dff101f9 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreContactSync$clearDismissStates$1.java @@ -0,0 +1,22 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreContactSync.kt */ +public final class StoreContactSync$clearDismissStates$1 extends o implements Function0 { + public final /* synthetic */ StoreContactSync this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreContactSync$clearDismissStates$1(StoreContactSync storeContactSync) { + super(0); + this.this$0 = storeContactSync; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreContactSync.access$getDismissState$p(this.this$0).clear(); + this.this$0.markChanged(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreContactSync$dismissFriendsListUpsell$1.java b/app/src/main/java/com/discord/stores/StoreContactSync$dismissFriendsListUpsell$1.java new file mode 100644 index 0000000000..d47fd40e80 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreContactSync$dismissFriendsListUpsell$1.java @@ -0,0 +1,22 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreContactSync.kt */ +public final class StoreContactSync$dismissFriendsListUpsell$1 extends o implements Function0 { + public final /* synthetic */ StoreContactSync this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreContactSync$dismissFriendsListUpsell$1(StoreContactSync storeContactSync) { + super(0); + this.this$0 = storeContactSync; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreContactSync.access$getDismissState$p(this.this$0).put("CONTACT_SYNC_DISMISS_FRIENDS_UPSELL", Boolean.TRUE); + this.this$0.markChanged(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreContactSync$dismissUpsell$1.java b/app/src/main/java/com/discord/stores/StoreContactSync$dismissUpsell$1.java new file mode 100644 index 0000000000..c4881d26b1 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreContactSync$dismissUpsell$1.java @@ -0,0 +1,22 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreContactSync.kt */ +public final class StoreContactSync$dismissUpsell$1 extends o implements Function0 { + public final /* synthetic */ StoreContactSync this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreContactSync$dismissUpsell$1(StoreContactSync storeContactSync) { + super(0); + this.this$0 = storeContactSync; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreContactSync.access$getDismissState$p(this.this$0).put("CONTACT_SYNC_DISMISS_UPSELL", Boolean.TRUE); + this.this$0.markChanged(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreContactSync$setContactSyncUploadTimestamp$1.java b/app/src/main/java/com/discord/stores/StoreContactSync$setContactSyncUploadTimestamp$1.java new file mode 100644 index 0000000000..882e7530ea --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreContactSync$setContactSyncUploadTimestamp$1.java @@ -0,0 +1,25 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreContactSync.kt */ +public final class StoreContactSync$setContactSyncUploadTimestamp$1 extends o implements Function0 { + public final /* synthetic */ long $timestamp; + public final /* synthetic */ StoreContactSync this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreContactSync$setContactSyncUploadTimestamp$1(StoreContactSync storeContactSync, long j) { + super(0); + this.this$0 = storeContactSync; + this.$timestamp = j; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreContactSync storeContactSync = this.this$0; + StoreContactSync.access$setShouldTryUploadContacts$p(storeContactSync, StoreContactSync.access$getClock$p(storeContactSync).currentTimeMillis() - this.$timestamp > 86400000); + this.this$0.markChanged(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreContactSync.java b/app/src/main/java/com/discord/stores/StoreContactSync.java index 03925be196..04d680c5b5 100644 --- a/app/src/main/java/com/discord/stores/StoreContactSync.java +++ b/app/src/main/java/com/discord/stores/StoreContactSync.java @@ -59,6 +59,22 @@ public final class StoreContactSync extends StoreV2 { this.userSettingsStore = storeUserSettings; } + public static final /* synthetic */ Clock access$getClock$p(StoreContactSync storeContactSync) { + return storeContactSync.clock; + } + + public static final /* synthetic */ HashMap access$getDismissState$p(StoreContactSync storeContactSync) { + return storeContactSync.dismissState; + } + + public static final /* synthetic */ boolean access$getShouldTryUploadContacts$p(StoreContactSync storeContactSync) { + return storeContactSync.shouldTryUploadContacts; + } + + public static final /* synthetic */ void access$setShouldTryUploadContacts$p(StoreContactSync storeContactSync, boolean z2) { + storeContactSync.shouldTryUploadContacts = z2; + } + private final StoreNotices.Notice createContactSyncNotice() { return new StoreNotices.Notice("CONTACT_SYNC_UPSELL", null, 1336, 0, true, null, 0, false, 0, StoreContactSync$createContactSyncNotice$1.INSTANCE, 482, null); } @@ -78,22 +94,19 @@ public final class StoreContactSync extends StoreV2 { } public final void clearDismissStates() { - this.dismissState.clear(); this.dismissStateCache.clear(true); getPrefsSessionDurable().edit().remove("CONTACT_SYNC_DISMISS_UPSELL").apply(); - markChanged(); + this.dispatcher.schedule(new StoreContactSync$clearDismissStates$1(this)); } public final void dismissFriendsListUpsell() { - this.dismissState.put("CONTACT_SYNC_DISMISS_FRIENDS_UPSELL", Boolean.TRUE); this.dismissStateCache.set(this.dismissState, true); - markChanged(); + this.dispatcher.schedule(new StoreContactSync$dismissFriendsListUpsell$1(this)); } public final void dismissUpsell() { - this.dismissState.put("CONTACT_SYNC_DISMISS_UPSELL", Boolean.TRUE); getPrefsSessionDurable().edit().putBoolean("CONTACT_SYNC_DISMISS_UPSELL", true).apply(); - markChanged(); + this.dispatcher.schedule(new StoreContactSync$dismissUpsell$1(this)); } public final boolean getFriendsListUpsellDismissed() { @@ -167,8 +180,7 @@ public final class StoreContactSync extends StoreV2 { } public final void setContactSyncUploadTimestamp(long j) { - this.shouldTryUploadContacts = this.clock.currentTimeMillis() - j > 86400000; this.uploadTimestampCache.set(Long.valueOf(j), true); - markChanged(); + this.dispatcher.schedule(new StoreContactSync$setContactSyncUploadTimestamp$1(this, j)); } } diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.java b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.java index 079b7643a2..a6a6800b4c 100644 --- a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.java +++ b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchGifsForSearchQuery$2.java @@ -1,18 +1,53 @@ package com.discord.stores; +import com.discord.utilities.error.Error; import d0.t.n; -import rx.functions.Action1; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; /* compiled from: StoreGifPicker.kt */ -public final class StoreGifPicker$fetchGifsForSearchQuery$2 implements Action1 { +public final class StoreGifPicker$fetchGifsForSearchQuery$2 extends o implements Function1 { public final /* synthetic */ String $query; public final /* synthetic */ StoreGifPicker this$0; + /* compiled from: StoreGifPicker.kt */ + /* renamed from: com.discord.stores.StoreGifPicker$fetchGifsForSearchQuery$2$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ StoreGifPicker$fetchGifsForSearchQuery$2 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreGifPicker$fetchGifsForSearchQuery$2 storeGifPicker$fetchGifsForSearchQuery$2) { + super(0); + this.this$0 = storeGifPicker$fetchGifsForSearchQuery$2; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreGifPicker$fetchGifsForSearchQuery$2 storeGifPicker$fetchGifsForSearchQuery$2 = this.this$0; + StoreGifPicker.access$handleGifSearchResults(storeGifPicker$fetchGifsForSearchQuery$2.this$0, storeGifPicker$fetchGifsForSearchQuery$2.$query, n.emptyList()); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public StoreGifPicker$fetchGifsForSearchQuery$2(StoreGifPicker storeGifPicker, String str) { + super(1); this.this$0 = storeGifPicker; this.$query = str; } - public final void call(Throwable th) { - StoreGifPicker.access$handleGifSearchResults(this.this$0, this.$query, n.emptyList()); + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + StoreGifPicker.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this)); } } diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.java b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.java index e9524fd48d..f5538a6e75 100644 --- a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.java +++ b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$1.java @@ -1,18 +1,53 @@ package com.discord.stores; +import com.discord.utilities.error.Error; import d0.t.n; -import rx.functions.Action1; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; /* compiled from: StoreGifPicker.kt */ -public final class StoreGifPicker$fetchSuggestedSearchTerms$1 implements Action1 { +public final class StoreGifPicker$fetchSuggestedSearchTerms$1 extends o implements Function1 { public final /* synthetic */ String $query; public final /* synthetic */ StoreGifPicker this$0; + /* compiled from: StoreGifPicker.kt */ + /* renamed from: com.discord.stores.StoreGifPicker$fetchSuggestedSearchTerms$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ StoreGifPicker$fetchSuggestedSearchTerms$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreGifPicker$fetchSuggestedSearchTerms$1 storeGifPicker$fetchSuggestedSearchTerms$1) { + super(0); + this.this$0 = storeGifPicker$fetchSuggestedSearchTerms$1; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreGifPicker$fetchSuggestedSearchTerms$1 storeGifPicker$fetchSuggestedSearchTerms$1 = this.this$0; + StoreGifPicker.access$handleSuggestedSearchTerms(storeGifPicker$fetchSuggestedSearchTerms$1.this$0, storeGifPicker$fetchSuggestedSearchTerms$1.$query, n.emptyList()); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public StoreGifPicker$fetchSuggestedSearchTerms$1(StoreGifPicker storeGifPicker, String str) { + super(1); this.this$0 = storeGifPicker; this.$query = str; } - public final void call(Throwable th) { - StoreGifPicker.access$handleSuggestedSearchTerms(this.this$0, this.$query, n.emptyList()); + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + StoreGifPicker.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this)); } } diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.java b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.java index 60027cf641..fddcde6cd7 100644 --- a/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.java +++ b/app/src/main/java/com/discord/stores/StoreGifPicker$fetchSuggestedSearchTerms$2.java @@ -28,11 +28,7 @@ public final class StoreGifPicker$fetchSuggestedSearchTerms$2 extends o implemen /* renamed from: invoke */ public final void mo1invoke() { StoreGifPicker$fetchSuggestedSearchTerms$2 storeGifPicker$fetchSuggestedSearchTerms$2 = this.this$0; - StoreGifPicker storeGifPicker = storeGifPicker$fetchSuggestedSearchTerms$2.this$0; - String str = storeGifPicker$fetchSuggestedSearchTerms$2.$query; - List list = this.$suggestedSearchTerms; - m.checkNotNullExpressionValue(list, "suggestedSearchTerms"); - StoreGifPicker.access$handleSuggestedSearchTerms(storeGifPicker, str, list); + StoreGifPicker.access$handleSuggestedSearchTerms(storeGifPicker$fetchSuggestedSearchTerms$2.this$0, storeGifPicker$fetchSuggestedSearchTerms$2.$query, this.$suggestedSearchTerms); } } @@ -52,6 +48,7 @@ public final class StoreGifPicker$fetchSuggestedSearchTerms$2 extends o implemen } public final void invoke(List list) { + m.checkNotNullParameter(list, "suggestedSearchTerms"); StoreGifPicker.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, list)); } } diff --git a/app/src/main/java/com/discord/stores/StoreGifPicker.java b/app/src/main/java/com/discord/stores/StoreGifPicker.java index 8d4e7f99e0..c43c9d9688 100644 --- a/app/src/main/java/com/discord/stores/StoreGifPicker.java +++ b/app/src/main/java/com/discord/stores/StoreGifPicker.java @@ -288,15 +288,11 @@ public final class StoreGifPicker extends StoreV2 { private final void fetchGifsForSearchQuery(String str) { Observable F = this.restAPI.getGifSearchResults(str, "tenor", this.storeUserSettingsSystem.getLocale(), "tinygif", 50).F(StoreGifPicker$fetchGifsForSearchQuery$1.INSTANCE); m.checkNotNullExpressionValue(F, "restAPI.getGifSearchResu…to)\n }\n }"); - Observable s2 = ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null).s(new StoreGifPicker$fetchGifsForSearchQuery$2(this, str)); - m.checkNotNullExpressionValue(s2, "restAPI.getGifSearchResu…y, emptyList())\n }"); - ObservableExtensionsKt.appSubscribe$default(s2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(F, false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchGifsForSearchQuery$2(this, str), (Function0) null, (Function0) null, new StoreGifPicker$fetchGifsForSearchQuery$3(this, str), 54, (Object) null); } private final void fetchSuggestedSearchTerms(String str) { - Observable s2 = ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null).s(new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str)); - m.checkNotNullExpressionValue(s2, "restAPI.getGifSuggestedS…y, emptyList())\n }"); - ObservableExtensionsKt.appSubscribe$default(s2, StoreGifPicker.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGifSuggestedSearchTerms("tenor", str, this.storeUserSettingsSystem.getLocale(), 5), false, 1, null), StoreGifPicker.class, (Context) null, (Function1) null, new StoreGifPicker$fetchSuggestedSearchTerms$1(this, str), (Function0) null, (Function0) null, new StoreGifPicker$fetchSuggestedSearchTerms$2(this, str), 54, (Object) null); } private final void fetchTrendingCategoryGifs() { diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$1.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$1.java index e090dad01e..0251042a3d 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$1.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$1.java @@ -1,30 +1,23 @@ package com.discord.stores; -import com.discord.utilities.error.Error; -import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import kotlin.jvm.functions.Function0; /* compiled from: StoreGuildScheduledEvents.kt */ -public final class StoreGuildScheduledEvents$fetchRsvpUsers$1 extends o implements Function1 { +public final class StoreGuildScheduledEvents$fetchRsvpUsers$1 extends o implements Function0 { public final /* synthetic */ StoreGuildScheduledEvents this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public StoreGuildScheduledEvents$fetchRsvpUsers$1(StoreGuildScheduledEvents storeGuildScheduledEvents) { - super(1); + super(0); this.this$0 = storeGuildScheduledEvents; } - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); - return Unit.a; - } - - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - StoreGuildScheduledEvents.access$handleFetchRsvpUsersFailure(this.this$0); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreGuildScheduledEvents.access$setUsersForGuildEventFetching$p(this.this$0, true); + StoreGuildScheduledEvents.access$setUsersForGuildEventError$p(this.this$0, false); + this.this$0.markChanged(); } } diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$2.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$2.java index b45cc2517e..3848d9b3eb 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$2.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$2.java @@ -1,65 +1,30 @@ package com.discord.stores; -import com.discord.api.guildscheduledevent.GuildScheduledEventRsvpUser; -import com.discord.api.guildscheduledevent.GuildScheduledEventRsvpUsersResponse; +import com.discord.utilities.error.Error; import d0.z.d.m; import d0.z.d.o; -import java.util.HashMap; import kotlin.Unit; -import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: StoreGuildScheduledEvents.kt */ -public final class StoreGuildScheduledEvents$fetchRsvpUsers$2 extends o implements Function1 { - public final /* synthetic */ long $eventId; +public final class StoreGuildScheduledEvents$fetchRsvpUsers$2 extends o implements Function1 { public final /* synthetic */ StoreGuildScheduledEvents this$0; - /* compiled from: StoreGuildScheduledEvents.kt */ - /* renamed from: com.discord.stores.StoreGuildScheduledEvents$fetchRsvpUsers$2$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ GuildScheduledEventRsvpUsersResponse $response; - public final /* synthetic */ StoreGuildScheduledEvents$fetchRsvpUsers$2 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreGuildScheduledEvents$fetchRsvpUsers$2 storeGuildScheduledEvents$fetchRsvpUsers$2, GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { - super(0); - this.this$0 = storeGuildScheduledEvents$fetchRsvpUsers$2; - this.$response = guildScheduledEventRsvpUsersResponse; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - HashMap hashMap = (HashMap) StoreGuildScheduledEvents.access$getUsersForGuildEvent$p(this.this$0.this$0).get(Long.valueOf(this.this$0.$eventId)); - if (hashMap == null) { - hashMap = new HashMap(); - } - for (GuildScheduledEventRsvpUser guildScheduledEventRsvpUser : this.$response.a()) { - hashMap.put(Long.valueOf(guildScheduledEventRsvpUser.d()), guildScheduledEventRsvpUser); - } - StoreGuildScheduledEvents.access$getUsersForGuildEvent$p(this.this$0.this$0).put(Long.valueOf(this.this$0.$eventId), hashMap); - StoreGuildScheduledEvents.access$setUsersForGuildEventFetching$p(this.this$0.this$0, false); - StoreGuildScheduledEvents.access$setUsersForGuildEventError$p(this.this$0.this$0, false); - this.this$0.this$0.markChanged(); - } - } - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreGuildScheduledEvents$fetchRsvpUsers$2(StoreGuildScheduledEvents storeGuildScheduledEvents, long j) { + public StoreGuildScheduledEvents$fetchRsvpUsers$2(StoreGuildScheduledEvents storeGuildScheduledEvents) { super(1); this.this$0 = storeGuildScheduledEvents; - this.$eventId = j; } /* Return type fixed from 'java.lang.Object' to match base method */ /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { - invoke(guildScheduledEventRsvpUsersResponse); + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); return Unit.a; } - public final void invoke(GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { - m.checkNotNullParameter(guildScheduledEventRsvpUsersResponse, "response"); - StoreGuildScheduledEvents.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, guildScheduledEventRsvpUsersResponse)); + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + StoreGuildScheduledEvents.access$handleFetchRsvpUsersFailure(this.this$0); } } diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$3.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$3.java new file mode 100644 index 0000000000..ec503e6956 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents$fetchRsvpUsers$3.java @@ -0,0 +1,65 @@ +package com.discord.stores; + +import com.discord.api.guildscheduledevent.GuildScheduledEventRsvpUser; +import com.discord.api.guildscheduledevent.GuildScheduledEventRsvpUsersResponse; +import d0.z.d.m; +import d0.z.d.o; +import java.util.HashMap; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreGuildScheduledEvents.kt */ +public final class StoreGuildScheduledEvents$fetchRsvpUsers$3 extends o implements Function1 { + public final /* synthetic */ long $eventId; + public final /* synthetic */ StoreGuildScheduledEvents this$0; + + /* compiled from: StoreGuildScheduledEvents.kt */ + /* renamed from: com.discord.stores.StoreGuildScheduledEvents$fetchRsvpUsers$3$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ GuildScheduledEventRsvpUsersResponse $response; + public final /* synthetic */ StoreGuildScheduledEvents$fetchRsvpUsers$3 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreGuildScheduledEvents$fetchRsvpUsers$3 storeGuildScheduledEvents$fetchRsvpUsers$3, GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { + super(0); + this.this$0 = storeGuildScheduledEvents$fetchRsvpUsers$3; + this.$response = guildScheduledEventRsvpUsersResponse; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + HashMap hashMap = (HashMap) StoreGuildScheduledEvents.access$getUsersForGuildEvent$p(this.this$0.this$0).get(Long.valueOf(this.this$0.$eventId)); + if (hashMap == null) { + hashMap = new HashMap(); + } + for (GuildScheduledEventRsvpUser guildScheduledEventRsvpUser : this.$response.a()) { + hashMap.put(Long.valueOf(guildScheduledEventRsvpUser.d()), guildScheduledEventRsvpUser); + } + StoreGuildScheduledEvents.access$getUsersForGuildEvent$p(this.this$0.this$0).put(Long.valueOf(this.this$0.$eventId), hashMap); + StoreGuildScheduledEvents.access$setUsersForGuildEventFetching$p(this.this$0.this$0, false); + StoreGuildScheduledEvents.access$setUsersForGuildEventError$p(this.this$0.this$0, false); + this.this$0.this$0.markChanged(); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreGuildScheduledEvents$fetchRsvpUsers$3(StoreGuildScheduledEvents storeGuildScheduledEvents, long j) { + super(1); + this.this$0 = storeGuildScheduledEvents; + this.$eventId = j; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { + invoke(guildScheduledEventRsvpUsersResponse); + return Unit.a; + } + + public final void invoke(GuildScheduledEventRsvpUsersResponse guildScheduledEventRsvpUsersResponse) { + m.checkNotNullParameter(guildScheduledEventRsvpUsersResponse, "response"); + StoreGuildScheduledEvents.access$getDispatcher$p(this.this$0).schedule(new AnonymousClass1(this, guildScheduledEventRsvpUsersResponse)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java index 930abe2fab..48ec204fae 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java @@ -402,10 +402,8 @@ public final class StoreGuildScheduledEvents extends StoreV2 { } public final void fetchRsvpUsers(long j, long j2) { - this.isUsersForGuildEventFetching = true; - this.isUsersForGuildEventError = false; - markChanged(); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getGuildScheduledEventUsers(j, j2, 100, true), false, 1, null), StoreGuildScheduledEvents.class, (Context) null, (Function1) null, new StoreGuildScheduledEvents$fetchRsvpUsers$1(this), (Function0) null, (Function0) null, new StoreGuildScheduledEvents$fetchRsvpUsers$2(this, j2), 54, (Object) null); + this.dispatcher.schedule(new StoreGuildScheduledEvents$fetchRsvpUsers$1(this)); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getGuildScheduledEventUsers(j, j2, 100, true), false, 1, null), StoreGuildScheduledEvents.class, (Context) null, (Function1) null, new StoreGuildScheduledEvents$fetchRsvpUsers$2(this), (Function0) null, (Function0) null, new StoreGuildScheduledEvents$fetchRsvpUsers$3(this, j2), 54, (Object) null); } public final void fetchUserGuildScheduledEvents(long j) { diff --git a/app/src/main/java/com/discord/stores/StoreNotificationUpsells$dismissPushNotificationsUpsell$1.java b/app/src/main/java/com/discord/stores/StoreNotificationUpsells$dismissPushNotificationsUpsell$1.java new file mode 100644 index 0000000000..b8abb7d227 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreNotificationUpsells$dismissPushNotificationsUpsell$1.java @@ -0,0 +1,21 @@ +package com.discord.stores; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreNotificationUpsells.kt */ +public final class StoreNotificationUpsells$dismissPushNotificationsUpsell$1 extends o implements Function0 { + public final /* synthetic */ StoreNotificationUpsells this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreNotificationUpsells$dismissPushNotificationsUpsell$1(StoreNotificationUpsells storeNotificationUpsells) { + super(0); + this.this$0 = storeNotificationUpsells; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + this.this$0.markChanged(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreNotificationUpsells.java b/app/src/main/java/com/discord/stores/StoreNotificationUpsells.java index 66d54b714a..dd0ca01d5b 100644 --- a/app/src/main/java/com/discord/stores/StoreNotificationUpsells.java +++ b/app/src/main/java/com/discord/stores/StoreNotificationUpsells.java @@ -7,20 +7,19 @@ import kotlin.jvm.internal.DefaultConstructorMarker; import rx.Observable; /* compiled from: StoreNotificationUpsells.kt */ public final class StoreNotificationUpsells extends StoreV2 { + private final Dispatcher dispatcher; private final ObservationDeck observationDeck; - public StoreNotificationUpsells() { - this(null, 1, null); - } - - public StoreNotificationUpsells(ObservationDeck observationDeck) { + public StoreNotificationUpsells(Dispatcher dispatcher, ObservationDeck observationDeck) { + m.checkNotNullParameter(dispatcher, "dispatcher"); m.checkNotNullParameter(observationDeck, "observationDeck"); + this.dispatcher = dispatcher; this.observationDeck = observationDeck; } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ - public /* synthetic */ StoreNotificationUpsells(ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? ObservationDeckProvider.get() : observationDeck); + public /* synthetic */ StoreNotificationUpsells(Dispatcher dispatcher, ObservationDeck observationDeck, int i, DefaultConstructorMarker defaultConstructorMarker) { + this(dispatcher, (i & 2) != 0 ? ObservationDeckProvider.get() : observationDeck); } public static final /* synthetic */ boolean access$getPushNotificationsUpsellDismissed(StoreNotificationUpsells storeNotificationUpsells) { @@ -33,7 +32,7 @@ public final class StoreNotificationUpsells extends StoreV2 { public final void dismissPushNotificationsUpsell() { getPrefsSessionDurable().edit().putBoolean("PUSH_NOTIFICATIONS_DISMISS_UPSELL", true).apply(); - markChanged(); + this.dispatcher.schedule(new StoreNotificationUpsells$dismissPushNotificationsUpsell$1(this)); } public final Observable observePushNotificationUpsellDismissed() { diff --git a/app/src/main/java/com/discord/stores/StoreStream.java b/app/src/main/java/com/discord/stores/StoreStream.java index 2b7746834e..557892f337 100644 --- a/app/src/main/java/com/discord/stores/StoreStream.java +++ b/app/src/main/java/com/discord/stores/StoreStream.java @@ -894,7 +894,7 @@ public final class StoreStream { StoreAccessibility storeAccessibility = new StoreAccessibility(dispatcher, null, null, 6, null); this.accessibility = storeAccessibility; this.userSettings = new StoreUserSettings(dispatcher, storeAccessibility); - StoreUserSettingsSystem storeUserSettingsSystem = new StoreUserSettingsSystem(new StoreStream$userSettingsSystem$1(this)); + StoreUserSettingsSystem storeUserSettingsSystem = new StoreUserSettingsSystem(new StoreStream$userSettingsSystem$1(this), dispatcher); this.userSettingsSystem = storeUserSettingsSystem; this.userSurvey = new StoreUserSurvey(dispatcher, storeUser, storeGuilds, storePermissions, ObservationDeckProvider.get(), companion.getApi(), clock, SharedPreferencesProvider.INSTANCE.get()); this.userRequiredAction = new StoreUserRequiredActions(ObservationDeckProvider.get()); @@ -1040,7 +1040,7 @@ public final class StoreStream { this.guildScheduledEvents = storeGuildScheduledEvents; StoreGuildRoleSubscriptions storeGuildRoleSubscriptions = new StoreGuildRoleSubscriptions(this.dispatcher, null, 2, null); this.guildRoleSubscriptions = storeGuildRoleSubscriptions; - StoreNotificationUpsells storeNotificationUpsells = new StoreNotificationUpsells(null, 1, null); + StoreNotificationUpsells storeNotificationUpsells = new StoreNotificationUpsells(this.dispatcher, null, 2, null); this.notificationUpsells = storeNotificationUpsells; ConnectionTimeStats connectionTimeStats = new ConnectionTimeStats(this.clock); this.connectionTimeStats = connectionTimeStats; diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setFontScale$2.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setFontScale$2.java new file mode 100644 index 0000000000..cd67a67d67 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem$setFontScale$2.java @@ -0,0 +1,27 @@ +package com.discord.stores; + +import com.discord.stores.StoreUserSettingsSystem; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: StoreUserSettingsSystem.kt */ +public final class StoreUserSettingsSystem$setFontScale$2 extends o implements Function0 { + public final /* synthetic */ int $fontScale; + public final /* synthetic */ StoreUserSettingsSystem this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreUserSettingsSystem$setFontScale$2(StoreUserSettingsSystem storeUserSettingsSystem, int i) { + super(0); + this.this$0 = storeUserSettingsSystem; + this.$fontScale = i; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreUserSettingsSystem storeUserSettingsSystem = this.this$0; + StoreUserSettingsSystem.access$setSettings$p(storeUserSettingsSystem, StoreUserSettingsSystem.Settings.copy$default(StoreUserSettingsSystem.access$getSettings$p(storeUserSettingsSystem), null, null, this.$fontScale, 3, null)); + this.this$0.markChanged(); + StoreUserSettingsSystem.access$getOnFontScaleUpdated$p(this.this$0).invoke(Integer.valueOf(this.$fontScale)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java index b8dbc61852..1cd81fbce6 100644 --- a/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java +++ b/app/src/main/java/com/discord/stores/StoreUserSettingsSystem.java @@ -22,6 +22,7 @@ import rx.Observable; public final class StoreUserSettingsSystem extends StoreV2 { public static final Companion Companion = new Companion(null); private static final boolean DEFAULT_IS_CLIENT_SYNC_ENABLED = true; + private final Dispatcher dispatcher; private final Function1 onFontScaleUpdated; private Settings settings; @@ -134,9 +135,15 @@ public final class StoreUserSettingsSystem extends StoreV2 { /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: kotlin.jvm.functions.Function1 */ /* JADX WARN: Multi-variable type inference failed */ - public StoreUserSettingsSystem(Function1 function1) { + public StoreUserSettingsSystem(Function1 function1, Dispatcher dispatcher) { m.checkNotNullParameter(function1, "onFontScaleUpdated"); + m.checkNotNullParameter(dispatcher, "dispatcher"); this.onFontScaleUpdated = function1; + this.dispatcher = dispatcher; + } + + public static final /* synthetic */ Function1 access$getOnFontScaleUpdated$p(StoreUserSettingsSystem storeUserSettingsSystem) { + return storeUserSettingsSystem.onFontScaleUpdated; } public static final /* synthetic */ Settings access$getSettings$p(StoreUserSettingsSystem storeUserSettingsSystem) { @@ -276,17 +283,11 @@ public final class StoreUserSettingsSystem extends StoreV2 { } public final void setFontScale(int i) { - Settings settings = this.settings; - if (settings == null) { - m.throwUninitializedPropertyAccessException("settings"); - } - this.settings = Settings.copy$default(settings, null, null, i, 3, null); SharedPreferences.Editor edit = getPrefs().edit(); m.checkNotNullExpressionValue(edit, "editor"); edit.putInt("CACHE_KEY_FONT_SCALE", i); edit.apply(); - markChanged(); - this.onFontScaleUpdated.invoke(Integer.valueOf(i)); + this.dispatcher.schedule(new StoreUserSettingsSystem$setFontScale$2(this, i)); } public final void setIsLocaleSyncEnabled(boolean z2) { 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 8fef107df0..1fbcf5ed03 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,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 + " - 103.2 - Alpha (103202)"); + textView.setText(string + " - 103.3 - Alpha (103203)"); binding.B.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/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index b92d287c0a..901a68f387 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -3619,6 +3619,16 @@ ‏‮Other‬‏ ‏‮I‬‏ ‏‮searched‬‏ ‏‮for‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮online‬‏ ‏‮Your‬‏ ‏‮Answer‬‏ + ‏‮I‬‏ ‏‮didn\'t‬‏ ‏‮mean‬‏ ‏‮to‬‏ ‏‮join‬‏ ‏‮this‬‏ ‏‮server‬‏ + ‏‮Why‬‏ ‏‮did‬‏ ‏‮you‬‏ ‏‮leave‬‏ ‏‮!!‬‏‏‮{server}‬‏‏‮!!?‬‏ + ‏‮Server‬‏ ‏‮was‬‏ ‏‮too‬‏ ‏‮confusing/I‬‏ ‏‮did‬‏ ‏‮not‬‏ ‏‮understand‬‏ ‏‮how‬‏ ‏‮to‬‏ ‏‮use‬‏ ‏‮it‬‏ + ‏‮Too‬‏ ‏‮many‬‏ ‏‮notifications‬‏ + ‏‮Can‬‏ ‏‮you‬‏ ‏‮tell‬‏ ‏‮us‬‏ ‏‮more?‬‏ + ‏‮There‬‏ ‏‮is‬‏ ‏‮no‬‏ ‏‮activity‬‏ ‏‮in‬‏ ‏‮this‬‏ ‏‮server‬‏ + ‏‮Too‬‏ ‏‮much‬‏ ‏‮activity‬‏ ‏‮in‬‏ ‏‮server‬‏ + ‏‮Thanks‬‏ ‏‮for‬‏ ‏‮your‬‏ ‏‮feedback!‬‏ ‏‮Feedback‬‏ ‏‮like‬‏ ‏‮yours‬‏ ‏‮helps‬‏ ‏‮us‬‏ ‏‮improve‬‏ ‏‮Discord.‬‏ + ‏‮Server‬‏ ‏‮content‬‏ ‏‮and/or‬‏ ‏‮members‬‏ ‏‮made‬‏ ‏‮me‬‏ ‏‮uncomfortable‬‏ + ‏‮I‬‏ ‏‮am‬‏ ‏‮not‬‏ ‏‮interested‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮topic‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers,‬‏ ‏‮upgrade‬‏ ‏‮your‬‏ ‏‮profile,‬‏ ‏‮[and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!](onAndMore)‬‏ ‏‮Be‬‏ ‏‮who‬‏ ‏‮you‬‏ ‏‮want‬‏ ‏‮and‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers,‬‏ ‏‮upgrade‬‏ ‏‮your‬‏ ‏‮profile,‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏ ‏‮Wanna‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar?‬‏ @@ -6146,8 +6156,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index af6c323a3c..15a827f8b4 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3619,6 +3619,16 @@ [Öţĥéŕ one] [Î šéåŕçĥéð ƒöŕ å šéŕVéŕ öñļîñé one two three four] [Ýöûŕ Åñšŵéŕ one two] + [Î ðîðñ\'ţ ḿéåñ ţö ĵöîñ ţĥîš šéŕVéŕ one two three four] + [Ŵĥý ðîð ýöû ļéåVé ¡¡»{server}«¡¡¿ one two three] + [ŠéŕVéŕ ŵåš ţöö çöñƒûšîñĝ/Î ðîð ñöţ ûñðéŕšţåñð ĥöŵ ţö ûšé îţ one two three four five six seven] + [Ţöö ḿåñý ñöţîƒîçåţîöñš one two three] + [Çåñ ýöû ţéļļ ûš ḿöŕé¿ one two three] + [Ţĥéŕé îš ñö åçţîVîţý îñ ţĥîš šéŕVéŕ one two three four] + [Ţöö ḿûçĥ åçţîVîţý îñ šéŕVéŕ one two three four] + [Ţĥåñķš ƒöŕ ýöûŕ ƒééðɓåçķ¡ Fééðɓåçķ ļîķé ýöûŕš ĥéļþš ûš îḿþŕöVé Ðîšçöŕð. one two three four five six seven eight] + [ŠéŕVéŕ çöñţéñţ åñð/öŕ ḿéḿɓéŕš ḿåðé ḿé ûñçöḿƒöŕţåɓļé one two three four five six] + [Î åḿ ñöţ îñţéŕéšţéð îñ ţĥé ţöþîç öƒ ţĥîš šéŕVéŕ one two three four five six] [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš, ûþĝŕåðé ýöûŕ þŕöƒîļé, [åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡](öñÅñðḾöŕé) one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three] [βé ŵĥö ýöû ŵåñţ åñð ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš, ûþĝŕåðé ýöûŕ þŕöƒîļé, åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven eight nine ten eleven twelve] [Ŵåññå ûšé å ðéŕéñţ åVåţåŕ¿ one two three four] @@ -6146,8 +6156,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index bee6ae5cb1..d487915161 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -18096,6644 +18096,6654 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 453afa9644..1b513706dc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1511,7 +1511,7 @@ Select a color Transparency Use Default - 70e14758b4a14c229d3d5ddc823c3ab0 + 019b6ff2646845b190c3d7ed158927a5 Coming Soon Slash command application {applicationName} {applicationName} application @@ -3635,6 +3635,16 @@ Other I searched for a server online Your Answer + I didn\'t mean to join this server + Why did you leave !!{server}!!? + Server was too confusing/I did not understand how to use it + Too many notifications + Can you tell us more? + There is no activity in this server + Too much activity in server + Thanks for your feedback! Feedback like yours helps us improve Discord. + Server content and/or members made me uncomfortable + I am not interested in the topic of this server Be who you want and use a different avatar in each of your servers, upgrade your profile, [and more with Discord Nitro!](onAndMore) Be who you want and use a different avatar in each of your servers, upgrade your profile, and more with Discord Nitro! Wanna use a different avatar? @@ -6165,8 +6175,8 @@ Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications