From 517229ce847ac46839e3109e98c424805df19ce1 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Fri, 19 Nov 2021 20:35:58 +0100 Subject: [PATCH] 103.8 - Alpha (103208) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../discord/models/domain/ModelUserNote.java | 2 - .../com/discord/stores/StoreUserNotes.java | 7 +- .../widgets/settings/WidgetSettings.java | 2 +- .../drawable-ldpi/img_age_gate_failure.png | Bin 8842 -> 8843 bytes app/src/main/res/values-ar-rXB/strings.xml | 6 +- app/src/main/res/values-en-rXA/strings.xml | 6 +- app/src/main/res/values/public.xml | 12846 ++++++++-------- app/src/main/res/values/strings.xml | 8 +- 10 files changed, 6447 insertions(+), 6436 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 304e8e9928..acb62d14c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 103207 - versionName "103.7 - Alpha" + versionCode 103208 + versionName "103.8 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6f60a6ea5..dd27496127 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/models/domain/ModelUserNote.java b/app/src/main/java/com/discord/models/domain/ModelUserNote.java index 9000a1b5c8..83224f8444 100644 --- a/app/src/main/java/com/discord/models/domain/ModelUserNote.java +++ b/app/src/main/java/com/discord/models/domain/ModelUserNote.java @@ -100,7 +100,6 @@ public final class ModelUserNote { } public ModelUserNote(long j, String str) { - m.checkNotNullParameter(str, "note"); this.noteUserId = j; this.note = str; } @@ -124,7 +123,6 @@ public final class ModelUserNote { } public final ModelUserNote copy(long j, String str) { - m.checkNotNullParameter(str, "note"); return new ModelUserNote(j, str); } diff --git a/app/src/main/java/com/discord/stores/StoreUserNotes.java b/app/src/main/java/com/discord/stores/StoreUserNotes.java index 45040eac28..ff5b5751ac 100644 --- a/app/src/main/java/com/discord/stores/StoreUserNotes.java +++ b/app/src/main/java/com/discord/stores/StoreUserNotes.java @@ -156,7 +156,12 @@ public final class StoreUserNotes extends StoreV2 { @StoreThread private final void handleRequestUserNoteSuccess(ModelUserNote modelUserNote) { - updateNoteInternal(modelUserNote.getNoteUserId(), modelUserNote.getNote()); + long noteUserId = modelUserNote.getNoteUserId(); + String note = modelUserNote.getNote(); + if (note == null) { + note = ""; + } + updateNoteInternal(noteUserId, note); } @StoreThread 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 67fc7c43d6..22719689d5 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.7 - Alpha (103207)"); + textView.setText(string + " - 103.8 - Alpha (103208)"); 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/drawable-ldpi/img_age_gate_failure.png b/app/src/main/res/drawable-ldpi/img_age_gate_failure.png index 0138941de65bd02c778ecf9515dedfbe54bb2d3a..da53e17086cbd945311842a5076fcb31f602dfa5 100644 GIT binary patch delta 8829 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 delta 8828 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‏‮Sorry,‬‏ ‏‮$[‬‏‏‮{serverName}‬‏ ‏‮Premium](serverNameHook)‬‏ ‏‮isn\'t‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮purchase‬‏ ‏‮on‬‏ ‏‮mobile‬‏ ‏‮We’re‬‏ ‏‮working‬‏ ‏‮on‬‏ ‏‮a‬‏ ‏‮solution.‬‏ ‏‮In‬‏ ‏‮the‬‏ ‏‮meantime,‬‏ ‏‮visit‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮on‬‏ ‏‮desktop‬‏ ‏‮or‬‏ ‏‮web‬‏ ‏‮for‬‏ ‏‮more‬‏ ‏‮info.‬‏ ‏‮Subscribe‬‏ ‏‮to‬‏ ‏‮**‬‏‏‮{serverName}‬‏ ‏‮Premium**‬‏ ‏‮to‬‏ ‏‮unlock‬‏ ‏‮#‬‏‏‮{channelName}‬‏ + ‏‮Your‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮charged‬‏ ‏‮at‬‏ ‏‮the‬‏ ‏‮beginning‬‏ ‏‮of‬‏ ‏‮the‬‏ ‏‮next‬‏ ‏‮billing‬‏ ‏‮period.‬‏ + ‏‮Your‬‏ ‏‮membership‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮restarted!‬‏ ‏‮Search‬‏ ‏‮channels‬‏ ‏‮Monetize‬‏ ‏‮your‬‏ ‏‮server‬‏ ‏‮by‬‏ ‏‮offering‬‏ ‏‮exclusive‬‏ ‏‮channels‬‏ ‏‮and‬‏ ‏‮benefits.‬‏ ‏‮Get‬‏ ‏‮Started‬‏ @@ -6168,8 +6170,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 27b699180d..affc7290d8 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3860,6 +3860,8 @@ [Šöŕŕý, €[»{serverName}« Þŕéḿîûḿ](šéŕVéŕÑåḿéĤööķ) îšñ\'ţ åVåîļåɓļé ţö þûŕçĥåšé öñ ḿöɓîļé one two three four five six seven eight nine ten eleven twelve thirteen fourteen] [Ŵé’ŕé ŵöŕķîñĝ öñ å šöļûţîöñ. Îñ ţĥé ḿéåñţîḿé, Vîšîţ ţĥîš šéŕVéŕ öñ ðéšķţöþ öŕ ŵéɓ ƒöŕ ḿöŕé îñƒö. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen] [Šûɓšçŕîɓé ţö **»{serverName}« Þŕéḿîûḿ** ţö ûñļöçķ #»{channelName}« one two three four five] + [Ýöûŕ þåýḿéñţ ḿéţĥöð ŵîļļ ɓé çĥåŕĝéð åţ ţĥé ɓéĝîññîñĝ öƒ ţĥé ñéхţ ɓîļļîñĝ þéŕîöð. one two three four five six seven eight nine] + [Ýöûŕ ḿéḿɓéŕšĥîþ ĥåš ɓééñ ŕéšţåŕţéð¡ one two three four] [Šéåŕçĥ çĥåññéļš one two three] [Ḿöñéţîžé ýöûŕ šéŕVéŕ ɓý öƒƒéŕîñĝ éхçļûšîVé çĥåññéļš åñð ɓéñéƒîţš. one two three four five six seven] [Ĝéţ Šţåŕţéð one two] @@ -6168,8 +6170,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 d73491b22b..a21291b42c 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -18338,6428 +18338,6430 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 01ac8ac9dd..27f262daf1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1514,7 +1514,7 @@ Select a color Transparency Use Default - 602a3cf5530748d7834a467383f85772 + fc4ffa0896154ceeaafed4a4b6f33cc9 Coming Soon Slash command application {applicationName} {applicationName} application @@ -3876,6 +3876,8 @@ Sorry, $[{serverName} Premium](serverNameHook) isn\'t available to purchase on mobile We’re working on a solution. In the meantime, visit this server on desktop or web for more info. Subscribe to **{serverName} Premium** to unlock #{channelName} + Your payment method will be charged at the beginning of the next billing period. + Your membership has been restarted! Search channels Monetize your server by offering exclusive channels and benefits. Get Started @@ -6187,8 +6189,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