diff --git a/app/build.gradle b/app/build.gradle index 96e34189fa..575107eb0c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 92202 - versionName "92.2 - Alpha" + versionCode 92203 + versionName "92.3 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e27ec213be..8de151d35d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/q/b0.java b/app/src/main/java/c/a/q/b0.java index dbba81f129..4481ccd4e8 100644 --- a/app/src/main/java/c/a/q/b0.java +++ b/app/src/main/java/c/a/q/b0.java @@ -4,6 +4,7 @@ import c.a.q.m0.a; import c.a.q.o0.b; import c.a.q.o0.c; import c.a.q.o0.d; +import c.a.q.o0.e; import co.discord.media_engine.MediaType; import co.discord.media_engine.StreamParameters; import co.discord.media_engine.VoiceQuality; @@ -180,6 +181,22 @@ public final class b0 implements MediaEngineConnection.d { } } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetBitrate(int i) { + e eVar = this.a.A; + synchronized (eVar) { + eVar.l.k = i; + } + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetFrameRate(int i) { + e eVar = this.a.A; + synchronized (eVar) { + eVar.l.l = i; + } + } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d public void onVideo(long j, Integer num, int i, int i2, int i3, StreamParameters[] streamParametersArr) { m.checkNotNullParameter(streamParametersArr, "streams"); diff --git a/app/src/main/java/c/a/q/h0.java b/app/src/main/java/c/a/q/h0.java index 1eb91b9f35..7325cc5454 100644 --- a/app/src/main/java/c/a/q/h0.java +++ b/app/src/main/java/c/a/q/h0.java @@ -126,8 +126,8 @@ public final class h0 implements a.d { long j2 = (long) i2; synchronized (eVar) { if (j2 != 0) { - eVar.n.put(Long.valueOf(j2), Long.valueOf(eVar.r.currentTimeMillis())); - Logger.i$default(eVar.q, "VideoQuality: handleVideoStreamUpdate(userId: " + j + ", videoSsrc: " + j2 + ')', null, 2, null); + eVar.n.put(Long.valueOf(j2), Long.valueOf(eVar.q.currentTimeMillis())); + Logger.i$default(eVar.p, "VideoQuality: handleVideoStreamUpdate(userId: " + j + ", videoSsrc: " + j2 + ')', null, 2, null); } } if (j != rtcConnection.S) { @@ -303,10 +303,10 @@ public final class h0 implements a.d { @Override // c.a.q.n0.a.d public void j(long j) { - Map b; + Map c2; RtcConnection rtcConnection = this.a; - if ((rtcConnection.W instanceof RtcConnection.d.a) && (b = rtcConnection.A.b(String.valueOf(j))) != null) { - rtcConnection.l(j, b); + if ((rtcConnection.W instanceof RtcConnection.d.a) && (c2 = rtcConnection.A.c(String.valueOf(j))) != null) { + rtcConnection.l(j, c2); } MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.G; if (mediaSinkWantsManager != null) { diff --git a/app/src/main/java/c/a/q/m0/c/e.java b/app/src/main/java/c/a/q/m0/c/e.java index ea6d160b7d..02afd17125 100644 --- a/app/src/main/java/c/a/q/m0/c/e.java +++ b/app/src/main/java/c/a/q/m0/c/e.java @@ -413,15 +413,57 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class p extends d0.z.d.o implements Function1 { - public final /* synthetic */ int $framerate; + public static final class p extends d0.z.d.o implements Function1 { + public final /* synthetic */ int $frameRate; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public p(int i) { + super(1); + this.$frameRate = i; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public Unit invoke(MediaEngineConnection.d dVar) { + MediaEngineConnection.d dVar2 = dVar; + d0.z.d.m.checkNotNullParameter(dVar2, "it"); + dVar2.onTargetFrameRate(this.$frameRate); + return Unit.a; + } + } + + /* compiled from: MediaEngineConnectionLegacy.kt */ + public static final class q extends d0.z.d.o implements Function1 { public final /* synthetic */ MediaEngineConnection.b $quality; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public p(MediaEngineConnection.b bVar, int i) { + public q(MediaEngineConnection.b bVar) { super(1); this.$quality = bVar; - this.$framerate = i; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public Unit invoke(MediaEngineConnection.d dVar) { + MediaEngineConnection.d dVar2 = dVar; + d0.z.d.m.checkNotNullParameter(dVar2, "it"); + dVar2.onTargetBitrate(this.$quality.b); + return Unit.a; + } + } + + /* compiled from: MediaEngineConnectionLegacy.kt */ + public static final class r extends d0.z.d.o implements Function1 { + public final /* synthetic */ int $frameRate; + public final /* synthetic */ MediaEngineConnection.b $quality; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public r(MediaEngineConnection.b bVar, int i) { + super(1); + this.$quality = bVar; + this.$frameRate = i; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -431,17 +473,17 @@ public final class e implements MediaEngineConnection { Connection connection2 = connection; d0.z.d.m.checkNotNullParameter(connection2, "$receiver"); MediaEngineConnection.b bVar = this.$quality; - connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2176c, bVar.d, this.$framerate); + connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2176c, bVar.d, this.$frameRate); return Unit.a; } } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class q extends d0.z.d.o implements Function1 { + public static final class s extends d0.z.d.o implements Function1 { public final /* synthetic */ boolean $selfDeaf; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public q(boolean z2) { + public s(boolean z2) { super(1); this.$selfDeaf = z2; } @@ -458,11 +500,11 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class r extends d0.z.d.o implements Function1 { + public static final class t extends d0.z.d.o implements Function1 { public final /* synthetic */ boolean $selfMute; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public r(boolean z2) { + public t(boolean z2) { super(1); this.$selfMute = z2; } @@ -479,11 +521,11 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class s extends d0.z.d.o implements Function1 { + public static final class u extends d0.z.d.o implements Function1 { public final /* synthetic */ boolean $isVideoBroadcast; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public s(boolean z2) { + public u(boolean z2) { super(1); this.$isVideoBroadcast = z2; } @@ -500,11 +542,11 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class t extends d0.z.d.o implements Function1 { + public static final class v extends d0.z.d.o implements Function1 { public final /* synthetic */ c.a.q.m0.b $screenCapturer; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public t(c.a.q.m0.b bVar) { + public v(c.a.q.m0.b bVar) { super(1); this.$screenCapturer = bVar; } @@ -522,17 +564,17 @@ public final class e implements MediaEngineConnection { } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class u extends MediaProjection.Callback { + public static final class w extends MediaProjection.Callback { @Override // android.media.projection.MediaProjection.Callback public void onStop() { } } /* compiled from: MediaEngineConnectionLegacy.kt */ - public static final class v extends d0.z.d.o implements Function1 { - public static final v i = new v(); + public static final class x extends d0.z.d.o implements Function1 { + public static final x i = new x(); - public v() { + public x() { super(1); } @@ -589,7 +631,7 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public synchronized void a(Intent intent, ThumbnailEmitter thumbnailEmitter) { d0.z.d.m.checkNotNullParameter(intent, "permission"); - z(new t(new c.a.q.m0.b(intent, new u(), this.l, thumbnailEmitter))); + z(new v(new c.a.q.m0.b(intent, new w(), this.l, thumbnailEmitter))); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -600,7 +642,7 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public void c(boolean z2) { this.f223c = z2; - z(new r(z2)); + z(new t(z2)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -643,7 +685,7 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public synchronized void h() { - z(v.i); + z(x.i); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -653,7 +695,7 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public void j(boolean z2) { - z(new s(z2)); + z(new u(z2)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -678,7 +720,10 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public void m(MediaEngineConnection.b bVar) { d0.z.d.m.checkNotNullParameter(bVar, "quality"); - z(new p(bVar, this.f223c ? bVar.e : bVar.f)); + int i2 = this.f223c ? bVar.e : bVar.f; + y(new p(i2)); + y(new q(bVar)); + z(new r(bVar, i2)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection @@ -799,7 +844,7 @@ public final class e implements MediaEngineConnection { @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection public void v(boolean z2) { - z(new q(z2)); + z(new s(z2)); } @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection diff --git a/app/src/main/java/c/a/q/o0/a.java b/app/src/main/java/c/a/q/o0/a.java index 72377418f4..8ab89f4736 100644 --- a/app/src/main/java/c/a/q/o0/a.java +++ b/app/src/main/java/c/a/q/o0/a.java @@ -46,17 +46,17 @@ public final /* synthetic */ class a extends k implements Function1 synchronized (eVar2) { try { m.checkNotNullParameter(stats2, "stats"); - long currentTimeMillis = eVar2.r.currentTimeMillis(); + long currentTimeMillis = eVar2.q.currentTimeMillis(); Transport transport = stats2.getTransport(); - eVar2.e(null, Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length), currentTimeMillis); + eVar2.f(null, Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length), currentTimeMillis); if (!eVar2.k.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) { - eVar2.a(eVar2.l, new e.g((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount()))); + eVar2.a(eVar2.l, new e.h((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount()))); if (eVar2.l.d == null && outboundRtpVideo.getFramesEncoded() > 0) { eVar2.e.notifyAsync(g.i); eVar2.l.d = Long.valueOf(currentTimeMillis - eVar2.g); - Logger.i$default(eVar2.q, "VideoQuality: outboundStats.timeToFirstFrame: " + eVar2.l.d, null, 2, null); + Logger.i$default(eVar2.p, "VideoQuality: outboundStats.timeToFirstFrame: " + eVar2.l.d, null, 2, null); } - eVar2.o = outboundRtpVideo.getBitrateTarget(); + eVar2.b(outboundRtpVideo.getBitrateTarget()); } if (!eVar2.i.a()) { Iterator> it = stats2.getInboundRtpVideo().entrySet().iterator(); @@ -73,37 +73,37 @@ public final /* synthetic */ class a extends k implements Function1 e.C0043e eVar4 = eVar3; try { eVar = eVar2; - } catch (Throwable th2) { - th = th2; - eVar = eVar2; - throw th; - } - try { - eVar.a(eVar4, new e.g((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), value.getNackCount(), value.getPliCount()))); - if (eVar4.d == null && value.getFramesDecoded() > 0) { - byte[] bArr = c.a; - m.checkParameterIsNotNull(key, "$this$toLongOrDefault"); - try { - j = Long.parseLong(key); - } catch (NumberFormatException unused) { - j = 0; - } - Long l = eVar.n.get(Long.valueOf(value.getSsrc())); - if (l != null) { - eVar.e.notifyAsync(new h(value)); - eVar4.d = Long.valueOf(currentTimeMillis - l.longValue()); - Logger.i$default(eVar.q, "VideoQuality: inbound.timeToFirstFrame: " + eVar4.d + " (userId: " + j + ", ssrc: " + value.getSsrc() + ')', null, 2, null); - } else { - Logger.e$default(eVar.q, "VideoQuality: inbound.timeToFirstFrame: Unable to locate start time. (userId: " + j + ", ssrc: " + value.getSsrc() + ')', null, null, 6, null); + try { + eVar.a(eVar4, new e.h((long) value.getResolution().getHeight(), currentTimeMillis, new e.a((long) value.getFramesDecoded(), (long) value.getFramesReceived(), (long) value.getPacketsReceived(), (long) value.getPacketsLost(), (long) value.getFramesDropped(), value.getBytesReceived(), value.getNackCount(), value.getPliCount()))); + if (eVar4.d == null && value.getFramesDecoded() > 0) { + byte[] bArr = c.a; + m.checkParameterIsNotNull(key, "$this$toLongOrDefault"); + try { + j = Long.parseLong(key); + } catch (NumberFormatException unused) { + j = 0; + } + Long l = eVar.n.get(Long.valueOf(value.getSsrc())); + if (l != null) { + eVar.e.notifyAsync(new h(value)); + eVar4.d = Long.valueOf(currentTimeMillis - l.longValue()); + Logger.i$default(eVar.p, "VideoQuality: inbound.timeToFirstFrame: " + eVar4.d + " (userId: " + j + ", ssrc: " + value.getSsrc() + ')', null, 2, null); + } else { + Logger.e$default(eVar.p, "VideoQuality: inbound.timeToFirstFrame: Unable to locate start time. (userId: " + j + ", ssrc: " + value.getSsrc() + ')', null, null, 6, null); + } } + eVar2 = eVar; + it = it; + stats2 = stats2; + dVar = dVar; + currentTimeMillis = currentTimeMillis; + } catch (Throwable th2) { + th = th2; + throw th; } - eVar2 = eVar; - it = it; - stats2 = stats2; - dVar = dVar; - currentTimeMillis = currentTimeMillis; } catch (Throwable th3) { th = th3; + eVar = eVar2; throw th; } } diff --git a/app/src/main/java/c/a/q/o0/e.java b/app/src/main/java/c/a/q/o0/e.java index 29118dd66c..4b0e07839b 100644 --- a/app/src/main/java/c/a/q/o0/e.java +++ b/app/src/main/java/c/a/q/o0/e.java @@ -38,13 +38,12 @@ public final class e { public final d i; public final d j; public final d k; - public final C0043e l = new C0043e(); + public final g l = new g(); public final Map m = new LinkedHashMap(); public final Map n = new LinkedHashMap(); - public int o; - public final DeviceResourceUsageMonitor p; - public final Logger q; - public final Clock r; + public final DeviceResourceUsageMonitor o; + public final Logger p; + public final Clock q; /* compiled from: VideoQuality.kt */ public static final class a { @@ -176,8 +175,8 @@ public final class e { /* compiled from: VideoQuality.kt */ /* renamed from: c.a.q.o0.e$e reason: collision with other inner class name */ - public static final class C0043e { - public List a = new ArrayList(); + public static class C0043e { + public List a = new ArrayList(); public final Histogram b = new Histogram(5, 0, 2, null); /* renamed from: c reason: collision with root package name */ @@ -211,18 +210,27 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public static final class g { + public static final class g extends C0043e { + public int k = 2500000; + public int l = 30; + public long m; + public long n; + public long o; + } + + /* compiled from: VideoQuality.kt */ + public static final class h { public final long a; public final long b; /* renamed from: c reason: collision with root package name */ public final a f234c; - public g() { + public h() { this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 255)); } - public g(long j, long j2, a aVar) { + public h(long j, long j2, a aVar) { m.checkNotNullParameter(aVar, "aggregatedProperties"); this.a = j; this.b = j2; @@ -233,11 +241,11 @@ public final class e { if (this == obj) { return true; } - if (!(obj instanceof g)) { + if (!(obj instanceof h)) { return false; } - g gVar = (g) obj; - return this.a == gVar.a && this.b == gVar.b && m.areEqual(this.f234c, gVar.f234c); + h hVar = (h) obj; + return this.a == hVar.a && this.b == hVar.b && m.areEqual(this.f234c, hVar.f234c); } public int hashCode() { @@ -259,11 +267,11 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public static final class h extends o implements Function1 { + public static final class i extends o implements Function1 { public final /* synthetic */ e this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public h(e eVar) { + public i(e eVar) { super(1); this.this$0 = eVar; } @@ -292,8 +300,8 @@ public final class e { public e(Logger logger, Clock clock) { m.checkNotNullParameter(logger, "logger"); m.checkNotNullParameter(clock, "clock"); - this.q = logger; - this.r = clock; + this.p = logger; + this.q = clock; ListenerCollectionSubject listenerCollectionSubject = new ListenerCollectionSubject<>(); this.e = listenerCollectionSubject; this.f = listenerCollectionSubject; @@ -302,23 +310,23 @@ public final class e { this.i = new d(false, currentTimeMillis); this.j = new d(false, currentTimeMillis); this.k = new d(false, currentTimeMillis); - DeviceResourceUsageMonitor deviceResourceUsageMonitor = new DeviceResourceUsageMonitor(new TimeSpan(1, TimeUnit.SECONDS), clock, new h(this)); - this.p = deviceResourceUsageMonitor; + DeviceResourceUsageMonitor deviceResourceUsageMonitor = new DeviceResourceUsageMonitor(new TimeSpan(1, TimeUnit.SECONDS), clock, new i(this)); + this.o = deviceResourceUsageMonitor; deviceResourceUsageMonitor.start(); } - public final void a(C0043e eVar, g gVar) { - eVar.a.add(gVar); + public final void a(C0043e eVar, h hVar) { + eVar.a.add(hVar); if (eVar.a.size() >= 2) { - List list = eVar.a; - g gVar2 = list.get(list.size() - 1); - List list2 = eVar.a; - g gVar3 = list2.get(list2.size() - 2); + List list = eVar.a; + h hVar2 = list.get(list.size() - 1); + List list2 = eVar.a; + h hVar3 = list2.get(list2.size() - 2); f fVar = f.i; - eVar.f = (gVar2.b - gVar3.b) + eVar.f; + eVar.f = (hVar2.b - hVar3.b) + eVar.f; a aVar = eVar.e; - a aVar2 = gVar2.f234c; - a aVar3 = gVar3.f234c; + a aVar2 = hVar2.f234c; + a aVar3 = hVar3.f234c; aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a; aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b; aVar.f232c = fVar.a(aVar2.f232c, aVar3.f232c) + aVar.f232c; @@ -327,20 +335,20 @@ public final class e { aVar.f = fVar.a(aVar2.f, aVar3.f) + aVar.f; aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g; aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h; - a aVar4 = gVar2.f234c; + a aVar4 = hVar2.f234c; long j = aVar4.f; long j2 = aVar4.a; - long j3 = gVar2.b; - long j4 = gVar2.a; - float f2 = ((float) (j3 - gVar3.b)) / 1000.0f; + long j3 = hVar2.b; + long j4 = hVar2.a; + float f2 = ((float) (j3 - hVar3.b)) / 1000.0f; eVar.i = (((float) j4) * f2) + eVar.i; if (eVar.a.size() >= 6) { - List list3 = eVar.a; - g gVar4 = list3.get(list3.size() - 3); - a aVar5 = gVar4.f234c; + List list3 = eVar.a; + h hVar4 = list3.get(list3.size() - 3); + a aVar5 = hVar4.f234c; long j5 = aVar5.f; long j6 = aVar5.a; - long j7 = gVar4.b; + long j7 = hVar4.b; Iterator it = f231c.iterator(); while (true) { float f3 = 0.0f; @@ -386,17 +394,51 @@ public final class e { } } - @AnyThread - public final synchronized Map b(String str) { - C0043e eVar; - m.checkNotNullParameter(str, "userId"); - eVar = this.m.get(str); - return eVar != null ? d(eVar) : null; + public final void b(int i2) { + if (this.l.a.size() >= 2) { + List list = this.l.a; + long j = list.get(list.size() - 1).b; + List list2 = this.l.a; + float f2 = ((float) (j - list2.get(list2.size() - 2).b)) / 1000.0f; + g gVar = this.l; + long j2 = gVar.m; + Float valueOf = Float.valueOf(((float) gVar.l) * f2); + long j3 = 0; + gVar.m = j2 + (valueOf != null ? d0.a0.a.roundToLong(valueOf.floatValue()) : 0); + g gVar2 = this.l; + long j4 = gVar2.n; + Float valueOf2 = Float.valueOf((((float) i2) / 8.0f) * f2); + gVar2.n = j4 + (valueOf2 != null ? d0.a0.a.roundToLong(valueOf2.floatValue()) : 0); + g gVar3 = this.l; + long j5 = gVar3.o; + Float valueOf3 = Float.valueOf((((float) gVar3.k) / 8.0f) * f2); + if (valueOf3 != null) { + j3 = d0.a0.a.roundToLong(valueOf3.floatValue()); + } + gVar3.o = j5 + j3; + } } @AnyThread - public final synchronized Map c() { - return h0.plus(d(this.l), h0.mapOf(d0.o.to("target_bitrate", Integer.valueOf(this.o)), d0.o.to("duration_encoder_nvidia_cuda", 0), d0.o.to("duration_encoder_nvidia_direct3d", 0), d0.o.to("duration_encoder_openh264", 0), d0.o.to("duration_encoder_videotoolbox", 0), d0.o.to("duration_encoder_amd_direct3d", 0), d0.o.to("duration_encoder_intel", 0), d0.o.to("duration_encoder_intel_direct3d", 0), d0.o.to("duration_encoder_unknown", 0))); + public final synchronized Map c(String str) { + C0043e eVar; + m.checkNotNullParameter(str, "userId"); + eVar = this.m.get(str); + return eVar != null ? e(eVar) : null; + } + + @AnyThread + public final synchronized Map d() { + g gVar; + float f2; + int i2; + Float valueOf; + Float valueOf2; + Float valueOf3; + gVar = this.l; + f2 = ((float) gVar.f) / 1000.0f; + i2 = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); + return h0.plus(e(this.l), h0.mapOf(d0.o.to("target_bitrate_max", Long.valueOf((i2 <= 0 || (valueOf3 = Float.valueOf(((float) (gVar.o * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf3.floatValue()))), d0.o.to("target_bitrate_network", Long.valueOf((i2 <= 0 || (valueOf2 = Float.valueOf(((float) (this.l.n * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf2.floatValue()))), d0.o.to("target_fps", Long.valueOf((i2 <= 0 || (valueOf = Float.valueOf(((float) this.l.m) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()))), d0.o.to("duration_encoder_nvidia_cuda", 0L), d0.o.to("duration_encoder_nvidia_direct3d", 0L), d0.o.to("duration_encoder_openh264", 0L), d0.o.to("duration_encoder_videotoolbox", 0L), d0.o.to("duration_encoder_amd_direct3d", 0L), d0.o.to("duration_encoder_intel", 0L), d0.o.to("duration_encoder_intel_direct3d", 0L), d0.o.to("duration_encoder_unknown", 0L))); } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x04e0: APUT @@ -407,22 +449,22 @@ public final class e { (wrap: java.lang.Long : 0x04d4: INVOKE (r1v2 java.lang.Long) = (r4v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) */ - public final Map d(C0043e eVar) { + public final Map e(C0043e eVar) { Float valueOf; - long currentTimeMillis = this.r.currentTimeMillis(); + long currentTimeMillis = this.q.currentTimeMillis(); Long l = this.h; float longValue = ((float) (l != null ? l.longValue() - this.g : currentTimeMillis - this.g)) / 1000.0f; float f2 = ((float) eVar.f) / 1000.0f; - int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); - long roundToLong = (i <= 0 || (valueOf = Float.valueOf(eVar.i / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); + int i2 = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); + long roundToLong = (i2 <= 0 || (valueOf = Float.valueOf(eVar.i / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); Histogram.Report report = eVar.b.getReport(); Histogram.Report report2 = eVar.f233c.getReport(); b bVar = d; long j = (long) 1024; Map mapOf = h0.mapOf(d0.o.to("duration", Double.valueOf(Math.floor((double) longValue))), c.d.b.a.a.Y(bVar, eVar.g.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.Y(bVar, eVar.h.get(60), "duration_fps_under_60"), c.d.b.a.a.Y(bVar, eVar.h.get(55), "duration_fps_under_55"), c.d.b.a.a.Y(bVar, eVar.h.get(50), "duration_fps_under_50"), c.d.b.a.a.Y(bVar, eVar.h.get(45), "duration_fps_under_45"), c.d.b.a.a.Y(bVar, eVar.h.get(40), "duration_fps_under_40"), c.d.b.a.a.Y(bVar, eVar.h.get(35), "duration_fps_under_35"), c.d.b.a.a.Y(bVar, eVar.h.get(30), "duration_fps_under_30"), c.d.b.a.a.Y(bVar, eVar.h.get(25), "duration_fps_under_25"), c.d.b.a.a.Y(bVar, eVar.h.get(20), "duration_fps_under_20"), c.d.b.a.a.Y(bVar, eVar.h.get(15), "duration_fps_under_15"), c.d.b.a.a.Y(bVar, eVar.h.get(10), "duration_fps_under_10"), c.d.b.a.a.Y(bVar, eVar.h.get(5), "duration_fps_under_5"), c.d.b.a.a.Y(bVar, eVar.h.get(0), "duration_fps_at_0"), d0.o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.Y(bVar, eVar.j.get(720), "duration_resolution_under_720"), c.d.b.a.a.Y(bVar, eVar.j.get(480), "duration_resolution_under_480"), c.d.b.a.a.Y(bVar, eVar.j.get(360), "duration_resolution_under_360"), d0.o.to("num_pauses", 0), d0.o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.i.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.j.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.k.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("client_performance_cpu_percentile25", Long.valueOf(report.getPercentile25())), d0.o.to("client_performance_cpu_percentile50", Long.valueOf(report.getPercentile50())), d0.o.to("client_performance_cpu_percentile75", Long.valueOf(report.getPercentile75())), d0.o.to("client_performance_cpu_percentile90", Long.valueOf(report.getPercentile90())), d0.o.to("client_performance_cpu_percentile95", Long.valueOf(report.getPercentile95())), d0.o.to("client_performance_memory_percentile25", Long.valueOf(report2.getPercentile25() / j)), d0.o.to("client_performance_memory_percentile50", Long.valueOf(report2.getPercentile50() / j)), d0.o.to("client_performance_memory_percentile75", Long.valueOf(report2.getPercentile75() / j)), d0.o.to("client_performance_memory_percentile90", Long.valueOf(report2.getPercentile90() / j)), d0.o.to("client_performance_memory_percentile95", Long.valueOf(report2.getPercentile95() / j)), d0.o.to("client_performance_memory_min", Long.valueOf(report2.getMin() / j)), d0.o.to("client_performance_memory_max", Long.valueOf(report2.getMax() / j))); a aVar = eVar.e; - long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; - long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; + long a2 = i2 > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; + long a3 = i2 > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; Pair[] pairArr = new Pair[10]; pairArr[0] = d0.o.to("avg_bitrate", Long.valueOf(a2)); pairArr[1] = d0.o.to("avg_fps", Long.valueOf(a3)); @@ -438,7 +480,7 @@ public final class e { return h0.plus(mapOf, h0.mapOf(pairArr)); } - public final void e(Boolean bool, Integer num, long j) { + public final void f(Boolean bool, Integer num, long j) { boolean z2 = false; if (num != null) { this.j.b(num.intValue() == 0, j); diff --git a/app/src/main/java/com/discord/databinding/WidgetProfileMarketingSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java similarity index 63% rename from app/src/main/java/com/discord/databinding/WidgetProfileMarketingSheetBinding.java rename to app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java index 477ab0eac3..9b64d045f0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetProfileMarketingSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildIdentityMarketingSheetBinding.java @@ -6,7 +6,7 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.viewbinding.ViewBinding; import com.google.android.material.button.MaterialButton; -public final class WidgetProfileMarketingSheetBinding implements ViewBinding { +public final class WidgetGuildIdentityMarketingSheetBinding implements ViewBinding { @NonNull public final FrameLayout a; @NonNull @@ -14,12 +14,12 @@ public final class WidgetProfileMarketingSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1924c; + public final MaterialButton f1849c; - public WidgetProfileMarketingSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { + public WidgetGuildIdentityMarketingSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = frameLayout; this.b = materialButton; - this.f1924c = materialButton2; + this.f1849c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java index d583b5b4fe..8084dcdd0f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1849c; + public final MaterialButton f1850c; @Nullable public final GuildScheduledEventItemView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetGuildInviteBinding implements ViewBinding { public WidgetGuildInviteBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull View view, @NonNull MaterialButton materialButton2, @Nullable GuildScheduledEventItemView guildScheduledEventItemView, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull SimpleDraweeView simpleDraweeView) { this.a = coordinatorLayout; this.b = materialButton; - this.f1849c = materialButton2; + this.f1850c = materialButton2; this.d = guildScheduledEventItemView; this.e = widgetInviteInfo; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java index 276148ae10..0bd5695c5e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteInfoBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1850c; + public final SimpleDraweeView f1851c; @NonNull public final CardView d; @NonNull @@ -44,7 +44,7 @@ public final class WidgetGuildInviteInfoBinding implements ViewBinding { public WidgetGuildInviteInfoBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull RelativeLayout relativeLayout, @NonNull RelativeLayout relativeLayout2, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull CardView cardView2, @NonNull TextView textView2, @NonNull CardView cardView3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = view; this.b = simpleDraweeView; - this.f1850c = simpleDraweeView2; + this.f1851c = simpleDraweeView2; this.d = cardView; this.e = relativeLayout; this.f = relativeLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java index df5e636373..4344c78da0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteSettingsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RadioGroup f1851c; + public final RadioGroup f1852c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGuildInviteSettingsBinding implements ViewBinding { public WidgetGuildInviteSettingsBinding(@NonNull LinearLayout linearLayout, @NonNull Spinner spinner, @NonNull RadioGroup radioGroup, @NonNull MaterialButton materialButton, @NonNull RadioGroup radioGroup2, @NonNull CheckedSetting checkedSetting) { this.a = linearLayout; this.b = spinner; - this.f1851c = radioGroup; + this.f1852c = radioGroup; this.d = materialButton; this.e = radioGroup2; this.f = checkedSetting; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java index bdda38f46c..5b4b5a7826 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareBinding.java @@ -20,7 +20,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1852c; + public final TextView f1853c; @NonNull public final TextView d; @NonNull @@ -41,7 +41,7 @@ public final class WidgetGuildInviteShareBinding implements ViewBinding { public WidgetGuildInviteShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull CheckedSetting checkedSetting, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1852c = textView; + this.f1853c = textView; this.d = textView2; this.e = checkedSetting; this.f = imageView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java index bdbf2af39d..335452b54a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareCompactBinding.java @@ -19,7 +19,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1853c; + public final TextView f1854c; @NonNull public final TextView d; @NonNull @@ -38,7 +38,7 @@ public final class WidgetGuildInviteShareCompactBinding implements ViewBinding { public WidgetGuildInviteShareCompactBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1853c = textView; + this.f1854c = textView; this.d = textView2; this.e = imageView; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java index 25c7dd19fd..6d5cdfc30c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareEmptySuggestionsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1854c; + public final TextView f1855c; @NonNull public final MaterialButton d; @NonNull @@ -29,7 +29,7 @@ public final class WidgetGuildInviteShareEmptySuggestionsBinding implements View public WidgetGuildInviteShareEmptySuggestionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull View view, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull ImageButton imageButton, @NonNull TextView textView2, @NonNull ViewInviteSettingsSheet viewInviteSettingsSheet) { this.a = coordinatorLayout; this.b = view; - this.f1854c = textView; + this.f1855c = textView; this.d = materialButton; this.e = imageButton; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java index 50ecf33a18..ee59e77b65 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareItemBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1855c; + public final MaterialButton f1856c; @NonNull public final TextView d; @NonNull @@ -25,7 +25,7 @@ public final class WidgetGuildInviteShareItemBinding implements ViewBinding { public WidgetGuildInviteShareItemBinding(@NonNull LinearLayout linearLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = simpleDraweeView; - this.f1855c = materialButton; + this.f1856c = materialButton; this.d = textView; this.e = materialButton2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java index 3097908bd3..278f709a94 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildInviteShareSheetBinding.java @@ -23,7 +23,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1856c; + public final TextView f1857c; @NonNull public final TextView d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetGuildInviteShareSheetBinding implements ViewBinding { public WidgetGuildInviteShareSheetBinding(@NonNull FrameLayout frameLayout, @NonNull ConstraintLayout constraintLayout, @NonNull FrameLayout frameLayout2, @NonNull Barrier barrier, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull ImageButton imageButton, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull TextView textView6, @NonNull FrameLayout frameLayout3, @NonNull TextView textView7, @NonNull Barrier barrier2, @NonNull FrameLayout frameLayout4, @NonNull Barrier barrier3, @NonNull SearchInputView searchInputView, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) { this.a = frameLayout; this.b = constraintLayout; - this.f1856c = textView; + this.f1857c = textView; this.d = textView4; this.e = imageButton; this.f = nestedScrollView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java index 710725c369..ca508f1cc4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildJoinBinding.java @@ -14,12 +14,12 @@ public final class WidgetGuildJoinBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1857c; + public final TextInputLayout f1858c; public WidgetGuildJoinBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout) { this.a = coordinatorLayout; this.b = materialButton; - this.f1857c = textInputLayout; + this.f1858c = textInputLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java index 6e5636e1b4..cd029442ca 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileActionsBinding.java @@ -21,7 +21,7 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1858c; + public final TextView f1859c; @NonNull public final LinearLayout d; @NonNull @@ -55,7 +55,7 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final TextView f1859s; + public final TextView f1860s; @NonNull public final CardView t; @NonNull @@ -67,20 +67,20 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { @NonNull /* renamed from: x reason: collision with root package name */ - public final CardView f1860x; + public final CardView f1861x; @NonNull /* renamed from: y reason: collision with root package name */ - public final MaterialButton f1861y; + public final MaterialButton f1862y; @NonNull /* renamed from: z reason: collision with root package name */ - public final MaterialButton f1862z; + public final MaterialButton f1863z; public WidgetGuildProfileActionsBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull CheckedSetting checkedSetting, @NonNull LinearLayout linearLayout4, @NonNull LinearLayout linearLayout5, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull CardView cardView, @NonNull RecyclerView recyclerView, @NonNull CardView cardView2, @NonNull TextView textView5, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CheckedSetting checkedSetting2, @NonNull MaterialButton materialButton, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull CardView cardView3, @NonNull TextView textView8, @NonNull ImageView imageView, @NonNull TextView textView9, @NonNull CardView cardView4, @NonNull CardView cardView5, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout6) { this.a = linearLayout; this.b = linearLayout2; - this.f1858c = textView; + this.f1859c = textView; this.d = linearLayout3; this.e = checkedSetting; this.f = linearLayout4; @@ -96,14 +96,14 @@ public final class WidgetGuildProfileActionsBinding implements ViewBinding { this.p = checkedSetting2; this.q = materialButton; this.r = textView6; - this.f1859s = textView7; + this.f1860s = textView7; this.t = cardView3; this.u = textView8; this.v = imageView; this.w = textView9; - this.f1860x = cardView4; - this.f1861y = materialButton2; - this.f1862z = materialButton3; + this.f1861x = cardView4; + this.f1862y = materialButton2; + this.f1863z = materialButton3; this.A = linearLayout6; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java index 0045b9f897..188e2539f0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildProfileSheetBinding.java @@ -22,7 +22,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1863c; + public final MaterialButton f1864c; @NonNull public final ConstraintLayout d; @NonNull @@ -56,7 +56,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { @NonNull /* renamed from: s reason: collision with root package name */ - public final MaterialButton f1864s; + public final MaterialButton f1865s; @NonNull public final LinearLayout t; @NonNull @@ -67,7 +67,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { public WidgetGuildProfileSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull Barrier barrier, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MaterialButton materialButton, @NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull CardView cardView, @NonNull TextView textView2, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout3, @NonNull TextView textView5, @NonNull MaterialButton materialButton4, @NonNull LinearLayout linearLayout4, @NonNull ViewStub viewStub, @NonNull ViewStub viewStub2) { this.a = nestedScrollView; this.b = simpleDraweeView; - this.f1863c = materialButton; + this.f1864c = materialButton; this.d = constraintLayout; this.e = view; this.f = textView; @@ -83,7 +83,7 @@ public final class WidgetGuildProfileSheetBinding implements ViewBinding { this.p = materialButton3; this.q = linearLayout3; this.r = textView5; - this.f1864s = materialButton4; + this.f1865s = materialButton4; this.t = linearLayout4; this.u = viewStub; this.v = viewStub2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java index 84898a5190..dd0d6a4ef3 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionDetailsBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildRoleSubscriptionDetailsBinding implements ViewBind @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1865c; + public final TextInputLayout f1866c; @NonNull public final GuildSubscriptionRoleImageUploadView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetGuildRoleSubscriptionDetailsBinding implements ViewBind public WidgetGuildRoleSubscriptionDetailsBinding(@NonNull ScrollView scrollView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull ScrollView scrollView2, @NonNull GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView, @NonNull TextInputEditText textInputEditText2, @NonNull TextInputLayout textInputLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = scrollView; this.b = textInputEditText; - this.f1865c = textInputLayout; + this.f1866c = textInputLayout; this.d = guildSubscriptionRoleImageUploadView; this.e = textInputEditText2; this.f = textInputLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java index 5c5a5558a2..16a012a45b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierBenefitsBinding.java @@ -14,14 +14,14 @@ public final class WidgetGuildRoleSubscriptionTierBenefitsBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1866c; + public final TextView f1867c; @NonNull public final RecyclerView d; public WidgetGuildRoleSubscriptionTierBenefitsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView) { this.a = linearLayout; this.b = textView; - this.f1866c = textView2; + this.f1867c = textView2; this.d = recyclerView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierChannelBenefitBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierChannelBenefitBinding.java index a6b4d8569b..6abbd40f02 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierChannelBenefitBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierChannelBenefitBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefitBinding implemen @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1867c; + public final MaterialButton f1868c; @NonNull public final TextInputLayout d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefitBinding implemen public WidgetGuildRoleSubscriptionTierChannelBenefitBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull TextInputLayout textInputLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout, @NonNull TextView textView3, @NonNull TextView textView4) { this.a = coordinatorLayout; this.b = textView; - this.f1867c = materialButton; + this.f1868c = materialButton; this.d = textInputLayout; this.e = simpleDraweeView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java index 1472b9c099..e03e4e8ead 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierDesignBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildRoleSubscriptionTierDesignBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1868c; + public final LinearLayout f1869c; @NonNull public final TextView d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetGuildRoleSubscriptionTierDesignBinding implements ViewB public WidgetGuildRoleSubscriptionTierDesignBinding(@NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull GuildSubscriptionRoleImageUploadView guildSubscriptionRoleImageUploadView, @NonNull GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview, @NonNull GuildRoleSubscriptionMemberPreview guildRoleSubscriptionMemberPreview2) { this.a = linearLayout; this.b = view; - this.f1868c = linearLayout2; + this.f1869c = linearLayout2; this.d = textView; this.e = guildSubscriptionRoleImageUploadView; this.f = guildRoleSubscriptionMemberPreview; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding.java index 6693c4be0d..d8e5c393a2 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding.java @@ -18,7 +18,7 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding imple @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputEditText f1869c; + public final TextInputEditText f1870c; @NonNull public final TextInputLayout d; @NonNull @@ -39,7 +39,7 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding imple public WidgetGuildRoleSubscriptionTierIntangibleBenefitBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull MaterialButton materialButton, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextInputEditText textInputEditText2, @NonNull TextInputLayout textInputLayout2, @NonNull MaterialButton materialButton2, @NonNull MaterialButton materialButton3, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = coordinatorLayout; this.b = materialButton; - this.f1869c = textInputEditText; + this.f1870c = textInputEditText; this.d = textInputLayout; this.e = simpleDraweeView; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java index 458febae74..d0081a480d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventDetailsBottomSheetBinding.java @@ -18,7 +18,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheetBinding implements @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1870c; + public final ImageView f1871c; @NonNull public final TextView d; @NonNull @@ -39,7 +39,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheetBinding implements public WidgetGuildScheduledEventDetailsBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull GuildScheduledEventDateView guildScheduledEventDateView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ImageView imageView2, @NonNull TextView textView4) { this.a = constraintLayout; this.b = guildScheduledEventBottomButtonView; - this.f1870c = imageView; + this.f1871c = imageView; this.d = textView; this.e = guildScheduledEventDateView; this.f = linkifiedTextView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java index f7e007a877..f36e71f5d0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventListBottomSheetBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildScheduledEventListBottomSheetBinding implements Vi @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1871c; + public final ConstraintLayout f1872c; @NonNull public final RecyclerView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetGuildScheduledEventListBottomSheetBinding implements Vi public WidgetGuildScheduledEventListBottomSheetBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull ImageView imageView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull RecyclerView recyclerView, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView4) { this.a = constraintLayout; this.b = textView; - this.f1871c = constraintLayout2; + this.f1872c = constraintLayout2; this.d = recyclerView; this.e = textView4; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventLocationSelectBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventLocationSelectBinding.java index a936fa32ca..ad3f586cae 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventLocationSelectBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventLocationSelectBinding.java @@ -21,7 +21,7 @@ public final class WidgetGuildScheduledEventLocationSelectBinding implements Vie @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1872c; + public final TextInputLayout f1873c; @NonNull public final ImageView d; @NonNull @@ -44,7 +44,7 @@ public final class WidgetGuildScheduledEventLocationSelectBinding implements Vie public WidgetGuildScheduledEventLocationSelectBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull ImageView imageView, @NonNull TextInputEditText textInputEditText2, @NonNull TextInputLayout textInputLayout2, @NonNull CheckedSetting checkedSetting, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull CheckedSetting checkedSetting2, @NonNull TextView textView2, @NonNull ScreenTitleView screenTitleView, @NonNull ConstraintLayout constraintLayout2, @NonNull CheckedSetting checkedSetting3) { this.a = constraintLayout; this.b = textInputEditText; - this.f1872c = textInputLayout; + this.f1873c = textInputLayout; this.d = imageView; this.e = textInputEditText2; this.f = textInputLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventSettingsBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventSettingsBinding.java index 8255c219e1..6a0c690fd0 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventSettingsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildScheduledEventSettingsBinding.java @@ -19,7 +19,7 @@ public final class WidgetGuildScheduledEventSettingsBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1873c; + public final TextView f1874c; @NonNull public final TextInputEditText d; @NonNull @@ -52,7 +52,7 @@ public final class WidgetGuildScheduledEventSettingsBinding implements ViewBindi public WidgetGuildScheduledEventSettingsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2, @NonNull TextInputEditText textInputEditText2, @NonNull TextInputLayout textInputLayout2, @NonNull TextView textView3, @NonNull TextInputEditText textInputEditText3, @NonNull TextInputLayout textInputLayout3, @NonNull MaterialButton materialButton, @NonNull NestedScrollView nestedScrollView, @NonNull TextView textView4, @NonNull TextInputEditText textInputEditText4, @NonNull TextInputLayout textInputLayout4, @NonNull TextView textView5, @NonNull TextInputEditText textInputEditText5, @NonNull TextInputLayout textInputLayout5, @NonNull TextView textView6, @NonNull ScreenTitleView screenTitleView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView7, @NonNull TextInputEditText textInputEditText6, @NonNull TextInputLayout textInputLayout6, @NonNull TextView textView8, @NonNull TextInputEditText textInputEditText7, @NonNull TextInputLayout textInputLayout7) { this.a = constraintLayout; this.b = imageView; - this.f1873c = textView; + this.f1874c = textView; this.d = textInputEditText; this.e = textInputLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java index b89a7a41af..9e5f9d9681 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildSelectorItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1874c; + public final SimpleDraweeView f1875c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetGuildSelectorItemBinding implements ViewBinding { public WidgetGuildSelectorItemBinding(@NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2) { this.a = linearLayout; this.b = frameLayout; - this.f1874c = simpleDraweeView; + this.f1875c = simpleDraweeView; this.d = textView; this.e = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java index 835575d697..4fa9b4473d 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildStickerSheetBinding.java @@ -18,7 +18,7 @@ public final class WidgetGuildStickerSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1875c; + public final TextView f1876c; @NonNull public final AppViewFlipper d; @NonNull @@ -45,7 +45,7 @@ public final class WidgetGuildStickerSheetBinding implements ViewBinding { public WidgetGuildStickerSheetBinding(@NonNull AppViewFlipper appViewFlipper, @NonNull View view, @NonNull FrameLayout frameLayout, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper2, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView3, @NonNull FrameLayout frameLayout2, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull StickerView stickerView, @NonNull TextView textView6) { this.a = appViewFlipper; this.b = frameLayout; - this.f1875c = textView; + this.f1876c = textView; this.d = appViewFlipper2; this.e = linearLayout; this.f = simpleDraweeView; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java index e7598b0730..958d5d2eee 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildTransferOwnershipBinding.java @@ -15,7 +15,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1876c; + public final MaterialButton f1877c; @NonNull public final MaterialButton d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetGuildTransferOwnershipBinding implements ViewBinding { public WidgetGuildTransferOwnershipBinding(@NonNull LinearLayout linearLayout, @NonNull CheckedSetting checkedSetting, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull LinearLayout linearLayout2) { this.a = linearLayout; this.b = checkedSetting; - this.f1876c = materialButton; + this.f1877c = materialButton; this.d = materialButton2; this.e = textInputLayout; this.f = linearLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java index bfa0a74fdd..3559003a00 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeChannelBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1877c; + public final TextView f1878c; @NonNull public final SimpleDraweeView d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetGuildWelcomeChannelBinding implements ViewBinding { public WidgetGuildWelcomeChannelBinding(@NonNull CardView cardView, @NonNull CardView cardView2, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ImageView imageView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2, @NonNull ConstraintLayout constraintLayout3, @NonNull TextView textView3) { this.a = cardView; this.b = cardView2; - this.f1877c = textView; + this.f1878c = textView; this.d = simpleDraweeView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java index 01c0ff344a..1f7a8740cd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildWelcomeSheetBinding.java @@ -17,7 +17,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1878c; + public final TextView f1879c; @NonNull public final AppViewFlipper d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetGuildWelcomeSheetBinding implements ViewBinding { public WidgetGuildWelcomeSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull RecyclerView recyclerView, @NonNull TextView textView, @NonNull AppViewFlipper appViewFlipper, @NonNull SimpleDraweeView simpleDraweeView, @NonNull CardView cardView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = nestedScrollView; this.b = recyclerView; - this.f1878c = textView; + this.f1879c = textView; this.d = appViewFlipper; this.e = simpleDraweeView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java index 49a656f967..d01bd70b72 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListBinding.java @@ -14,12 +14,12 @@ public final class WidgetGuildsListBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ViewStub f1879c; + public final ViewStub f1880c; public WidgetGuildsListBinding(@NonNull RelativeLayout relativeLayout, @NonNull RecyclerView recyclerView, @NonNull ViewStub viewStub) { this.a = relativeLayout; this.b = recyclerView; - this.f1879c = viewStub; + this.f1880c = viewStub; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java index dc47733d4e..316d68652f 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemDmBinding.java @@ -14,12 +14,12 @@ public final class WidgetGuildsListItemDmBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1880c; + public final TextView f1881c; public WidgetGuildsListItemDmBinding(@NonNull View view, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = view; this.b = simpleDraweeView; - this.f1880c = textView; + this.f1881c = textView; } @NonNull diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java index 509fd66201..81bfb0c110 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemFolderBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1881c; + public final FrameLayout f1882c; @NonNull public final View d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetGuildsListItemFolderBinding implements ViewBinding { public WidgetGuildsListItemFolderBinding(@NonNull RelativeLayout relativeLayout, @NonNull ServerFolderView serverFolderView, @NonNull FrameLayout frameLayout, @NonNull View view, @NonNull TextView textView, @NonNull View view2, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = serverFolderView; - this.f1881c = frameLayout; + this.f1882c = frameLayout; this.d = view; this.e = textView; this.f = view2; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java index 41a6d2cd91..35dfb09216 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildBinding.java @@ -16,7 +16,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1882c; + public final ImageView f1883c; @NonNull public final SimpleDraweeView d; @NonNull @@ -31,7 +31,7 @@ public final class WidgetGuildsListItemGuildBinding implements ViewBinding { public WidgetGuildsListItemGuildBinding(@NonNull View view, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull ImageView imageView3) { this.a = view; this.b = imageView; - this.f1882c = imageView2; + this.f1883c = imageView2; this.d = simpleDraweeView; this.e = textView; this.f = frameLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java index 207b336ea1..c263fce40b 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemGuildVerticalBinding.java @@ -13,12 +13,12 @@ public final class WidgetGuildsListItemGuildVerticalBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final ImageView f1883c; + public final ImageView f1884c; public WidgetGuildsListItemGuildVerticalBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1883c = imageView2; + this.f1884c = imageView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java index 000a76b790..f312171c36 100644 --- a/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetGuildsListItemProfileBinding.java @@ -14,14 +14,14 @@ public final class WidgetGuildsListItemProfileBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1884c; + public final FrameLayout f1885c; @NonNull public final ImageView d; public WidgetGuildsListItemProfileBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout, @NonNull ImageView imageView2) { this.a = relativeLayout; this.b = imageView; - this.f1884c = frameLayout; + this.f1885c = frameLayout; this.d = imageView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java index df1bba07b5..37b25f156c 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHomeBinding.java @@ -18,7 +18,7 @@ public final class WidgetHomeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final HomePanelsLayout f1885c; + public final HomePanelsLayout f1886c; @NonNull public final f5 d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetHomeBinding implements ViewBinding { public WidgetHomeBinding(@NonNull FrameLayout frameLayout, @NonNull j5 j5Var, @NonNull HomePanelsLayout homePanelsLayout, @NonNull f5 f5Var, @NonNull i5 i5Var, @NonNull k5 k5Var, @NonNull ImageView imageView, @NonNull FrameLayout frameLayout2) { this.a = frameLayout; this.b = j5Var; - this.f1885c = homePanelsLayout; + this.f1886c = homePanelsLayout; this.d = f5Var; this.e = i5Var; this.f = k5Var; diff --git a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java index 76b5b83221..e150b4a06a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHomePanelCenterNsfwBinding.java @@ -16,7 +16,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1886c; + public final MaterialButton f1887c; @NonNull public final MaterialButton d; @NonNull @@ -27,7 +27,7 @@ public final class WidgetHomePanelCenterNsfwBinding implements ViewBinding { public WidgetHomePanelCenterNsfwBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView) { this.a = linearLayout; this.b = imageView; - this.f1886c = materialButton; + this.f1887c = materialButton; this.d = materialButton2; this.e = linkifiedTextView; this.f = textView; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubAddNameBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubAddNameBinding.java index dfce44511d..eb3e2e1335 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubAddNameBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubAddNameBinding.java @@ -17,7 +17,7 @@ public final class WidgetHubAddNameBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputEditText f1887c; + public final TextInputEditText f1888c; @NonNull public final TextInputLayout d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetHubAddNameBinding implements ViewBinding { public WidgetHubAddNameBinding(@NonNull LinearLayout linearLayout, @NonNull GuildView guildView, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView, @NonNull LoadingButton loadingButton) { this.a = linearLayout; this.b = guildView; - this.f1887c = textInputEditText; + this.f1888c = textInputEditText; this.d = textInputLayout; this.e = textView; this.f = loadingButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubAddServerBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubAddServerBinding.java index 4e3b744151..06e9c67372 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubAddServerBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubAddServerBinding.java @@ -17,7 +17,7 @@ public final class WidgetHubAddServerBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ScreenTitleView f1888c; + public final ScreenTitleView f1889c; @NonNull public final RecyclerView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetHubAddServerBinding implements ViewBinding { public WidgetHubAddServerBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull ScreenTitleView screenTitleView, @NonNull RecyclerView recyclerView, @NonNull SegmentedControlContainer segmentedControlContainer, @NonNull CardSegment cardSegment, @NonNull CardSegment cardSegment2) { this.a = linearLayout; this.b = materialButton; - this.f1888c = screenTitleView; + this.f1889c = screenTitleView; this.d = recyclerView; this.e = segmentedControlContainer; this.f = cardSegment; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubAuthenticationBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubAuthenticationBinding.java index e505ea4727..8264558023 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubAuthenticationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubAuthenticationBinding.java @@ -15,12 +15,12 @@ public final class WidgetHubAuthenticationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final CodeVerificationView f1889c; + public final CodeVerificationView f1890c; public WidgetHubAuthenticationBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextView textView2, @NonNull CodeVerificationView codeVerificationView) { this.a = linearLayout; this.b = linkifiedTextView; - this.f1889c = codeVerificationView; + this.f1890c = codeVerificationView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetHubDescriptionBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubDescriptionBinding.java index 7adbb0bea9..8e1316e649 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubDescriptionBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubDescriptionBinding.java @@ -17,7 +17,7 @@ public final class WidgetHubDescriptionBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1890c; + public final TextView f1891c; @NonNull public final TextView d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetHubDescriptionBinding implements ViewBinding { public WidgetHubDescriptionBinding(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextInputEditText textInputEditText, @NonNull TextInputLayout textInputLayout, @NonNull ScreenTitleView screenTitleView) { this.a = linearLayout; this.b = loadingButton; - this.f1890c = textView; + this.f1891c = textView; this.d = textView2; this.e = linearLayout2; this.f = textInputEditText; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubDomainSearchBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubDomainSearchBinding.java index a9f79a64a6..6302fe7ffb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubDomainSearchBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubDomainSearchBinding.java @@ -21,7 +21,7 @@ public final class WidgetHubDomainSearchBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1891c; + public final LinearLayout f1892c; @NonNull public final RecyclerView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetHubDomainSearchBinding implements ViewBinding { public WidgetHubDomainSearchBinding(@NonNull ConstraintLayout constraintLayout, @NonNull AppBarLayout appBarLayout, @NonNull Barrier barrier, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull FloatingActionButton floatingActionButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputEditText textInputEditText) { this.a = constraintLayout; this.b = linkifiedTextView; - this.f1891c = linearLayout; + this.f1892c = linearLayout; this.d = recyclerView; this.e = floatingActionButton; this.f = textInputLayout; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java index 4f849df6a4..281ef0b430 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubDomainsBinding.java @@ -15,12 +15,12 @@ public final class WidgetHubDomainsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1892c; + public final MaterialButton f1893c; public WidgetHubDomainsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull RecyclerView recyclerView, @NonNull MaterialButton materialButton) { this.a = linearLayout; this.b = recyclerView; - this.f1892c = materialButton; + this.f1893c = materialButton; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetHubEmailFlowBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubEmailFlowBinding.java index 2a6793caaf..a3ee184238 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubEmailFlowBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubEmailFlowBinding.java @@ -17,7 +17,7 @@ public final class WidgetHubEmailFlowBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final b5 f1893c; + public final b5 f1894c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetHubEmailFlowBinding implements ViewBinding { public WidgetHubEmailFlowBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull l5 l5Var, @NonNull b5 b5Var, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull m5 m5Var) { this.a = linearLayout; this.b = l5Var; - this.f1893c = b5Var; + this.f1894c = b5Var; this.d = materialButton; this.e = loadingButton; this.f = m5Var; diff --git a/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java b/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java index 16e5391270..4a6db984ac 100644 --- a/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetHubWaitlistBinding.java @@ -16,14 +16,14 @@ public final class WidgetHubWaitlistBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputEditText f1894c; + public final TextInputEditText f1895c; @NonNull public final TextInputLayout d; public WidgetHubWaitlistBinding(@NonNull LinearLayout linearLayout, @NonNull LoadingButton loadingButton, @NonNull TextInputEditText textInputEditText, @NonNull ScreenTitleView screenTitleView, @NonNull TextInputLayout textInputLayout) { this.a = linearLayout; this.b = loadingButton; - this.f1894c = textInputEditText; + this.f1895c = textInputEditText; this.d = textInputLayout; } diff --git a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java index bc06d35f98..f3672a7b9e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetIncomingShareBinding.java @@ -21,7 +21,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ViewEmbedGameInvite f1895c; + public final ViewEmbedGameInvite f1896c; @NonNull public final TextInputLayout d; @NonNull @@ -46,7 +46,7 @@ public final class WidgetIncomingShareBinding implements ViewBinding { public WidgetIncomingShareBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull ViewEmbedGameInvite viewEmbedGameInvite, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull CardView cardView, @NonNull TextInputLayout textInputLayout2, @NonNull RecyclerView recyclerView2, @NonNull ImageView imageView, @NonNull AppViewFlipper appViewFlipper, @NonNull NestedScrollView nestedScrollView, @NonNull AppViewFlipper appViewFlipper2, @NonNull ViewGlobalSearchItem viewGlobalSearchItem, @NonNull ImageView imageView2) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1895c = viewEmbedGameInvite; + this.f1896c = viewEmbedGameInvite; this.d = textInputLayout; this.e = recyclerView; this.f = cardView; diff --git a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java index 5f28030d5f..dcc5a97e71 100644 --- a/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetIssueDetailsFormBinding.java @@ -15,14 +15,14 @@ public final class WidgetIssueDetailsFormBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1896c; + public final TextInputLayout f1897c; @NonNull public final MaterialButton d; public WidgetIssueDetailsFormBinding(@NonNull NestedScrollView nestedScrollView, @NonNull LinkifiedTextView linkifiedTextView, @NonNull TextInputLayout textInputLayout, @NonNull MaterialButton materialButton) { this.a = nestedScrollView; this.b = linkifiedTextView; - this.f1896c = textInputLayout; + this.f1897c = textInputLayout; this.d = materialButton; } diff --git a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java index 3d631ae7bb..6b88e786dd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetKickUserBinding.java @@ -15,7 +15,7 @@ public final class WidgetKickUserBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1897c; + public final MaterialButton f1898c; @NonNull public final MaterialButton d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetKickUserBinding implements ViewBinding { public WidgetKickUserBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextInputLayout textInputLayout, @NonNull TextView textView2) { this.a = linearLayout; this.b = textView; - this.f1897c = materialButton; + this.f1898c = materialButton; this.d = materialButton2; this.e = textInputLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java index 83b4f92d6f..18aaf788df 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsBinding.java @@ -13,12 +13,12 @@ public final class WidgetManageReactionsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1898c; + public final RecyclerView f1899c; public WidgetManageReactionsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull RecyclerView recyclerView2) { this.a = coordinatorLayout; this.b = recyclerView; - this.f1898c = recyclerView2; + this.f1899c = recyclerView2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java index 8c062244c3..10b3c63683 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsEmojiBinding.java @@ -15,14 +15,14 @@ public final class WidgetManageReactionsEmojiBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeSpanTextView f1899c; + public final SimpleDraweeSpanTextView f1900c; @NonNull public final View d; public WidgetManageReactionsEmojiBinding(@NonNull RelativeLayout relativeLayout, @NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view) { this.a = relativeLayout; this.b = textView; - this.f1899c = simpleDraweeSpanTextView; + this.f1900c = simpleDraweeSpanTextView; this.d = view; } diff --git a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java index bdb2708bbc..49c9833579 100644 --- a/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetManageReactionsResultUserBinding.java @@ -15,14 +15,14 @@ public final class WidgetManageReactionsResultUserBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1900c; + public final SimpleDraweeView f1901c; @NonNull public final TextView d; public WidgetManageReactionsResultUserBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView) { this.a = relativeLayout; this.b = imageView; - this.f1900c = simpleDraweeView; + this.f1901c = simpleDraweeView; this.d = textView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java index 5652905895..be446dce4a 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMediaBinding.java @@ -17,7 +17,7 @@ public final class WidgetMediaBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final FrameLayout f1901c; + public final FrameLayout f1902c; @NonNull public final ZoomableDraweeView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetMediaBinding implements ViewBinding { public WidgetMediaBinding(@NonNull FrameLayout frameLayout, @NonNull AppBarLayout appBarLayout, @NonNull FrameLayout frameLayout2, @NonNull ZoomableDraweeView zoomableDraweeView, @NonNull ProgressBar progressBar, @NonNull PlayerControlView playerControlView, @NonNull PlayerView playerView) { this.a = frameLayout; this.b = appBarLayout; - this.f1901c = frameLayout2; + this.f1902c = frameLayout2; this.d = zoomableDraweeView; this.e = progressBar; this.f = playerControlView; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java index ceaee84e62..171234ad43 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationBinding.java @@ -21,7 +21,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1902c; + public final SimpleDraweeView f1903c; @NonNull public final MemberVerificationView d; @NonNull @@ -36,7 +36,7 @@ public final class WidgetMemberVerificationBinding implements ViewBinding { public WidgetMemberVerificationBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull CustomAppBarLayout customAppBarLayout, @NonNull CollapsingToolbarLayout collapsingToolbarLayout, @NonNull DimmerView dimmerView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull MemberVerificationView memberVerificationView, @NonNull MemberVerificationAvatarView memberVerificationAvatarView, @NonNull LoadingButton loadingButton, @NonNull RecyclerView recyclerView, @NonNull NestedScrollView nestedScrollView) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1902c = simpleDraweeView; + this.f1903c = simpleDraweeView; this.d = memberVerificationView; this.e = memberVerificationAvatarView; this.f = loadingButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java index 8923b5f8e8..bd4d298533 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationPendingDialogBinding.java @@ -15,7 +15,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1903c; + public final MaterialButton f1904c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetMemberVerificationPendingDialogBinding implements ViewB public WidgetMemberVerificationPendingDialogBinding(@NonNull RelativeLayout relativeLayout, @NonNull ImageView imageView, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3) { this.a = relativeLayout; this.b = imageView; - this.f1903c = materialButton; + this.f1904c = materialButton; this.d = materialButton2; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java index b4194ccd47..320d1108b1 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationRuleItemBinding.java @@ -15,7 +15,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final View f1904c; + public final View f1905c; @NonNull public final TextView d; @NonNull @@ -24,7 +24,7 @@ public final class WidgetMemberVerificationRuleItemBinding implements ViewBindin public WidgetMemberVerificationRuleItemBinding(@NonNull RoundedRelativeLayout roundedRelativeLayout, @NonNull LinearLayout linearLayout, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull View view, @NonNull TextView textView, @NonNull RoundedRelativeLayout roundedRelativeLayout2) { this.a = roundedRelativeLayout; this.b = simpleDraweeSpanTextView; - this.f1904c = view; + this.f1905c = view; this.d = textView; this.e = roundedRelativeLayout2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java index a6d298dc11..b3b81ac4ae 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMemberVerificationSuccessBinding.java @@ -15,12 +15,12 @@ public final class WidgetMemberVerificationSuccessBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1905c; + public final TextView f1906c; public WidgetMemberVerificationSuccessBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull CardView cardView) { this.a = relativeLayout; this.b = materialButton; - this.f1905c = textView; + this.f1906c = textView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java index fd370239ec..9f6cf47342 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMobileReportsBinding.java @@ -14,12 +14,12 @@ public final class WidgetMobileReportsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final ProgressBar f1906c; + public final ProgressBar f1907c; public WidgetMobileReportsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull FrameLayout frameLayout, @NonNull ProgressBar progressBar) { this.a = coordinatorLayout; this.b = frameLayout; - this.f1906c = progressBar; + this.f1907c = progressBar; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetModeratorStartStageBinding.java b/app/src/main/java/com/discord/databinding/WidgetModeratorStartStageBinding.java index 441bfdb76d..29d8303baf 100644 --- a/app/src/main/java/com/discord/databinding/WidgetModeratorStartStageBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetModeratorStartStageBinding.java @@ -17,14 +17,14 @@ public final class WidgetModeratorStartStageBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1907c; + public final RecyclerView f1908c; @NonNull public final CallEventsButtonView d; public WidgetModeratorStartStageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull Toolbar toolbar, @NonNull AppBarLayout appBarLayout, @NonNull Button button, @NonNull RecyclerView recyclerView, @NonNull CallEventsButtonView callEventsButtonView) { this.a = constraintLayout; this.b = button; - this.f1907c = recyclerView; + this.f1908c = recyclerView; this.d = callEventsButtonView; } diff --git a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java index 7a631d4f7f..31bee15e23 100644 --- a/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetMuteSettingsSheetBinding.java @@ -15,7 +15,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1908c; + public final LinearLayout f1909c; @NonNull public final LinearLayout d; @NonNull @@ -48,7 +48,7 @@ public final class WidgetMuteSettingsSheetBinding implements ViewBinding { public WidgetMuteSettingsSheetBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull FrameLayout frameLayout, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull TextView textView7, @NonNull TextView textView8, @NonNull TextView textView9, @NonNull TextView textView10, @NonNull LinearLayout linearLayout3, @NonNull TextView textView11, @NonNull TextView textView12) { this.a = nestedScrollView; this.b = textView; - this.f1908c = linearLayout; + this.f1909c = linearLayout; this.d = linearLayout2; this.e = frameLayout; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java index 1913c473a0..bb38a503f9 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNavigationHelpBinding.java @@ -15,14 +15,14 @@ public final class WidgetNavigationHelpBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TabLayout f1909c; + public final TabLayout f1910c; @NonNull public final ViewPager2 d; public WidgetNavigationHelpBinding(@NonNull LinearLayout linearLayout, @NonNull ImageView imageView, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2) { this.a = linearLayout; this.b = imageView; - this.f1909c = tabLayout; + this.f1910c = tabLayout; this.d = viewPager2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java index b08c8eeb42..318a9304e8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeDialogBinding.java @@ -15,7 +15,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1910c; + public final LinkifiedTextView f1911c; @NonNull public final MaterialButton d; @NonNull @@ -28,7 +28,7 @@ public final class WidgetNoticeDialogBinding implements ViewBinding { public WidgetNoticeDialogBinding(@NonNull LinearLayout linearLayout, @NonNull LinearLayout linearLayout2, @NonNull LinkifiedTextView linkifiedTextView, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull LinearLayout linearLayout3, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = linearLayout2; - this.f1910c = linkifiedTextView; + this.f1911c = linkifiedTextView; this.d = materialButton; this.e = textView; this.f = linearLayout3; diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java index d4c4c660a4..45d2e19782 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxOverlayBinding.java @@ -13,12 +13,12 @@ public final class WidgetNoticeNuxOverlayBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1911c; + public final MaterialButton f1912c; public WidgetNoticeNuxOverlayBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1911c = materialButton2; + this.f1912c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java index 53a23430ab..60953302ea 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticeNuxSamsungLinkBinding.java @@ -13,12 +13,12 @@ public final class WidgetNoticeNuxSamsungLinkBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1912c; + public final MaterialButton f1913c; public WidgetNoticeNuxSamsungLinkBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2) { this.a = linearLayout; this.b = materialButton; - this.f1912c = materialButton2; + this.f1913c = materialButton2; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java index 38c90e182b..ccab7a0256 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNoticePopupBinding.java @@ -17,7 +17,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeSpanTextView f1913c; + public final SimpleDraweeSpanTextView f1914c; @NonNull public final ImageView d; @NonNull @@ -32,7 +32,7 @@ public final class WidgetNoticePopupBinding implements ViewBinding { public WidgetNoticePopupBinding(@NonNull RelativeLayout relativeLayout, @NonNull SimpleDraweeView simpleDraweeView, @NonNull SimpleDraweeSpanTextView simpleDraweeSpanTextView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView2, @NonNull StickerView stickerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RelativeLayout relativeLayout2) { this.a = relativeLayout; this.b = simpleDraweeView; - this.f1913c = simpleDraweeSpanTextView; + this.f1914c = simpleDraweeSpanTextView; this.d = imageView; this.e = simpleDraweeView2; this.f = stickerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java index 349f98315d..fb809ddebc 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNuxChannelPromptBinding.java @@ -17,7 +17,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1914c; + public final SimpleDraweeView f1915c; @NonNull public final TextView d; @NonNull @@ -30,7 +30,7 @@ public final class WidgetNuxChannelPromptBinding implements ViewBinding { public WidgetNuxChannelPromptBinding(@NonNull RelativeLayout relativeLayout, @NonNull LoadingButton loadingButton, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextInputLayout textInputLayout, @NonNull Toolbar toolbar) { this.a = relativeLayout; this.b = loadingButton; - this.f1914c = simpleDraweeView; + this.f1915c = simpleDraweeView; this.d = textView; this.e = textView2; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java index 0598a05380..d1df4855cd 100644 --- a/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetNuxGuildTemplateBinding.java @@ -15,7 +15,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinearLayout f1915c; + public final LinearLayout f1916c; @NonNull public final TextView d; @NonNull @@ -26,7 +26,7 @@ public final class WidgetNuxGuildTemplateBinding implements ViewBinding { public WidgetNuxGuildTemplateBinding(@NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView) { this.a = linearLayout; this.b = materialButton; - this.f1915c = linearLayout2; + this.f1916c = linearLayout2; this.d = textView; this.e = textView2; this.f = recyclerView; diff --git a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java index 42711baa12..dae571ff6e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetOauthAuthorizeBinding.java @@ -19,7 +19,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final SimpleDraweeView f1916c; + public final SimpleDraweeView f1917c; @NonNull public final TextView d; @NonNull @@ -50,7 +50,7 @@ public final class WidgetOauthAuthorizeBinding implements ViewBinding { public WidgetOauthAuthorizeBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull ImageView imageView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull TextView textView2, @NonNull MaterialCardView materialCardView, @NonNull TextView textView3, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull MaterialButton materialButton2, @NonNull LinearLayout linearLayout2, @NonNull MaterialButton materialButton3, @NonNull ImageView imageView2, @NonNull LinearLayout linearLayout3, @NonNull TextView textView4, @NonNull RecyclerView recyclerView, @NonNull TextView textView5, @NonNull ImageView imageView3, @NonNull MaterialButton materialButton4, @NonNull MaterialButton materialButton5, @NonNull SimpleDraweeView simpleDraweeView2) { this.a = coordinatorLayout; this.b = textView; - this.f1916c = simpleDraweeView; + this.f1917c = simpleDraweeView; this.d = textView2; this.e = linearLayout; this.f = materialButton; diff --git a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java index c2771ef6ef..af9e7c37e8 100644 --- a/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetOutboundPromoTermsBinding.java @@ -14,12 +14,12 @@ public final class WidgetOutboundPromoTermsBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final LinkifiedTextView f1917c; + public final LinkifiedTextView f1918c; public WidgetOutboundPromoTermsBinding(@NonNull LinearLayout linearLayout, @NonNull TextView textView, @NonNull LinkifiedTextView linkifiedTextView) { this.a = linearLayout; this.b = textView; - this.f1917c = linkifiedTextView; + this.f1918c = linkifiedTextView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java index 3878bcb39b..8e0708eedb 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPaymentSourceEditDialogBinding.java @@ -19,7 +19,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final MaterialButton f1918c; + public final MaterialButton f1919c; @NonNull public final LoadingButton d; @NonNull @@ -48,7 +48,7 @@ public final class WidgetPaymentSourceEditDialogBinding implements ViewBinding { public WidgetPaymentSourceEditDialogBinding(@NonNull LinearLayout linearLayout, @NonNull Toolbar toolbar, @NonNull MaterialButton materialButton, @NonNull LoadingButton loadingButton, @NonNull TextInputLayout textInputLayout, @NonNull TextInputLayout textInputLayout2, @NonNull TextInputLayout textInputLayout3, @NonNull TextInputLayout textInputLayout4, @NonNull CheckBox checkBox, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextInputLayout textInputLayout5, @NonNull TextInputLayout textInputLayout6, @NonNull TextInputLayout textInputLayout7, @NonNull PaymentSourceView paymentSourceView) { this.a = linearLayout; this.b = toolbar; - this.f1918c = materialButton; + this.f1919c = materialButton; this.d = loadingButton; this.e = textInputLayout; this.f = textInputLayout2; diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java index 43db2e5be1..969c3512a4 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeBottomSheetBinding.java @@ -14,12 +14,12 @@ public final class WidgetPhoneCountryCodeBottomSheetBinding implements ViewBindi @NonNull /* renamed from: c reason: collision with root package name */ - public final TextInputLayout f1919c; + public final TextInputLayout f1920c; public WidgetPhoneCountryCodeBottomSheetBinding(@NonNull LinearLayout linearLayout, @NonNull RecyclerView recyclerView, @NonNull TextInputLayout textInputLayout) { this.a = linearLayout; this.b = recyclerView; - this.f1919c = textInputLayout; + this.f1920c = textInputLayout; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java index ddec98668f..86cfbbea05 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPhoneCountryCodeListItemBinding.java @@ -13,14 +13,14 @@ public final class WidgetPhoneCountryCodeListItemBinding implements ViewBinding @NonNull /* renamed from: c reason: collision with root package name */ - public final ConstraintLayout f1920c; + public final ConstraintLayout f1921c; @NonNull public final TextView d; public WidgetPhoneCountryCodeListItemBinding(@NonNull ConstraintLayout constraintLayout, @NonNull TextView textView, @NonNull ConstraintLayout constraintLayout2, @NonNull TextView textView2) { this.a = constraintLayout; this.b = textView; - this.f1920c = constraintLayout2; + this.f1921c = constraintLayout2; this.d = textView2; } diff --git a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java index c91970f961..ec9e22c642 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPremiumGuildTransferBinding.java @@ -16,7 +16,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding { @NonNull /* renamed from: c reason: collision with root package name */ - public final TextView f1921c; + public final TextView f1922c; @NonNull public final TextView d; @NonNull @@ -33,7 +33,7 @@ public final class WidgetPremiumGuildTransferBinding implements ViewBinding { public WidgetPremiumGuildTransferBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull DimmerView dimmerView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView, @NonNull TextView textView3, @NonNull MaterialButton materialButton, @NonNull PremiumGuildConfirmationView premiumGuildConfirmationView2, @NonNull TextView textView4) { this.a = coordinatorLayout; this.b = dimmerView; - this.f1921c = textView; + this.f1922c = textView; this.d = textView2; this.e = premiumGuildConfirmationView; this.f = textView3; diff --git a/app/src/main/java/com/discord/databinding/WidgetPreviewGuildScheduledEventBinding.java b/app/src/main/java/com/discord/databinding/WidgetPreviewGuildScheduledEventBinding.java index 5d02303ad8..fd46738d0e 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPreviewGuildScheduledEventBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPreviewGuildScheduledEventBinding.java @@ -17,7 +17,7 @@ public final class WidgetPreviewGuildScheduledEventBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final CheckedSetting f1922c; + public final CheckedSetting f1923c; @NonNull public final GuildScheduledEventItemView d; @NonNull @@ -34,7 +34,7 @@ public final class WidgetPreviewGuildScheduledEventBinding implements ViewBindin public WidgetPreviewGuildScheduledEventBinding(@NonNull ConstraintLayout constraintLayout, @NonNull ImageView imageView, @NonNull CheckedSetting checkedSetting, @NonNull GuildScheduledEventItemView guildScheduledEventItemView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull ConstraintLayout constraintLayout2, @NonNull MaterialButton materialButton) { this.a = constraintLayout; this.b = imageView; - this.f1922c = checkedSetting; + this.f1923c = checkedSetting; this.d = guildScheduledEventItemView; this.e = textView; this.f = textView2; diff --git a/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java b/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java index d72ee2f066..dbd9ea1c29 100644 --- a/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetPriceTierPickerBottomSheetBinding.java @@ -16,12 +16,12 @@ public final class WidgetPriceTierPickerBottomSheetBinding implements ViewBindin @NonNull /* renamed from: c reason: collision with root package name */ - public final RecyclerView f1923c; + public final RecyclerView f1924c; public WidgetPriceTierPickerBottomSheetBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout appBarLayout, @NonNull AppViewFlipper appViewFlipper, @NonNull RecyclerView recyclerView, @NonNull Toolbar toolbar) { this.a = coordinatorLayout; this.b = appViewFlipper; - this.f1923c = recyclerView; + this.f1924c = recyclerView; } @Override // androidx.viewbinding.ViewBinding diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index 88ec01d895..e6e0fac65f 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -891,6 +891,9 @@ public interface RestAPIInterface { @n("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") Observable updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing); + @n("guild-events/{eventId}") + Observable updateGuildScheduledEvent(@s("eventId") long j, @a RestAPIParams.UpdateGuildScheduledEventBody updateGuildScheduledEventBody); + @n("guilds/{guildId}/members/@me") Observable updateMeGuildMember(@s("guildId") long j, @a PatchGuildMemberBody patchGuildMemberBody); diff --git a/app/src/main/java/com/discord/restapi/RestAPIParams.java b/app/src/main/java/com/discord/restapi/RestAPIParams.java index aaea165bd0..c4490a16b0 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIParams.java +++ b/app/src/main/java/com/discord/restapi/RestAPIParams.java @@ -17,6 +17,7 @@ import com.discord.api.guild.GuildVerificationLevel; import com.discord.api.guildrolesubscription.GuildRoleSubscriptionBenefit; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityMetadata; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; +import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; import com.discord.api.message.activity.MessageActivityType; import com.discord.api.message.allowedmentions.MessageAllowedMentions; import com.discord.api.message.allowedmentions.MessageAllowedMentionsTypes; @@ -3533,6 +3534,58 @@ public final class RestAPIParams { } } + /* compiled from: RestAPIParams.kt */ + public static final class UpdateGuildScheduledEventBody { + private final GuildScheduledEventStatus status; + + public UpdateGuildScheduledEventBody(GuildScheduledEventStatus guildScheduledEventStatus) { + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + this.status = guildScheduledEventStatus; + } + + public static /* synthetic */ UpdateGuildScheduledEventBody copy$default(UpdateGuildScheduledEventBody updateGuildScheduledEventBody, GuildScheduledEventStatus guildScheduledEventStatus, int i, Object obj) { + if ((i & 1) != 0) { + guildScheduledEventStatus = updateGuildScheduledEventBody.status; + } + return updateGuildScheduledEventBody.copy(guildScheduledEventStatus); + } + + public final GuildScheduledEventStatus component1() { + return this.status; + } + + public final UpdateGuildScheduledEventBody copy(GuildScheduledEventStatus guildScheduledEventStatus) { + m.checkNotNullParameter(guildScheduledEventStatus, "status"); + return new UpdateGuildScheduledEventBody(guildScheduledEventStatus); + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof UpdateGuildScheduledEventBody) && m.areEqual(this.status, ((UpdateGuildScheduledEventBody) obj).status); + } + return true; + } + + public final GuildScheduledEventStatus getStatus() { + return this.status; + } + + public int hashCode() { + GuildScheduledEventStatus guildScheduledEventStatus = this.status; + if (guildScheduledEventStatus != null) { + return guildScheduledEventStatus.hashCode(); + } + return 0; + } + + public String toString() { + StringBuilder P = a.P("UpdateGuildScheduledEventBody(status="); + P.append(this.status); + P.append(")"); + return P.toString(); + } + } + /* compiled from: RestAPIParams.kt */ public static final class UpdateStageInstanceBody { private final StageInstancePrivacyLevel privacyLevel; diff --git a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java index 864f1dd4f7..565b7424bf 100644 --- a/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java +++ b/app/src/main/java/com/discord/rtcconnection/MediaSinkWantsManager.java @@ -405,6 +405,14 @@ public final class MediaSinkWantsManager implements MediaEngineConnection.d { public void onSpeaking(long j, int i, boolean z2) { } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetBitrate(int i) { + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetFrameRate(int i) { + } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d public void onVideo(long j, Integer num, int i, int i2, int i3, StreamParameters[] streamParametersArr) { m.checkNotNullParameter(streamParametersArr, "streams"); diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java index 688132eba5..463f851c06 100644 --- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java +++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java @@ -687,19 +687,19 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage this.v = null; c.a.q.o0.e eVar = this.A; synchronized (eVar) { - eVar.p.stop(); - eVar.h = Long.valueOf(eVar.r.currentTimeMillis()); + eVar.o.stop(); + eVar.h = Long.valueOf(eVar.q.currentTimeMillis()); } if (!(this.r.a instanceof State.d)) { n(false, str); d dVar = this.W; if (dVar instanceof d.b) { - Map b2 = this.A.b(String.valueOf(((d.b) dVar).a)); - if (b2 != null) { - l(((d.b) this.W).a, b2); + Map c2 = this.A.c(String.valueOf(((d.b) dVar).a)); + if (c2 != null) { + l(((d.b) this.W).a, c2); } if (this.o) { - m(this.S, this.A.c()); + m(this.S, this.A.d()); } } } @@ -846,11 +846,11 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage for (String str4 : list) { Long longOrNull = s.toLongOrNull(str4); if (longOrNull != null) { - l(longOrNull.longValue(), this.A.b(str4)); + l(longOrNull.longValue(), this.A.c(str4)); } } if (this.o) { - m(this.S, this.A.c()); + m(this.S, this.A.d()); } } } diff --git a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java index de8c735c06..631e6792a0 100644 --- a/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java +++ b/app/src/main/java/com/discord/rtcconnection/mediaengine/MediaEngineConnection.java @@ -184,6 +184,14 @@ public interface MediaEngineConnection { public void onSpeaking(long j, int i, boolean z2) { } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetBitrate(int i) { + } + + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d + public void onTargetFrameRate(int i) { + } + @Override // com.discord.rtcconnection.mediaengine.MediaEngineConnection.d public void onVideo(long j, Integer num, int i, int i2, int i3, StreamParameters[] streamParametersArr) { m.checkNotNullParameter(streamParametersArr, "streams"); @@ -343,6 +351,10 @@ public interface MediaEngineConnection { void onSpeaking(long j, int i, boolean z2); + void onTargetBitrate(int i); + + void onTargetFrameRate(int i); + void onVideo(long j, Integer num, int i, int i2, int i3, StreamParameters[] streamParametersArr); } diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java index 847904f6f3..3d7705a3e3 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticsTracker.java @@ -2131,8 +2131,8 @@ public final class AnalyticsTracker { tracker.track("notification_settings_updated", CollectionExtensionsKt.filterNonNullValues(hashMap)); } - public final void trackProfileMarketingSheet() { - tracker.track("tooltip_viewed", g0.mapOf(o.to("type", "Custom Profiles Marketing Bottom Sheet"))); + public final void trackGuildIdentityMarketingSheet() { + tracker.track("tooltip_viewed", g0.mapOf(o.to("type", "per server identity tooltip"))); } public final void trackStartStageOpened(boolean z2, Long l, Long l2) { diff --git a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java index b00f9d5cc9..0a94846685 100644 --- a/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java +++ b/app/src/main/java/com/discord/utilities/colors/RepresentativeColors$handleBitmap$1.java @@ -19,7 +19,7 @@ import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; /* compiled from: RepresentativeColors.kt */ -@e(c = "com.discord.utilities.colors.RepresentativeColors$handleBitmap$1", f = "RepresentativeColors.kt", l = {55}, m = "invokeSuspend") +@e(c = "com.discord.utilities.colors.RepresentativeColors$handleBitmap$1", f = "RepresentativeColors.kt", l = {59}, m = "invokeSuspend") public final class RepresentativeColors$handleBitmap$1 extends k implements Function2, Object> { public final /* synthetic */ Bitmap $bitmap; public final /* synthetic */ Object $id; @@ -48,21 +48,28 @@ public final class RepresentativeColors$handleBitmap$1 extends k implements Func return ((RepresentativeColors$handleBitmap$1) create(coroutineScope, continuation)).invokeSuspend(Unit.a); } - /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x00ac: APUT + /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x00ba: APUT (r4v1 kotlin.Pair[]) (3 ??[int, float, short, byte, char]) - (wrap: kotlin.Pair : 0x00a8: INVOKE (r3v7 kotlin.Pair) = ("url"), (r3v6 java.lang.String) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) + (wrap: kotlin.Pair : 0x00b6: INVOKE (r3v7 kotlin.Pair) = ("url"), (r3v6 java.lang.String) type: STATIC call: d0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair) */ @Override // d0.w.i.a.a public final Object invokeSuspend(Object obj) { int i; + int i2; Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); - int i2 = this.label; - if (i2 == 0) { + int i3 = this.label; + if (i3 == 0) { l.throwOnFailure(obj); if (RepresentativeColors.access$getRepresentativeColors$p(this.this$0).containsKey(this.$id)) { return Unit.a; } + if (this.$bitmap.isRecycled()) { + i = RepresentativeColors.access$getBLURPLE$cp(); + RepresentativeColors.access$getRepresentativeColors$p(this.this$0).put(this.$id, b.boxInt(i)); + RepresentativeColors.access$getRepresentativeColorsSubject$p(this.this$0).onNext(RepresentativeColors.access$getRepresentativeColors$p(this.this$0)); + return Unit.a; + } Bitmap copy = this.$bitmap.copy(Bitmap.Config.ARGB_8888, false); RepresentativeColors representativeColors = this.this$0; m.checkNotNullExpressionValue(copy, "copiedBitmap"); @@ -71,16 +78,16 @@ public final class RepresentativeColors$handleBitmap$1 extends k implements Func if (obj == coroutine_suspended) { return coroutine_suspended; } - } else if (i2 == 1) { + } else if (i3 == 1) { l.throwOnFailure(obj); } else { throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine"); } RepresentativeColors.RepresentativeColorResult representativeColorResult = (RepresentativeColors.RepresentativeColorResult) obj; if (representativeColorResult instanceof RepresentativeColors.RepresentativeColorResult.Success) { - i = ((RepresentativeColors.RepresentativeColorResult.Success) representativeColorResult).getColor(); + i2 = ((RepresentativeColors.RepresentativeColorResult.Success) representativeColorResult).getColor(); } else if (representativeColorResult instanceof RepresentativeColors.RepresentativeColorResult.Failure) { - i = RepresentativeColors.access$getBLURPLE$cp(); + i2 = RepresentativeColors.access$getBLURPLE$cp(); } else { throw new NoWhenBranchMatchedException(); } @@ -98,6 +105,7 @@ public final class RepresentativeColors$handleBitmap$1 extends k implements Func pairArr[3] = o.to("url", str); appLog.e("Failed to get representative color for entity", exception, h0.mapOf(pairArr)); } + i = i2; RepresentativeColors.access$getRepresentativeColors$p(this.this$0).put(this.$id, b.boxInt(i)); RepresentativeColors.access$getRepresentativeColorsSubject$p(this.this$0).onNext(RepresentativeColors.access$getRepresentativeColors$p(this.this$0)); return Unit.a; diff --git a/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventsComparator.java b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventsComparator.java new file mode 100644 index 0000000000..b3f134e342 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/guildscheduledevent/GuildScheduledEventsComparator.java @@ -0,0 +1,38 @@ +package com.discord.utilities.guildscheduledevent; + +import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; +import java.util.Comparator; +/* compiled from: GuildScheduledEventUtilities.kt */ +public final class GuildScheduledEventsComparator implements Comparator { + public static final GuildScheduledEventsComparator INSTANCE = new GuildScheduledEventsComparator(); + + private GuildScheduledEventsComparator() { + } + + /* JADX WARNING: Code restructure failed: missing block: B:9:0x0017, code lost: + if ((r7 != null ? r7.k() : null) != r2) goto L_0x0019; + */ + public int compare(GuildScheduledEvent guildScheduledEvent, GuildScheduledEvent guildScheduledEvent2) { + GuildScheduledEventStatus guildScheduledEventStatus = null; + GuildScheduledEventStatus k = guildScheduledEvent != null ? guildScheduledEvent.k() : null; + GuildScheduledEventStatus guildScheduledEventStatus2 = GuildScheduledEventStatus.ACTIVE; + if (k == guildScheduledEventStatus2) { + } + if ((guildScheduledEvent != null ? guildScheduledEvent.k() : null) != guildScheduledEventStatus2) { + if (guildScheduledEvent2 != null) { + guildScheduledEventStatus = guildScheduledEvent2.k(); + } + if (guildScheduledEventStatus == guildScheduledEventStatus2) { + return 1; + } + } + if (guildScheduledEvent != null && guildScheduledEvent2 != null) { + return guildScheduledEvent.j().compareTo(guildScheduledEvent2.j()); + } + if (guildScheduledEvent == null) { + return 1; + } + return guildScheduledEvent2 == null ? -1 : 0; + } +} diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java index 06ac680b43..ff0d5c197d 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -2168,6 +2168,13 @@ public final class RestAPI implements RestAPIInterface { return this._api.updateGuildRoleSubscriptionTierListing(j, j2, j3, updateGuildRoleSubscriptionTierListing); } + @Override // com.discord.restapi.RestAPIInterface + @i0.f0.n("guild-events/{eventId}") + public Observable updateGuildScheduledEvent(@s("eventId") long j, @i0.f0.a RestAPIParams.UpdateGuildScheduledEventBody updateGuildScheduledEventBody) { + m.checkNotNullParameter(updateGuildScheduledEventBody, "body"); + return this._api.updateGuildScheduledEvent(j, updateGuildScheduledEventBody); + } + @Override // com.discord.restapi.RestAPIInterface @i0.f0.n("guilds/{guildId}/members/@me") public Observable updateMeGuildMember(@s("guildId") long j, @i0.f0.a PatchGuildMemberBody patchGuildMemberBody) { diff --git a/app/src/main/java/com/discord/utilities/views/viewstub/LazyViewStubDelegate.java b/app/src/main/java/com/discord/utilities/views/viewstub/LazyViewStubDelegate.java index d544aa25bc..c1bda793b1 100644 --- a/app/src/main/java/com/discord/utilities/views/viewstub/LazyViewStubDelegate.java +++ b/app/src/main/java/com/discord/utilities/views/viewstub/LazyViewStubDelegate.java @@ -52,6 +52,12 @@ public final class LazyViewStubDelegate { return (View) this.view$delegate.getValue(); } + public final View getForceInitializedView() { + View view = getView(); + m.checkNotNullExpressionValue(view, "view"); + return view; + } + public final View getMaybeView() { if (!this.viewField.isInitialized()) { return null; diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java index aa9e23ea2d..4933d5760f 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize.java @@ -584,7 +584,7 @@ public class WidgetOauth2Authorize extends AppFragment { TextView textView2 = getBinding().k; d0.z.d.m.checkNotNullExpressionValue(textView2, "binding.oauthAuthorizePermissionsLabelTv"); b.n(textView2, R.string.oauth2_scopes_label, new Object[]{application.g()}, null, 4); - SimpleDraweeView simpleDraweeView2 = getBinding().f1916c; + SimpleDraweeView simpleDraweeView2 = getBinding().f1917c; d0.z.d.m.checkNotNullExpressionValue(simpleDraweeView2, "binding.oauthAuthorizeApplicationIcon"); String e = application.e(); MGImages.setImage$default(simpleDraweeView2, e != null ? IconUtils.getApplicationIcon$default(application.f(), e, 0, 4, null) : null, 0, 0, false, null, null, 124, null); diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java index 44d1a401db..9ae9591c15 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsEmojisAdapter.java @@ -175,7 +175,7 @@ public final class ManageReactionsEmojisAdapter extends MGRecyclerAdapterSimple< m.checkNotNullParameter(reactionEmojiItem, "data"); super.onConfigure(i, (int) reactionEmojiItem); EmojiNode.Companion companion = EmojiNode.Companion; - SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1899c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.binding.f1900c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.manageReactionsEmojiEmojiTextview"); companion.renderEmoji(simpleDraweeSpanTextView, reactionEmojiItem.getReaction().b(), true, emojiSizePx); TextView textView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java index c6885d4a67..9d3d948073 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/ManageReactionsResultsAdapter.java @@ -314,7 +314,7 @@ public final class ManageReactionsResultsAdapter extends MGRecyclerAdapterSimple str = reactionUserItem.getUser().getUsername(); } textView.setText(str); - SimpleDraweeView simpleDraweeView = this.binding.f1900c; + SimpleDraweeView simpleDraweeView = this.binding.f1901c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.manageReactionsResultUserAvatar"); IconUtils.setIcon$default(simpleDraweeView, reactionUserItem.getUser(), R.dimen.avatar_size_standard, null, null, reactionUserItem.getGuildMember(), 24, null); ImageView imageView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java index 888460257b..cf3f09fbbc 100644 --- a/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java +++ b/app/src/main/java/com/discord/widgets/chat/managereactions/WidgetManageReactions.java @@ -119,7 +119,7 @@ public final class WidgetManageReactions extends AppFragment { RecyclerView recyclerView = getBinding().b; m.checkNotNullExpressionValue(recyclerView, "binding.manageReactionsEmojisRecycler"); this.emojisAdapter = (ManageReactionsEmojisAdapter) companion.configure(new ManageReactionsEmojisAdapter(recyclerView)); - RecyclerView recyclerView2 = getBinding().f1898c; + RecyclerView recyclerView2 = getBinding().f1899c; m.checkNotNullExpressionValue(recyclerView2, "binding.manageReactionsResultsRecycler"); this.resultsAdapter = (ManageReactionsResultsAdapter) companion.configure(new ManageReactionsResultsAdapter(recyclerView2)); ManageReactionsEmojisAdapter manageReactionsEmojisAdapter = this.emojisAdapter; diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/WidgetPriceTierPickerBottomSheet.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/WidgetPriceTierPickerBottomSheet.java index 6a6386e51f..072b378cc4 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/WidgetPriceTierPickerBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/WidgetPriceTierPickerBottomSheet.java @@ -135,7 +135,7 @@ public final class WidgetPriceTierPickerBottomSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); this.adapter = new PriceTierPickerAdapter(this.itemClickListener); - RecyclerView recyclerView = getBinding().f1923c; + RecyclerView recyclerView = getBinding().f1924c; m.checkNotNullExpressionValue(recyclerView, "binding.priceTierPickerRecycler"); PriceTierPickerAdapter priceTierPickerAdapter = this.adapter; if (priceTierPickerAdapter == null) { @@ -145,6 +145,6 @@ public final class WidgetPriceTierPickerBottomSheet extends AppBottomSheet { int dimensionPixelSize = getResources().getDimensionPixelSize(R.dimen.guild_role_subscription_setup_default_padding); Context requireContext = requireContext(); m.checkNotNullExpressionValue(requireContext, "requireContext()"); - getBinding().f1923c.addItemDecoration(new f(requireContext, 1, 0, dimensionPixelSize, dimensionPixelSize, 4)); + getBinding().f1924c.addItemDecoration(new f(requireContext, 1, 0, dimensionPixelSize, dimensionPixelSize, 4)); } } diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java index dca37679d0..48470cd5f5 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDesign.java @@ -110,7 +110,7 @@ public final class WidgetGuildRoleSubscriptionTierDesign extends AppFragment { } if (drawable != null) { view.setBackground(drawable); - getBinding().f1868c.setOnClickListener(new WidgetGuildRoleSubscriptionTierDesign$setupMemberColor$2(this, i)); + getBinding().f1869c.setOnClickListener(new WidgetGuildRoleSubscriptionTierDesign$setupMemberColor$2(this, i)); getBinding().g.setMemberColor(Integer.valueOf(i)); getBinding().f.setMemberColor(Integer.valueOf(i)); TextView textView = getBinding().d; diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java index 484abe3840..3e1376de03 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java @@ -88,7 +88,7 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment { TextInputLayout textInputLayout = getBinding().f; m.checkNotNullExpressionValue(textInputLayout, "binding.createSubscriptionTierNameLayout"); ViewExtensions.setTextIfDifferent(textInputLayout, viewState.getGuildRoleSubscriptionTier().getName()); - TextInputLayout textInputLayout2 = getBinding().f1865c; + TextInputLayout textInputLayout2 = getBinding().f1866c; m.checkNotNullExpressionValue(textInputLayout2, "binding.createSubscriptionTierDescriptionLayout"); ViewExtensions.setTextIfDifferent(textInputLayout2, viewState.getGuildRoleSubscriptionTier().getDescription()); getBinding().d.updateImage(viewState.getGuildRoleSubscriptionTier().getImage()); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java index 802d02453a..9e3138a0fc 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefits.java @@ -180,7 +180,7 @@ public final class WidgetGuildRoleSubscriptionTierBenefits extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); setUpBenefitsRecycler(); - TextView textView = getBinding().f1866c; + TextView textView = getBinding().f1867c; m.checkNotNullExpressionValue(textView, "binding.guildRoleSubscriptionTierBenefitsTitle"); int i = 0; textView.setVisibility(getHideHeader() ^ true ? 0 : 8); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java index 3e87929770..09f82b27c3 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/channel/WidgetGuildRoleSubscriptionTierChannelBenefit.java @@ -192,7 +192,7 @@ public final class WidgetGuildRoleSubscriptionTierChannelBenefit extends AppFrag super.onViewBound(view); WidgetChannelPickerBottomSheet.Companion.registerForResult(this, REQUEST_KEY_CHANNEL_PICKER, new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$1(this), new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$2(this)); getBinding().h.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$3(this)); - getBinding().f1867c.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$4(this)); + getBinding().f1868c.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$4(this)); getBinding().i.setOnClickListener(new WidgetGuildRoleSubscriptionTierChannelBenefit$onViewBound$5(this)); TextInputLayout textInputLayout = getBinding().d; m.checkNotNullExpressionValue(textInputLayout, "binding.guildRoleSubscri…ChannelBenefitDescription"); diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java index d52b4dbbf5..ccc0ef01af 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/intangible/WidgetGuildRoleSubscriptionTierIntangibleBenefit.java @@ -169,7 +169,7 @@ public final class WidgetGuildRoleSubscriptionTierIntangibleBenefit extends AppF TextInputEditText textInputEditText = getBinding().g; m.checkNotNullExpressionValue(textInputEditText, "binding.guildRoleSubscriptionIntangibleBenefitName"); TextWatcherKt.addLifecycleAwareTextWatcher(textInputEditText, this, new WidgetGuildRoleSubscriptionTierIntangibleBenefit$onViewBound$4(this)); - TextInputEditText textInputEditText2 = getBinding().f1869c; + TextInputEditText textInputEditText2 = getBinding().f1870c; m.checkNotNullExpressionValue(textInputEditText2, "binding.guildRoleSubscri…angibleBenefitDescription"); TextWatcherKt.addLifecycleAwareTextWatcher(textInputEditText2, this, new WidgetGuildRoleSubscriptionTierIntangibleBenefit$onViewBound$5(this)); getBinding().i.setOnClickListener(new WidgetGuildRoleSubscriptionTierIntangibleBenefit$onViewBound$6(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java index 09ad429564..8e0a19b1dd 100644 --- a/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java +++ b/app/src/main/java/com/discord/widgets/guilds/WidgetGuildSelector.java @@ -130,13 +130,13 @@ public final class WidgetGuildSelector extends AppBottomSheet { z2 = true; } } - SimpleDraweeView simpleDraweeView = this.binding.f1874c; + SimpleDraweeView simpleDraweeView = this.binding.f1875c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.itemIcon"); Guild guild4 = item.getGuild(); View view = this.itemView; m.checkNotNullExpressionValue(view, "itemView"); Integer valueOf = Integer.valueOf(ColorCompat.getThemedColor(view, (int) R.attr.colorBackgroundPrimary)); - SimpleDraweeView simpleDraweeView2 = this.binding.f1874c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1875c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.itemIcon"); SimpleDraweeViewExtensionsKt.setGuildIcon$default(simpleDraweeView, false, guild4, (float) simpleDraweeView2.getResources().getDimensionPixelSize(R.dimen.guild_icon_radius), null, valueOf, null, null, true, null, 360, null); FrameLayout frameLayout = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java index b31af48942..a930aab511 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteSuggestionsAdapter.java @@ -87,13 +87,13 @@ public final class InviteSuggestionsAdapter extends MGRecyclerAdapterSimple it2 = until.iterator(); while (it2.hasNext()) { - View childAt = getBinding().f1851c.getChildAt(((c0) it2).nextInt()); + View childAt = getBinding().f1852c.getChildAt(((c0) it2).nextInt()); Objects.requireNonNull(childAt, "null cannot be cast to non-null type android.widget.RadioButton"); arrayList.add((RadioButton) childAt); } @@ -337,7 +337,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { if (radioButton != null) { radioButton.setChecked(true); } - getBinding().f1851c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings)); + getBinding().f1852c.setOnCheckedChangeListener(new WidgetGuildInviteSettings$configureUi$4(this, inviteSettings)); RadioGroup radioGroup2 = getBinding().e; m.checkNotNullExpressionValue(radioGroup2, "binding.guildInviteMaxUsesRadiogroup"); IntRange until2 = f.until(0, radioGroup2.getChildCount()); @@ -402,7 +402,7 @@ public final class WidgetGuildInviteSettings extends AppFragment { m.throwUninitializedPropertyAccessException("channelsSpinnerAdapter"); } spinner.setAdapter((SpinnerAdapter) channelsSpinnerAdapter); - RadioGroup radioGroup = getBinding().f1851c; + RadioGroup radioGroup = getBinding().f1852c; m.checkNotNullExpressionValue(radioGroup, "binding.guildInviteExpiresAfterRadiogroup"); int[] iArr = ModelInvite.Settings.EXPIRES_AFTER_ARRAY; m.checkNotNullExpressionValue(iArr, "ModelInvite.Settings.EXPIRES_AFTER_ARRAY"); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java index 456886d62c..126438d901 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.java @@ -187,7 +187,7 @@ public final class WidgetGuildInviteShare extends AppFragment { analyticsTracker.inviteSuggestionOpened(p, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } - TextView textView = getBinding().f1852c; + TextView textView = getBinding().f1853c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults"); textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8); RecyclerView recyclerView = getBinding().i; diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java index 6057c2e757..ff500a5002 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareCompact.java @@ -112,13 +112,13 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { m.checkNotNullExpressionValue(materialButton, "binding.itemSent"); int i2 = 0; materialButton.setVisibility(inviteSuggestionItem.hasSentInvite() ? 0 : 8); - MaterialButton materialButton2 = this.binding.f1855c; + MaterialButton materialButton2 = this.binding.f1856c; m.checkNotNullExpressionValue(materialButton2, "binding.itemInviteBtn"); if (!(!inviteSuggestionItem.hasSentInvite())) { i2 = 8; } materialButton2.setVisibility(i2); - this.binding.f1855c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem)); + this.binding.f1856c.setOnClickListener(new WidgetGuildInviteShareCompact$PrivateChannelAdapter$Item$onConfigure$1(this, inviteSuggestionItem)); } } } @@ -223,7 +223,7 @@ public final class WidgetGuildInviteShareCompact extends AppFragment { analyticsTracker.inviteSuggestionOpened(p, arrayList2, arrayList4); this.hasTrackedSuggestionsViewed = true; } - TextView textView = getBinding().f1853c; + TextView textView = getBinding().f1854c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptyResults"); textView.setVisibility(inviteSuggestionItems.isEmpty() ? 0 : 8); RecyclerView recyclerView = getBinding().h; diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java index 0221da1909..faf5488405 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.java @@ -106,10 +106,10 @@ public final class WidgetGuildInviteShareEmptySuggestions extends AppFragment { WidgetInviteModel widgetInviteModel = loaded.getWidgetInviteModel(); getBinding().g.configureUi(widgetInviteModel); ModelInvite invite = widgetInviteModel.getInvite(); - TextView textView = getBinding().f1854c; + TextView textView = getBinding().f1855c; m.checkNotNullExpressionValue(textView, "binding.guildInviteEmptySuggestionsInviteLink"); textView.setText(getInviteLink(invite)); - getBinding().f1854c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite)); + getBinding().f1855c.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$1(this, invite)); getBinding().d.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$2(this, invite)); getBinding().e.setOnClickListener(new WidgetGuildInviteShareEmptySuggestions$updateUi$3(this)); ModelInvite.Settings settings = widgetInviteModel.getSettings(); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java index aa2858d5a3..c05d3500a4 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInviteShareSheet.java @@ -257,7 +257,7 @@ public final class WidgetGuildInviteShareSheet extends AppBottomSheet { Context requireContext2 = requireContext(); m.checkNotNullExpressionValue(requireContext2, "requireContext()"); CharSequence inviteSettingsText = GuildInviteUiHelperKt.getInviteSettingsText(requireContext2, expirationTimeMs); - TextView textView = binding.f1856c; + TextView textView = binding.f1857c; m.checkNotNullExpressionValue(textView, "copyLinkSubtitle"); textView.setText(link + ' ' + inviteSettingsText); binding.l.setOnClickListener(new WidgetGuildInviteShareSheet$configureNormalUI$$inlined$with$lambda$1(invite, this, searchQuery, viewState)); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java index d0ed12a7f1..523276ba3e 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java @@ -152,7 +152,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { } sb.append(str2); String sb2 = sb.toString(); - SimpleDraweeView simpleDraweeView2 = this.binding.f1850c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1851c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall"); simpleDraweeView2.setVisibility(8); RelativeLayout relativeLayout = this.binding.e; @@ -202,7 +202,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { } z2 = false; if (z2) { - SimpleDraweeView simpleDraweeView2 = this.binding.f1850c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1851c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall"); IconUtils.setIcon$default(simpleDraweeView2, channel, (int) R.dimen.avatar_size_medium, (MGImages.ChangeDetector) null, 8, (Object) null); } @@ -234,7 +234,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatar"); User inviter = modelInvite.getInviter(); IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), (int) R.dimen.avatar_size_hero, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null); - SimpleDraweeView simpleDraweeView2 = this.binding.f1850c; + SimpleDraweeView simpleDraweeView2 = this.binding.f1851c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall"); Guild guild = modelInvite.getGuild(); Long valueOf = guild != null ? Long.valueOf(guild.p()) : null; @@ -257,7 +257,7 @@ public final class WidgetInviteInfo extends LinearLayoutCompat { RelativeLayout relativeLayout = this.binding.e; m.checkNotNullExpressionValue(relativeLayout, "binding.inviteAvatarSmallWrap"); relativeLayout.setVisibility(z2 ? 0 : 8); - SimpleDraweeView simpleDraweeView4 = this.binding.f1850c; + SimpleDraweeView simpleDraweeView4 = this.binding.f1851c; m.checkNotNullExpressionValue(simpleDraweeView4, "binding.inviteAvatarSmall"); if (!z2) { i = 8; diff --git a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java index 3682c6278b..fecd771d6b 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java @@ -39,7 +39,7 @@ public final class ChannelViewHolder extends BaseChannelViewHolder { Long c2 = welcomeChannel.c(); String str = null; String imageUri = c2 != null ? ModelEmojiCustom.getImageUri(c2.longValue(), false, mediaProxySize) : null; - TextView textView = this.binding.f1877c; + TextView textView = this.binding.f1878c; m.checkNotNullExpressionValue(textView, "binding.guildWelcomeChannelDescription"); textView.setText(channelData.getWelcomeChannel().b()); TextView textView2 = this.binding.e; diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java index 2cfbc81bc6..25f24100f1 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildJoin.java @@ -84,13 +84,13 @@ public class WidgetGuildJoin extends AppFragment { } public final void handleGuildJoin() { - TextInputLayout textInputLayout = getBinding().f1857c; + TextInputLayout textInputLayout = getBinding().f1858c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); if (textOrEmpty.length() > 0) { Intent selectInvite = IntentUtils.RouteBuilders.INSTANCE.selectInvite(textOrEmpty, StoreInviteSettings.LOCATION_JOIN); IntentUtils intentUtils = IntentUtils.INSTANCE; - TextInputLayout textInputLayout2 = getBinding().f1857c; + TextInputLayout textInputLayout2 = getBinding().f1858c; m.checkNotNullExpressionValue(textInputLayout2, "binding.guildJoinInvite"); Context context = textInputLayout2.getContext(); m.checkNotNullExpressionValue(context, "binding.guildJoinInvite.context"); @@ -103,7 +103,7 @@ public class WidgetGuildJoin extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - TextInputLayout textInputLayout = getBinding().f1857c; + TextInputLayout textInputLayout = getBinding().f1858c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); ViewExtensions.setOnImeActionDone$default(textInputLayout, false, new WidgetGuildJoin$onViewBound$1(this), 1, null); getBinding().b.setOnClickListener(new WidgetGuildJoin$onViewBound$2(this)); diff --git a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java index f8aba4a25a..dd1ea1c0ce 100644 --- a/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/join/WidgetGuildWelcomeSheet.java @@ -101,12 +101,12 @@ public final class WidgetGuildWelcomeSheet extends AppBottomSheet { m.checkNotNullExpressionValue(textView, "binding.guildWelcomeSheetName"); b.n(textView, R.string.welcome_screen_title, new Object[]{str}, null, 4); if (str2 != null) { - TextView textView2 = getBinding().f1878c; + TextView textView2 = getBinding().f1879c; m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeSheetDescription"); ViewExtensions.setTextAndVisibilityBy(textView2, str2); return; } - TextView textView3 = getBinding().f1878c; + TextView textView3 = getBinding().f1879c; m.checkNotNullExpressionValue(textView3, "binding.guildWelcomeSheetDescription"); textView3.setVisibility(8); } diff --git a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java index 30649535c0..497c6612d8 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/GuildListViewHolder.java @@ -336,16 +336,16 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { imageView.setVisibility(friendsItem.isSelected() ? 0 : 8); this.binding.a.setOnClickListener(new GuildListViewHolder$FriendsViewHolder$configure$1(this, friendsItem)); if (friendsItem.isSelected()) { - this.binding.f1884c.setBackgroundResource(R.drawable.drawable_squircle_brand_500); - FrameLayout frameLayout = this.binding.f1884c; + this.binding.f1885c.setBackgroundResource(R.drawable.drawable_squircle_brand_500); + FrameLayout frameLayout = this.binding.f1885c; m.checkNotNullExpressionValue(frameLayout, "binding.guildsItemProfileAvatarWrap"); frameLayout.setBackgroundTintList(null); } else { - this.binding.f1884c.setBackgroundResource(R.drawable.drawable_circle_black); - FrameLayout frameLayout2 = this.binding.f1884c; + this.binding.f1885c.setBackgroundResource(R.drawable.drawable_circle_black); + FrameLayout frameLayout2 = this.binding.f1885c; m.checkNotNullExpressionValue(frameLayout2, "binding.guildsItemProfileAvatarWrap"); int themedColor = ColorCompat.getThemedColor(frameLayout2, (int) R.attr.colorBackgroundSecondary); - FrameLayout frameLayout3 = this.binding.f1884c; + FrameLayout frameLayout3 = this.binding.f1885c; m.checkNotNullExpressionValue(frameLayout3, "binding.guildsItemProfileAvatarWrap"); frameLayout3.setBackgroundTintList(ColorStateList.valueOf(themedColor)); } @@ -695,10 +695,10 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { imageView.setVisibility(guildItem.isConnectedToVoice() || guildItem.getHasActiveStageChannel() ? 0 : 8); imageView.setActivated(guildItem.isConnectedToVoice()); imageView.setImageResource((!guildItem.isConnectedToVoice() || guildItem.isConnectedToStageChannel()) ? R.drawable.ic_channel_stage_24dp_white : R.drawable.ic_volume_up_white_24dp); - ImageView imageView2 = this.bindingGuild.f1882c; + ImageView imageView2 = this.bindingGuild.f1883c; m.checkNotNullExpressionValue(imageView2, "bindingGuild.guildsItemApplicationStream"); imageView2.setVisibility(!guildItem.isConnectedToVoice() && guildItem.getHasOngoingApplicationStream() ? 0 : 8); - ImageView imageView3 = this.binding.f1883c; + ImageView imageView3 = this.binding.f1884c; m.checkNotNullExpressionValue(imageView3, "binding.guildsItemUnread"); imageView3.setVisibility(guildItem.isUnread() ? 0 : 8); ImageView imageView4 = this.binding.b; @@ -787,7 +787,7 @@ public abstract class GuildListViewHolder extends RecyclerView.ViewHolder { public final void configure(GuildListItem.PrivateChannelItem privateChannelItem) { m.checkNotNullParameter(privateChannelItem, "data"); int mentionCount = privateChannelItem.getMentionCount(); - TextView textView = this.binding.f1880c; + TextView textView = this.binding.f1881c; m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount"); configureMentionsCount(textView, mentionCount); String i18nPluralString = mentionCount > 0 ? StringResourceUtilsKt.getI18nPluralString(a.x(this.itemView, "itemView", "itemView.context"), R.plurals.dm_tooltip_a11y_label_mentions, mentionCount, Integer.valueOf(mentionCount)) : ""; diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java index b8716fdd3b..ab4d522d75 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList$configureBottomNavSpace$1.java @@ -27,13 +27,13 @@ public final class WidgetGuildsList$configureBottomNavSpace$1 extends o implemen public final void invoke(int i) { WidgetGuildsList.access$getAdapter$p(this.this$0).handleBottomNavHeight(i); - ViewStub viewStub = WidgetGuildsList.access$getBinding$p(this.this$0).f1879c; + ViewStub viewStub = WidgetGuildsList.access$getBinding$p(this.this$0).f1880c; m.checkNotNullExpressionValue(viewStub, "binding.guildListUnreadsStub"); ViewGroup.LayoutParams layoutParams = viewStub.getLayoutParams(); Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.MarginLayoutParams"); ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) layoutParams; marginLayoutParams.setMargins(marginLayoutParams.leftMargin, marginLayoutParams.topMargin, marginLayoutParams.rightMargin, i); - ViewStub viewStub2 = WidgetGuildsList.access$getBinding$p(this.this$0).f1879c; + ViewStub viewStub2 = WidgetGuildsList.access$getBinding$p(this.this$0).f1880c; m.checkNotNullExpressionValue(viewStub2, "binding.guildListUnreadsStub"); viewStub2.setLayoutParams(marginLayoutParams); } diff --git a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java index 1d0676bee4..6d1b22ee20 100644 --- a/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java +++ b/app/src/main/java/com/discord/widgets/guilds/list/WidgetGuildsList.java @@ -487,7 +487,7 @@ public final class WidgetGuildsList extends AppFragment implements WidgetGuildLi m.checkNotNullParameter(view, "view"); super.onViewBound(view); setupRecycler(); - ViewStub viewStub = getBinding().f1879c; + ViewStub viewStub = getBinding().f1880c; m.checkNotNullExpressionValue(viewStub, "binding.guildListUnreadsStub"); RecyclerView recyclerView = getBinding().b; m.checkNotNullExpressionValue(recyclerView, "binding.guildList"); diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/GuildIdentityMarketingTooltipKt.java b/app/src/main/java/com/discord/widgets/guilds/profile/GuildIdentityMarketingTooltipKt.java new file mode 100644 index 0000000000..c878392299 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/profile/GuildIdentityMarketingTooltipKt.java @@ -0,0 +1,5 @@ +package com.discord.widgets.guilds.profile; +/* compiled from: GuildIdentityMarketingTooltip.kt */ +public final class GuildIdentityMarketingTooltipKt { + private static final String CACHE_GUILD_KEY_PROFILE_MARKETING = "CACHE_KEY_GUILD_PROFILE_MARKETING"; +} diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/GuildProfileMarketingTooltip.java b/app/src/main/java/com/discord/widgets/guilds/profile/GuildProfileMarketingTooltip.java new file mode 100644 index 0000000000..a78128d630 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/profile/GuildProfileMarketingTooltip.java @@ -0,0 +1,11 @@ +package com.discord.widgets.guilds.profile; + +import com.discord.tooltips.TooltipManager; +/* compiled from: GuildIdentityMarketingTooltip.kt */ +public final class GuildProfileMarketingTooltip extends TooltipManager.b { + public static final GuildProfileMarketingTooltip INSTANCE = new GuildProfileMarketingTooltip(); + + private GuildProfileMarketingTooltip() { + super("CACHE_KEY_GUILD_PROFILE_MARKETING", "GUILD_PROFILE_MARKETING_SHEET"); + } +} diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$2.java similarity index 88% rename from app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$1.java rename to app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$2.java index 1c49072483..58a054d1c2 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity$onViewBound$2.java @@ -5,11 +5,11 @@ import android.view.View; import com.discord.utilities.dimmer.DimmerView; import d0.z.d.m; /* compiled from: WidgetChangeGuildIdentity.kt */ -public final class WidgetChangeGuildIdentity$onViewBound$1 implements View.OnClickListener { +public final class WidgetChangeGuildIdentity$onViewBound$2 implements View.OnClickListener { public final /* synthetic */ View $view; public final /* synthetic */ WidgetChangeGuildIdentity this$0; - public WidgetChangeGuildIdentity$onViewBound$1(WidgetChangeGuildIdentity widgetChangeGuildIdentity, View view) { + public WidgetChangeGuildIdentity$onViewBound$2(WidgetChangeGuildIdentity widgetChangeGuildIdentity, View view) { this.this$0 = widgetChangeGuildIdentity; this.$view = view; } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity.java index 7f77b98097..ab5a07c1f9 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetChangeGuildIdentity.java @@ -2,6 +2,7 @@ package com.discord.widgets.guilds.profile; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.res.Resources; import android.net.Uri; import android.text.Editable; @@ -29,6 +30,7 @@ import com.discord.databinding.ViewDialogConfirmationBinding; import com.discord.databinding.WidgetChangeGuildIdentityBinding; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.analytics.Traits; +import com.discord.utilities.cache.SharedPreferencesProvider; import com.discord.utilities.color.ColorCompat; import com.discord.utilities.dimmer.DimmerView; import com.discord.utilities.icon.IconUtils; @@ -58,6 +60,7 @@ import rx.functions.Action1; public final class WidgetChangeGuildIdentity extends AppFragment { public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetChangeGuildIdentity.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChangeGuildIdentityBinding;", 0)}; public static final Companion Companion = new Companion(null); + public static final String USER_GUILD_PROFILE_VIEWED_CACHE_KEY = "USER_GUILD_PROFILE_VIEWED_CACHE_KEY"; private Function1 avatarSelectedResult = WidgetChangeGuildIdentity$avatarSelectedResult$1.INSTANCE; private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetChangeGuildIdentity$binding$2.INSTANCE, null, 2, null); private final AtomicBoolean discardConfirmed = new AtomicBoolean(false); @@ -290,9 +293,13 @@ public final class WidgetChangeGuildIdentity extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); + SharedPreferences.Editor edit = SharedPreferencesProvider.INSTANCE.get().edit(); + m.checkExpressionValueIsNotNull(edit, "editor"); + edit.putBoolean(USER_GUILD_PROFILE_VIEWED_CACHE_KEY, true); + edit.apply(); setActionBarTitle(R.string.change_identity); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - getBinding().f.setOnClickListener(new WidgetChangeGuildIdentity$onViewBound$1(this, view)); + getBinding().f.setOnClickListener(new WidgetChangeGuildIdentity$onViewBound$2(this, view)); } @Override // com.discord.app.AppFragment diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java similarity index 54% rename from app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java rename to app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java index 0f7eb9ca70..a3144c38ad 100644 --- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$binding$2.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$binding$2.java @@ -1,23 +1,23 @@ -package com.discord.widgets.settings.profile; +package com.discord.widgets.guilds.profile; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; import com.discord.R; -import com.discord.databinding.WidgetProfileMarketingSheetBinding; +import com.discord.databinding.WidgetGuildIdentityMarketingSheetBinding; import com.google.android.material.button.MaterialButton; import d0.z.d.k; import d0.z.d.m; import kotlin.jvm.functions.Function1; -/* compiled from: WidgetProfileMarketingSheet.kt */ -public final /* synthetic */ class WidgetProfileMarketingSheet$binding$2 extends k implements Function1 { - public static final WidgetProfileMarketingSheet$binding$2 INSTANCE = new WidgetProfileMarketingSheet$binding$2(); +/* compiled from: WidgetGuildIdentityMarketingSheet.kt */ +public final /* synthetic */ class WidgetGuildIdentityMarketingSheet$binding$2 extends k implements Function1 { + public static final WidgetGuildIdentityMarketingSheet$binding$2 INSTANCE = new WidgetGuildIdentityMarketingSheet$binding$2(); - public WidgetProfileMarketingSheet$binding$2() { - super(1, WidgetProfileMarketingSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetProfileMarketingSheetBinding;", 0); + public WidgetGuildIdentityMarketingSheet$binding$2() { + super(1, WidgetGuildIdentityMarketingSheetBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetGuildIdentityMarketingSheetBinding;", 0); } - public final WidgetProfileMarketingSheetBinding invoke(View view) { + public final WidgetGuildIdentityMarketingSheetBinding invoke(View view) { m.checkNotNullParameter(view, "p1"); int i = R.id.profile_marketing_image; ImageView imageView = (ImageView) view.findViewById(R.id.profile_marketing_image); @@ -28,7 +28,7 @@ public final /* synthetic */ class WidgetProfileMarketingSheet$binding$2 extends i = R.id.profile_marketing_update_profile_button; MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.profile_marketing_update_profile_button); if (materialButton2 != null) { - return new WidgetProfileMarketingSheetBinding((FrameLayout) view, imageView, materialButton, materialButton2); + return new WidgetGuildIdentityMarketingSheetBinding((FrameLayout) view, imageView, materialButton, materialButton2); } } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$1.java new file mode 100644 index 0000000000..0ed41ed608 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$1.java @@ -0,0 +1,16 @@ +package com.discord.widgets.guilds.profile; + +import android.view.View; +/* compiled from: WidgetGuildIdentityMarketingSheet.kt */ +public final class WidgetGuildIdentityMarketingSheet$onViewCreated$1 implements View.OnClickListener { + public final /* synthetic */ WidgetGuildIdentityMarketingSheet this$0; + + public WidgetGuildIdentityMarketingSheet$onViewCreated$1(WidgetGuildIdentityMarketingSheet widgetGuildIdentityMarketingSheet) { + this.this$0 = widgetGuildIdentityMarketingSheet; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + this.this$0.dismiss(); + } +} diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$2.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$2.java new file mode 100644 index 0000000000..80a1d4d0df --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet$onViewCreated$2.java @@ -0,0 +1,24 @@ +package com.discord.widgets.guilds.profile; + +import android.content.Context; +import android.view.View; +import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity; +import d0.z.d.m; +/* compiled from: WidgetGuildIdentityMarketingSheet.kt */ +public final class WidgetGuildIdentityMarketingSheet$onViewCreated$2 implements View.OnClickListener { + public final /* synthetic */ WidgetGuildIdentityMarketingSheet this$0; + + public WidgetGuildIdentityMarketingSheet$onViewCreated$2(WidgetGuildIdentityMarketingSheet widgetGuildIdentityMarketingSheet) { + this.this$0 = widgetGuildIdentityMarketingSheet; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + WidgetChangeGuildIdentity.Companion companion = WidgetChangeGuildIdentity.Companion; + long guildId = this.this$0.getGuildId(); + Context requireContext = this.this$0.requireContext(); + m.checkNotNullExpressionValue(requireContext, "this@WidgetGuildIdentity…ingSheet.requireContext()"); + companion.launch(guildId, requireContext); + this.this$0.dismiss(); + } +} diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java similarity index 63% rename from app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java rename to app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java index ebad5feeb1..c997bea7dd 100644 --- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildIdentityMarketingSheet.java @@ -1,4 +1,4 @@ -package com.discord.widgets.settings.profile; +package com.discord.widgets.guilds.profile; import android.os.Bundle; import android.view.View; @@ -9,7 +9,7 @@ import c.d.b.a.a; import com.discord.R; import com.discord.app.AppBottomSheet; import com.discord.app.AppLog; -import com.discord.databinding.WidgetProfileMarketingSheetBinding; +import com.discord.databinding.WidgetGuildIdentityMarketingSheetBinding; import com.discord.tooltips.TooltipManager; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; @@ -19,14 +19,15 @@ import java.lang.ref.WeakReference; import java.util.Set; import kotlin.jvm.internal.DefaultConstructorMarker; import kotlin.reflect.KProperty; -/* compiled from: WidgetProfileMarketingSheet.kt */ -public final class WidgetProfileMarketingSheet extends AppBottomSheet { - public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetProfileMarketingSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetProfileMarketingSheetBinding;", 0)}; +/* compiled from: WidgetGuildIdentityMarketingSheet.kt */ +public final class WidgetGuildIdentityMarketingSheet extends AppBottomSheet { + public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.a0(WidgetGuildIdentityMarketingSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetGuildIdentityMarketingSheetBinding;", 0)}; public static final Companion Companion = new Companion(null); - private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetProfileMarketingSheet$binding$2.INSTANCE, null, 2, null); + private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetGuildIdentityMarketingSheet$binding$2.INSTANCE, null, 2, null); + private final long guildId; private final TooltipManager tooltipManager; - /* compiled from: WidgetProfileMarketingSheet.kt */ + /* compiled from: WidgetGuildIdentityMarketingSheet.kt */ public static final class Companion { private Companion() { } @@ -35,17 +36,18 @@ public final class WidgetProfileMarketingSheet extends AppBottomSheet { this(); } - public final void show(FragmentManager fragmentManager) { + public final void show(FragmentManager fragmentManager, long j) { m.checkNotNullParameter(fragmentManager, "fragmentManager"); - new WidgetProfileMarketingSheet().show(fragmentManager, "javaClass"); - AnalyticsTracker.INSTANCE.trackProfileMarketingSheet(); + new WidgetGuildIdentityMarketingSheet(j).show(fragmentManager, "javaClass"); + AnalyticsTracker.INSTANCE.trackGuildIdentityMarketingSheet(); } } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetProfileMarketingSheet() { + public WidgetGuildIdentityMarketingSheet(long j) { super(false, 1, null); TooltipManager tooltipManager = null; + this.guildId = j; AppLog appLog = AppLog.g; m.checkNotNullParameter(appLog, "logger"); WeakReference weakReference = a.b.a; @@ -65,17 +67,17 @@ public final class WidgetProfileMarketingSheet extends AppBottomSheet { this.tooltipManager = tooltipManager; } - public static final /* synthetic */ TooltipManager access$getTooltipManager$p(WidgetProfileMarketingSheet widgetProfileMarketingSheet) { - return widgetProfileMarketingSheet.tooltipManager; - } - - private final WidgetProfileMarketingSheetBinding getBinding() { - return (WidgetProfileMarketingSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); + private final WidgetGuildIdentityMarketingSheetBinding getBinding() { + return (WidgetGuildIdentityMarketingSheetBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]); } @Override // com.discord.app.AppBottomSheet public int getContentViewResId() { - return R.layout.widget_profile_marketing_sheet; + return R.layout.widget_guild_identity_marketing_sheet; + } + + public final long getGuildId() { + return this.guildId; } @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment @@ -83,8 +85,8 @@ public final class WidgetProfileMarketingSheet extends AppBottomSheet { m.checkNotNullParameter(view, "view"); super.onViewCreated(view, bundle); setBottomSheetCollapsedStateDisabled(); - this.tooltipManager.a(ProfileMarketingTooltip.INSTANCE); - getBinding().b.setOnClickListener(new WidgetProfileMarketingSheet$onViewCreated$1(this)); - getBinding().f1924c.setOnClickListener(new WidgetProfileMarketingSheet$onViewCreated$2(this)); + this.tooltipManager.a(GuildProfileMarketingTooltip.INSTANCE); + getBinding().b.setOnClickListener(new WidgetGuildIdentityMarketingSheet$onViewCreated$1(this)); + getBinding().f1849c.setOnClickListener(new WidgetGuildIdentityMarketingSheet$onViewCreated$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java index 5cb40aefc5..2a71f4bef4 100644 --- a/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java +++ b/app/src/main/java/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.java @@ -195,7 +195,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding2 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - MaterialButton materialButton = widgetGuildProfileActionsBinding2.f1861y; + MaterialButton materialButton = widgetGuildProfileActionsBinding2.f1862y; materialButton.setVisibility(showUploadEmoji ? 0 : 8); setOnClickAndDismissListener(materialButton, new WidgetGuildProfileSheet$configureBottomActions$$inlined$apply$lambda$1(this, showUploadEmoji, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding3 = this.guildActionBinding; @@ -209,7 +209,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding4 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.f1862z; + MaterialButton materialButton3 = widgetGuildProfileActionsBinding4.f1863z; if (showViewServer) { i = 0; } @@ -318,12 +318,12 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding4 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - widgetGuildProfileActionsBinding4.f1859s.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j)); + widgetGuildProfileActionsBinding4.f1860s.setOnClickListener(new WidgetGuildProfileSheet$configureGuildActions$1(this, j)); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding5 = this.guildActionBinding; if (widgetGuildProfileActionsBinding5 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - CardView cardView2 = widgetGuildProfileActionsBinding5.f1860x; + CardView cardView2 = widgetGuildProfileActionsBinding5.f1861x; m.checkNotNullExpressionValue(cardView2, "guildActionBinding.guildProfileSheetPrimaryActions"); cardView2.setVisibility(canManageChannels ? 0 : 8); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding6 = this.guildActionBinding; @@ -344,7 +344,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { if (widgetGuildProfileActionsBinding8 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); } - widgetGuildProfileActionsBinding8.f1858c.setText(z2 ? R.string.change_identity : R.string.change_nickname); + widgetGuildProfileActionsBinding8.f1859c.setText(z2 ? R.string.change_identity : R.string.change_nickname); WidgetGuildProfileActionsBinding widgetGuildProfileActionsBinding9 = this.guildActionBinding; if (widgetGuildProfileActionsBinding9 == null) { m.throwUninitializedPropertyAccessException("guildActionBinding"); @@ -595,7 +595,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { m.checkNotNullExpressionValue(view2, "binding.guildProfileShee…entContainerBottomDivider"); view2.setVisibility(0); int themedColor = ColorCompat.getThemedColor(this, (int) R.attr.colorInteractiveNormal); - MaterialButton materialButton = getBinding().f1863c; + MaterialButton materialButton = getBinding().f1864c; Resources resources = materialButton.getResources(); m.checkNotNullExpressionValue(resources, "resources"); materialButton.setText(StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.premium_guild_perks_modal_header_subscription_count_subscriptions, (int) R.string.premium_guild_subscription, premiumSubscriptionCount, Integer.valueOf(premiumSubscriptionCount))); @@ -605,7 +605,7 @@ public final class WidgetGuildProfileSheet extends AppBottomSheet { ColorCompatKt.setDrawableColor(materialButton2, themedColor); materialButton2.setTextColor(themedColor); setOnClickAndDismissListener(materialButton2, new WidgetGuildProfileSheet$configureTabItems$$inlined$apply$lambda$2(this, themedColor, j)); - MaterialButton materialButton3 = getBinding().f1864s; + MaterialButton materialButton3 = getBinding().f1865s; materialButton3.setVisibility(canAccessSettings ? 0 : 8); ColorCompatKt.setDrawableColor(materialButton3, themedColor); materialButton3.setTextColor(themedColor); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventAPI.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventAPI.java new file mode 100644 index 0000000000..6d25258237 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventAPI.java @@ -0,0 +1,22 @@ +package com.discord.widgets.guildscheduledevent; + +import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; +import com.discord.restapi.RestAPIParams; +import com.discord.utilities.rest.RestAPI; +import kotlin.Unit; +import rx.Observable; +/* compiled from: GuildScheduledEventAPI.kt */ +public final class GuildScheduledEventAPI { + public static final GuildScheduledEventAPI INSTANCE = new GuildScheduledEventAPI(); + + private GuildScheduledEventAPI() { + } + + public final Observable endEvent(long j) { + return RestAPI.Companion.getApi().updateGuildScheduledEvent(j, new RestAPIParams.UpdateGuildScheduledEventBody(GuildScheduledEventStatus.COMPLETED)); + } + + public final Observable startEvent(long j) { + return RestAPI.Companion.getApi().updateGuildScheduledEvent(j, new RestAPIParams.UpdateGuildScheduledEventBody(GuildScheduledEventStatus.ACTIVE)); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3.java index 37eee46a49..ccff57bc2d 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3.java @@ -4,13 +4,11 @@ import android.view.View; import kotlin.jvm.functions.Function0; /* compiled from: GuildScheduledEventBottomButtonView.kt */ public final class GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3 implements View.OnClickListener { - public final /* synthetic */ boolean $canShareWithExperiment$inlined; - public final /* synthetic */ boolean $isEventComplete$inlined; + public final /* synthetic */ boolean $isShareVisible$inlined; public final /* synthetic */ Function0 $onShareButtonClicked$inlined; - public GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3(boolean z2, boolean z3, Function0 function0) { - this.$canShareWithExperiment$inlined = z2; - this.$isEventComplete$inlined = z3; + public GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3(boolean z2, Function0 function0) { + this.$isShareVisible$inlined = z2; this.$onShareButtonClicked$inlined = function0; } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java index 981ec7e1e0..132acbc809 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java @@ -19,10 +19,41 @@ import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; import d0.z.d.m; import kotlin.Unit; import kotlin.jvm.functions.Function0; +import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: GuildScheduledEventBottomButtonView.kt */ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout { + public static final Companion Companion = new Companion(null); private final GuildScheduledEventBottomButtonViewBinding binding; + /* compiled from: GuildScheduledEventBottomButtonView.kt */ + public static final class Companion { + private Companion() { + } + + public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) { + this(); + } + + public static /* synthetic */ boolean isAnyButtonVisible$default(Companion companion, GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, int i, Object obj) { + if ((i & 2) != 0) { + z2 = false; + } + if ((i & 4) != 0) { + z3 = false; + } + if ((i & 8) != 0) { + z4 = false; + } + return companion.isAnyButtonVisible(guildScheduledEvent, z2, z3, z4); + } + + public final boolean isAnyButtonVisible(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4) { + m.checkNotNullParameter(guildScheduledEvent, "guildScheduledEvent"); + boolean z5 = z3 && GuildScheduledEventsSharingFeatureFlag.Companion.getINSTANCE().canShareGuildScheduledEvents(); + return z2 || ((z4 && guildScheduledEvent.e() != GuildScheduledEventEntityType.EXTERNAL) ? GuildScheduledEventUtilitiesKt.getEventTiming(guildScheduledEvent).isStartable() : false) || (z5 && !(guildScheduledEvent.k() == GuildScheduledEventStatus.COMPLETED)); + } + } + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public GuildScheduledEventBottomButtonView(Context context) { super(context); @@ -74,6 +105,7 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout boolean z7 = eventTiming == GuildScheduledEventTiming.LIVE; boolean z8 = guildScheduledEvent.k() == GuildScheduledEventStatus.COMPLETED; boolean isStartable = (z5 && guildScheduledEvent.e() != GuildScheduledEventEntityType.EXTERNAL) ? eventTiming.isStartable() : false; + boolean z9 = z6 && !z8; ImageView imageView = this.binding.b; imageView.setVisibility(z3 ? 0 : 8); imageView.setImageResource(z7 ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_active : z2 ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_interested : R.drawable.bg_guild_scheduled_event_list_item_interested_button_default); @@ -96,11 +128,11 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout imageView2.setVisibility(isStartable ? 0 : 8); imageView2.setOnClickListener(new GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$2(isStartable, function02)); ImageView imageView3 = this.binding.d; - if (!(z6 && !z8)) { + if (!z9) { i = 8; } imageView3.setVisibility(i); - imageView3.setOnClickListener(new GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3(z6, z8, function03)); + imageView3.setOnClickListener(new GuildScheduledEventBottomButtonView$configure$$inlined$apply$lambda$3(z9, function03)); } public final GuildScheduledEventBottomButtonViewBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java index 0158312bed..495eddf2e8 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java @@ -131,7 +131,7 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView = this.binding.b; m.checkNotNullExpressionValue(guildScheduledEventBottomButtonView, "binding.guildScheduledEventListItemButtomView"); int i = 0; - guildScheduledEventBottomButtonView.setVisibility(z3 || z4 || z5 ? 0 : 8); + guildScheduledEventBottomButtonView.setVisibility(GuildScheduledEventBottomButtonView.Companion.isAnyButtonVisible(guildScheduledEvent, z3, z5, z4) ? 0 : 8); this.binding.b.configure(guildScheduledEvent, z2, z3, z5, z4, function0, function02, function03); TextView textView = this.binding.j; Integer l = guildScheduledEvent.l(); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java index 4e6c937b92..8196ed067d 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel$Companion$observeStores$1.java @@ -6,6 +6,7 @@ import com.discord.stores.StoreChannels; import com.discord.stores.StoreGuildScheduledEvents; import com.discord.stores.StorePermissions; import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilities; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventsComparator; import com.discord.widgets.guildscheduledevent.GuildScheduledEventListViewModel; import d0.t.u; import d0.z.d.m; @@ -46,6 +47,6 @@ public final class GuildScheduledEventListViewModel$Companion$observeStores$1 ex } guildScheduledEvents$default = arrayList; } - return new GuildScheduledEventListViewModel.StoreState(u.sortedWith(guildScheduledEvents$default, GuildScheduledEventListViewModel.GuildScheduledEventsComparator.INSTANCE), this.$guildScheduledEventsStore.getUserGuildScheduledEventIds(), channelsForGuild, GuildScheduledEventUtilities.Companion.canCreateAnyEvent(this.$guildId, this.$channelStore, this.$permissionsStore)); + return new GuildScheduledEventListViewModel.StoreState(u.sortedWith(guildScheduledEvents$default, GuildScheduledEventsComparator.INSTANCE), this.$guildScheduledEventsStore.getUserGuildScheduledEventIds(), channelsForGuild, GuildScheduledEventUtilities.Companion.canCreateAnyEvent(this.$guildId, this.$channelStore, this.$permissionsStore)); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel.java index e0ae20de86..ed160e67c9 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListViewModel.java @@ -4,7 +4,6 @@ import android.content.Context; import c.d.b.a.a; import com.discord.api.channel.Channel; import com.discord.api.guildscheduledevent.GuildScheduledEvent; -import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; import com.discord.app.AppViewModel; import com.discord.stores.StoreChannels; import com.discord.stores.StoreGuildScheduledEvents; @@ -21,7 +20,6 @@ import d0.t.o; import d0.z.d.k; import d0.z.d.m; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; @@ -79,40 +77,6 @@ public final class GuildScheduledEventListViewModel extends AppViewModel { - public static final GuildScheduledEventsComparator INSTANCE = new GuildScheduledEventsComparator(); - - private GuildScheduledEventsComparator() { - } - - /* JADX WARNING: Code restructure failed: missing block: B:9:0x0017, code lost: - if ((r7 != null ? r7.k() : null) != r2) goto L_0x0019; - */ - public int compare(GuildScheduledEvent guildScheduledEvent, GuildScheduledEvent guildScheduledEvent2) { - GuildScheduledEventStatus guildScheduledEventStatus = null; - GuildScheduledEventStatus k = guildScheduledEvent != null ? guildScheduledEvent.k() : null; - GuildScheduledEventStatus guildScheduledEventStatus2 = GuildScheduledEventStatus.ACTIVE; - if (k == guildScheduledEventStatus2) { - } - if ((guildScheduledEvent != null ? guildScheduledEvent.k() : null) != guildScheduledEventStatus2) { - if (guildScheduledEvent2 != null) { - guildScheduledEventStatus = guildScheduledEvent2.k(); - } - if (guildScheduledEventStatus == guildScheduledEventStatus2) { - return 1; - } - } - if (guildScheduledEvent != null && guildScheduledEvent2 != null) { - return guildScheduledEvent.j().compareTo(guildScheduledEvent2.j()); - } - if (guildScheduledEvent == null) { - return 1; - } - return guildScheduledEvent2 == null ? -1 : 0; - } - } - /* compiled from: GuildScheduledEventListViewModel.kt */ public static final class StoreState { private final boolean canCreateEvents; diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$1.java new file mode 100644 index 0000000000..af0431c7b4 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$1.java @@ -0,0 +1,30 @@ +package com.discord.widgets.guildscheduledevent; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: PreviewGuildScheduledEventViewModel.kt */ +public final class PreviewGuildScheduledEventViewModel$createEvent$1 extends o implements Function1 { + public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public PreviewGuildScheduledEventViewModel$createEvent$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { + super(1); + this.this$0 = previewGuildScheduledEventViewModel; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$2.java new file mode 100644 index 0000000000..70ab82d8bd --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$createEvent$2.java @@ -0,0 +1,32 @@ +package com.discord.widgets.guildscheduledevent; + +import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: PreviewGuildScheduledEventViewModel.kt */ +public final class PreviewGuildScheduledEventViewModel$createEvent$2 extends o implements Function1 { + public final /* synthetic */ Function0 $onRequestSuccess; + public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public PreviewGuildScheduledEventViewModel$createEvent$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { + super(1); + this.this$0 = previewGuildScheduledEventViewModel; + this.$onRequestSuccess = function0; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(GuildScheduledEvent guildScheduledEvent) { + invoke(guildScheduledEvent); + return Unit.a; + } + + public final void invoke(GuildScheduledEvent guildScheduledEvent) { + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); + this.$onRequestSuccess.mo1invoke(); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$1.java deleted file mode 100644 index d1cb3d29ae..0000000000 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$1.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.discord.widgets.guildscheduledevent; - -import com.discord.utilities.error.Error; -import com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel; -import d0.z.d.m; -import d0.z.d.o; -import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: PreviewGuildScheduledEventViewModel.kt */ -public final class PreviewGuildScheduledEventViewModel$onBottomButtonClicked$1 extends o implements Function1 { - public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$onBottomButtonClicked$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { - super(1); - this.this$0 = previewGuildScheduledEventViewModel; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); - return Unit.a; - } - - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel = this.this$0; - PreviewGuildScheduledEventViewModel.ViewState access$requireViewState = PreviewGuildScheduledEventViewModel.access$requireViewState(previewGuildScheduledEventViewModel); - Objects.requireNonNull(access$requireViewState, "null cannot be cast to non-null type com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel.ViewState.Initialized"); - PreviewGuildScheduledEventViewModel.access$updateViewState(previewGuildScheduledEventViewModel, PreviewGuildScheduledEventViewModel.ViewState.Initialized.copy$default((PreviewGuildScheduledEventViewModel.ViewState.Initialized) access$requireViewState, false, false, false, null, null, 30, null)); - } -} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$3.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$3.java deleted file mode 100644 index 8aa139145f..0000000000 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$3.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.discord.widgets.guildscheduledevent; - -import com.discord.utilities.error.Error; -import com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel; -import d0.z.d.m; -import d0.z.d.o; -import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: PreviewGuildScheduledEventViewModel.kt */ -public final class PreviewGuildScheduledEventViewModel$onBottomButtonClicked$3 extends o implements Function1 { - public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$onBottomButtonClicked$3(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { - super(1); - this.this$0 = previewGuildScheduledEventViewModel; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); - return Unit.a; - } - - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel = this.this$0; - PreviewGuildScheduledEventViewModel.ViewState access$requireViewState = PreviewGuildScheduledEventViewModel.access$requireViewState(previewGuildScheduledEventViewModel); - Objects.requireNonNull(access$requireViewState, "null cannot be cast to non-null type com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel.ViewState.Initialized"); - PreviewGuildScheduledEventViewModel.access$updateViewState(previewGuildScheduledEventViewModel, PreviewGuildScheduledEventViewModel.ViewState.Initialized.copy$default((PreviewGuildScheduledEventViewModel.ViewState.Initialized) access$requireViewState, false, false, false, null, null, 30, null)); - } -} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$4.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$4.java deleted file mode 100644 index 246007e04d..0000000000 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$4.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.discord.widgets.guildscheduledevent; - -import com.discord.api.guildscheduledevent.GuildScheduledEvent; -import com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel; -import d0.z.d.o; -import java.util.Objects; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; -/* compiled from: PreviewGuildScheduledEventViewModel.kt */ -public final class PreviewGuildScheduledEventViewModel$onBottomButtonClicked$4 extends o implements Function1 { - public final /* synthetic */ Function0 $onRequestSuccess; - public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$onBottomButtonClicked$4(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { - super(1); - this.this$0 = previewGuildScheduledEventViewModel; - this.$onRequestSuccess = function0; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(GuildScheduledEvent guildScheduledEvent) { - invoke(guildScheduledEvent); - return Unit.a; - } - - public final void invoke(GuildScheduledEvent guildScheduledEvent) { - PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel = this.this$0; - PreviewGuildScheduledEventViewModel.ViewState access$requireViewState = PreviewGuildScheduledEventViewModel.access$requireViewState(previewGuildScheduledEventViewModel); - Objects.requireNonNull(access$requireViewState, "null cannot be cast to non-null type com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel.ViewState.Initialized"); - PreviewGuildScheduledEventViewModel.access$updateViewState(previewGuildScheduledEventViewModel, PreviewGuildScheduledEventViewModel.ViewState.Initialized.copy$default((PreviewGuildScheduledEventViewModel.ViewState.Initialized) access$requireViewState, false, false, false, null, null, 30, null)); - this.$onRequestSuccess.mo1invoke(); - } -} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$1.java new file mode 100644 index 0000000000..dc688c8fee --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$1.java @@ -0,0 +1,30 @@ +package com.discord.widgets.guildscheduledevent; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: PreviewGuildScheduledEventViewModel.kt */ +public final class PreviewGuildScheduledEventViewModel$startStageEvent$1 extends o implements Function1 { + public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public PreviewGuildScheduledEventViewModel$startStageEvent$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { + super(1); + this.this$0 = previewGuildScheduledEventViewModel; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$2.java similarity index 50% rename from app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2.java rename to app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$2.java index 999dfde337..eed65c101a 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startStageEvent$2.java @@ -1,20 +1,18 @@ package com.discord.widgets.guildscheduledevent; import com.discord.api.stageinstance.StageInstance; -import com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel; import d0.z.d.m; import d0.z.d.o; -import java.util.Objects; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: PreviewGuildScheduledEventViewModel.kt */ -public final class PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2 extends o implements Function1 { +public final class PreviewGuildScheduledEventViewModel$startStageEvent$2 extends o implements Function1 { public final /* synthetic */ Function0 $onRequestSuccess; public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { + public PreviewGuildScheduledEventViewModel$startStageEvent$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { super(1); this.this$0 = previewGuildScheduledEventViewModel; this.$onRequestSuccess = function0; @@ -30,10 +28,7 @@ public final class PreviewGuildScheduledEventViewModel$onBottomButtonClicked$2 e public final void invoke(StageInstance stageInstance) { m.checkNotNullParameter(stageInstance, "it"); - PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel = this.this$0; - PreviewGuildScheduledEventViewModel.ViewState access$requireViewState = PreviewGuildScheduledEventViewModel.access$requireViewState(previewGuildScheduledEventViewModel); - Objects.requireNonNull(access$requireViewState, "null cannot be cast to non-null type com.discord.widgets.guildscheduledevent.PreviewGuildScheduledEventViewModel.ViewState.Initialized"); - PreviewGuildScheduledEventViewModel.access$updateViewState(previewGuildScheduledEventViewModel, PreviewGuildScheduledEventViewModel.ViewState.Initialized.copy$default((PreviewGuildScheduledEventViewModel.ViewState.Initialized) access$requireViewState, false, false, false, null, null, 30, null)); + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); this.$onRequestSuccess.mo1invoke(); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$1.java new file mode 100644 index 0000000000..51944794d4 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$1.java @@ -0,0 +1,30 @@ +package com.discord.widgets.guildscheduledevent; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: PreviewGuildScheduledEventViewModel.kt */ +public final class PreviewGuildScheduledEventViewModel$startVoiceEvent$1 extends o implements Function1 { + public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public PreviewGuildScheduledEventViewModel$startVoiceEvent$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { + super(1); + this.this$0 = previewGuildScheduledEventViewModel; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java new file mode 100644 index 0000000000..9fbbb848b0 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java @@ -0,0 +1,33 @@ +package com.discord.widgets.guildscheduledevent; + +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: PreviewGuildScheduledEventViewModel.kt */ +public final class PreviewGuildScheduledEventViewModel$startVoiceEvent$2 extends o implements Function1 { + public final /* synthetic */ Function0 $onRequestSuccess; + public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public PreviewGuildScheduledEventViewModel$startVoiceEvent$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { + super(1); + this.this$0 = previewGuildScheduledEventViewModel; + this.$onRequestSuccess = function0; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Unit unit) { + invoke(unit); + return Unit.a; + } + + public final void invoke(Unit unit) { + m.checkNotNullParameter(unit, "it"); + PreviewGuildScheduledEventViewModel.access$setRequestFinished(this.this$0); + this.$onRequestSuccess.mo1invoke(); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java index 62b00d49b8..014221cb4c 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java @@ -4,6 +4,7 @@ import android.content.Context; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.permission.Permission; import com.discord.api.stageinstance.StageInstancePrivacyLevel; import com.discord.app.AppViewModel; @@ -201,6 +202,18 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel function0) { + RestAPIParams.CreateGuildScheduledEventBody requestBody = this.eventModel.toRequestBody(); + if (requestBody != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildScheduledEvent(this.eventModel.getGuildId(), requestBody), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$createEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$createEvent$2(this, function0), 52, (Object) null); + } + } + public static /* synthetic */ void onBottomButtonClicked$default(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Context context, boolean z2, Function0 function0, int i, Object obj) { if ((i & 2) != 0) { z2 = false; @@ -247,12 +263,30 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel function0) { + if (this.eventModel.getName() != null && this.eventModel.getChannelId() != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(StageChannelAPI.INSTANCE.startStageInstance(this.eventModel.getChannelId().longValue(), this.eventModel.getName(), StageInstancePrivacyLevel.GUILD_ONLY, z2, String.valueOf(this.eventId)), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$startStageEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$startStageEvent$2(this, function0), 52, (Object) null); + } + } + + private final void startVoiceEvent(Context context, Function0 function0) { + Long l = this.eventId; + if (l != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(GuildScheduledEventAPI.INSTANCE.startEvent(l.longValue()), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$startVoiceEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$startVoiceEvent$2(this, function0), 52, (Object) null); + } + } + public final ViewState getCurrentViewState() { return this.currentViewState; } public final void onBottomButtonClicked(Context context, boolean z2, Function0 function0) { - Channel channel; m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(function0, "onRequestSuccess"); ViewState viewState = this.currentViewState; @@ -261,12 +295,14 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel list) { m.checkNotNullParameter(list, "gestureRegions"); - getBinding().f1885c.setChildGestureRegions(list); + getBinding().f1886c.setChildGestureRegions(list); } @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment @@ -562,7 +562,7 @@ public final class WidgetHome extends AppFragment implements OnTabSelectedListen m.checkNotNullExpressionValue(binding, "binding"); widgetHomeHeaderManager.configure(this, widgetHomeModel$app_productionCanaryRelease, binding); } - if (getBinding().f1885c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) { + if (getBinding().f1886c.getSelectedPanel() == OverlappingPanelsLayout.Panel.CENTER) { setActionBarTitleAccessibilityViewFocused(); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java index 3ef1549ae4..b786de34aa 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomePanelNsfw.java @@ -172,7 +172,7 @@ public final class WidgetHomePanelNsfw { } if (z4) { WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding = this.binding; - if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1886c) == null)) { + if (!(widgetHomePanelCenterNsfwBinding == null || (materialButton2 = widgetHomePanelCenterNsfwBinding.f1887c) == null)) { ViewKt.setVisible(materialButton2, false); } WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding; @@ -215,7 +215,7 @@ public final class WidgetHomePanelNsfw { materialButton2.setOnClickListener(new WidgetHomePanelNsfw$configureUI$1(this, widgetHomeModel)); } WidgetHomePanelCenterNsfwBinding widgetHomePanelCenterNsfwBinding2 = this.binding; - if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1886c) != null) { + if (widgetHomePanelCenterNsfwBinding2 != null && (materialButton = widgetHomePanelCenterNsfwBinding2.f1887c) != null) { materialButton.setOnClickListener(new WidgetHomePanelNsfw$configureUI$2(this, widgetHomeModel)); } } diff --git a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java index 9eb380dae5..0a0ed3240c 100644 --- a/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java +++ b/app/src/main/java/com/discord/widgets/home/WidgetHomeViewModel.java @@ -25,8 +25,8 @@ import com.discord.utilities.time.Clock; import com.discord.utilities.time.ClockFactory; import com.discord.utilities.user.UserUtils; import com.discord.widgets.channels.ChannelOnboardingManager; -import com.discord.widgets.settings.profile.ProfileMarketingTooltip; -import com.discord.widgets.settings.profile.WidgetSettingsUserProfile; +import com.discord.widgets.guilds.profile.GuildProfileMarketingTooltip; +import com.discord.widgets.guilds.profile.WidgetChangeGuildIdentity; import d0.z.d.m; import d0.z.d.o; import java.lang.ref.WeakReference; @@ -170,6 +170,50 @@ public final class WidgetHomeViewModel extends AppViewModel { } } + /* compiled from: WidgetHomeViewModel.kt */ + public static final class ShowGuildProfileMarketingSheet extends Event { + private final long guildId; + + public ShowGuildProfileMarketingSheet(long j) { + super(null); + this.guildId = j; + } + + public static /* synthetic */ ShowGuildProfileMarketingSheet copy$default(ShowGuildProfileMarketingSheet showGuildProfileMarketingSheet, long j, int i, Object obj) { + if ((i & 1) != 0) { + j = showGuildProfileMarketingSheet.guildId; + } + return showGuildProfileMarketingSheet.copy(j); + } + + public final long component1() { + return this.guildId; + } + + public final ShowGuildProfileMarketingSheet copy(long j) { + return new ShowGuildProfileMarketingSheet(j); + } + + public boolean equals(Object obj) { + if (this != obj) { + return (obj instanceof ShowGuildProfileMarketingSheet) && this.guildId == ((ShowGuildProfileMarketingSheet) obj).guildId; + } + return true; + } + + public final long getGuildId() { + return this.guildId; + } + + public int hashCode() { + return b.a(this.guildId); + } + + public String toString() { + return a.A(a.P("ShowGuildProfileMarketingSheet(guildId="), this.guildId, ")"); + } + } + /* compiled from: WidgetHomeViewModel.kt */ public static final class ShowGuildWelcomeSheet extends Event { private final long guildId; @@ -214,15 +258,6 @@ public final class WidgetHomeViewModel extends AppViewModel { } } - /* compiled from: WidgetHomeViewModel.kt */ - public static final class ShowProfileMarketingSheet extends Event { - public static final ShowProfileMarketingSheet INSTANCE = new ShowProfileMarketingSheet(); - - private ShowProfileMarketingSheet() { - super(null); - } - } - /* compiled from: WidgetHomeViewModel.kt */ public static final class UnlockLeftPanel extends Event { public static final UnlockLeftPanel INSTANCE = new UnlockLeftPanel(); @@ -661,9 +696,9 @@ public final class WidgetHomeViewModel extends AppViewModel { } @MainThread - private final void emitShowProfileMarketingSheet() { + private final void emitShowGuildIdentityMarketingSheet(long j) { PublishSubject publishSubject = this.eventSubject; - publishSubject.j.onNext(Event.ShowProfileMarketingSheet.INSTANCE); + publishSubject.j.onNext(new Event.ShowGuildProfileMarketingSheet(j)); } @MainThread @@ -708,8 +743,8 @@ public final class WidgetHomeViewModel extends AppViewModel { } if (shouldShowChannelOnboardingSheet(this.previousLeftPanelState, leftPanelState, guildId, isNewUser)) { emitShowChannelOnboardingSheet(); - } else if (shouldShowProfileMarketingSheet(this.previousLeftPanelState, leftPanelState, storeState.getMe())) { - emitShowProfileMarketingSheet(); + } else if (shouldShowGuildIdentityMarketingSheet(this.previousLeftPanelState, leftPanelState, storeState.getMe())) { + emitShowGuildIdentityMarketingSheet(guildId); } this.previousLeftPanelState = leftPanelState; if (storeState.isThreadPeek() && !this.wasThreadPeek) { @@ -725,25 +760,10 @@ public final class WidgetHomeViewModel extends AppViewModel { return ((panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && ((j > 0 ? 1 : (j == 0 ? 0 : -1)) != 0) && z2 && !this.channelOnboardingManager.hasUserSeenChannelOnboarding(); } - private final boolean shouldShowProfileMarketingSheet(PanelState panelState, PanelState panelState2, MeUser meUser) { - boolean z2; + private final boolean shouldShowGuildIdentityMarketingSheet(PanelState panelState, PanelState panelState2, MeUser meUser) { UserUtils userUtils = UserUtils.INSTANCE; Clock clock = this.clock; - boolean since = userUtils.since(meUser, clock, new UtcDateTime(clock.currentTimeMillis() - 1209600000)); - String banner = meUser.getBanner(); - if (banner == null || banner.length() == 0) { - String bio = meUser.getBio(); - if (bio == null || bio.length() == 0) { - String bannerColor = meUser.getBannerColor(); - if (bannerColor == null || bannerColor.length() == 0) { - z2 = true; - return !(!(panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && this.tooltipManager.b(ProfileMarketingTooltip.INSTANCE, false) && since && !this.sharedPreferences.getBoolean(WidgetSettingsUserProfile.USER_PROFILE_SETTINGS_VIEWED_CACHE_KEY, false) && z2; - } - } - } - z2 = false; - if (!(!(panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c))) { - } + return ((panelState instanceof PanelState.d) && (panelState2 instanceof PanelState.c)) && this.tooltipManager.b(GuildProfileMarketingTooltip.INSTANCE, false) && userUtils.since(meUser, clock, new UtcDateTime(clock.currentTimeMillis() - 1209600000)) && !this.sharedPreferences.getBoolean(WidgetChangeGuildIdentity.USER_GUILD_PROFILE_VIEWED_CACHE_KEY, false); } @MainThread diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java index 5bf58b213e..eae0dbe044 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddName.java @@ -59,7 +59,7 @@ public final class WidgetHubAddName extends AppFragment { if (context != null) { m.checkNotNullExpressionValue(context, "context ?: return"); getBinding().f.setIsLoading(addNameState.getChangeNicknameAsync() instanceof Loading); - getBinding().f1887c.setText(addNameState.getNickname()); + getBinding().f1888c.setText(addNameState.getNickname()); TextView textView = getBinding().e; m.checkNotNullExpressionValue(textView, "binding.discordHubAddNameTitle"); Object[] objArr = new Object[1]; @@ -81,7 +81,7 @@ public final class WidgetHubAddName extends AppFragment { private final void maybeUpdateName() { if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) { WidgetHubAddNameViewModel viewModel = getViewModel(); - TextInputEditText textInputEditText = getBinding().f1887c; + TextInputEditText textInputEditText = getBinding().f1888c; m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubAddNameInput"); viewModel.setName(String.valueOf(textInputEditText.getText())); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer.java index 94b7453d8a..d93bcaf8df 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAddServer.java @@ -92,7 +92,7 @@ public final class WidgetHubAddServer extends AppFragment { } simpleRecyclerAdapter.setData(list); getBinding().e.setSelectedIndex(hubAddServerState.getSelectedIndex()); - getBinding().f1888c.setTitle(b.k(this, R.string.hub_choose_guild_title, new Object[]{hubAddServerState.getHubName()}, null, 4)); + getBinding().f1889c.setTitle(b.k(this, R.string.hub_choose_guild_title, new Object[]{hubAddServerState.getHubName()}, null, 4)); getBinding().b.setOnClickListener(new WidgetHubAddServer$configureUI$1(this, hubAddServerState)); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java index da64d6c94b..ede822dfb8 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubAuthentication.java @@ -70,7 +70,7 @@ public final class WidgetHubAuthentication extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - getBinding().f1889c.setOnCodeEntered(new WidgetHubAuthentication$onViewBound$1(this)); + getBinding().f1890c.setOnCodeEntered(new WidgetHubAuthentication$onViewBound$1(this)); LinkifiedTextView linkifiedTextView = getBinding().b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.description"); linkifiedTextView.setText(b.e(this, R.string.hub_pin_description, new Object[]{getArgs().getEmail()}, new WidgetHubAuthentication$onViewBound$2(this))); diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java index b0f3345f93..d90458593f 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDescription.java @@ -73,7 +73,7 @@ public final class WidgetHubDescription extends AppFragment { loadingButton.setOnClickListener(new WidgetHubDescription$configureUI$$inlined$apply$lambda$1(this, hubDescriptionState)); loadingButton.setIsLoading(hubDescriptionState.getAddServerAsync() instanceof Loading); loadingButton.setText(getString(getArgs().isEditing() ? R.string.save : R.string.hub_add_server_cta)); - TextView textView = getBinding().f1890c; + TextView textView = getBinding().f1891c; DirectoryEntryCategory selectedCategory = hubDescriptionState.getSelectedCategory(); if (selectedCategory == null || (titleRes2 = selectedCategory.getTitleRes()) == null) { i = R.attr.colorTextMuted; @@ -82,7 +82,7 @@ public final class WidgetHubDescription extends AppFragment { i = R.attr.colorTextNormal; } textView.setTextColor(ColorCompat.getThemedColor(context, i)); - TextView textView2 = getBinding().f1890c; + TextView textView2 = getBinding().f1891c; m.checkNotNullExpressionValue(textView2, "binding.category"); DirectoryEntryCategory selectedCategory2 = hubDescriptionState.getSelectedCategory(); if (selectedCategory2 == null || (titleRes = selectedCategory2.getTitleRes()) == null || (str = getString(titleRes.intValue())) == null) { @@ -151,7 +151,7 @@ public final class WidgetHubDescription extends AppFragment { DirectoryEntryCategory category = getArgs().getCategory(); if (!(category == null || (titleRes = category.getTitleRes()) == null)) { int intValue = titleRes.intValue(); - TextView textView = getBinding().f1890c; + TextView textView = getBinding().f1891c; m.checkNotNullExpressionValue(textView, "binding.category"); textView.setText(getString(intValue)); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java index 84649b12eb..5b8ecc1698 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomainSearch.java @@ -72,7 +72,7 @@ public final class WidgetHubDomainSearch extends AppFragment { arrayList.add(next); } } - LinearLayout linearLayout = getBinding().f1891c; + LinearLayout linearLayout = getBinding().f1892c; m.checkNotNullExpressionValue(linearLayout, "binding.emptyState"); linearLayout.setVisibility(arrayList.isEmpty() ? 0 : 8); RecyclerView recyclerView = getBinding().d; diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java index 2939696096..972ef5affc 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubDomains.java @@ -60,7 +60,7 @@ public final class WidgetHubDomains extends AppFragment { recyclerView.setAdapter(this.adapter); this.adapter.setData(getArgs().getGuildInfos()); AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_search, new WidgetHubDomains$onViewBound$1(this), null, 4, null); - MaterialButton materialButton = getBinding().f1892c; + MaterialButton materialButton = getBinding().f1893c; Context context = materialButton.getContext(); if (context != null) { materialButton.setText(b.h(context, R.string.hub_email_connection_guild_select_subheader, new Object[0], null, 4)); diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow$validationManager$2.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow$validationManager$2.java index 9f5dc82145..b6235bdd8c 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow$validationManager$2.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow$validationManager$2.java @@ -20,7 +20,7 @@ public final class WidgetHubEmailFlow$validationManager$2 extends o implements F /* renamed from: invoke */ public final ValidationManager mo1invoke() { AuthUtils authUtils = AuthUtils.INSTANCE; - TextInputLayout textInputLayout = WidgetHubEmailFlow.access$getBinding$p(this.this$0).f1893c.d; + TextInputLayout textInputLayout = WidgetHubEmailFlow.access$getBinding$p(this.this$0).f1894c.d; m.checkNotNullExpressionValue(textInputLayout, "binding.discordHubEmailI…scriptionEmailInputLayout"); return authUtils.createEmailValidationManager(textInputLayout); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java index f3d913963c..3f3de8d238 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubEmailFlow.java @@ -98,7 +98,7 @@ public final class WidgetHubEmailFlow extends AppFragment { } private final String getEmail() { - TextInputEditText textInputEditText = getBinding().f1893c.f73c; + TextInputEditText textInputEditText = getBinding().f1894c.f73c; m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubEmailI…aderDescriptionEmailInput"); return String.valueOf(textInputEditText.getText()); } @@ -122,10 +122,10 @@ public final class WidgetHubEmailFlow extends AppFragment { boolean z3 = !(hubEmailState.getVerifyEmailAsync() instanceof Success) && hubEmailState.getWaitlistResult() == null; EmailVerification invoke2 = hubEmailState.getVerifyEmailAsync().invoke(); boolean z4 = (invoke2 != null && !invoke2.b()) || hubEmailState.getWaitlistResult() != null; - TextInputEditText textInputEditText = getBinding().f1893c.f73c; + TextInputEditText textInputEditText = getBinding().f1894c.f73c; m.checkNotNullExpressionValue(textInputEditText, "binding.discordHubEmailI…aderDescriptionEmailInput"); String valueOf = String.valueOf(textInputEditText.getText()); - b5 b5Var = getBinding().f1893c; + b5 b5Var = getBinding().f1894c; m.checkNotNullExpressionValue(b5Var, "binding.discordHubEmailInput"); NestedScrollView nestedScrollView = b5Var.a; m.checkNotNullExpressionValue(nestedScrollView, "binding.discordHubEmailInput.root"); @@ -168,7 +168,7 @@ public final class WidgetHubEmailFlow extends AppFragment { private final void verifyEmail() { int i = 0; boolean validate$default = ValidationManager.validate$default(getValidationManager(), false, 1, null); - TextView textView = getBinding().f1893c.f; + TextView textView = getBinding().f1894c.f; m.checkNotNullExpressionValue(textView, "binding.discordHubEmailInput.discordHubEmailLabel"); if (!validate$default) { i = 8; @@ -201,7 +201,7 @@ public final class WidgetHubEmailFlow extends AppFragment { getBinding().b.d.setOnClickListener(new WidgetHubEmailFlow$onViewCreated$1(this)); getBinding().d.setOnClickListener(new WidgetHubEmailFlow$onViewCreated$2(this)); getBinding().b.b.setOnClickListener(new WidgetHubEmailFlow$onViewCreated$3(this)); - TextView textView = getBinding().f1893c.e; + TextView textView = getBinding().f1894c.e; m.checkNotNullExpressionValue(textView, "binding.discordHubEmailI…iscordHubEmailHeaderTitle"); if (getArgs().getHasInvitee()) { Context context = view.getContext(); @@ -214,7 +214,7 @@ public final class WidgetHubEmailFlow extends AppFragment { String string = getString(getArgs().getHasInvitee() ? R.string.hub_email_connection_content_description : R.string.hub_waitlist_modal_join_subheader); m.checkNotNullExpressionValue(string, "getString(\n if (a…subheader\n }\n )"); CharSequence e = b.e(this, R.string.learn_more_link, new Object[0], new WidgetHubEmailFlow$onViewCreated$learnMore$1(this)); - LinkifiedTextView linkifiedTextView = getBinding().f1893c.b; + LinkifiedTextView linkifiedTextView = getBinding().f1894c.b; m.checkNotNullExpressionValue(linkifiedTextView, "binding.discordHubEmailI…HubEmailHeaderDescription"); linkifiedTextView.setText(new SpannableStringBuilder(string).append((CharSequence) " ").append(e)); } diff --git a/app/src/main/java/com/discord/widgets/hubs/WidgetHubWaitlist.java b/app/src/main/java/com/discord/widgets/hubs/WidgetHubWaitlist.java index 8fc8d433c0..fdcb2a1404 100644 --- a/app/src/main/java/com/discord/widgets/hubs/WidgetHubWaitlist.java +++ b/app/src/main/java/com/discord/widgets/hubs/WidgetHubWaitlist.java @@ -63,7 +63,7 @@ public final class WidgetHubWaitlist extends AppFragment { private final void maybeSubmitSchoolName() { if (getValidationManager().validate(true)) { WidgetHubWaitlistViewModel viewModel = getViewModel(); - TextInputEditText textInputEditText = getBinding().f1894c; + TextInputEditText textInputEditText = getBinding().f1895c; m.checkNotNullExpressionValue(textInputEditText, "binding.hubWaitlistEditText"); viewModel.joinWaitlist(String.valueOf(textInputEditText.getText())); } diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java index 26f8cd8e10..7c90f0e09c 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java @@ -467,7 +467,7 @@ public final class WidgetMedia extends AppFragment { if (videoSurfaceView != null) { videoSurfaceView.setOnClickListener(new WidgetMedia$onViewBound$1(this)); } - getBinding().f1901c.setOnClickListener(new WidgetMedia$onViewBound$2(this)); + getBinding().f1902c.setOnClickListener(new WidgetMedia$onViewBound$2(this)); AppBarLayout appBarLayout = getBinding().b; m.checkNotNullExpressionValue(appBarLayout, "binding.actionBarToolbarLayout"); ViewExtensions.addOnHeightChangedListener(appBarLayout, new WidgetMedia$onViewBound$3(this)); diff --git a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java index 57a42fb5a2..ea2f9cb5e8 100644 --- a/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java +++ b/app/src/main/java/com/discord/widgets/mobile_reports/WidgetMobileReports.java @@ -85,7 +85,7 @@ public final class WidgetMobileReports extends AppFragment { private final void configureUI(MobileReportsViewModel.ViewState.Menu menu) { setActionBarDisplayHomeAsUpEnabled(!menu.shouldHideBackArrow()); - ProgressBar progressBar = getBinding().f1906c; + ProgressBar progressBar = getBinding().f1907c; m.checkNotNullExpressionValue(progressBar, "binding.mobileReportsProgressBar"); progressBar.setVisibility(8); ReportsMenuNode reportsMenuNode = (ReportsMenuNode) getBinding().b.getChildAt(0); diff --git a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java index 2fa7fc0636..da3d598c42 100644 --- a/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java +++ b/app/src/main/java/com/discord/widgets/notice/NoticePopup$enqueue$notice$1$3$2.java @@ -15,23 +15,23 @@ public final class NoticePopup$enqueue$notice$1$3$2 implements Runnable { @Override // java.lang.Runnable public final void run() { - SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView, "binding.popupBody"); Layout layout = simpleDraweeSpanTextView.getLayout(); int lineCount = layout != null ? layout.getLineCount() : 0; - SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView2 = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView2, "binding.popupBody"); if (lineCount > simpleDraweeSpanTextView2.getMaxLines()) { - SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView3 = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView3, "binding.popupBody"); Layout layout2 = simpleDraweeSpanTextView3.getLayout(); - SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView4 = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView4, "binding.popupBody"); int lineEnd = layout2.getLineEnd(simpleDraweeSpanTextView4.getMaxLines() - 1); - SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView5 = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView5, "binding.popupBody"); CharSequence subSequence = simpleDraweeSpanTextView5.getText().subSequence(0, lineEnd - 1); - SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1913c; + SimpleDraweeSpanTextView simpleDraweeSpanTextView6 = this.$binding.f1914c; m.checkNotNullExpressionValue(simpleDraweeSpanTextView6, "binding.popupBody"); simpleDraweeSpanTextView6.setText(new SpannableStringBuilder(subSequence).append((CharSequence) "…")); } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java index 526739ed3e..becf008fa5 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java @@ -409,16 +409,16 @@ public final class WidgetNoticeDialog extends AppDialog { LinearLayout linearLayout = getBinding().f; m.checkNotNullExpressionValue(linearLayout, "binding.noticeHeaderContainer"); linearLayout.setVisibility((charSequence2 == null || t.isBlank(charSequence2)) ^ true ? 0 : 8); - LinkifiedTextView linkifiedTextView = getBinding().f1910c; + LinkifiedTextView linkifiedTextView = getBinding().f1911c; m.checkNotNullExpressionValue(linkifiedTextView, "binding.noticeBodyText"); Bundle arguments4 = getArguments(); linkifiedTextView.setText(arguments4 != null ? arguments4.getCharSequence(ARG_BODY_TEXT) : null); if (isCancelable()) { - LinkifiedTextView linkifiedTextView2 = getBinding().f1910c; + LinkifiedTextView linkifiedTextView2 = getBinding().f1911c; m.checkNotNullExpressionValue(linkifiedTextView2, "binding.noticeBodyText"); linkifiedTextView2.setMovementMethod(new ActionLinkMovementMethod(new WidgetNoticeDialog$onViewBound$2(this))); } - LinkifiedTextView linkifiedTextView3 = getBinding().f1910c; + LinkifiedTextView linkifiedTextView3 = getBinding().f1911c; m.checkNotNullExpressionValue(linkifiedTextView3, "binding.noticeBodyText"); Bundle arguments5 = getArguments(); linkifiedTextView3.setTextAlignment(arguments5 != null ? arguments5.getInt(ARG_BODY_TEXT_ALIGNMENT) : 2); diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java index 1f412c8704..505c24ceb6 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxOverlay.java @@ -47,7 +47,7 @@ public final class WidgetNoticeNuxOverlay extends AppDialog { m.checkNotNullParameter(view, "view"); super.onViewBound(view); StoreStream.Companion.getNotices().markDialogSeen(NOTICE_NAME); - getBinding().f1911c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this)); + getBinding().f1912c.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$1(this)); getBinding().b.setOnClickListener(new WidgetNoticeNuxOverlay$onViewBound$2(this)); } } diff --git a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java index 4e5ab34282..6ec04cf7ec 100644 --- a/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java +++ b/app/src/main/java/com/discord/widgets/notice/WidgetNoticeNuxSamsungLink.java @@ -89,7 +89,7 @@ public final class WidgetNoticeNuxSamsungLink extends AppDialog { super.onViewBound(view); StoreStream.Companion.getNotices().markDialogSeen(NOTICE_NAME); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(ObservableExtensionsKt.computationLatest(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().getOAuthTokens(), false, 1, null)), 0, false, 1, null), this, null, 2, null), WidgetNoticeNuxSamsungLink.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetNoticeNuxSamsungLink$onViewBound$1(this), 62, (Object) null); - getBinding().f1912c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this)); + getBinding().f1913c.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$2(this)); getBinding().b.setOnClickListener(new WidgetNoticeNuxSamsungLink$onViewBound$3(this)); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java index 02a68f628c..3b5eade500 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetGuildTemplates.java @@ -118,7 +118,7 @@ public class WidgetGuildTemplates extends AppFragment { } guildTemplatesAdapter.setItems(arrayList); getBinding().b.setOnClickListener(new WidgetGuildTemplates$onViewBound$3(this)); - LinearLayout linearLayout = getBinding().f1915c; + LinearLayout linearLayout = getBinding().f1916c; m.checkNotNullExpressionValue(linearLayout, "binding.nuxGuildTemplateSectionBottom"); if (!getArgs().getGuildTemplate().getShowInvitePrompt()) { i = 8; diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java index 8d3c72c2f4..825976f8b2 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNavigationHelp.java @@ -110,7 +110,7 @@ public final class WidgetNavigationHelp extends AppDialog { ViewPager2 viewPager2 = getBinding().d; m.checkNotNullExpressionValue(viewPager2, "binding.navigationHelpNuxPager"); viewPager2.setAdapter(new NuxPagerAdapter(this)); - TabLayout tabLayout = getBinding().f1909c; + TabLayout tabLayout = getBinding().f1910c; m.checkNotNullExpressionValue(tabLayout, "binding.navigationHelpIndicators"); ViewPager2 viewPager22 = getBinding().d; m.checkNotNullExpressionValue(viewPager22, "binding.navigationHelpNuxPager"); diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java index c30d6ddf8f..215d7315b0 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt.java @@ -108,7 +108,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment { TextView textView = getBinding().d; m.checkNotNullExpressionValue(textView, "binding.nufChannelPromptGuildIconName"); textView.setVisibility(8); - SimpleDraweeView simpleDraweeView = getBinding().f1914c; + SimpleDraweeView simpleDraweeView = getBinding().f1915c; m.checkNotNullExpressionValue(simpleDraweeView, "binding.nufChannelPromptGuildIcon"); IconUtils.setIcon$default(simpleDraweeView, forGuild$default, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); } else { @@ -118,7 +118,7 @@ public final class WidgetNuxChannelPrompt extends AppFragment { TextView textView3 = getBinding().d; m.checkNotNullExpressionValue(textView3, "binding.nufChannelPromptGuildIconName"); textView3.setText(guild.getShortName()); - SimpleDraweeView simpleDraweeView2 = getBinding().f1914c; + SimpleDraweeView simpleDraweeView2 = getBinding().f1915c; m.checkNotNullExpressionValue(simpleDraweeView2, "binding.nufChannelPromptGuildIcon"); IconUtils.setIcon$default(simpleDraweeView2, IconUtils.DEFAULT_ICON, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null); } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java index 437b959615..be51ae0e04 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$1.java @@ -19,7 +19,7 @@ public final class WidgetNuxPostRegistrationJoin$onViewBound$1 implements View.O @Override // android.view.View.OnClickListener public final void onClick(View view) { - TextInputLayout textInputLayout = this.this$0.getBinding().f1857c; + TextInputLayout textInputLayout = this.this$0.getBinding().f1858c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); if (t.isBlank(ViewExtensions.getTextOrEmpty(textInputLayout))) { AnalyticsTracker.INSTANCE.newUserOnboarding("Mobile NUX Post Reg", "Ask to join", "Friend List", Long.valueOf(this.$startTimeMs), true); diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java index 4de41a645a..dacf2eb469 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin.java @@ -47,7 +47,7 @@ public final class WidgetNuxPostRegistrationJoin extends WidgetGuildJoin { setActionBarDisplayHomeAsUpEnabled(false); AnalyticsTracker.newUserOnboarding$default(AnalyticsTracker.INSTANCE, NUX_FLOW_TYPE, GuildTemplateAnalytics.STEP_REGISTRATION, NUX_STEP, null, false, 24, null); getBinding().b.setOnClickListener(new WidgetNuxPostRegistrationJoin$onViewBound$1(this, ClockFactory.get().currentTimeMillis())); - TextInputLayout textInputLayout = getBinding().f1857c; + TextInputLayout textInputLayout = getBinding().f1858c; m.checkNotNullExpressionValue(textInputLayout, "binding.guildJoinInvite"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetNuxPostRegistrationJoin$onViewBound$2(this)); } diff --git a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java index a6c76b229e..7431383b61 100644 --- a/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java +++ b/app/src/main/java/com/discord/widgets/phone/PhoneCountryCodeAdapterItem.java @@ -39,6 +39,6 @@ public final class PhoneCountryCodeAdapterItem extends RecyclerView.ViewHolder { TextView textView2 = this.binding.b; m.checkNotNullExpressionValue(textView2, "binding.phoneCountryCodeCode"); textView2.setText(phoneCountryCode.getCode()); - this.binding.f1920c.setOnClickListener(new PhoneCountryCodeAdapterItem$bind$1(this, phoneCountryCode)); + this.binding.f1921c.setOnClickListener(new PhoneCountryCodeAdapterItem$bind$1(this, phoneCountryCode)); } } diff --git a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java index 24634a7c59..1cec827505 100644 --- a/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/phone/WidgetPhoneCountryCodeBottomSheet.java @@ -113,7 +113,7 @@ public final class WidgetPhoneCountryCodeBottomSheet extends AppBottomSheet { @Override // com.discord.app.AppBottomSheet, androidx.fragment.app.Fragment public void onResume() { super.onResume(); - TextInputLayout textInputLayout = getBinding().f1919c; + TextInputLayout textInputLayout = getBinding().f1920c; m.checkNotNullExpressionValue(textInputLayout, "binding.phoneCountryCodeSearch"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetPhoneCountryCodeBottomSheet$onResume$1(this)); Observable o = this.nameFilterSubject.o(200, TimeUnit.MILLISECONDS); diff --git a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java index 80c05305b5..bf47d5be4a 100644 --- a/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java +++ b/app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.java @@ -219,7 +219,7 @@ public final class WidgetServerSettingsTransferOwnership extends AppDialog { LinearLayout linearLayout = getBinding().f; m.checkNotNullExpressionValue(linearLayout, "binding.guildTransferOwnershipMfaWrap"); linearLayout.setVisibility(model.isMfaEnabled() ? 0 : 8); - getBinding().f1876c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this)); + getBinding().f1877c.setOnClickListener(new WidgetServerSettingsTransferOwnership$configureUI$1(this)); MaterialButton materialButton = getBinding().d; m.checkNotNullExpressionValue(materialButton, "binding.guildTransferOwnershipConfirm"); CheckedSetting checkedSetting = getBinding().b; diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java index 3601221c05..e8a70ed2bb 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationPendingDialog.java @@ -112,7 +112,7 @@ public final class MemberVerificationPendingDialog extends AppDialog { } textView.setVisibility(i); int themedColor = loaded.getDialogState().ordinal() != 3 ? ColorCompat.getThemedColor(getContext(), (int) R.attr.color_brand_500) : ColorCompat.getColor(getContext(), (int) R.color.status_red_500); - MaterialButton materialButton = getBinding().f1903c; + MaterialButton materialButton = getBinding().f1904c; m.checkNotNullExpressionValue(materialButton, "binding.memberVerificationPrimaryBtn"); materialButton.setBackgroundTintList(ColorStateList.valueOf(themedColor)); int ordinal = loaded.getDialogState().ordinal(); @@ -124,13 +124,13 @@ public final class MemberVerificationPendingDialog extends AppDialog { TextView textView3 = getBinding().f; m.checkNotNullExpressionValue(textView3, "binding.pendingDialogDesc"); textView3.setText(getString(R.string.member_verification_warning_update_modal_desc)); - MaterialButton materialButton2 = getBinding().f1903c; + MaterialButton materialButton2 = getBinding().f1904c; m.checkNotNullExpressionValue(materialButton2, "binding.memberVerificationPrimaryBtn"); materialButton2.setText(getString(R.string.member_verification_warning_update)); MaterialButton materialButton3 = getBinding().d; m.checkNotNullExpressionValue(materialButton3, "binding.memberVerificationSecondaryBtn"); materialButton3.setText(getString(R.string.cancel)); - getBinding().f1903c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this)); + getBinding().f1904c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$8(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$9(this)); } else if (ordinal == 1) { getBinding().b.setImageResource(R.drawable.ic_member_verification_pending); @@ -140,13 +140,13 @@ public final class MemberVerificationPendingDialog extends AppDialog { TextView textView5 = getBinding().f; m.checkNotNullExpressionValue(textView5, "binding.pendingDialogDesc"); textView5.setText(getString(R.string.member_verification_pending_application_modal_desc)); - MaterialButton materialButton4 = getBinding().f1903c; + MaterialButton materialButton4 = getBinding().f1904c; m.checkNotNullExpressionValue(materialButton4, "binding.memberVerificationPrimaryBtn"); materialButton4.setText(getString(R.string.member_verification_pending_application_modal_confirm)); MaterialButton materialButton5 = getBinding().d; m.checkNotNullExpressionValue(materialButton5, "binding.memberVerificationSecondaryBtn"); materialButton5.setText(getString(R.string.member_verification_pending_application_modal_cancel)); - getBinding().f1903c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this)); + getBinding().f1904c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$1(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$2(this)); getBinding().e.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$3(this)); } else if (ordinal == 2) { @@ -156,13 +156,13 @@ public final class MemberVerificationPendingDialog extends AppDialog { TextView textView7 = getBinding().f; m.checkNotNullExpressionValue(textView7, "binding.pendingDialogDesc"); textView7.setText(getString(R.string.member_verification_pending_application_leave_server_modal_desc)); - MaterialButton materialButton6 = getBinding().f1903c; + MaterialButton materialButton6 = getBinding().f1904c; m.checkNotNullExpressionValue(materialButton6, "binding.memberVerificationPrimaryBtn"); materialButton6.setText(getString(R.string.member_verification_pending_application_modal_cancel)); MaterialButton materialButton7 = getBinding().d; m.checkNotNullExpressionValue(materialButton7, "binding.memberVerificationSecondaryBtn"); materialButton7.setText(getString(R.string.member_verification_pending_application_modal_dismiss)); - getBinding().f1903c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this)); + getBinding().f1904c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$4(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$5(this)); } else if (ordinal == 3) { TextView textView8 = getBinding().g; @@ -171,13 +171,13 @@ public final class MemberVerificationPendingDialog extends AppDialog { TextView textView9 = getBinding().f; m.checkNotNullExpressionValue(textView9, "binding.pendingDialogDesc"); textView9.setText(getString(R.string.member_verification_pending_application_leave_server_modal_desc)); - MaterialButton materialButton8 = getBinding().f1903c; + MaterialButton materialButton8 = getBinding().f1904c; m.checkNotNullExpressionValue(materialButton8, "binding.memberVerificationPrimaryBtn"); materialButton8.setText(getString(R.string.member_verification_pending_application_modal_leave)); MaterialButton materialButton9 = getBinding().d; m.checkNotNullExpressionValue(materialButton9, "binding.memberVerificationSecondaryBtn"); materialButton9.setText(getString(R.string.member_verification_pending_application_modal_dismiss)); - getBinding().f1903c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this)); + getBinding().f1904c.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$6(this)); getBinding().d.setOnClickListener(new MemberVerificationPendingDialog$configureLoadedUI$7(this)); } } diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java index 41dd530492..da570c4d48 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationRulesAdapter.java @@ -322,7 +322,7 @@ public final class MemberVerificationRulesAdapter extends MGRecyclerAdapterSimpl int i2 = 0; textView.setText(b.i(resources, R.string.member_verification_rule_index, new Object[]{format}, null, 4)); this.binding.b.setDraweeSpanStringBuilder(AstRenderer.render(memberVerificationItemTerm.getAst(), new MessageRenderContext(a.x(this.itemView, "itemView", "itemView.context"), 0, memberVerificationItemTerm.getAllowAnimatedEmojis(), null, memberVerificationItemTerm.getChannelNames(), memberVerificationItemTerm.getRoles(), 0, null, null, 0, 0, null, null, null, 16328, null))); - View view3 = this.binding.f1904c; + View view3 = this.binding.f1905c; m.checkNotNullExpressionValue(view3, "binding.memberVerificationRuleDivider"); if (!(!memberVerificationItemTerm.isLastItem())) { i2 = 8; diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java index f14506aa35..79b57c0344 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/MemberVerificationSuccessDialog.java @@ -53,7 +53,7 @@ public final class MemberVerificationSuccessDialog extends AppDialog { m.checkNotNullParameter(view, "view"); super.onViewBound(view); String string = getArgumentsOrDefault().getString(INTENT_EXTRA_GUILD_NAME); - TextView textView = getBinding().f1905c; + TextView textView = getBinding().f1906c; m.checkNotNullExpressionValue(textView, "binding.memberVerificationGuildName"); textView.setText(b.k(this, R.string.lurker_mode_popout_success_header, new Object[]{string}, null, 4)); getBinding().b.setOnClickListener(new MemberVerificationSuccessDialog$onViewBound$1(this)); diff --git a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java index 6d31a7597c..2f90bd87fc 100644 --- a/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java +++ b/app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerification.java @@ -133,7 +133,7 @@ public final class WidgetMemberVerification extends AppFragment { RecyclerView recyclerView = getBinding().g; m.checkNotNullExpressionValue(recyclerView, "binding.memberVerificationRulesRecycler"); recyclerView.setVisibility(loaded.isRulesListVisible() ? 0 : 8); - SimpleDraweeView simpleDraweeView = getBinding().f1902c; + SimpleDraweeView simpleDraweeView = getBinding().f1903c; IconUtils iconUtils = IconUtils.INSTANCE; Guild guild = loaded.getGuild(); Resources resources = getResources(); diff --git a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java index c967da58e6..5014c73d26 100644 --- a/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java +++ b/app/src/main/java/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionTransfer.java @@ -140,7 +140,7 @@ public final class WidgetPremiumGuildSubscriptionTransfer extends AppFragment { m.checkNotNullParameter(view, "view"); super.onViewBound(view); AppFragment.setActionBarDisplayHomeAsUpEnabled$default(this, false, 1, null); - TextView textView = getBinding().f1921c; + TextView textView = getBinding().f1922c; m.checkNotNullExpressionValue(textView, "binding.premiumGuildTransferConfirmationBlurb"); textView.setText(b.k(this, R.string.premium_guild_subscribe_confirm_transfer_blurb, new Object[]{StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_blurb_slotCount, 1, 1), StringResourceUtilsKt.getI18nPluralString(requireContext(), R.plurals.premium_guild_subscribe_confirm_transfer_blurb_guildCount, 1, 1)}, null, 4)); TextView textView2 = getBinding().f; diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java index 33d1ae3dfc..61cf34e5b7 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetMuteSettingsSheet.java @@ -197,7 +197,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { LinearLayout linearLayout = getBinding().o; m.checkNotNullExpressionValue(linearLayout, "binding.unmuteButton"); linearLayout.setVisibility(0); - LinearLayout linearLayout2 = getBinding().f1908c; + LinearLayout linearLayout2 = getBinding().f1909c; m.checkNotNullExpressionValue(linearLayout2, "binding.muteSettingsSheetMuteOptions"); linearLayout2.setVisibility(8); return; @@ -205,7 +205,7 @@ public final class WidgetMuteSettingsSheet extends AppBottomSheet { LinearLayout linearLayout3 = getBinding().o; m.checkNotNullExpressionValue(linearLayout3, "binding.unmuteButton"); linearLayout3.setVisibility(8); - LinearLayout linearLayout4 = getBinding().f1908c; + LinearLayout linearLayout4 = getBinding().f1909c; m.checkNotNullExpressionValue(linearLayout4, "binding.muteSettingsSheetMuteOptions"); linearLayout4.setVisibility(0); } 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 a427400bb2..faa887eeba 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -323,7 +323,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 + " - 92.2 - Alpha (92202)"); + textView.setText(string + " - 92.3 - Alpha (92203)"); 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/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java index a0f0764103..8c9d9734d7 100644 --- a/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java +++ b/app/src/main/java/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.java @@ -304,12 +304,12 @@ public final class WidgetPaymentSourceEditDialog extends AppDialog { checkBox.setChecked(component1.getDefault()); getBinding().d.setIsLoading(false); if (component2) { - getBinding().f1918c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this)); - MaterialButton materialButton = getBinding().f1918c; + getBinding().f1919c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2(this)); + MaterialButton materialButton = getBinding().f1919c; m.checkNotNullExpressionValue(materialButton, "binding.dialogDelete"); materialButton.setAlpha(0.3f); } else { - getBinding().f1918c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1)); + getBinding().f1919c.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$3(this, component1)); } getBinding().d.setOnClickListener(new WidgetPaymentSourceEditDialog$initPaymentSourceInfo$4(this, component1)); if (m.areEqual(component1.getBillingAddress().getCountry(), "CA")) { diff --git a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java index 0c191d909b..01b5d686c3 100644 --- a/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java +++ b/app/src/main/java/com/discord/widgets/settings/premium/WidgetOutboundPromoTerms.java @@ -76,6 +76,6 @@ public final class WidgetOutboundPromoTerms extends AppBottomSheet { String string = getArgumentsOrDefault().getString(ARG_CONTENT, ""); Parser, MessageParseState> parser = this.parser; m.checkNotNullExpressionValue(string, "content"); - getBinding().f1917c.setDraweeSpanStringBuilder(AstRenderer.render(Parser.parse$default(parser, string, MessageParseState.Companion.getInitialState(), null, 4, null), getRenderContext())); + getBinding().f1918c.setDraweeSpanStringBuilder(AstRenderer.render(Parser.parse$default(parser, string, MessageParseState.Companion.getInitialState(), null, 4, null), getRenderContext())); } } diff --git a/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltip.java b/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltip.java deleted file mode 100644 index 565cf32b93..0000000000 --- a/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltip.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.discord.widgets.settings.profile; - -import com.discord.tooltips.TooltipManager; -/* compiled from: ProfileMarketingTooltip.kt */ -public final class ProfileMarketingTooltip extends TooltipManager.b { - public static final ProfileMarketingTooltip INSTANCE = new ProfileMarketingTooltip(); - - private ProfileMarketingTooltip() { - super("CACHE_KEY_PROFILE_MARKETING", "PROFILE_MARKETING_SHEET"); - } -} diff --git a/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltipKt.java b/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltipKt.java deleted file mode 100644 index b35fef45e7..0000000000 --- a/app/src/main/java/com/discord/widgets/settings/profile/ProfileMarketingTooltipKt.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.discord.widgets.settings.profile; -/* compiled from: ProfileMarketingTooltip.kt */ -public final class ProfileMarketingTooltipKt { - private static final String CACHE_KEY_PROFILE_MARKETING = "CACHE_KEY_PROFILE_MARKETING"; -} diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$1.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$1.java deleted file mode 100644 index 041dbceaf0..0000000000 --- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$1.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.discord.widgets.settings.profile; - -import android.view.View; -/* compiled from: WidgetProfileMarketingSheet.kt */ -public final class WidgetProfileMarketingSheet$onViewCreated$1 implements View.OnClickListener { - public final /* synthetic */ WidgetProfileMarketingSheet this$0; - - public WidgetProfileMarketingSheet$onViewCreated$1(WidgetProfileMarketingSheet widgetProfileMarketingSheet) { - this.this$0 = widgetProfileMarketingSheet; - } - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - this.this$0.dismiss(); - } -} diff --git a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$2.java b/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$2.java deleted file mode 100644 index 5b5e2581c7..0000000000 --- a/app/src/main/java/com/discord/widgets/settings/profile/WidgetProfileMarketingSheet$onViewCreated$2.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.discord.widgets.settings.profile; - -import android.content.Context; -import android.view.View; -import com.discord.widgets.settings.profile.WidgetSettingsUserProfile; -import d0.z.d.m; -/* compiled from: WidgetProfileMarketingSheet.kt */ -public final class WidgetProfileMarketingSheet$onViewCreated$2 implements View.OnClickListener { - public final /* synthetic */ WidgetProfileMarketingSheet this$0; - - public WidgetProfileMarketingSheet$onViewCreated$2(WidgetProfileMarketingSheet widgetProfileMarketingSheet) { - this.this$0 = widgetProfileMarketingSheet; - } - - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - WidgetProfileMarketingSheet.access$getTooltipManager$p(this.this$0).a(ProfileMarketingTooltip.INSTANCE); - WidgetSettingsUserProfile.Companion companion = WidgetSettingsUserProfile.Companion; - Context requireContext = this.this$0.requireContext(); - m.checkNotNullExpressionValue(requireContext, "this@WidgetProfileMarketingSheet.requireContext()"); - companion.launch(requireContext); - this.this$0.dismiss(); - } -} diff --git a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java index 28a7be1f8f..c2768b9e5a 100644 --- a/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java +++ b/app/src/main/java/com/discord/widgets/share/WidgetIncomingShare.java @@ -596,7 +596,7 @@ public final class WidgetIncomingShare extends AppFragment { } widgetGlobalSearchAdapter.setData(arrayList); widgetGlobalSearchAdapter.setOnSelectedListener(new WidgetIncomingShare$configureUi$$inlined$apply$lambda$2(this, model)); - ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1895c; + ViewEmbedGameInvite viewEmbedGameInvite = getBinding().f1896c; m.checkNotNullExpressionValue(viewEmbedGameInvite, "binding.externalShareActivityActionPreview"); if (model.getGameInviteModel() == null) { z2 = false; @@ -607,7 +607,7 @@ public final class WidgetIncomingShare extends AppFragment { viewEmbedGameInvite.setVisibility(i); ViewEmbedGameInvite.Model gameInviteModel = model.getGameInviteModel(); if (gameInviteModel != null) { - getBinding().f1895c.bind(gameInviteModel, clock); + getBinding().f1896c.bind(gameInviteModel, clock); } } diff --git a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java index 71ed2f3b3a..35e630a2c8 100644 --- a/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java +++ b/app/src/main/java/com/discord/widgets/stage/start/WidgetModeratorStartStage.java @@ -165,10 +165,10 @@ public final class WidgetModeratorStartStage extends AppFragment { public void onViewBound(View view) { m.checkNotNullParameter(view, "view"); super.onViewBound(view); - RecyclerView recyclerView = getBinding().f1907c; + RecyclerView recyclerView = getBinding().f1908c; m.checkNotNullExpressionValue(recyclerView, "binding.recyclerView"); this.adapter = new ModeratorStartStageAdapter(recyclerView, new WidgetModeratorStartStage$onViewBound$1(this)); - RecyclerView recyclerView2 = getBinding().f1907c; + RecyclerView recyclerView2 = getBinding().f1908c; recyclerView2.setLayoutManager(new LinearLayoutManager(recyclerView2.getContext())); ModeratorStartStageAdapter moderatorStartStageAdapter = this.adapter; if (moderatorStartStageAdapter == null) { diff --git a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java index 0e9bfe5689..64b3da34e4 100644 --- a/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java +++ b/app/src/main/java/com/discord/widgets/stickers/WidgetGuildStickerSheet.java @@ -195,7 +195,7 @@ public final class WidgetGuildStickerSheet extends AppBottomSheet { TextView textView = getBinding().n; m.checkNotNullExpressionValue(textView, "binding.guildStickerSheetStickerName"); textView.setText(component1.h()); - TextView textView2 = getBinding().f1875c; + TextView textView2 = getBinding().f1876c; m.checkNotNullExpressionValue(textView2, "binding.guildStickerSheetDescription"); textView2.setText(getString(getCustomStickerInfoText(component3, isUserInGuild, isPublic, component2))); configureButtons(component2, isUserInGuild, known != null ? known.getGuild() : null); diff --git a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java index a8ba94146b..86e7dbb1b5 100644 --- a/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java +++ b/app/src/main/java/com/discord/widgets/user/WidgetKickUser.java @@ -70,7 +70,7 @@ public final class WidgetKickUser extends AppDialog { TextView textView2 = getBinding().b; m.checkNotNullExpressionValue(textView2, "binding.kickUserBody"); b.n(textView2, R.string.kick_user_body, new Object[]{string}, null, 4); - getBinding().f1897c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this)); + getBinding().f1898c.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$1(this)); getBinding().d.setOnClickListener(new WidgetKickUser$onViewBoundOrOnResume$2(this, j, j2, string)); } } diff --git a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java index 94f2aafc4d..f6d06f7fa7 100644 --- a/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java +++ b/app/src/main/java/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter.java @@ -87,7 +87,7 @@ public final class WidgetGlobalSearchGuildsAdapter extends MGRecyclerAdapterSimp public void onConfigure(int i, WidgetGlobalSearchGuildsModel.Item item) { m.checkNotNullParameter(item, "data"); super.onConfigure(i, item); - TextView textView = this.binding.f1880c; + TextView textView = this.binding.f1881c; m.checkNotNullExpressionValue(textView, "binding.guildsItemDmCount"); configureMentionsCount(textView, item.getMentionCount()); SimpleDraweeView simpleDraweeView = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java index c3e87cb998..c57daa4abc 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm$onViewBound$1.java @@ -14,7 +14,7 @@ public final class WidgetIssueDetailsForm$onViewBound$1 implements View.OnClickL @Override // android.view.View.OnClickListener public final void onClick(View view) { - TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1896c; + TextInputLayout textInputLayout = WidgetIssueDetailsForm.access$getBinding$p(this.this$0).f1897c; m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput"); WidgetIssueDetailsForm.access$getViewModel$p(this.this$0).submitForm(ViewExtensions.getTextOrEmpty(textInputLayout)); } diff --git a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java index 6e60afdb6b..fe3017be32 100644 --- a/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java +++ b/app/src/main/java/com/discord/widgets/voice/feedback/WidgetIssueDetailsForm.java @@ -102,7 +102,7 @@ public final class WidgetIssueDetailsForm extends AppFragment { c.a.d.m.i(this, R.string.call_feedback_confirmation, 0, 4); AppActivity appActivity = getAppActivity(); if (appActivity != null) { - appActivity.hideKeyboard(getBinding().f1896c); + appActivity.hideKeyboard(getBinding().f1897c); } requireActivity().onBackPressed(); } @@ -121,10 +121,10 @@ public final class WidgetIssueDetailsForm extends AppFragment { m.checkNotNullExpressionValue(materialButton, "binding.issueDetailsSubmitButton"); materialButton.setEnabled(false); getBinding().d.setOnClickListener(new WidgetIssueDetailsForm$onViewBound$1(this)); - TextInputLayout textInputLayout = getBinding().f1896c; + TextInputLayout textInputLayout = getBinding().f1897c; m.checkNotNullExpressionValue(textInputLayout, "binding.issueDetailsInput"); ViewExtensions.addBindedTextWatcher(textInputLayout, this, new WidgetIssueDetailsForm$onViewBound$2(this)); - TextInputLayout textInputLayout2 = getBinding().f1896c; + TextInputLayout textInputLayout2 = getBinding().f1897c; m.checkNotNullExpressionValue(textInputLayout2, "binding.issueDetailsInput"); showKeyboard(textInputLayout2); LinkifiedTextView linkifiedTextView = getBinding().b; diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$1.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartStage$1.java similarity index 84% rename from app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$1.java rename to app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartStage$1.java index b5607e3fab..e89600fb31 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$1.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureEventPrompt$onStartStage$1.java @@ -9,12 +9,12 @@ import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: WidgetCallFullscreen.kt */ -public final class WidgetCallFullscreen$configureEventPrompt$1 extends o implements Function0 { +public final class WidgetCallFullscreen$configureEventPrompt$onStartStage$1 extends o implements Function0 { public final /* synthetic */ WidgetCallFullscreenViewModel.ViewState.Valid $viewState; public final /* synthetic */ WidgetCallFullscreen this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetCallFullscreen$configureEventPrompt$1(WidgetCallFullscreen widgetCallFullscreen, WidgetCallFullscreenViewModel.ViewState.Valid valid) { + public WidgetCallFullscreen$configureEventPrompt$onStartStage$1(WidgetCallFullscreen widgetCallFullscreen, WidgetCallFullscreenViewModel.ViewState.Valid valid) { super(0); this.this$0 = widgetCallFullscreen; this.$viewState = valid; diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java index b8c1a582aa..6da2ec7485 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java @@ -61,6 +61,7 @@ import com.discord.utilities.device.DeviceUtils; import com.discord.utilities.dimen.DimenUtils; import com.discord.utilities.drawable.DrawableCompat; import com.discord.utilities.extensions.SimpleDraweeViewExtensionsKt; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilities; import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; import com.discord.utilities.icon.IconUtils; import com.discord.utilities.mg_recycler.MGRecyclerAdapter; @@ -560,13 +561,17 @@ public final class WidgetCallFullscreen extends AppFragment { WidgetCallFullscreen$configureEventPrompt$onCreateEventClick$1 widgetCallFullscreen$configureEventPrompt$onCreateEventClick$1 = new WidgetCallFullscreen$configureEventPrompt$onCreateEventClick$1(this, guild); GuildScheduledEvent startableEvent = valid.getStartableEvent(); WidgetCallFullscreen$configureEventPrompt$onStartEvent$1 widgetCallFullscreen$configureEventPrompt$onStartEvent$1 = new WidgetCallFullscreen$configureEventPrompt$onStartEvent$1(this, startableEvent); + WidgetCallFullscreen$configureEventPrompt$onStartStage$1 widgetCallFullscreen$configureEventPrompt$onStartStage$1 = new WidgetCallFullscreen$configureEventPrompt$onStartStage$1(this, valid); GuildEventPromptListView guildEventPromptListView = (GuildEventPromptListView) getEventPromptOverlay().getMaybeView(); if (guildEventPromptListView != null) { - GuildEventPromptListView.ScheduledEventData scheduledEventData = (startableEvent != null && PermissionUtils.can(Permission.START_STAGE_EVENT, valid.getChannelPermissions())) ? new GuildEventPromptListView.ScheduledEventData(startableEvent, widgetCallFullscreen$configureEventPrompt$onStartEvent$1) : null; - if (guild == null || !StageEventsCreationGuildsFeatureFlag.Companion.getINSTANCE().canGuildCreateStageEvents(guild.getId()) || !PermissionUtils.can(Permission.START_STAGE_EVENT, valid.getChannelPermissions())) { + GuildEventPromptListView.ScheduledEventData scheduledEventData = (startableEvent != null && GuildScheduledEventUtilities.Companion.canStartEventInChannel(valid.getCallModel().getChannel(), valid.getChannelPermissions())) ? new GuildEventPromptListView.ScheduledEventData(startableEvent, widgetCallFullscreen$configureEventPrompt$onStartEvent$1) : null; + if (guild == null || valid.getStageCallModel() == null || !StageEventsCreationGuildsFeatureFlag.Companion.getINSTANCE().canGuildCreateStageEvents(guild.getId()) || !PermissionUtils.can(Permission.START_STAGE_EVENT, valid.getChannelPermissions())) { widgetCallFullscreen$configureEventPrompt$onCreateEventClick$1 = null; } - guildEventPromptListView.configure(scheduledEventData, widgetCallFullscreen$configureEventPrompt$onCreateEventClick$1, new WidgetCallFullscreen$configureEventPrompt$1(this, valid)); + if (valid.getStageCallModel() == null || !StageRoles.m26isModeratorimpl(valid.getStageCallModel().m40getMyStageRoles1LxfuJo())) { + widgetCallFullscreen$configureEventPrompt$onStartStage$1 = null; + } + guildEventPromptListView.configure(scheduledEventData, widgetCallFullscreen$configureEventPrompt$onCreateEventClick$1, widgetCallFullscreen$configureEventPrompt$onStartStage$1); } } @@ -574,8 +579,11 @@ public final class WidgetCallFullscreen extends AppFragment { /* JADX WARNING: Removed duplicated region for block: B:39:0x0152 */ /* JADX WARNING: Removed duplicated region for block: B:42:0x015b */ /* JADX WARNING: Removed duplicated region for block: B:43:0x015d */ - /* JADX WARNING: Removed duplicated region for block: B:46:0x0169 */ - /* JADX WARNING: Removed duplicated region for block: B:49:0x016e */ + /* JADX WARNING: Removed duplicated region for block: B:46:0x0168 */ + /* JADX WARNING: Removed duplicated region for block: B:47:0x016a */ + /* JADX WARNING: Removed duplicated region for block: B:50:0x016f */ + /* JADX WARNING: Removed duplicated region for block: B:61:0x01a4 */ + /* JADX WARNING: Removed duplicated region for block: B:64:0x01bf */ private final void configureGridUi(WidgetCallFullscreenViewModel.ViewState.Valid valid) { boolean z2; VideoCallGridAdapter videoCallGridAdapter; @@ -632,19 +640,28 @@ public final class WidgetCallFullscreen extends AppFragment { m.throwUninitializedPropertyAccessException("gridAdapter"); } boolean z4 = videoCallGridAdapter.getItemCount() != 1; - if (valid.getVisibleVideoParticipants().size() != 1) { - z3 = false; - } + boolean z5 = valid.getVisibleVideoParticipants().size() != 1; videoCallGridAdapter2 = this.gridAdapter; if (videoCallGridAdapter2 == null) { m.throwUninitializedPropertyAccessException("gridAdapter"); } videoCallGridAdapter2.setData(valid.getVisibleVideoParticipants()); - if (z4 && !z3) { + if (z4 && !z5) { getBinding().p.scrollToPosition(0); } configureMenu(valid); configureActionBar(valid); + if (valid.getStartableEvent() == null || GuildScheduledEventUtilitiesKt.hasLiveEvent(valid.getCallModel().getGuildScheduledEvents())) { + z3 = false; + } + if (!z3) { + ViewExtensions.fadeBy(getEventPromptOverlay().getForceInitializedView(), valid.getShowControls(), 200); + if (valid.getShowControls()) { + configureEventPrompt(valid); + } + } else { + getEventPromptOverlay().setVisible(false); + } enableWakeLock(); } } @@ -666,6 +683,9 @@ public final class WidgetCallFullscreen extends AppFragment { getBinding().p.scrollToPosition(0); configureMenu(valid); configureActionBar(valid); + z3 = false; + if (!z3) { + } enableWakeLock(); } @@ -721,13 +741,12 @@ public final class WidgetCallFullscreen extends AppFragment { configureConnectionStatusText(valid.getCallModel()); } - /* JADX WARNING: Removed duplicated region for block: B:28:0x00e0 */ - /* JADX WARNING: Removed duplicated region for block: B:31:0x00e5 */ - /* JADX WARNING: Removed duplicated region for block: B:34:0x00f0 */ - /* JADX WARNING: Removed duplicated region for block: B:41:0x0192 */ - /* JADX WARNING: Removed duplicated region for block: B:42:0x01cc */ - /* JADX WARNING: Removed duplicated region for block: B:56:0x0232 */ - /* JADX WARNING: Removed duplicated region for block: B:59:0x024d */ + /* JADX WARNING: Removed duplicated region for block: B:32:0x00ed */ + /* JADX WARNING: Removed duplicated region for block: B:35:0x00f8 */ + /* JADX WARNING: Removed duplicated region for block: B:42:0x019a */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x01d4 */ + /* JADX WARNING: Removed duplicated region for block: B:57:0x023a */ + /* JADX WARNING: Removed duplicated region for block: B:60:0x0255 */ private final void configureStageUi(WidgetCallFullscreenViewModel.ViewState.Valid valid) { boolean z2; ArrayList arrayList; @@ -763,6 +782,8 @@ public final class WidgetCallFullscreen extends AppFragment { if (z4) { configureEventPrompt(valid); } + } else { + getEventPromptOverlay().setVisible(false); } Channel channel = valid.getCallModel().getChannel(); List speakingVoiceUsers = stageCallModel.getSpeakingVoiceUsers(); @@ -781,58 +802,56 @@ public final class WidgetCallFullscreen extends AppFragment { break; } } - if (z3) { - z2 = true; - if (z2) { - i = 0; - } - constraintLayout.setVisibility(i); - if (!speakingVoiceUsers.isEmpty()) { - UserSummaryView userSummaryView = getBinding().u; - ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(speakingVoiceUsers, 10)); - for (StoreVoiceParticipants.VoiceUser voiceUser : speakingVoiceUsers) { - arrayList2.add(new UserGuildMember(voiceUser.getUser(), voiceUser.getGuildMember())); - } - userSummaryView.setMembers(arrayList2); - MaterialTextView materialTextView = getBinding().v; - m.checkNotNullExpressionValue(materialTextView, "binding.stageCallSpeakingUserSummaryLabel"); - Resources resources = getResources(); - m.checkNotNullExpressionValue(resources, "resources"); - materialTextView.setText(b.e(this, R.string.stage_is_speaking_hook, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.stage_is_speaking_hook_count, (int) R.string.stage_is_speaking_zero_quantity_hook, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$3(this))); - } - arrayList = new ArrayList(); - boolean z5 = !stageCallModel.getSpeakers().isEmpty(); - isEmpty = true ^ stageCallModel.getAudience().isEmpty(); - if (stageCallModel.getStageInstance() == null) { - arrayList.add(new StageCallItem.DetailsItem(stageCallModel.getStageInstance().f(), AnimatableValueParser.y0(channel), valid.getCallModel().getNumUsersConnected(), stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size(), stageCallModel.getNumBlockedUsers(), AnimatableValueParser.v1(stageCallModel.getStageInstance()))); - } else { - String string = StageRoles.m26isModeratorimpl(stageCallModel.m40getMyStageRoles1LxfuJo()) ? getString(R.string.stage_start_prompt_title_moderator) : getString(R.string.stage_start_prompt_title); - m.checkNotNullExpressionValue(string, "when {\n s…pt_title)\n }"); - String string2 = StageRoles.m26isModeratorimpl(stageCallModel.m40getMyStageRoles1LxfuJo()) ? getString(R.string.stage_start_prompt_subtitle_mobile_moderator) : getString(R.string.stage_start_prompt_subtitle_mobile); - m.checkNotNullExpressionValue(string2, "when {\n s…e_mobile)\n }"); - arrayList.add(new StageCallItem.PreStartDetailsItem(string, string2, stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size())); - } - arrayList.addAll(stageCallModel.getSpeakers()); - if (z5 && isEmpty) { - arrayList.add(StageCallItem.DividerItem.INSTANCE); - } - if (isEmpty) { - arrayList.add(new StageCallItem.AudienceHeaderItem(stageCallModel.getAudience().size())); - arrayList.addAll(stageCallModel.getAudience()); - } - stageCallAdapter = this.stageAdapter; - if (stageCallAdapter == null) { - m.throwUninitializedPropertyAccessException("stageAdapter"); - } - stageCallAdapter.setData(arrayList, stageCallModel.getSpeakers().size()); - configureMenu(valid); - configureActionBar(valid); - enableWakeLock(); - WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this, valid)); - } } z3 = false; if (z3) { + z2 = true; + if (z2) { + i = 0; + } + constraintLayout.setVisibility(i); + if (!speakingVoiceUsers.isEmpty()) { + UserSummaryView userSummaryView = getBinding().u; + ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(speakingVoiceUsers, 10)); + for (StoreVoiceParticipants.VoiceUser voiceUser : speakingVoiceUsers) { + arrayList2.add(new UserGuildMember(voiceUser.getUser(), voiceUser.getGuildMember())); + } + userSummaryView.setMembers(arrayList2); + MaterialTextView materialTextView = getBinding().v; + m.checkNotNullExpressionValue(materialTextView, "binding.stageCallSpeakingUserSummaryLabel"); + Resources resources = getResources(); + m.checkNotNullExpressionValue(resources, "resources"); + materialTextView.setText(b.e(this, R.string.stage_is_speaking_hook, new Object[]{speakingVoiceUsers.get(0).getDisplayName(), StringResourceUtilsKt.getQuantityString(resources, (int) R.plurals.stage_is_speaking_hook_count, (int) R.string.stage_is_speaking_zero_quantity_hook, speakingVoiceUsers.size() - 1, Integer.valueOf(speakingVoiceUsers.size() - 1))}, new WidgetCallFullscreen$configureStageUi$3(this))); + } + arrayList = new ArrayList(); + boolean z5 = !stageCallModel.getSpeakers().isEmpty(); + isEmpty = true ^ stageCallModel.getAudience().isEmpty(); + if (stageCallModel.getStageInstance() == null) { + arrayList.add(new StageCallItem.DetailsItem(stageCallModel.getStageInstance().f(), AnimatableValueParser.y0(channel), valid.getCallModel().getNumUsersConnected(), stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size(), stageCallModel.getNumBlockedUsers(), AnimatableValueParser.v1(stageCallModel.getStageInstance()))); + } else { + String string = StageRoles.m26isModeratorimpl(stageCallModel.m40getMyStageRoles1LxfuJo()) ? getString(R.string.stage_start_prompt_title_moderator) : getString(R.string.stage_start_prompt_title); + m.checkNotNullExpressionValue(string, "when {\n s…pt_title)\n }"); + String string2 = StageRoles.m26isModeratorimpl(stageCallModel.m40getMyStageRoles1LxfuJo()) ? getString(R.string.stage_start_prompt_subtitle_mobile_moderator) : getString(R.string.stage_start_prompt_subtitle_mobile); + m.checkNotNullExpressionValue(string2, "when {\n s…e_mobile)\n }"); + arrayList.add(new StageCallItem.PreStartDetailsItem(string, string2, stageCallModel.getSpeakers().size(), stageCallModel.getAudience().size())); + } + arrayList.addAll(stageCallModel.getSpeakers()); + if (z5 && isEmpty) { + arrayList.add(StageCallItem.DividerItem.INSTANCE); + } + if (isEmpty) { + arrayList.add(new StageCallItem.AudienceHeaderItem(stageCallModel.getAudience().size())); + arrayList.addAll(stageCallModel.getAudience()); + } + stageCallAdapter = this.stageAdapter; + if (stageCallAdapter == null) { + m.throwUninitializedPropertyAccessException("stageAdapter"); + } + stageCallAdapter.setData(arrayList, stageCallModel.getSpeakers().size()); + configureMenu(valid); + configureActionBar(valid); + enableWakeLock(); + WidgetEndStageBottomSheet.Companion.registerForResult(this, END_STAGE_REQUEST_KEY, new WidgetCallFullscreen$configureStageUi$4(this, valid)); } } z2 = false; diff --git a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java index 00e0e824d3..969818c2ae 100644 --- a/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java +++ b/app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2.java @@ -1,9 +1,7 @@ package com.discord.widgets.voice.fullscreen; import com.airbnb.lottie.parser.AnimatableValueParser; -import com.discord.api.stageinstance.StageInstance; import com.discord.utilities.permissions.PermissionUtils; -import com.discord.widgets.stage.model.StageCallModel; import com.discord.widgets.voice.fullscreen.WidgetCallFullscreenViewModel; import d0.z.d.o; import java.util.Set; @@ -22,13 +20,6 @@ public final class WidgetCallFullscreenViewModel$ViewState$Valid$menuItems$2 ext @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Set mo1invoke() { - StageInstance stageInstance; - if (!this.this$0.getCallModel().canInvite()) { - StageCallModel stageCallModel = this.this$0.getStageCallModel(); - if (stageCallModel != null && (stageInstance = stageCallModel.getStageInstance()) != null) { - stageInstance.d(); - } - } WidgetCallFullscreenViewModel.ViewState.Valid valid = this.this$0; return WidgetCallFullscreenViewModel.ViewState.Valid.access$computeMenuItems(valid, PermissionUtils.can(16, valid.getCallModel().getChannelPermissions()), this.this$0.getCallModel().isConnected(), AnimatableValueParser.x1(this.this$0.getCallModel().getChannel()), this.this$0.getCallModel().getSelectedVideoDevice(), this.this$0.getCallModel().getVideoDevices()); } diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java index d3c2497695..585b26b2b9 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1.java @@ -13,7 +13,7 @@ import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; import rx.subjects.PublishSubject; /* compiled from: WidgetVoiceBottomSheetViewModel.kt */ -@e(c = "com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1", f = "WidgetVoiceBottomSheetViewModel.kt", l = {156, 164}, m = "invokeSuspend") +@e(c = "com.discord.widgets.voice.sheet.WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1", f = "WidgetVoiceBottomSheetViewModel.kt", l = {157, 165}, m = "invokeSuspend") public final class WidgetVoiceBottomSheetViewModel$tryConnectToVoice$1 extends k implements Function2, Object> { public final /* synthetic */ StoreMediaEngine $mediaEngine; public int label; diff --git a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java index 365dfdd682..cd0112e5aa 100644 --- a/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/voice/sheet/WidgetVoiceBottomSheetViewModel.java @@ -13,7 +13,6 @@ import com.discord.R; import com.discord.api.channel.Channel; import com.discord.api.guild.GuildMaxVideoChannelUsers; import com.discord.api.guildscheduledevent.GuildScheduledEvent; -import com.discord.api.utcdatetime.UtcDateTime; import com.discord.app.AppLog; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelApplicationStream; @@ -32,6 +31,7 @@ import com.discord.stores.StoreVoiceParticipants; import com.discord.tooltips.TooltipManager; import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventsComparator; import com.discord.utilities.permissions.VideoPermissionsManager; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.streams.StreamContext; @@ -984,15 +984,11 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel, java.util.Iterator */ - /* JADX DEBUG: Type inference failed for r11v2. Raw type applied. Possible types: java.util.Iterator, java.util.Iterator */ private final List createConnectedListItems(Map map, String str, Channel channel, StoreState.Valid valid) { - GuildScheduledEvent guildScheduledEvent; ArrayList arrayList = new ArrayList(); List guildScheduledEvents = valid.getCallModel().getGuildScheduledEvents(); ArrayList arrayList2 = new ArrayList(); - Iterator it = guildScheduledEvents.iterator(); + Iterator it = guildScheduledEvents.iterator(); while (true) { boolean z2 = false; if (!it.hasNext()) { @@ -1007,27 +1003,9 @@ public final class WidgetVoiceBottomSheetViewModel extends AppViewModel 0) { - next2 = next3; - j = j2; - } - } while (it2.hasNext()); - } - guildScheduledEvent = next2; - } - GuildScheduledEvent guildScheduledEvent2 = guildScheduledEvent; - if (guildScheduledEvent2 != null) { - arrayList.add(new CallParticipantsAdapter.ListItem.Event(guildScheduledEvent2, valid.getCallModel().canManageEvent(), valid.getCallModel().isConnected())); + GuildScheduledEvent guildScheduledEvent = (GuildScheduledEvent) u.minWithOrNull(arrayList2, GuildScheduledEventsComparator.INSTANCE); + if (guildScheduledEvent != null) { + arrayList.add(new CallParticipantsAdapter.ListItem.Event(guildScheduledEvent, valid.getCallModel().canManageEvent(), valid.getCallModel().isConnected())); } ArrayList arrayList3 = new ArrayList(); for (StoreVoiceParticipants.VoiceUser voiceUser : map.values()) { diff --git a/app/src/main/java/d0/t/u.java b/app/src/main/java/d0/t/u.java index b1df007b8d..526c997c2a 100644 --- a/app/src/main/java/d0/t/u.java +++ b/app/src/main/java/d0/t/u.java @@ -515,6 +515,25 @@ public class u extends t { return t; } + /* JADX WARN: Multi-variable type inference failed */ + /* JADX WARNING: Unknown variable types count: 1 */ + public static final T minWithOrNull(Iterable iterable, Comparator comparator) { + m.checkNotNullParameter(iterable, "$this$minWithOrNull"); + m.checkNotNullParameter(comparator, "comparator"); + Iterator it = iterable.iterator(); + if (!it.hasNext()) { + return null; + } + T t = (T) it.next(); + while (it.hasNext()) { + ?? r1 = (Object) it.next(); + if (comparator.compare(t, r1) > 0) { + t = r1; + } + } + return t; + } + public static final List minus(Iterable iterable, Iterable iterable2) { m.checkNotNullParameter(iterable, "$this$minus"); m.checkNotNullParameter(iterable2, "elements"); diff --git a/app/src/main/res/drawable-xhdpi/img_server_profile_marketing.png b/app/src/main/res/drawable-xhdpi/img_server_profile_marketing.png new file mode 100644 index 0000000000..cb93566e40 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/img_server_profile_marketing.png differ diff --git a/app/src/main/res/drawable-xxhdpi/img_server_profile_marketing.png b/app/src/main/res/drawable-xxhdpi/img_server_profile_marketing.png new file mode 100644 index 0000000000..8676fd05ad Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/img_server_profile_marketing.png differ diff --git a/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml b/app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml similarity index 81% rename from app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml rename to app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml index 1250e2ce45..1796fc24d1 100644 --- a/app/src/main/res/layout-v22/widget_profile_marketing_sheet.xml +++ b/app/src/main/res/layout-v22/widget_guild_identity_marketing_sheet.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/app/src/main/res/layout/widget_profile_marketing_sheet.xml b/app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml similarity index 81% rename from app/src/main/res/layout/widget_profile_marketing_sheet.xml rename to app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml index be10e4420c..89c2fd4c3d 100644 --- a/app/src/main/res/layout/widget_profile_marketing_sheet.xml +++ b/app/src/main/res/layout/widget_guild_identity_marketing_sheet.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 5a1b31572d..f87a9f91fc 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -1215,8 +1215,9 @@ ‏‮Change‬‏ ‏‮Identity‬‏ ‏‮Setting‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮for‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮is‬‏ ‏‮currently‬‏ ‏‮available‬‏ ‏‮to‬‏ ‏‮a‬‏ ‏‮limited‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮people.‬‏ ‏‮Got‬‏ ‏‮it‬‏ - ‏‮Use‬‏ ‏‮a‬‏ ‏‮nickname‬‏ ‏‮and,‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮Nitro,‬‏ ‏‮use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ - ‏‮NEW!‬‏ ‏‮Change‬‏ ‏‮Server‬‏ ‏‮Identity‬‏ + ‏‮Use‬‏ ‏‮a‬‏ ‏‮nickname,‬‏ ‏‮and‬‏ ‏‮if‬‏ ‏‮you‬‏ ‏‮have‬‏ ‏‮Nitro,‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers!‬‏ + ‏‮Update‬‏ ‏‮my‬‏ ‏‮server‬‏ ‏‮profile‬‏ + ‏‮New!‬‏ ‏‮Server‬‏ ‏‮Profiles‬‏ ‏‮Use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮and‬‏ ‏‮more‬‏ ‏‮with‬‏ ‏‮Discord‬‏ ‏‮Nitro!‬‏ ‏‮Nickname‬‏ ‏‮(Disabled)‬‏ ‏‮You‬‏ ‏‮can‬‏ ‏‮change‬‏ ‏‮how‬‏ ‏‮others‬‏ ‏‮see‬‏ ‏‮you‬‏ ‏‮inside‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮by‬‏ ‏‮setting‬‏ ‏‮a‬‏ ‏‮server‬‏ ‏‮nickname‬‏ ‏‮and‬‏ ‏‮avatar.‬‏ @@ -3299,7 +3300,8 @@ ‏‮Good‬‏ ‏‮for:‬‏ ‏‮$[Q&A,‬‏ ‏‮AMA,‬‏ ‏‮Panel‬‏ ‏‮Discussion](suggestionsHook)‬‏ ‏‮Q&A‬‏ ‏‮AMA‬‏ - ‏‮Panel‬‏ ‏‮Discussion‬‏ + ‏‮Panel‬‏ + ‏‮Discussion‬‏ ‏‮Try‬‏ ‏‮using‬‏ ‏‮a‬‏ ‏‮Stage‬‏ ‏‮channel!‬‏ ‏‮So‬‏ ‏‮no‬‏ ‏‮one‬‏ ‏‮gets‬‏ ‏‮lost‬‏ ‏‮on‬‏ ‏‮where‬‏ ‏‮to‬‏ ‏‮go.‬‏ ‏‮Where‬‏ ‏‮is‬‏ ‏‮your‬‏ ‏‮event?‬‏ @@ -3339,6 +3341,8 @@ ‏‮No‬‏ ‏‮Results‬‏ ‏‮Search‬‏ ‏‮your‬‏ ‏‮servers‬‏ ‏‮Owned‬‏ ‏‮by‬‏ ‏‮you‬‏ + ‏‮Before‬‏ ‏‮you‬‏ ‏‮join,‬‏ ‏‮please‬‏ ‏‮confirm‬‏ ‏‮you’re‬‏ ‏‮not‬‏ ‏‮a‬‏ ‏‮robot.‬‏ + ‏‮Wait!‬‏ ‏‮Are‬‏ ‏‮you‬‏ ‏‮human?‬‏ ‏‮I‬‏ ‏‮asked‬‏ ‏‮my‬‏ ‏‮friends‬‏ ‏‮for‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮Describe‬‏ ‏‮how‬‏ ‏‮you‬‏ ‏‮found‬‏ ‏‮this‬‏ ‏‮server‬‏ ‏‮I‬‏ ‏‮joined‬‏ ‏‮a‬‏ ‏‮community‬‏ ‏‮I\'m‬‏ ‏‮a‬‏ ‏‮member‬‏ ‏‮of‬‏ ‏‮elsewhere‬‏ @@ -5679,8 +5683,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‬‏ @@ -6763,6 +6767,7 @@ ‏‮Get‬‏ ‏‮{numBoosts}‬‏ ‏‮Boosts‬‏ ‏‮and‬‏ ‏‮{discountPercentage}‬‏ ‏‮off‬‏ ‏‮future‬‏ ‏‮Boosts‬‏ ‏‮Double‬‏ ‏‮the‬‏ ‏‮number‬‏ ‏‮of‬‏ ‏‮servers‬‏ ‏‮you‬‏ ‏‮can‬‏ ‏‮join‬‏ ‏‮from‬‏ ‏‮{nonPremiumMaxGuilds}‬‏ ‏‮to‬‏ ‏‮{premiumMaxGuilds}‬‏ ‏‮Style‬‏ ‏‮your‬‏ ‏‮profile‬‏ ‏‮with‬‏ ‏‮a‬‏ ‏‮banner,‬‏ ‏‮custom‬‏ ‏‮tag,‬‏ ‏‮animated‬‏ ‏‮avatar,‬‏ ‏‮and‬‏ ‏‮exclusive‬‏ ‏‮Nitro‬‏ ‏‮badge‬‏ + ‏‮Use‬‏ ‏‮a‬‏ ‏‮different‬‏ ‏‮avatar‬‏ ‏‮in‬‏ ‏‮each‬‏ ‏‮of‬‏ ‏‮your‬‏ ‏‮servers.‬‏ ‏‮Better‬‏ ‏‮video‬‏ ‏‮resolutions‬‏ ‏‮for‬‏ ‏‮all‬‏ ‏‮your‬‏ ‏‮desktop‬‏ ‏‮screen‬‏ ‏‮shares‬‏ ‏‮up‬‏ ‏‮to‬‏ ‏‮4k‬‏ ‏‮60fps‬‏ ‏‮Increased‬‏ ‏‮upload‬‏ ‏‮size‬‏ ‏‮from‬‏ ‏‮{maxUploadStandard}‬‏ ‏‮to‬‏ ‏‮{maxUploadPremium}‬‏ ‏‮Nitro‬‏ ‏‮Monthly‬‏ diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 649ebe2ace..093809239c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1148,7 +1148,6 @@ Псевдоним (деактивирано) Можеш да промениш как другите те виждат в този сървър, като зададеш псевдоним и аватар за сървъра. Аватар за сървъра $[БЕТА ВЕРСИЯ](betaBadgeHook) - Нулиране до основния аватар Промяна на сървъра Промени аватара за сървъра Използвай различен аватар във всеки от своите сървъри и още много с **Discord Nitro!** diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6a393955df..c26a809a60 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1149,7 +1149,6 @@ Přezdívka (vypnuto) Můžeš změnit, jak tě ostatní na tomto serveru vidí, nastavením přezdívky a avataru pro konkrétní server. Avatar pro server $[BETA VERZE](betaBadgeHook) - Obnovit výchozí avatar Změnit server Změnit avatar pro server Na každém ze svých serverů používej různé avatary a více s **Discordem Nitro!** diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d74c19ee45..37e51fc3bb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1141,7 +1141,6 @@ Kaldenavn (Deaktiveret) Du kan ændre, hvordan andre ser dig inde på denne server ved at angive et kaldenavn og avatar. Server-avatar $[BETA](betaBadgeHook) - Nulstil til primær avatar Skift server Ændr Server- avatar Brug en anden avatar på hver af dine servere og meget mere med **Discord Nitro!** diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b05f08539f..f9864ca71f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1149,7 +1149,6 @@ Nickname (deaktiviert) Du kannst ändern, wie andere auf diesem Server dich sehen, indem du deinen Server-Nickname und Avatar änderst. Server-Avatar $[BETA](betaBadgeHook) - Primären Avatar wiederherstellen Server wechseln Server -Avatar ändern Benutze auf jedem deiner Server einen anderen Avatar und vieles mehr mit **Discord Nitro!** diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c98fc2d651..ff356ae6fe 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1149,7 +1149,6 @@ Ψευδώνυμο (απενεργοποιημένο) Μπορείς να αλλάξεις τον τρόπο με τον οποίο σε βλέπουν οι άλλοι μέσα στον διακομιστή, ορίζοντας ψευδώνυμο και άβαταρ διακομιστή. Άβαταρ διακομιστή $[BETA](betaBadgeHook) - Επαναφορά στο αρχικό άβαταρ Αλλαγή διακομιστή Αλλαγή Άβαταρ Διακομιστή Χρησιμοποίησε διαφορετικό άβαταρ σε κάθε διακομιστή σου και πολλά άλλα με το **Discord Nitro!** diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index b6c7b106db..aeeea24019 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -1215,8 +1215,9 @@ [Çĥåñĝé Îðéñţîţý one two three] [Šéţţîñĝ å ðéŕéñţ åVåţåŕ ƒöŕ éåçĥ öƒ ýöûŕ šéŕVéŕš îš çûŕŕéñţļý åVåîļåɓļé ţö å ļîḿîţéð ñûḿɓéŕ öƒ þéöþļé. one two three four five six seven eight nine ten eleven] [Ĝöţ îţ one two] - [Ûšé å ñîçķñåḿé åñð, îƒ ýöû ĥåVé Ñîţŕö, ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš. one two three four five six seven eight nine] - [ÑÉŴ¡ Çĥåñĝé ŠéŕVéŕ Îðéñţîţý one two three four] + [Ûšé å ñîçķñåḿé, åñð îƒ ýöû ĥåVé Ñîţŕö, å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš¡ one two three four five six seven eight nine] + [Ûþðåţé ḿý šéŕVéŕ þŕöƒîļé one two three] + [Ñéŵ¡ ŠéŕVéŕ Þŕöƒîļéš one two three] [Ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš åñð ḿöŕé ŵîţĥ Ðîšçöŕð Ñîţŕö¡ one two three four five six seven eight] [Ñîçķñåḿé (Ðîšåɓļéð) one two three] [Ýöû çåñ çĥåñĝé ĥöŵ öţĥéŕš šéé ýöû îñšîðé ţĥîš šéŕVéŕ ɓý šéţţîñĝ å šéŕVéŕ ñîçķñåḿé åñð åVåţåŕ. one two three four five six seven eight nine ten] @@ -3299,7 +3300,8 @@ [Ĝööð ƒöŕ: €[q&A,Å, ÅḾÅ, Þåñéļ Ðîšçûššîöñ](šûĝĝéšţîöñšĤööķ) one two three four five six seven eight nine ten eleven twelve] [q&AÅ one] [ÅḾÅ one] - [Þåñéļ Ðîšçûššîöñ one two three] + [Þåñéļ one] + [Ðîšçûššîöñ one two] [Ţŕý ûšîñĝ å Šţåĝé çĥåññéļ¡ one two three four] [Šö ñö öñé ĝéţš ļöšţ öñ ŵĥéŕé ţö ĝö. one two three four] [Ŵĥéŕé îš ýöûŕ éVéñţ¿ one two three] @@ -3339,6 +3341,8 @@ [Ñö Ŕéšûļţš one two] [Šéåŕçĥ ýöûŕ šéŕVéŕš one two three] [Öŵñéð ɓý ýöû one two] + [βéƒöŕé ýöû ĵöîñ, þļéåšé çöñƒîŕḿ ýöû’ŕé ñöţ å ŕöɓöţ. one two three four five six] + [Ŵåîţ¡ Åŕé ýöû ĥûḿåñ¿ one two three] [Î åšķéð ḿý ƒŕîéñðš ƒöŕ åñ îñVîţé one two three four] [Ðéšçŕîɓé ĥöŵ ýöû ƒöûñð ţĥîš šéŕVéŕ one two three four] [Î ĵöîñéð å çöḿḿûñîţý Î\'ḿ å ḿéḿɓéŕ öƒ éļšéŵĥéŕé one two three four five six] @@ -5679,8 +5683,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] @@ -6763,6 +6767,7 @@ [Ĝéţ »{numBoosts}« βööšţš åñð »{discountPercentage}« öƒƒ ƒûţûŕé βööšţš one two three four] [Ðöûɓļé ţĥé ñûḿɓéŕ öƒ šéŕVéŕš ýöû çåñ ĵöîñ ƒŕöḿ »{nonPremiumMaxGuilds}« ţö »{premiumMaxGuilds}« one two three four five six] [Šţýļé ýöûŕ þŕöƒîļé ŵîţĥ å ɓåññéŕ, çûšţöḿ ţåĝ, åñîḿåţéð åVåţåŕ, åñð éхçļûšîVé Ñîţŕö ɓåðĝé one two three four five six seven eight nine ten] + [Ûšé å ðéŕéñţ åVåţåŕ îñ éåçĥ öƒ ýöûŕ šéŕVéŕš. one two three four five six] [βéţţéŕ Vîðéö ŕéšöļûţîöñš ƒöŕ åļļ ýöûŕ ðéšķţöþ šçŕééñ šĥåŕéš ûþ ţö 4ķ 60ƒþš one two three four five six seven eight] [Îñçŕéåšéð ûþļöåð šîžé ƒŕöḿ »{maxUploadStandard}« ţö »{maxUploadPremium}« one two three four] [Ñîţŕö Ḿöñţĥļý one two] diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 9c8c544a17..a016068cb8 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1121,7 +1121,6 @@ Apodo (deshabilitado) Puedes cambiar cómo te ven los demás dentro de este servidor estableciendo un apodo y un avatar del servidor. Avatar de servidor $[BETA](betaBadgeHook) - Restablecer avatar principal Cambiar de servidor Cambiar de avatar de servidor ¡Utiliza un avatar diferente en cada uno de tus servidores y más con **Discord Nitro!** diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 70acc99bbc..a0d16cdd7d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1149,7 +1149,6 @@ Nimimerkki (pois käytöstä) Asettamalla palvelinkohtaisen nimimerkin ja avatarin voit muuttaa sitä, miten muut näkevät sinut palvelimella. Palvelimen avatar $[BEETA](betaBadgeHook) - Palauta ensisijainen avatar Vaihda palvelin Vaihda avatar palvelimelle Käytä eri avataria kullakin palvelimellesi ja monia muita etuja **Discord Nitrolla**. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4c9f63ca6f..0704a6a8d5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1149,7 +1149,6 @@ Pseudo (Désactivé) Tu peux changer la façon dont les autres te voient dans ce serveur en personnalisant ton pseudo et ton avatar de serveur. Avatar du serveur $[BÊTA](betaBadgeHook) - Restaurer l\'avatar principal Changer le serveur Changer l\'avatar du serveur Avec **Discord Nitro**, utilise un avatar différent sur chacun de tes serveurs et bien plus ! diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0924e2dbae..30fb239ce9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1149,7 +1149,6 @@ निकनेम (ऑफ़ है) अब सर्वर का निकनेम और अवतार सेट करके, आप दूसरो के लिए सर्वर में अपने दिखने के तरीके को बदल सकते हैं. सर्वर का अवतार $[बीटा](betaBadgeHook) - प्राइमरी अवतार पर रीसेट करें सर्वर बदलें सर्वर का अवतार बदलें **Discord Nitro** के साथ अपने हर सर्वर में अलग-अलग अवतार का इस्तेमाल और भी बहुत कुछ करें! diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 27d4eefb4e..c38377d82c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1149,7 +1149,6 @@ Nadimak (onemogućen) Da bi promijenio kako te drugi vide unutar ovog servera, možeš postaviti nadimak i avatar koji vrijede samo za njega. Server Avatar $[BETA](betaBadgeHook) - Vrati na primarni avatar Promijeni server Promijeni server avatar Koristi drugi avatar u svakom od svojih servera i još mnogo toga uz **Discord Nitro!** diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f22267dcce..edc3086159 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1149,7 +1149,6 @@ Becenév (letiltva) A szerverbecenév és -profilkép beállításával módosíthatod, hogy mások hogyan lássanak ezen a szerveren. Szerverprofilkép $[BÉTA](betaBadgeHook) - Elsődleges profilkép visszaállítása Szerver módosítása Szerver profilkép módosítása Használj eltérő profilképet minden egyes szerveren, és juss hozzá még sok minden máshoz is a **Discord Nitro-előfizetéssel**! diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c3432d6922..9068557227 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1149,7 +1149,6 @@ Nickname (disattivato) Puoi modificare il modo in cui gli altri possono vederti all\'interno di questo server impostando un nickname e un avatar specifici per questo server. Avatar per il server $[BETA](betaBadgeHook) - Ripristina avatar principale Cambia server Cambia avatar del server Utilizza un avatar diverso in ognuno dei tuoi server e molto altro ancora con **Discord Nitro!** @@ -8718,7 +8717,7 @@ Questo qui è il tuo server nuovo di zecca. Benvenuto su !!{guildName}!! Benvenuto in !!{guildName}!! - **Scarica** l\'[applicazione per desktop](onDownloadClick) per poter usare il push-to-talk anche se la finestra non è in primo piano, per ridurre il consumo di banda e l\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 + **Scarica** l\'[applicazione per desktop](onDownloadClick) per poter usare il push-to-talk anche se la finestra non è in primo piano, per ridurre il consumo di banda e l\'utilizzo del processore, e molto altro. Modifica il canale **Invita gli amici** al server cliccando [qui](onShareClick) non appena sei pronto. **Resta connesso** al server dal [tuo smartphone](onDownloadClick) mentre sei a casa o in movimento. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 951c5dadd2..1e54be774e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1149,7 +1149,6 @@ ニックネーム（無効） このサーバー専用のニックネームとアバターを設定して、サーバー内のメンバーに見せる自分を変更できます。 サーバーアバター $[BETA](betaBadgeHook) - 初期アバターに戻す サーバーを変更 サーバー アバターを 変更 サーバーごとに使うアバターを変えることも、**Discord Nitro ならできちゃいます！** diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b5cbb862d2..f80a86fb05 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1149,7 +1149,6 @@ 별명 (비활성화됨) 서버 별명 및 아바타 설정으로, 이 서버에서 자신이 어떻게 타인에게 나타날지를 바꿀 수 있어요. 서버 아바타 $[BETA](betaBadgeHook) - 기본 아바타로 재설정하기 서버 변경하기 서버 아바타 변경하기 **Discord Nitro 구독**으로 참가 중인 서버마다 각기 다른 아바타를 사용해보세요! diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c650bf5c30..0520ba1683 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1149,7 +1149,6 @@ Slapyvardis (išjungtas) Gali pakeisti, kaip kiti mato tave šiame serveryje, nustatydamas serverio slapyvardį ir pseudoportretą. Serverio pseudoportretas $[BETA](betaBadgeHook) - Atkurti pirminį pseudoportretą Keisti serverį Pakeisti serverio pseudoportretą Naudok skirtingus pseudoportretus kiekviename savo serveryje **ir dar daugiau su Discord Nitro!** diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f748a6b456..bbf2d60b39 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1149,7 +1149,6 @@ Bijnaam (uitgeschakeld) Je kunt wijzigen hoe anderen je zien in deze server door een bijnaam en avatar in te stellen. Serveravatar $[BÈTA](betaBadgeHook) - Resetten naar standaardavatar Andere server Andere serveravatar Gebruik een andere avatar op al je servers en nog veel meer met **Discord Nitro!** diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 2dd90def94..e0f2f11ce0 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -1121,7 +1121,6 @@ Kallenavn (deaktivert) Du kan endre hvordan andre ser deg i denne serveren ved å angi et kallenavn og en avatar for serveren. Server-avatar $[BETA](betaBadgeHook) - Tilbakestill til primæravatar Bytt server Bytt server-avatar Bruk forskjellig avatar på hver av serverne dine og mer med **Discord Nitro!** diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f7bfae1f11..aea97218f5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1148,7 +1148,6 @@ Pseudonim (wył.) Możesz zmienić to, jak inne osoby widzą Cię na tym serwerze, ustawiając pseudonim serwerowy oraz awatar. Awatar serwerowy $[BETA](betaBadgeHook) - Przywróć do domyślnego awatara Zmień serwer Zmień awatar serwerowy Używaj innego awatara na każdym ze swoich serwerów i nie tylko dzięki **Discord Nitro!** diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 914fba97ba..43639dfbb0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1147,7 +1147,6 @@ Apelido (desabilitado) Você pode mudar como os outros te veem dentro deste servidor ao definir seu apelido e seu avatar no servidor. Avatar do servidor $[BETA](betaBadgeHook) - Redefinir para avatar principal Mudar servidor Mudar avatar do servidor Use um avatar diferente em cada um dos seus servidores e muito mais com o **Discord Nitro!** diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a440261f98..784f8bbf1d 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1149,7 +1149,6 @@ Poreclă (Dezactivată) Poți schimba cum te văd ceilalți de pe acest server setând o poreclă și un avatar specifice serverului. Avatar server $[BETA](betaBadgeHook) - Resetează la avatarul principal Schimbă serverul Schimbă avatarul pentru server Folosește câte un avatar diferit pe fiecare server, plus multe altele cu **Discord Nitro!** diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4931970e78..1d89d54954 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1148,7 +1148,6 @@ Никнейм (выключен) Вы можете изменить то, как другие видят вас на этом сервере, выбрав никнейм и аватар для этого сервера. Аватары для серверов $[БЕТА](betaBadgeHook) - Вернуться к основному аватару Сменить сервер Изменить аватар на сервере Используйте разные аватары на каждом из своих серверов и многое другое с **подпиской Discord Nitro!** diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index b6dd278d38..2a0ba4286e 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -1121,7 +1121,6 @@ Smeknamn (inaktiverat) Du kan ändra hur andra ser dig på den här servern genom att ange ett serversmeknamn och en avatar. Serveravatar $[BETA](betaBadgeHook) - Återställ till huvudavatar Ändra server Ändra serveravatar Använd olika avatarer på var och en av dina servrar och mer med **Discord Nitro!** diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ca3364d23c..cf7a8df749 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1149,7 +1149,6 @@ ชื่อเล่น (ปิดใช้งาน) คุณสามารถเปลี่ยนลักษณะที่ผู้อื่นเห็นคุณในเซิร์ฟเวอร์นี้ได้โดยตั้งค่าชื่อเล่นและสัญลักษณ์ประจำตัวของเซิร์ฟเวอร์ สัญลักษณ์ประจำตัวของเซิร์ฟเวอร์ $[เบตา](betaBadgeHook) - รีเซ็ตไปยังสัญลักษณ์ประจำตัวหลัก เปลี่ยนเซิร์ฟเวอร์ เปลี่ยนสัญลักษณ์ประจำตัวของ เซิร์ฟเวอร์ ใช้สัญลักษณ์ประจำตัวที่แตกต่างกันในแต่ละเซิร์ฟเวอร์ของคุณ และอีกมากมายด้วย **Discord Nitro!** diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index cfe82a3f05..97fd19ef74 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1149,7 +1149,6 @@ Kullanıcı adı (devre dışı) Bu sunucuya özel kullanıcı adı ve avatar belirleyerek bu sunucudaki diğer kullanıcılara nasıl görüneceğini belirleyebilirsin. Sunucu Avatarı $[BETA](betaBadgeHook) - Ana Avatara Sıfırla Sunucu Değiştir Sunucu Avatarını Değiştir **Discord Nitro** ile sunucularında farklı avatarlar kullan ve daha fazla özelliğe eriş! diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 412b09c5be..de0ec10fd9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1149,7 +1149,6 @@ Нікнейм (Вимкнено) Можеш змінити свій зовнішній вигляд для інших користувачів сервера, обравши нікнейм та аватар для сервера. Аватар сервера $[БЕТА-ДОСТУП](betaBadgeHook) - Скинути до стандартного аватара Змінити сервер Змінити аватар сервера Використовуй інший аватар для кожного зі своїх серверів, та багато інших можливостей чекають на тебе із **Discord Nitro!** diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1f12554f53..c580429ef5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1148,7 +1148,6 @@ Biệt danh (Tắt) Bạn có thể thay đổi cách người khác nhìn thấy bạn trong máy chủ này bằng cách đặt biệt danh và ảnh đại diện máy chủ. Ảnh Đại Diện Máy Chủ $[BETA](betaBadgeHook) - Đặt lại về Ảnh đại diện chính Thay đổi Máy Chủ Đổi Ảnh Đại Diện Máy Chủ Sử dụng ảnh đại diện khác nhau trong mỗi máy chủ và nhiều hơn thế nữa với **Discord Nitro!** diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e0e25cc754..e36a5df991 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1149,7 +1149,6 @@ 昵称（已关闭） 您可以通过设置服务器昵称和头像来更改其他人在此服务器内所能看到的您的形象。 服务器头像$[测试版](betaBadgeHook) - 重置主头像 更改服务器 更改 服务器 头像 使用**Discord Nitro**，在您的每个服务器使用不同的头像，以及更多内容等你来享！ diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c91c006ee2..6b9ed70208 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1148,7 +1148,6 @@ 暱稱 (已停用) 透過設定伺服器暱稱和頭像，變更您在此伺服器內的形象。 伺服器頭像 $[BETA](betaBadgeHook) - 重置為主要頭像 變更伺服器 變更 伺服器 頭像 取得 **Discord Nitro**，就能在各個伺服器使用不同的頭像，還能盡享更多好處 ！ diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index bf7e50838d..ab827ab67b 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -4943,127 +4943,128 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10099,116 +10100,116 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15577,8273 +15578,8278 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index abde3fb96c..9271c9bc7b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1217,8 +1217,9 @@ Change Identity Setting a different avatar for each of your servers is currently available to a limited number of people. Got it - Use a nickname and, if you have Nitro, use a different avatar in each of your servers. - NEW! Change Server Identity + Use a nickname, and if you have Nitro, a different avatar in each of your servers! + Update my server profile + New! Server Profiles Use a different avatar in each of your servers and more with Discord Nitro! Nickname (Disabled) You can change how others see you inside this server by setting a server nickname and avatar. @@ -1412,7 +1413,7 @@ Select a color Transparency Use Default - dc756968c8e343d6bc58c8068642e5a5 + 5b05e527a2984172829d27e5ec36021c Coming Soon Slash command application {applicationName} {applicationName} application @@ -3315,7 +3316,8 @@ Good for: $[Q&A, AMA, Panel Discussion](suggestionsHook) Q&A AMA - Panel Discussion + Panel + Discussion Try using a Stage channel! So no one gets lost on where to go. Where is your event? @@ -3355,6 +3357,8 @@ No Results Search your servers Owned by you + Before you join, please confirm you’re not a robot. + Wait! Are you human? I asked my friends for an invite Describe how you found this server I joined a community I\'m a member of elsewhere @@ -5698,8 +5702,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 @@ -6789,6 +6793,7 @@ Get {numBoosts} Boosts and {discountPercentage} off future Boosts Double the number of servers you can join from {nonPremiumMaxGuilds} to {premiumMaxGuilds} Style your profile with a banner, custom tag, animated avatar, and exclusive Nitro badge + Use a different avatar in each of your servers. Better video resolutions for all your desktop screen shares up to 4k 60fps Increased upload size from {maxUploadStandard} to {maxUploadPremium} Nitro Monthly