diff --git a/app/build.gradle b/app/build.gradle index d29ff3fef7..40abc86ab4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102200 - versionName "102.0 - Alpha" + versionCode 102201 + versionName "102.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cae9dc754c..150bfb49f9 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/analytics/generated/events/TrackDataInfraTest.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java index a25dfd5ad7..4ad391867b 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java @@ -8,9 +8,10 @@ import d0.z.d.m; import java.util.List; /* compiled from: TrackDataInfraTest.kt */ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseReceiver { - private final transient String analyticsSchemaTypeName = "data_infra_test"; - private final CharSequence pushToken = null; - private final List pushTokenArr = null; + private final transient String analyticsSchemaTypeName; + private final CharSequence pushToken; + private final List pushTokenArr; + private final CharSequence requiredStr; private TrackBase trackBase; @Override // com.discord.api.science.AnalyticsSchema @@ -26,7 +27,7 @@ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseRecei return false; } TrackDataInfraTest trackDataInfraTest = (TrackDataInfraTest) obj; - return m.areEqual(this.pushToken, trackDataInfraTest.pushToken) && m.areEqual(this.pushTokenArr, trackDataInfraTest.pushTokenArr); + return m.areEqual(this.pushToken, trackDataInfraTest.pushToken) && m.areEqual(this.pushTokenArr, trackDataInfraTest.pushTokenArr) && m.areEqual(this.requiredStr, trackDataInfraTest.requiredStr); } public int hashCode() { @@ -34,16 +35,20 @@ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseRecei int i = 0; int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; List list = this.pushTokenArr; - if (list != null) { - i = list.hashCode(); + int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31; + CharSequence charSequence2 = this.requiredStr; + if (charSequence2 != null) { + i = charSequence2.hashCode(); } - return hashCode + i; + return hashCode2 + i; } public String toString() { StringBuilder R = a.R("TrackDataInfraTest(pushToken="); R.append(this.pushToken); R.append(", pushTokenArr="); - return a.J(R, this.pushTokenArr, ")"); + R.append(this.pushTokenArr); + R.append(", requiredStr="); + return a.D(R, this.requiredStr, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java new file mode 100644 index 0000000000..e8549031ef --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java @@ -0,0 +1,53 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackDismissibleContentDismissed.kt */ +public final class TrackDismissibleContentDismissed implements AnalyticsSchema, TrackBaseReceiver { + private final CharSequence action = null; + private final transient String analyticsSchemaTypeName = "dismissible_content_dismissed"; + private final Long contentCount = null; + private TrackBase trackBase; + private final CharSequence type = null; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackDismissibleContentDismissed)) { + return false; + } + TrackDismissibleContentDismissed trackDismissibleContentDismissed = (TrackDismissibleContentDismissed) obj; + return m.areEqual(this.type, trackDismissibleContentDismissed.type) && m.areEqual(this.action, trackDismissibleContentDismissed.action) && m.areEqual(this.contentCount, trackDismissibleContentDismissed.contentCount); + } + + public int hashCode() { + CharSequence charSequence = this.type; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + CharSequence charSequence2 = this.action; + int hashCode2 = (hashCode + (charSequence2 != null ? charSequence2.hashCode() : 0)) * 31; + Long l = this.contentCount; + if (l != null) { + i = l.hashCode(); + } + return hashCode2 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackDismissibleContentDismissed(type="); + R.append(this.type); + R.append(", action="); + R.append(this.action); + R.append(", contentCount="); + return a.F(R, this.contentCount, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java new file mode 100644 index 0000000000..c700aa648b --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackDismissibleContentDismissed.kt */ +public interface TrackDismissibleContentDismissedReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java new file mode 100644 index 0000000000..7450312cbc --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java @@ -0,0 +1,48 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackDismissibleContentShown.kt */ +public final class TrackDismissibleContentShown implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "dismissible_content_shown"; + private final Long contentCount = null; + private TrackBase trackBase; + private final CharSequence type = null; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackDismissibleContentShown)) { + return false; + } + TrackDismissibleContentShown trackDismissibleContentShown = (TrackDismissibleContentShown) obj; + return m.areEqual(this.type, trackDismissibleContentShown.type) && m.areEqual(this.contentCount, trackDismissibleContentShown.contentCount); + } + + public int hashCode() { + CharSequence charSequence = this.type; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + Long l = this.contentCount; + if (l != null) { + i = l.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackDismissibleContentShown(type="); + R.append(this.type); + R.append(", contentCount="); + return a.F(R, this.contentCount, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java new file mode 100644 index 0000000000..05ea19a607 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackDismissibleContentShown.kt */ +public interface TrackDismissibleContentShownReceiver extends AnalyticsSchema { +} 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 81e821913e..c02456ac94 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 + " - 102.0 - Alpha (102200)"); + textView.setText(string + " - 102.1 - Alpha (102201)"); 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-xxxhdpi/asset_nux_navigation_dms.png b/app/src/main/res/drawable-xxxhdpi/asset_nux_navigation_dms.png index 0bfa0b1d41..407ee93c74 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/asset_nux_navigation_dms.png and b/app/src/main/res/drawable-xxxhdpi/asset_nux_navigation_dms.png differ diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 351dfa5007..2afbc5fffd 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -9967,6 +9967,7 @@ ‏‮List‬‏ ‏‮Show‬‏ ‏‮Chat‬‏ ‏‮Show‬‏ ‏‮Members‬‏ + ‏‮View‬‏ ‏‮all‬‏ ‏‮(‬‏‏‮{count}‬‏‏‮)‬‏ ‏‮Sorry,‬‏ ‏‮video‬‏ ‏‮chat‬‏ ‏‮isn\'t‬‏ ‏‮available‬‏ ‏‮when‬‏ ‏‮there\'s‬‏ ‏‮more‬‏ ‏‮than‬‏ ‏‮{videoUserLimit}‬‏ ‏‮people‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮voice‬‏ ‏‮channel.‬‏ ‏‮Video‬‏ ‏‮isn\'t‬‏ ‏‮available‬‏ ‏‮Mute‬‏ ‏‮video‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index daf00f9c86..c89735f558 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -9967,6 +9967,7 @@ [Ļîšţ one] [Šĥöŵ Çĥåţ one two] [Šĥöŵ Ḿéḿɓéŕš one two] + [νîéŵ åļļ (»{count}«) one two] [Šöŕŕý, Vîðéö çĥåţ îšñ\'ţ åVåîļåɓļé ŵĥéñ ţĥéŕé\'š ḿöŕé ţĥåñ »{videoUserLimit}« þéöþļé îñ ţĥé Vöîçé çĥåññéļ. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [νîðéö îšñ\'ţ åVåîļåɓļé one two three] [Ḿûţé Vîðéö one two] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index c07e13d857..433df8c596 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -24456,181 +24456,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1015c0866..0d9366879e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1478,7 +1478,7 @@ Select a color Transparency Use Default - 7d1f1e7b615e4044b5e1923b5545ecfb + 67d20640bde848748661eddb990755b6 Coming Soon Slash command application {applicationName} {applicationName} application @@ -9996,6 +9996,7 @@ List Show Chat Show Members + View all ({count}) Sorry, video chat isn\'t available when there\'s more than {videoUserLimit} people in the voice channel. Video isn\'t available Mute video