From 0d5acb60beb973fe4f6ec549a127c701a5e444a7 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Mon, 25 Oct 2021 08:22:50 +0200 Subject: [PATCH] 100.0 - Alpha (100200) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 4 +- app/src/main/java/c/i/a/f/h/c/i.java | 2 +- app/src/main/java/c/i/a/f/h/c/l.java | 2 +- app/src/main/java/c/i/a/f/h/c/p.java | 2 +- app/src/main/java/c/i/a/f/h/c/s.java | 4 +- app/src/main/java/c/i/a/f/h/c/t.java | 4 +- app/src/main/java/c/i/a/f/h/c/u.java | 2 +- .../media_engine/internal/DeviceInfo.java | 8 +- .../GuildScheduledEvent.java | 73 +- .../engine/VideoInputDeviceFacing.java | 8 - .../stores/StoreGuildScheduledEvents.java | 6 +- .../widgets/settings/WidgetSettings.java | 2 +- .../{p001authapi => p000authapi}/zzt.java | 2 +- .../{p001authapi => p000authapi}/zzz.java | 2 +- 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 | 13280 ++++++++-------- app/src/main/res/values/strings.xml | 8 +- 19 files changed, 6713 insertions(+), 6712 deletions(-) delete mode 100644 app/src/main/java/com/discord/p000native/engine/VideoInputDeviceFacing.java rename app/src/main/java/com/google/android/gms/internal/{p001authapi => p000authapi}/zzt.java (94%) rename app/src/main/java/com/google/android/gms/internal/{p001authapi => p000authapi}/zzz.java (94%) diff --git a/app/build.gradle b/app/build.gradle index 40fbc41dbf..7f0c3af104 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 99210 - versionName "99.10 - Alpha" + versionCode 100200 + versionName "100.0 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da0d40c439..f5d0b04255 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/app/src/main/java/c/i/a/f/h/c/i.java b/app/src/main/java/c/i/a/f/h/c/i.java index 49f734edcf..6a3405d7fd 100644 --- a/app/src/main/java/c/i/a/f/h/c/i.java +++ b/app/src/main/java/c/i/a/f/h/c/i.java @@ -6,7 +6,7 @@ import c.i.a.f.e.h.c; import c.i.a.f.e.h.h; import com.google.android.gms.auth.api.credentials.Credential; import com.google.android.gms.common.api.Status; -import com.google.android.gms.internal.p001authapi.zzz; +import com.google.android.gms.internal.p000authapi.zzz; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public final class i extends m { public final /* synthetic */ Credential l; diff --git a/app/src/main/java/c/i/a/f/h/c/l.java b/app/src/main/java/c/i/a/f/h/c/l.java index 70b8d3b145..41147e5892 100644 --- a/app/src/main/java/c/i/a/f/h/c/l.java +++ b/app/src/main/java/c/i/a/f/h/c/l.java @@ -6,7 +6,7 @@ import c.i.a.f.e.h.c; import c.i.a.f.e.h.h; import com.google.android.gms.auth.api.credentials.Credential; import com.google.android.gms.common.api.Status; -import com.google.android.gms.internal.p001authapi.zzt; +import com.google.android.gms.internal.p000authapi.zzt; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public final class l extends m { public final /* synthetic */ Credential l; diff --git a/app/src/main/java/c/i/a/f/h/c/p.java b/app/src/main/java/c/i/a/f/h/c/p.java index 3038e2ae15..a325861081 100644 --- a/app/src/main/java/c/i/a/f/h/c/p.java +++ b/app/src/main/java/c/i/a/f/h/c/p.java @@ -4,7 +4,7 @@ import android.os.Parcel; import android.os.Parcelable; import c.c.a.a0.d; import com.google.android.gms.auth.api.credentials.Credential; -import com.google.android.gms.internal.p001authapi.zzt; +import com.google.android.gms.internal.p000authapi.zzt; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public final class p implements Parcelable.Creator { /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/c/i/a/f/h/c/s.java b/app/src/main/java/c/i/a/f/h/c/s.java index 152fd2ceed..c866a2c545 100644 --- a/app/src/main/java/c/i/a/f/h/c/s.java +++ b/app/src/main/java/c/i/a/f/h/c/s.java @@ -4,8 +4,8 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import com.google.android.gms.auth.api.credentials.CredentialRequest; -import com.google.android.gms.internal.p001authapi.zzt; -import com.google.android.gms.internal.p001authapi.zzz; +import com.google.android.gms.internal.p000authapi.zzt; +import com.google.android.gms.internal.p000authapi.zzz; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public final class s extends c implements t { public s(IBinder iBinder) { diff --git a/app/src/main/java/c/i/a/f/h/c/t.java b/app/src/main/java/c/i/a/f/h/c/t.java index b4dff4c254..1901b549b7 100644 --- a/app/src/main/java/c/i/a/f/h/c/t.java +++ b/app/src/main/java/c/i/a/f/h/c/t.java @@ -3,8 +3,8 @@ package c.i.a.f.h.c; import android.os.IInterface; import android.os.RemoteException; import com.google.android.gms.auth.api.credentials.CredentialRequest; -import com.google.android.gms.internal.p001authapi.zzt; -import com.google.android.gms.internal.p001authapi.zzz; +import com.google.android.gms.internal.p000authapi.zzt; +import com.google.android.gms.internal.p000authapi.zzz; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public interface t extends IInterface { void I(r rVar, zzt zzt) throws RemoteException; diff --git a/app/src/main/java/c/i/a/f/h/c/u.java b/app/src/main/java/c/i/a/f/h/c/u.java index c5b33ff4d3..e46106b56a 100644 --- a/app/src/main/java/c/i/a/f/h/c/u.java +++ b/app/src/main/java/c/i/a/f/h/c/u.java @@ -4,7 +4,7 @@ import android.os.Parcel; import android.os.Parcelable; import c.c.a.a0.d; import com.google.android.gms.auth.api.credentials.Credential; -import com.google.android.gms.internal.p001authapi.zzz; +import com.google.android.gms.internal.p000authapi.zzz; /* compiled from: com.google.android.gms:play-services-auth@@19.0.0 */ public final class u implements Parcelable.Creator { /* Return type fixed from 'java.lang.Object' to match base method */ diff --git a/app/src/main/java/co/discord/media_engine/internal/DeviceInfo.java b/app/src/main/java/co/discord/media_engine/internal/DeviceInfo.java index 479332596f..393b39a05d 100644 --- a/app/src/main/java/co/discord/media_engine/internal/DeviceInfo.java +++ b/app/src/main/java/co/discord/media_engine/internal/DeviceInfo.java @@ -1,7 +1,6 @@ package co.discord.media_engine.internal; import androidx.annotation.NonNull; -import androidx.core.os.EnvironmentCompat; import co.discord.media_engine.CameraEnumeratorProvider; import java.util.Locale; import org.webrtc.CameraEnumerator; @@ -10,11 +9,6 @@ public final class DeviceInfo { return CameraEnumeratorProvider.get(); } - @NonNull - private String getDeviceFacingString(int i) { - return getDeviceFrontFacing(i) ? "front" : getDeviceBackFacing(i) ? "back" : EnvironmentCompat.MEDIA_UNKNOWN; - } - public boolean getDeviceBackFacing(int i) { return enumerator().isBackFacing(getDeviceName(i)); } @@ -25,7 +19,7 @@ public final class DeviceInfo { @NonNull public String getDeviceGuid(int i) { - return String.format(Locale.US, "android_camera_%d_%s_facing", Integer.valueOf(i), getDeviceFacingString(i)); + return String.format(Locale.US, "android_camera_%d", Integer.valueOf(i)); } @NonNull diff --git a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java index e8bfd1686b..cfecc761da 100644 --- a/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java +++ b/app/src/main/java/com/discord/api/guildscheduledevent/GuildScheduledEvent.java @@ -9,6 +9,7 @@ import java.util.List; /* compiled from: GuildScheduledEvent.kt */ public final class GuildScheduledEvent { private final Long channelId; + private final Long creatorId; private final String description; private final Long entityId; private final GuildScheduledEventEntityMetadata entityMetadata; @@ -27,7 +28,7 @@ public final class GuildScheduledEvent { private final Integer userCount; private final GuildScheduledEventUser userRsvp; - public GuildScheduledEvent(long j, long j2, Long l, String str, String str2, String str3, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, StageInstancePrivacyLevel stageInstancePrivacyLevel, GuildScheduledEventStatus guildScheduledEventStatus, GuildScheduledEventEntityType guildScheduledEventEntityType, Long l2, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, List list, Integer num, GuildScheduledEventUser guildScheduledEventUser) { + public GuildScheduledEvent(long j, long j2, Long l, Long l2, String str, String str2, String str3, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, StageInstancePrivacyLevel stageInstancePrivacyLevel, GuildScheduledEventStatus guildScheduledEventStatus, GuildScheduledEventEntityType guildScheduledEventEntityType, Long l3, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, List list, Integer num, GuildScheduledEventUser guildScheduledEventUser) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(utcDateTime, "scheduledStartTime"); m.checkNotNullParameter(stageInstancePrivacyLevel, "privacyLevel"); @@ -37,6 +38,7 @@ public final class GuildScheduledEvent { this.f1976id = j; this.guildId = j2; this.channelId = l; + this.creatorId = l2; this.name = str; this.description = str2; this.image = str3; @@ -45,37 +47,38 @@ public final class GuildScheduledEvent { this.privacyLevel = stageInstancePrivacyLevel; this.status = guildScheduledEventStatus; this.entityType = guildScheduledEventEntityType; - this.entityId = l2; + this.entityId = l3; this.entityMetadata = guildScheduledEventEntityMetadata; this.skuIds = list; this.userCount = num; this.userRsvp = guildScheduledEventUser; } - public static GuildScheduledEvent a(GuildScheduledEvent guildScheduledEvent, long j, long j2, Long l, String str, String str2, String str3, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, StageInstancePrivacyLevel stageInstancePrivacyLevel, GuildScheduledEventStatus guildScheduledEventStatus, GuildScheduledEventEntityType guildScheduledEventEntityType, Long l2, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, List list, Integer num, GuildScheduledEventUser guildScheduledEventUser, int i) { + public static GuildScheduledEvent a(GuildScheduledEvent guildScheduledEvent, long j, long j2, Long l, Long l2, String str, String str2, String str3, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, StageInstancePrivacyLevel stageInstancePrivacyLevel, GuildScheduledEventStatus guildScheduledEventStatus, GuildScheduledEventEntityType guildScheduledEventEntityType, Long l3, GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata, List list, Integer num, GuildScheduledEventUser guildScheduledEventUser, int i) { long j3 = (i & 1) != 0 ? guildScheduledEvent.f1976id : j; long j4 = (i & 2) != 0 ? guildScheduledEvent.guildId : j2; - Long l3 = (i & 4) != 0 ? guildScheduledEvent.channelId : null; - String str4 = (i & 8) != 0 ? guildScheduledEvent.name : null; - String str5 = (i & 16) != 0 ? guildScheduledEvent.description : null; - String str6 = (i & 32) != 0 ? guildScheduledEvent.image : null; - UtcDateTime utcDateTime3 = (i & 64) != 0 ? guildScheduledEvent.scheduledStartTime : null; - UtcDateTime utcDateTime4 = (i & 128) != 0 ? guildScheduledEvent.scheduledEndTime : null; - StageInstancePrivacyLevel stageInstancePrivacyLevel2 = (i & 256) != 0 ? guildScheduledEvent.privacyLevel : null; - GuildScheduledEventStatus guildScheduledEventStatus2 = (i & 512) != 0 ? guildScheduledEvent.status : null; - GuildScheduledEventEntityType guildScheduledEventEntityType2 = (i & 1024) != 0 ? guildScheduledEvent.entityType : null; - Long l4 = (i & 2048) != 0 ? guildScheduledEvent.entityId : null; - GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata2 = (i & 4096) != 0 ? guildScheduledEvent.entityMetadata : null; - List list2 = (i & 8192) != 0 ? guildScheduledEvent.skuIds : null; - Integer num2 = (i & 16384) != 0 ? guildScheduledEvent.userCount : num; - GuildScheduledEventUser guildScheduledEventUser2 = (i & 32768) != 0 ? guildScheduledEvent.userRsvp : null; + Long l4 = (i & 4) != 0 ? guildScheduledEvent.channelId : null; + Long l5 = (i & 8) != 0 ? guildScheduledEvent.creatorId : null; + String str4 = (i & 16) != 0 ? guildScheduledEvent.name : null; + String str5 = (i & 32) != 0 ? guildScheduledEvent.description : null; + String str6 = (i & 64) != 0 ? guildScheduledEvent.image : null; + UtcDateTime utcDateTime3 = (i & 128) != 0 ? guildScheduledEvent.scheduledStartTime : null; + UtcDateTime utcDateTime4 = (i & 256) != 0 ? guildScheduledEvent.scheduledEndTime : null; + StageInstancePrivacyLevel stageInstancePrivacyLevel2 = (i & 512) != 0 ? guildScheduledEvent.privacyLevel : null; + GuildScheduledEventStatus guildScheduledEventStatus2 = (i & 1024) != 0 ? guildScheduledEvent.status : null; + GuildScheduledEventEntityType guildScheduledEventEntityType2 = (i & 2048) != 0 ? guildScheduledEvent.entityType : null; + Long l6 = (i & 4096) != 0 ? guildScheduledEvent.entityId : null; + GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata2 = (i & 8192) != 0 ? guildScheduledEvent.entityMetadata : null; + List list2 = (i & 16384) != 0 ? guildScheduledEvent.skuIds : null; + Integer num2 = (i & 32768) != 0 ? guildScheduledEvent.userCount : num; + GuildScheduledEventUser guildScheduledEventUser2 = (i & 65536) != 0 ? guildScheduledEvent.userRsvp : null; m.checkNotNullParameter(str4, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(utcDateTime3, "scheduledStartTime"); m.checkNotNullParameter(stageInstancePrivacyLevel2, "privacyLevel"); m.checkNotNullParameter(guildScheduledEventStatus2, "status"); m.checkNotNullParameter(guildScheduledEventEntityType2, "entityType"); m.checkNotNullParameter(list2, "skuIds"); - return new GuildScheduledEvent(j3, j4, l3, str4, str5, str6, utcDateTime3, utcDateTime4, stageInstancePrivacyLevel2, guildScheduledEventStatus2, guildScheduledEventEntityType2, l4, guildScheduledEventEntityMetadata2, list2, num2, guildScheduledEventUser2); + return new GuildScheduledEvent(j3, j4, l4, l5, str4, str5, str6, utcDateTime3, utcDateTime4, stageInstancePrivacyLevel2, guildScheduledEventStatus2, guildScheduledEventEntityType2, l6, guildScheduledEventEntityMetadata2, list2, num2, guildScheduledEventUser2); } public final Long b() { @@ -102,7 +105,7 @@ public final class GuildScheduledEvent { return false; } GuildScheduledEvent guildScheduledEvent = (GuildScheduledEvent) obj; - return this.f1976id == guildScheduledEvent.f1976id && this.guildId == guildScheduledEvent.guildId && m.areEqual(this.channelId, guildScheduledEvent.channelId) && m.areEqual(this.name, guildScheduledEvent.name) && m.areEqual(this.description, guildScheduledEvent.description) && m.areEqual(this.image, guildScheduledEvent.image) && m.areEqual(this.scheduledStartTime, guildScheduledEvent.scheduledStartTime) && m.areEqual(this.scheduledEndTime, guildScheduledEvent.scheduledEndTime) && m.areEqual(this.privacyLevel, guildScheduledEvent.privacyLevel) && m.areEqual(this.status, guildScheduledEvent.status) && m.areEqual(this.entityType, guildScheduledEvent.entityType) && m.areEqual(this.entityId, guildScheduledEvent.entityId) && m.areEqual(this.entityMetadata, guildScheduledEvent.entityMetadata) && m.areEqual(this.skuIds, guildScheduledEvent.skuIds) && m.areEqual(this.userCount, guildScheduledEvent.userCount) && m.areEqual(this.userRsvp, guildScheduledEvent.userRsvp); + return this.f1976id == guildScheduledEvent.f1976id && this.guildId == guildScheduledEvent.guildId && m.areEqual(this.channelId, guildScheduledEvent.channelId) && m.areEqual(this.creatorId, guildScheduledEvent.creatorId) && m.areEqual(this.name, guildScheduledEvent.name) && m.areEqual(this.description, guildScheduledEvent.description) && m.areEqual(this.image, guildScheduledEvent.image) && m.areEqual(this.scheduledStartTime, guildScheduledEvent.scheduledStartTime) && m.areEqual(this.scheduledEndTime, guildScheduledEvent.scheduledEndTime) && m.areEqual(this.privacyLevel, guildScheduledEvent.privacyLevel) && m.areEqual(this.status, guildScheduledEvent.status) && m.areEqual(this.entityType, guildScheduledEvent.entityType) && m.areEqual(this.entityId, guildScheduledEvent.entityId) && m.areEqual(this.entityMetadata, guildScheduledEvent.entityMetadata) && m.areEqual(this.skuIds, guildScheduledEvent.skuIds) && m.areEqual(this.userCount, guildScheduledEvent.userCount) && m.areEqual(this.userRsvp, guildScheduledEvent.userRsvp); } public final long f() { @@ -124,35 +127,37 @@ public final class GuildScheduledEvent { Long l = this.channelId; int i2 = 0; int hashCode = (i + (l != null ? l.hashCode() : 0)) * 31; + Long l2 = this.creatorId; + int hashCode2 = (hashCode + (l2 != null ? l2.hashCode() : 0)) * 31; String str = this.name; - int hashCode2 = (hashCode + (str != null ? str.hashCode() : 0)) * 31; + int hashCode3 = (hashCode2 + (str != null ? str.hashCode() : 0)) * 31; String str2 = this.description; - int hashCode3 = (hashCode2 + (str2 != null ? str2.hashCode() : 0)) * 31; + int hashCode4 = (hashCode3 + (str2 != null ? str2.hashCode() : 0)) * 31; String str3 = this.image; - int hashCode4 = (hashCode3 + (str3 != null ? str3.hashCode() : 0)) * 31; + int hashCode5 = (hashCode4 + (str3 != null ? str3.hashCode() : 0)) * 31; UtcDateTime utcDateTime = this.scheduledStartTime; - int hashCode5 = (hashCode4 + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31; + int hashCode6 = (hashCode5 + (utcDateTime != null ? utcDateTime.hashCode() : 0)) * 31; UtcDateTime utcDateTime2 = this.scheduledEndTime; - int hashCode6 = (hashCode5 + (utcDateTime2 != null ? utcDateTime2.hashCode() : 0)) * 31; + int hashCode7 = (hashCode6 + (utcDateTime2 != null ? utcDateTime2.hashCode() : 0)) * 31; StageInstancePrivacyLevel stageInstancePrivacyLevel = this.privacyLevel; - int hashCode7 = (hashCode6 + (stageInstancePrivacyLevel != null ? stageInstancePrivacyLevel.hashCode() : 0)) * 31; + int hashCode8 = (hashCode7 + (stageInstancePrivacyLevel != null ? stageInstancePrivacyLevel.hashCode() : 0)) * 31; GuildScheduledEventStatus guildScheduledEventStatus = this.status; - int hashCode8 = (hashCode7 + (guildScheduledEventStatus != null ? guildScheduledEventStatus.hashCode() : 0)) * 31; + int hashCode9 = (hashCode8 + (guildScheduledEventStatus != null ? guildScheduledEventStatus.hashCode() : 0)) * 31; GuildScheduledEventEntityType guildScheduledEventEntityType = this.entityType; - int hashCode9 = (hashCode8 + (guildScheduledEventEntityType != null ? guildScheduledEventEntityType.hashCode() : 0)) * 31; - Long l2 = this.entityId; - int hashCode10 = (hashCode9 + (l2 != null ? l2.hashCode() : 0)) * 31; + int hashCode10 = (hashCode9 + (guildScheduledEventEntityType != null ? guildScheduledEventEntityType.hashCode() : 0)) * 31; + Long l3 = this.entityId; + int hashCode11 = (hashCode10 + (l3 != null ? l3.hashCode() : 0)) * 31; GuildScheduledEventEntityMetadata guildScheduledEventEntityMetadata = this.entityMetadata; - int hashCode11 = (hashCode10 + (guildScheduledEventEntityMetadata != null ? guildScheduledEventEntityMetadata.hashCode() : 0)) * 31; + int hashCode12 = (hashCode11 + (guildScheduledEventEntityMetadata != null ? guildScheduledEventEntityMetadata.hashCode() : 0)) * 31; List list = this.skuIds; - int hashCode12 = (hashCode11 + (list != null ? list.hashCode() : 0)) * 31; + int hashCode13 = (hashCode12 + (list != null ? list.hashCode() : 0)) * 31; Integer num = this.userCount; - int hashCode13 = (hashCode12 + (num != null ? num.hashCode() : 0)) * 31; + int hashCode14 = (hashCode13 + (num != null ? num.hashCode() : 0)) * 31; GuildScheduledEventUser guildScheduledEventUser = this.userRsvp; if (guildScheduledEventUser != null) { i2 = guildScheduledEventUser.hashCode(); } - return hashCode13 + i2; + return hashCode14 + i2; } public final UtcDateTime i() { @@ -190,6 +195,8 @@ public final class GuildScheduledEvent { O.append(this.guildId); O.append(", channelId="); O.append(this.channelId); + O.append(", creatorId="); + O.append(this.creatorId); O.append(", name="); O.append(this.name); O.append(", description="); diff --git a/app/src/main/java/com/discord/p000native/engine/VideoInputDeviceFacing.java b/app/src/main/java/com/discord/p000native/engine/VideoInputDeviceFacing.java deleted file mode 100644 index 49a991686b..0000000000 --- a/app/src/main/java/com/discord/p000native/engine/VideoInputDeviceFacing.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.discord.p000native.engine; -/* compiled from: VideoInputDeviceFacing.kt */ -/* renamed from: com.discord.native.engine.VideoInputDeviceFacing reason: invalid package */ -public enum VideoInputDeviceFacing { - Unknown, - Front, - Back -} diff --git a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java index 82c4ce60e9..bf06d0ef30 100644 --- a/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/stores/StoreGuildScheduledEvents.java @@ -173,7 +173,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { Integer l = (list3 == null || (guildScheduledEvent2 = list3.get(i)) == null) ? null : guildScheduledEvent2.l(); if (guildScheduledEvent.l() == null) { i2 = i; - guildScheduledEvent3 = GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, l, null, 49151); + guildScheduledEvent3 = GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, l, null, 98303); } else { i2 = i; } @@ -197,7 +197,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { this.rsvpsAwaitingSnapshot.add(Long.valueOf(g)); addUserRsvpForEvent(guildScheduledEvent.f(), guildScheduledEvent.g()); Integer l = guildScheduledEvent.l(); - GuildScheduledEvent a = GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(l != null ? l.intValue() + 1 : 1), null, 49151); + GuildScheduledEvent a = GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(l != null ? l.intValue() + 1 : 1), null, 98303); List list = this.guildScheduledEvents.get(Long.valueOf(a.f())); if (list != null) { m.checkNotNullExpressionValue(list, "eventList"); @@ -264,7 +264,7 @@ public final class StoreGuildScheduledEvents extends StoreV2 { if (l != null) { i = l.intValue() - 1; } - list.set(intValue, GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(i), null, 49151)); + list.set(intValue, GuildScheduledEvent.a(guildScheduledEvent, 0, 0, null, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(i), null, 98303)); } } markChanged(); 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 6f07cf7373..e789f524d8 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -313,7 +313,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 + " - 99.10 - Alpha (99210)"); + textView.setText(string + " - 100.0 - Alpha (100200)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/java/com/google/android/gms/internal/p001authapi/zzt.java b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java similarity index 94% rename from app/src/main/java/com/google/android/gms/internal/p001authapi/zzt.java rename to app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java index b59d34674e..7641d42024 100644 --- a/app/src/main/java/com/google/android/gms/internal/p001authapi/zzt.java +++ b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzt.java @@ -1,4 +1,4 @@ -package com.google.android.gms.internal.p001authapi; +package com.google.android.gms.internal.p000authapi; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/google/android/gms/internal/p001authapi/zzz.java b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java similarity index 94% rename from app/src/main/java/com/google/android/gms/internal/p001authapi/zzz.java rename to app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java index dc52f93411..e964e60a16 100644 --- a/app/src/main/java/com/google/android/gms/internal/p001authapi/zzz.java +++ b/app/src/main/java/com/google/android/gms/internal/p000authapi/zzz.java @@ -1,4 +1,4 @@ -package com.google.android.gms.internal.p001authapi; +package com.google.android.gms.internal.p000authapi; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 27f0652592..bcdab9b083 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -3380,6 +3380,8 @@ ‏‮An‬‏ ‏‮event‬‏ ‏‮topic‬‏ ‏‮is‬‏ ‏‮required.‬‏ ‏‮Event‬‏ ‏‮Topic‬‏ ‏‮What\'s‬‏ ‏‮your‬‏ ‏‮event?‬‏ + ‏‮Created‬‏ ‏‮by‬‏ ‏‮{username}‬‏ + ‏‮Created‬‏ ‏‮by‬‏ ‏‮$[](usernameHook)‬‏ ‏‮Copy‬‏ ‏‮the‬‏ ‏‮event‬‏ ‏‮link‬‏ ‏‮below‬‏ ‏‮to‬‏ ‏‮invite‬‏ ‏‮people‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮event.‬‏ ‏‮This‬‏ ‏‮also‬‏ ‏‮acts‬‏ ‏‮as‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮invite‬‏ ‏‮link.‬‏ ‏‮All‬‏ ‏‮set.‬‏ ‏‮Now‬‏ ‏‮share‬‏ ‏‮your‬‏ ‏‮event!‬‏ ‏‮{date}‬‏ ‏‮at‬‏ ‏‮{time}‬‏ @@ -5971,8 +5973,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 76a65d2b1d..917357aa47 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3380,6 +3380,8 @@ [Åñ éVéñţ ţöþîç îš ŕéQûîŕéð. one two three four] [ÉVéñţ Ţöþîç one two] [Ŵĥåţ\'š ýöûŕ éVéñţ¿ one two three] + [Çŕéåţéð ɓý »{username}« one two] + [Çŕéåţéð ɓý €[](ûšéŕñåḿéĤööķ) one two three four] [Çöþý ţĥé éVéñţ ļîñķ ɓéļöŵ ţö îñVîţé þéöþļé ţö ýöûŕ éVéñţ. Ţĥîš åļšö åçţš åš å šéŕVéŕ îñVîţé ļîñķ. one two three four five six seven eight nine ten eleven] [Åļļ šéţ. Ñöŵ šĥåŕé ýöûŕ éVéñţ¡ one two three four] [»{date}« åţ »{time}« one] @@ -5971,8 +5973,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 bfbf0b9083..67c6e9432e 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -17778,6645 +17778,6647 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05ecc179dc..ac382518c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1446,7 +1446,7 @@ Select a color Transparency Use Default - 5d755f33c77f405688dab4f5133c426c + 5fae544a2b9249598f0cd5d9aca1223b Coming Soon Slash command application {applicationName} {applicationName} application @@ -3396,6 +3396,8 @@ An event topic is required. Event Topic What\'s your event? + Created by {username} + Created by $[](usernameHook) Copy the event link below to invite people to your event. This also acts as a server invite link. All set. Now share your event! {date} at {time} @@ -5990,8 +5992,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